From 5f5ca13fb00c188a83fa9622dd0f884e17ec298b Mon Sep 17 00:00:00 2001 From: GoGoWen2021 Date: Mon, 1 Apr 2024 17:28:56 +0800 Subject: [PATCH 1/2] fix iceberg catalog of hms and hadoop not support iceberg properties --- .../doris/datasource/iceberg/IcebergHMSExternalCatalog.java | 2 +- .../datasource/iceberg/IcebergHadoopExternalCatalog.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java index 221aed4cd8c1d7..04dfdd3044f8f7 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java @@ -42,7 +42,7 @@ protected void initCatalog() { HiveCatalog hiveCatalog = new org.apache.iceberg.hive.HiveCatalog(); hiveCatalog.setConf(getConfiguration()); // initialize hive catalog - Map catalogProperties = new HashMap<>(); + Map catalogProperties = catalogProperty.getProperties(); String metastoreUris = catalogProperty.getOrDefault(HMSProperties.HIVE_METASTORE_URIS, ""); catalogProperties.put(CatalogProperties.URI, metastoreUris); hiveCatalog.initialize(icebergCatalogType, catalogProperties); diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java index e86bdd61369f59..6b1383ab83c83d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java @@ -56,8 +56,8 @@ protected void initCatalog() { HadoopCatalog hadoopCatalog = new HadoopCatalog(); Configuration conf = getConfiguration(); initS3Param(conf); - // initialize hive catalog - Map catalogProperties = new HashMap<>(); + // initialize hadoop catalog + Map catalogProperties = catalogProperty.getProperties(); String warehouse = catalogProperty.getHadoopProperties().get(CatalogProperties.WAREHOUSE_LOCATION); hadoopCatalog.setConf(conf); catalogProperties.put(CatalogProperties.WAREHOUSE_LOCATION, warehouse); From a7d337ed45100cc628ec38f9bd87e62bd0ca9eea Mon Sep 17 00:00:00 2001 From: GoGoWen2021 Date: Tue, 2 Apr 2024 11:19:59 +0800 Subject: [PATCH 2/2] remove unused import --- .../doris/datasource/iceberg/IcebergHMSExternalCatalog.java | 1 - .../doris/datasource/iceberg/IcebergHadoopExternalCatalog.java | 1 - 2 files changed, 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java index 04dfdd3044f8f7..34e6f0c187e5ba 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java @@ -24,7 +24,6 @@ import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.hive.HiveCatalog; -import java.util.HashMap; import java.util.Map; public class IcebergHMSExternalCatalog extends IcebergExternalCatalog { diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java index 6b1383ab83c83d..01eee31d3b08d3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java @@ -27,7 +27,6 @@ import org.apache.iceberg.CatalogProperties; import org.apache.iceberg.hadoop.HadoopCatalog; -import java.util.HashMap; import java.util.Map; public class IcebergHadoopExternalCatalog extends IcebergExternalCatalog {