From 8ef9409c06dcfbc1fe51de227958fc410088f639 Mon Sep 17 00:00:00 2001 From: fanng Date: Fri, 18 Oct 2024 11:17:25 +0800 Subject: [PATCH] fix comment --- .../catalog/lakehouse/iceberg/IcebergConstants.java | 5 ++++- .../gravitino/iceberg/common/IcebergConfig.java | 8 ++++---- .../provider/DynamicIcebergCatalogConfigProvider.java | 3 --- .../provider/StaticIcebergCatalogConfigProvider.java | 2 -- .../iceberg/service/IcebergCatalogWrapperManager.java | 11 ++++++----- .../iceberg/service/rest/IcebergRestTestUtil.java | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/catalogs/catalog-common/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergConstants.java b/catalogs/catalog-common/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergConstants.java index 21462b9ca91..004bde0bd7e 100644 --- a/catalogs/catalog-common/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergConstants.java +++ b/catalogs/catalog-common/src/main/java/org/apache/gravitino/catalog/lakehouse/iceberg/IcebergConstants.java @@ -68,7 +68,10 @@ public class IcebergConstants { public static final String ICEBERG_REST_CATALOG_CACHE_EVICTION_INTERVAL = "catalog-cache-eviction-interval-ms"; - public static final String ICEBERG_REST_CATALOG_PROVIDER = "catalog-provider"; + public static final String ICEBERG_REST_CATALOG_CONFIG_PROVIDER = "catalog-config-provider"; + public static final String STATIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME = "static-config-provider"; + public static final String DYNAMIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME = + "dynamic-config-provider"; public static final String GRAVITINO_URI = "gravitino-uri"; diff --git a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/IcebergConfig.java b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/IcebergConfig.java index c8b3f405b76..638b4172ce4 100644 --- a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/IcebergConfig.java +++ b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/IcebergConfig.java @@ -202,13 +202,13 @@ public class IcebergConfig extends Config implements OverwriteDefaultConfig { .longConf() .createWithDefault(3600000L); - public static final ConfigEntry ICEBERG_REST_CATALOG_PROVIDER = - new ConfigBuilder(IcebergConstants.ICEBERG_REST_CATALOG_PROVIDER) + public static final ConfigEntry ICEBERG_REST_CATALOG_CONFIG_PROVIDER = + new ConfigBuilder(IcebergConstants.ICEBERG_REST_CATALOG_CONFIG_PROVIDER) .doc( - "Catalog provider class name, you can develop a class that implements `IcebergCatalogWrapperProvider` and add the corresponding jar file to the Iceberg REST service classpath directory.") + "Catalog provider class name, you can develop a class that implements `IcebergCatalogConfigProvider` and add the corresponding jar file to the Iceberg REST service classpath directory.") .version(ConfigConstants.VERSION_0_7_0) .stringConf() - .createWithDefault("config-based-provider"); + .createWithDefault(IcebergConstants.STATIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME); public static final ConfigEntry GRAVITINO_URI = new ConfigBuilder(IcebergConstants.GRAVITINO_URI) diff --git a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/DynamicIcebergCatalogConfigProvider.java b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/DynamicIcebergCatalogConfigProvider.java index 8783283cc84..4965f4bc132 100644 --- a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/DynamicIcebergCatalogConfigProvider.java +++ b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/DynamicIcebergCatalogConfigProvider.java @@ -45,9 +45,6 @@ public class DynamicIcebergCatalogConfigProvider public static final Logger LOG = LoggerFactory.getLogger(DynamicIcebergCatalogConfigProvider.class); - public static final String DYNAMIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME = - "dynamic-config-provider"; - private String gravitinoMetalake; private GravitinoAdminClient client; diff --git a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/StaticIcebergCatalogConfigProvider.java b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/StaticIcebergCatalogConfigProvider.java index d39d06800c4..aa7f1032134 100644 --- a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/StaticIcebergCatalogConfigProvider.java +++ b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/provider/StaticIcebergCatalogConfigProvider.java @@ -43,8 +43,6 @@ public class StaticIcebergCatalogConfigProvider implements IcebergCatalogConfigP public static final Logger LOG = LoggerFactory.getLogger(StaticIcebergCatalogConfigProvider.class); - public static final String STATIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME = "static-config-provider"; - @VisibleForTesting Map catalogConfigs; @Override diff --git a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java index afc33ece642..823f42ddb16 100644 --- a/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java +++ b/iceberg/iceberg-rest-server/src/main/java/org/apache/gravitino/iceberg/service/IcebergCatalogWrapperManager.java @@ -47,9 +47,9 @@ public class IcebergCatalogWrapperManager implements AutoCloseable { private static final ImmutableMap ICEBERG_CATALOG_CONFIG_PROVIDER_NAMES = ImmutableMap.of( - StaticIcebergCatalogConfigProvider.STATIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME, + IcebergConstants.STATIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME, StaticIcebergCatalogConfigProvider.class.getCanonicalName(), - DynamicIcebergCatalogConfigProvider.DYNAMIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME, + IcebergConstants.DYNAMIC_ICEBERG_CATALOG_CONFIG_PROVIDER_NAME, DynamicIcebergCatalogConfigProvider.class.getCanonicalName()); private final Cache icebergCatalogWrapperCache; @@ -60,7 +60,7 @@ public class IcebergCatalogWrapperManager implements AutoCloseable { public IcebergCatalogWrapperManager(Map properties) { this.credentialProviderManager = new CredentialProviderManager(); - this.provider = createProvider(properties); + this.provider = createIcebergCatalogConfigProvider(properties); this.provider.initialize(properties); this.icebergCatalogWrapperCache = Caffeine.newBuilder() @@ -139,9 +139,10 @@ private String getCatalogName(String rawPrefix) { return prefix; } - private IcebergCatalogConfigProvider createProvider(Map properties) { + private IcebergCatalogConfigProvider createIcebergCatalogConfigProvider( + Map properties) { String providerName = - (new IcebergConfig(properties)).get(IcebergConfig.ICEBERG_REST_CATALOG_PROVIDER); + (new IcebergConfig(properties)).get(IcebergConfig.ICEBERG_REST_CATALOG_CONFIG_PROVIDER); String className = ICEBERG_CATALOG_CONFIG_PROVIDER_NAMES.getOrDefault(providerName, providerName); LOG.info("Load Iceberg catalog provider: {}.", className); diff --git a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/IcebergRestTestUtil.java b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/IcebergRestTestUtil.java index d1beb49afc0..1a085a251d9 100644 --- a/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/IcebergRestTestUtil.java +++ b/iceberg/iceberg-rest-server/src/test/java/org/apache/gravitino/iceberg/service/rest/IcebergRestTestUtil.java @@ -79,7 +79,7 @@ public static ResourceConfig getIcebergResourceConfig(Class c, boolean bindIcebe Map catalogConf = Maps.newHashMap(); String catalogConfigPrefix = "catalog." + PREFIX; catalogConf.put( - IcebergConstants.ICEBERG_REST_CATALOG_PROVIDER, + IcebergConstants.ICEBERG_REST_CATALOG_CONFIG_PROVIDER, StaticIcebergCatalogConfigProvider.class.getName()); catalogConf.put(String.format("%s.catalog-backend-name", catalogConfigPrefix), PREFIX); catalogConf.put(