Skip to content

[BugFix](Iceberg Catalog) Fix iceberg catalog of hms and hadoop not support iceberg properties #33113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 2 commits into from
Apr 5, 2024
Merged

[BugFix](Iceberg Catalog) Fix iceberg catalog of hms and hadoop not support iceberg properties #33113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f5ca13
fix iceberg catalog of hms and hadoop not support iceberg properties
GoGoWen Apr 1, 2024
a7d337e
remove unused import
GoGoWen Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHMSExternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -42,7 +41,7 @@ protected void initCatalog() {
HiveCatalog hiveCatalog = new org.apache.iceberg.hive.HiveCatalog();
hiveCatalog.setConf(getConfiguration());
// initialize hive catalog
Map<String, String> catalogProperties = new HashMap<>();
Map<String, String> catalogProperties = catalogProperty.getProperties();
String metastoreUris = catalogProperty.getOrDefault(HMSProperties.HIVE_METASTORE_URIS, "");
catalogProperties.put(CatalogProperties.URI, metastoreUris);
hiveCatalog.initialize(icebergCatalogType, catalogProperties);
Expand Down
5 changes: 2 additions & 3 deletions ...-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergHadoopExternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -56,8 +55,8 @@ protected void initCatalog() {
HadoopCatalog hadoopCatalog = new HadoopCatalog();
Configuration conf = getConfiguration();
initS3Param(conf);
// initialize hive catalog
Map<String, String> catalogProperties = new HashMap<>();
// initialize hadoop catalog
Map<String, String> catalogProperties = catalogProperty.getProperties();
String warehouse = catalogProperty.getHadoopProperties().get(CatalogProperties.WAREHOUSE_LOCATION);
hadoopCatalog.setConf(conf);
catalogProperties.put(CatalogProperties.WAREHOUSE_LOCATION, warehouse);
Expand Down