This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 077ec4b114 [bug](multi-catalog) empty hadoop configuration when
reading iceberg table (#10793)
077ec4b114 is described below
commit 077ec4b1144149687fb5a80cd982cacaaa58cf84
Author: Ashin Gau <ashin...@users.noreply.github.com>
AuthorDate: Thu Jul 14 10:18:59 2022 +0800
[bug](multi-catalog) empty hadoop configuration when reading iceberg table
(#10793)
---
fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java | 5 -----
.../org/apache/doris/planner/external/ExternalHiveScanProvider.java | 4 ++--
.../apache/doris/planner/external/ExternalIcebergScanProvider.java | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java
index 015f238a31..06063b614c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java
@@ -88,8 +88,6 @@ public class DescribeStmt extends ShowStmt {
private boolean isAllTables;
private boolean isOlapTable;
- private List<List<String>> hmsSchema = null;
-
public DescribeStmt(TableName dbTableName, boolean isAllTables) {
this.dbTableName = dbTableName;
this.totalRows = new LinkedList<List<String>>();
@@ -236,9 +234,6 @@ public class DescribeStmt extends ShowStmt {
if (isAllTables) {
return totalRows;
} else {
- if (hmsSchema != null) {
- return hmsSchema;
- }
Preconditions.checkNotNull(node);
return node.fetchResult().getRows();
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalHiveScanProvider.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalHiveScanProvider.java
index 67fa36ad06..c60ee3c211 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalHiveScanProvider.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalHiveScanProvider.java
@@ -107,13 +107,13 @@ public class ExternalHiveScanProvider implements
ExternalFileScanProvider {
return inputFormat.getSplits(jobConf, 0);
}
- private Configuration setConfiguration() {
+ protected Configuration setConfiguration() {
Configuration conf = new Configuration();
Map<String, String> dfsProperties = hmsTable.getDfsProperties();
for (Map.Entry<String, String> entry : dfsProperties.entrySet()) {
conf.set(entry.getKey(), entry.getValue());
}
- Map<String, String> s3Properties = hmsTable.getDfsProperties();
+ Map<String, String> s3Properties = hmsTable.getS3Properties();
for (Map.Entry<String, String> entry : s3Properties.entrySet()) {
conf.set(entry.getKey(), entry.getValue());
}
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalIcebergScanProvider.java
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalIcebergScanProvider.java
index 6f321fc4b7..83ddc86c4d 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalIcebergScanProvider.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/planner/external/ExternalIcebergScanProvider.java
@@ -101,7 +101,7 @@ public class ExternalIcebergScanProvider extends
ExternalHiveScanProvider {
private org.apache.iceberg.Table getIcebergTable() throws
MetaNotFoundException {
org.apache.iceberg.hive.HiveCatalog hiveCatalog = new
org.apache.iceberg.hive.HiveCatalog();
- Configuration conf = new Configuration();
+ Configuration conf = setConfiguration();
hiveCatalog.setConf(conf);
// initialize hive catalog
Map<String, String> catalogProperties = new HashMap<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
