This is an automated email from the ASF dual-hosted git repository. jshao pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push: new 78286130a [#4185] improvement(core, catalogs): Change the @VisibleForTesting in production code to change usability (#4315) 78286130a is described below commit 78286130a5d8b1c19c26886d172583126639b3f6 Author: khmgobe <dr94...@naver.com> AuthorDate: Thu Aug 1 14:17:38 2024 +0900 [#4185] improvement(core, catalogs): Change the @VisibleForTesting in production code to change usability (#4315) ### What changes were proposed in this pull request? Modifying declaration parts, removing calls that do not need to be used ### Why are the changes needed? It shouldn't be used, but it's declared Fix: #4185 ### Does this PR introduce any user-facing change? No ### How was this patch tested? Check change code and existing code comparison --- .../catalog/hadoop/authentication/kerberos/KerberosClient.java | 2 -- .../org/apache/gravitino/catalog/hive/HiveCatalogOperations.java | 2 -- .../catalog/lakehouse/paimon/PaimonCatalogPropertiesMetadata.java | 6 +++--- .../lakehouse/paimon/authentication/kerberos/KerberosClient.java | 2 -- core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java | 3 +-- .../iceberg/common/authentication/kerberos/KerberosClient.java | 2 -- .../spark/connector/iceberg/IcebergPropertiesConstants.java | 2 -- 7 files changed, 4 insertions(+), 15 deletions(-) diff --git a/catalogs/catalog-hadoop/src/main/java/org/apache/gravitino/catalog/hadoop/authentication/kerberos/KerberosClient.java b/catalogs/catalog-hadoop/src/main/java/org/apache/gravitino/catalog/hadoop/authentication/kerberos/KerberosClient.java index dd746b4da..b8f31699d 100644 --- a/catalogs/catalog-hadoop/src/main/java/org/apache/gravitino/catalog/hadoop/authentication/kerberos/KerberosClient.java +++ b/catalogs/catalog-hadoop/src/main/java/org/apache/gravitino/catalog/hadoop/authentication/kerberos/KerberosClient.java @@ -33,7 +33,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.security.authentication.util.KerberosName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,7 +65,6 @@ public class KerberosClient implements Closeable { // Login UserGroupInformation.setConfiguration(hadoopConf); - KerberosName.resetDefaultRealm(); UserGroupInformation kerberosLoginUgi = UserGroupInformation.loginUserFromKeytabAndReturnUGI(catalogPrincipal, keytabFilePath); UserGroupInformation.setLoginUser(kerberosLoginUgi); diff --git a/catalogs/catalog-hive/src/main/java/org/apache/gravitino/catalog/hive/HiveCatalogOperations.java b/catalogs/catalog-hive/src/main/java/org/apache/gravitino/catalog/hive/HiveCatalogOperations.java index afae1cbbd..1f7495bd8 100644 --- a/catalogs/catalog-hive/src/main/java/org/apache/gravitino/catalog/hive/HiveCatalogOperations.java +++ b/catalogs/catalog-hive/src/main/java/org/apache/gravitino/catalog/hive/HiveCatalogOperations.java @@ -96,7 +96,6 @@ import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.metastore.api.UnknownDBException; import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.security.authentication.util.KerberosName; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -235,7 +234,6 @@ public class HiveCatalogOperations implements CatalogOperations, SupportsSchemas LOG.info("krb5 path: {}", System.getProperty("java.security.krb5.conf")); refreshKerberosConfig(); - KerberosName.resetDefaultRealm(); UserGroupInformation.setConfiguration(hadoopConf); UserGroupInformation.loginUserFromKeytab( catalogPrincipal, keytabPath.toAbsolutePath().toString()); diff --git a/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonCatalogPropertiesMetadata.java b/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonCatalogPropertiesMetadata.java index 9ea3e43fd..86ed1b84c 100644 --- a/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonCatalogPropertiesMetadata.java +++ b/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/PaimonCatalogPropertiesMetadata.java @@ -41,9 +41,9 @@ import org.apache.gravitino.connector.PropertyEntry; public class PaimonCatalogPropertiesMetadata extends BaseCatalogPropertiesMetadata { @VisibleForTesting public static final String GRAVITINO_CATALOG_BACKEND = "catalog-backend"; - @VisibleForTesting public static final String PAIMON_METASTORE = "metastore"; - @VisibleForTesting public static final String WAREHOUSE = "warehouse"; - @VisibleForTesting public static final String URI = "uri"; + public static final String PAIMON_METASTORE = "metastore"; + public static final String WAREHOUSE = "warehouse"; + public static final String URI = "uri"; public static final Map<String, String> GRAVITINO_CONFIG_TO_PAIMON = ImmutableMap.of(GRAVITINO_CATALOG_BACKEND, PAIMON_METASTORE, WAREHOUSE, WAREHOUSE, URI, URI); diff --git a/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/authentication/kerberos/KerberosClient.java b/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/authentication/kerberos/KerberosClient.java index 7f1685af9..370de52da 100644 --- a/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/authentication/kerberos/KerberosClient.java +++ b/catalogs/catalog-lakehouse-paimon/src/main/java/org/apache/gravitino/catalog/lakehouse/paimon/authentication/kerberos/KerberosClient.java @@ -28,7 +28,6 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.security.authentication.util.KerberosName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,7 +61,6 @@ public class KerberosClient implements Closeable { // Login UserGroupInformation.setConfiguration(hadoopConf); - KerberosName.resetDefaultRealm(); UserGroupInformation.loginUserFromKeytab(catalogPrincipal, keytabFilePath); UserGroupInformation kerberosLoginUgi = UserGroupInformation.getCurrentUser(); diff --git a/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java b/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java index 317575d84..34898e91e 100644 --- a/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java +++ b/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java @@ -18,7 +18,6 @@ */ package org.apache.gravitino.connector; -import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -63,7 +62,7 @@ public abstract class BaseCatalog<T extends BaseCatalog> // Gravitino. // You can use your own object to replace the default catalog operation. // The object you used is not stable, don't use it unless you know what you are doing. - @VisibleForTesting public static final String CATALOG_OPERATION_IMPL = "ops-impl"; + public static final String CATALOG_OPERATION_IMPL = "ops-impl"; // Underlying access control system plugin for this catalog. private volatile BaseAuthorization<?> authorization; diff --git a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/authentication/kerberos/KerberosClient.java b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/authentication/kerberos/KerberosClient.java index 0fb64d9be..a7d1f9d07 100644 --- a/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/authentication/kerberos/KerberosClient.java +++ b/iceberg/iceberg-common/src/main/java/org/apache/gravitino/iceberg/common/authentication/kerberos/KerberosClient.java @@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.security.UserGroupInformation; -import org.apache.hadoop.security.authentication.util.KerberosName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,7 +72,6 @@ public class KerberosClient implements Closeable { // Login UserGroupInformation.setConfiguration(hadoopConf); - KerberosName.resetDefaultRealm(); UserGroupInformation.loginUserFromKeytab(catalogPrincipal, keytabFilePath); UserGroupInformation kerberosLoginUgi = UserGroupInformation.getCurrentUser(); diff --git a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/IcebergPropertiesConstants.java b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/IcebergPropertiesConstants.java index 7ea87857a..0f1b6790b 100644 --- a/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/IcebergPropertiesConstants.java +++ b/spark-connector/spark-common/src/main/java/org/apache/gravitino/spark/connector/iceberg/IcebergPropertiesConstants.java @@ -30,12 +30,10 @@ public class IcebergPropertiesConstants { static final String ICEBERG_CATALOG_TYPE = CatalogUtil.ICEBERG_CATALOG_TYPE; - @VisibleForTesting public static final String GRAVITINO_ICEBERG_CATALOG_WAREHOUSE = IcebergConstants.WAREHOUSE; static final String ICEBERG_CATALOG_WAREHOUSE = CatalogProperties.WAREHOUSE_LOCATION; - @VisibleForTesting public static final String GRAVITINO_ICEBERG_CATALOG_URI = IcebergConstants.URI; static final String ICEBERG_CATALOG_URI = CatalogProperties.URI;