This is an automated email from the ASF dual-hosted git repository.

morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new ffc16bca0ee branch-3.1: [chore](MS)Rename HMSProperties to 
HiveProperties to avoid confusion with Hive/HMS configs #57064 (#57077)
ffc16bca0ee is described below

commit ffc16bca0ee0929f34cf6e3d56d4057c8d7f378f
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Oct 28 14:50:43 2025 +0800

    branch-3.1: [chore](MS)Rename HMSProperties to HiveProperties to avoid 
confusion with Hive/HMS configs #57064 (#57077)
    
    Cherry-picked from #57064
    
    Co-authored-by: Calvin Kirs <[email protected]>
---
 .../doris/datasource/hive/HMSExternalCatalog.java      | 10 +++++-----
 ...tHMSProperties.java => AbstractHiveProperties.java} |  4 ++--
 .../property/metastore/HMSBaseProperties.java          |  3 +++
 ...ties.java => HiveAliyunDLFMetaStoreProperties.java} |  4 ++--
 ...roperties.java => HiveGlueMetaStoreProperties.java} |  6 +++---
 .../{HMSProperties.java => HiveHMSProperties.java}     |  4 ++--
 ...opertiesFactory.java => HivePropertiesFactory.java} | 18 +++++++++---------
 .../property/metastore/MetastoreProperties.java        |  2 +-
 .../metastore/HMSAliyunDLFMetaStorePropertiesTest.java |  4 ++--
 .../doris/datasource/property/metastore/HMSGlueIT.java |  2 +-
 .../metastore/HMSGlueMetaStorePropertiesTest.java      | 16 ++++++++--------
 .../property/metastore/HMSPropertiesTest.java          | 14 +++++++-------
 12 files changed, 45 insertions(+), 42 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
index 040c10b9603..ceb4755b2c5 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
@@ -31,7 +31,7 @@ import org.apache.doris.datasource.SessionContext;
 import org.apache.doris.datasource.iceberg.IcebergMetadataOps;
 import org.apache.doris.datasource.iceberg.IcebergUtils;
 import org.apache.doris.datasource.operations.ExternalMetadataOperations;
-import org.apache.doris.datasource.property.metastore.AbstractHMSProperties;
+import org.apache.doris.datasource.property.metastore.AbstractHiveProperties;
 import org.apache.doris.fs.FileSystemProvider;
 import org.apache.doris.fs.FileSystemProviderImpl;
 import org.apache.doris.fs.remote.dfs.DFSFileSystem;
@@ -72,7 +72,7 @@ public class HMSExternalCatalog extends ExternalCatalog {
     //for "type" = "hms" , but is iceberg table.
     private IcebergMetadataOps icebergMetadataOps;
 
-    private volatile AbstractHMSProperties hmsProperties;
+    private volatile AbstractHiveProperties hmsProperties;
 
     /**
      * Lazily initializes HMSProperties from catalog properties.
@@ -85,7 +85,7 @@ public class HMSExternalCatalog extends ExternalCatalog {
      * We will consider a unified solution for alter support later,
      * as it's currently not feasible to handle it in a common/shared location.
      */
-    public AbstractHMSProperties getHmsProperties() {
+    public AbstractHiveProperties getHmsProperties() {
         makeSureInitialized();
         return hmsProperties;
     }
@@ -122,7 +122,7 @@ public class HMSExternalCatalog extends ExternalCatalog {
             throw new DdlException(
                     "The parameter " + PARTITION_CACHE_TTL_SECOND + " is 
wrong, value is " + partitionCacheTtlSecond);
         }
-        
catalogProperty.checkMetaStoreAndStorageProperties(AbstractHMSProperties.class);
+        
catalogProperty.checkMetaStoreAndStorageProperties(AbstractHiveProperties.class);
     }
 
     @Override
@@ -134,7 +134,7 @@ public class HMSExternalCatalog extends ExternalCatalog {
 
     @Override
     protected void initLocalObjectsImpl() {
-        this.hmsProperties = (AbstractHMSProperties) 
catalogProperty.getMetastoreProperties();
+        this.hmsProperties = (AbstractHiveProperties) 
catalogProperty.getMetastoreProperties();
         initPreExecutionAuthenticator();
         HiveMetadataOps hiveOps = 
ExternalMetadataOperations.newHiveMetadataOps(hmsProperties.getHiveConf(), 
this);
         threadPoolWithPreAuth = 
ThreadPoolManager.newDaemonFixedThreadPoolWithPreAuth(
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AbstractHMSProperties.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AbstractHiveProperties.java
similarity index 93%
rename from 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AbstractHMSProperties.java
rename to 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AbstractHiveProperties.java
index 5839566519b..8bfb2f1b153 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AbstractHMSProperties.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/AbstractHiveProperties.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.hive.conf.HiveConf;
 
 import java.util.Map;
 
-public abstract class AbstractHMSProperties extends MetastoreProperties {
+public abstract class AbstractHiveProperties extends MetastoreProperties {
 
     @Getter
     protected HiveConf hiveConf;
@@ -56,7 +56,7 @@ public abstract class AbstractHMSProperties extends 
MetastoreProperties {
      * @param type      metastore type
      * @param origProps original configuration
      */
-    protected AbstractHMSProperties(Type type, Map<String, String> origProps) {
+    protected AbstractHiveProperties(Type type, Map<String, String> origProps) 
{
         super(type, origProps);
     }
 }
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSBaseProperties.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSBaseProperties.java
index 7ac349096f2..9121d2148e6 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSBaseProperties.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSBaseProperties.java
@@ -34,6 +34,9 @@ import org.apache.hadoop.hive.conf.HiveConf;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * Base properties for Hive Metastore.
+ */
 public class HMSBaseProperties {
     public static final String HIVE_METASTORE_TYPE = "hive.metastore.type";
     public static final String DLF_TYPE = "dlf";
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSAliyunDLFMetaStoreProperties.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveAliyunDLFMetaStoreProperties.java
similarity index 94%
rename from 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSAliyunDLFMetaStoreProperties.java
rename to 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveAliyunDLFMetaStoreProperties.java
index aabf57bbeba..e78cd73b722 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSAliyunDLFMetaStoreProperties.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveAliyunDLFMetaStoreProperties.java
@@ -24,13 +24,13 @@ import org.apache.hadoop.hive.conf.HiveConf;
 
 import java.util.Map;
 
-public class HMSAliyunDLFMetaStoreProperties extends AbstractHMSProperties {
+public class HiveAliyunDLFMetaStoreProperties extends AbstractHiveProperties {
 
     private AliyunDLFBaseProperties baseProperties;
 
     private OSSProperties ossProperties;
 
-    public HMSAliyunDLFMetaStoreProperties(Map<String, String> origProps) {
+    public HiveAliyunDLFMetaStoreProperties(Map<String, String> origProps) {
         super(Type.DLF, origProps);
     }
 
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSGlueMetaStoreProperties.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveGlueMetaStoreProperties.java
similarity index 96%
rename from 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSGlueMetaStoreProperties.java
rename to 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveGlueMetaStoreProperties.java
index 12967749620..940fc997011 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSGlueMetaStoreProperties.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveGlueMetaStoreProperties.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.hive.conf.HiveConf;
 
 import java.util.Map;
 
-public class HMSGlueMetaStoreProperties extends AbstractHMSProperties {
+public class HiveGlueMetaStoreProperties extends AbstractHiveProperties {
 
     // ========== Constants ==========
     public static final String AWS_GLUE_SECRET_KEY_KEY = "aws.glue.secret-key";
@@ -81,7 +81,7 @@ public class HMSGlueMetaStoreProperties extends 
AbstractHMSProperties {
      * @param type      The metastore type.
      * @param origProps The original configuration properties.
      */
-    protected HMSGlueMetaStoreProperties(Type type, Map<String, String> 
origProps) {
+    protected HiveGlueMetaStoreProperties(Type type, Map<String, String> 
origProps) {
         super(type, origProps);
     }
 
@@ -121,7 +121,7 @@ public class HMSGlueMetaStoreProperties extends 
AbstractHMSProperties {
         }
     }
 
-    public HMSGlueMetaStoreProperties(Map<String, String> origProps) {
+    public HiveGlueMetaStoreProperties(Map<String, String> origProps) {
         super(Type.GLUE, origProps);
     }
 }
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSProperties.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveHMSProperties.java
similarity index 95%
rename from 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSProperties.java
rename to 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveHMSProperties.java
index 570be49b647..3810b29acb2 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSProperties.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HiveHMSProperties.java
@@ -27,7 +27,7 @@ import org.apache.commons.lang3.BooleanUtils;
 import java.util.Map;
 
 @Slf4j
-public class HMSProperties extends AbstractHMSProperties {
+public class HiveHMSProperties extends AbstractHiveProperties {
 
     private HMSBaseProperties hmsBaseProperties;
 
@@ -41,7 +41,7 @@ public class HMSProperties extends AbstractHMSProperties {
             description = "The batch size of hms events per rpc.")
     private int hmsEventisBatchSizePerRpcInput = 
Config.hms_events_batch_size_per_rpc;
 
-    public HMSProperties(Map<String, String> origProps) {
+    public HiveHMSProperties(Map<String, String> origProps) {
         super(Type.HMS, origProps);
     }
 
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSPropertiesFactory.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HivePropertiesFactory.java
similarity index 70%
rename from 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSPropertiesFactory.java
rename to 
fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HivePropertiesFactory.java
index d20c90e205c..a379a110fbf 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HMSPropertiesFactory.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/HivePropertiesFactory.java
@@ -23,20 +23,20 @@ import java.util.Map;
  * Factory for creating {@link MetastoreProperties} instances for Hive-based 
catalogs.
  * <p>
  * Supported subtypes include:
- * - "default" or "hms" -> {@link HMSProperties}
- * - "glue"             -> {@link HMSGlueMetaStoreProperties}
- * - "dlf"              -> {@link HMSAliyunDLFMetaStoreProperties}
+ * - "default" or "hms" -> {@link HiveHMSProperties}
+ * - "glue"             -> {@link HiveGlueMetaStoreProperties}
+ * - "dlf"              -> {@link HiveAliyunDLFMetaStoreProperties}
  */
-public class HMSPropertiesFactory extends AbstractMetastorePropertiesFactory {
+public class HivePropertiesFactory extends AbstractMetastorePropertiesFactory {
 
     private static final String KEY = "hive.metastore.type";
     private static final String DEFAULT_TYPE = "default";
 
-    public HMSPropertiesFactory() {
-        register("default", HMSProperties::new);
-        register("hms", HMSProperties::new);
-        register("glue", HMSGlueMetaStoreProperties::new);
-        register("dlf", HMSAliyunDLFMetaStoreProperties::new);
+    public HivePropertiesFactory() {
+        register("default", HiveHMSProperties::new);
+        register("hms", HiveHMSProperties::new);
+        register("glue", HiveGlueMetaStoreProperties::new);
+        register("dlf", HiveAliyunDLFMetaStoreProperties::new);
     }
 
     @Override
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/MetastoreProperties.java
 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/MetastoreProperties.java
index 48cba3c0bcc..fc0e98de077 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/MetastoreProperties.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/datasource/property/metastore/MetastoreProperties.java
@@ -82,7 +82,7 @@ public class MetastoreProperties extends ConnectionProperties 
{
 
     static {
         //subclasses should be registered here
-        register(Type.HMS, new HMSPropertiesFactory());
+        register(Type.HMS, new HivePropertiesFactory());
         register(Type.ICEBERG, new IcebergPropertiesFactory());
         register(Type.PAIMON, new PaimonPropertiesFactory());
     }
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSAliyunDLFMetaStorePropertiesTest.java
 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSAliyunDLFMetaStorePropertiesTest.java
index b93886e0119..f60f190ff58 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSAliyunDLFMetaStorePropertiesTest.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSAliyunDLFMetaStorePropertiesTest.java
@@ -38,8 +38,8 @@ public class HMSAliyunDLFMetaStorePropertiesTest {
         props.put("dlf.access_key", "xxx");
         props.put("dlf.secret_key", "xxx");
         props.put("dlf.catalog_id", "5789");
-        HMSAliyunDLFMetaStoreProperties hmsAliyunDLFMetaStoreProperties =
-                (HMSAliyunDLFMetaStoreProperties) 
MetastoreProperties.create(props);
+        HiveAliyunDLFMetaStoreProperties hmsAliyunDLFMetaStoreProperties =
+                (HiveAliyunDLFMetaStoreProperties) 
MetastoreProperties.create(props);
         Assertions.assertEquals("xxx", 
hmsAliyunDLFMetaStoreProperties.getHiveConf().get(DataLakeConfig.CATALOG_ACCESS_KEY_ID));
         Assertions.assertEquals("xxx", 
hmsAliyunDLFMetaStoreProperties.getHiveConf().get(DataLakeConfig.CATALOG_ACCESS_KEY_SECRET));
         Assertions.assertEquals("5789", 
hmsAliyunDLFMetaStoreProperties.getHiveConf().get(DataLakeConfig.CATALOG_ID));
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueIT.java
 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueIT.java
index ceec4b94fbe..15aefdcc8f2 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueIT.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueIT.java
@@ -41,7 +41,7 @@ public class HMSGlueIT {
         System.setProperty("aws.region", "us-east-1");
         System.setProperty("aws.accessKeyId", "");
         System.setProperty("aws.secretKey", "");
-        HMSGlueMetaStoreProperties properties = (HMSGlueMetaStoreProperties) 
MetastoreProperties.create(baseProps);
+        HiveGlueMetaStoreProperties properties = (HiveGlueMetaStoreProperties) 
MetastoreProperties.create(baseProps);
         ThriftHMSCachedClient client = new 
ThriftHMSCachedClient(properties.hiveConf, 1, new ExecutionAuthenticator() {
         });
         client.getTable("default", "test_hive_table");
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueMetaStorePropertiesTest.java
 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueMetaStorePropertiesTest.java
index 8ab2ea0642b..a13e7299e42 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueMetaStorePropertiesTest.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSGlueMetaStorePropertiesTest.java
@@ -27,7 +27,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class HMSGlueMetaStorePropertiesTest {
-    private HMSGlueMetaStoreProperties properties;
+    private HiveGlueMetaStoreProperties properties;
 
     @BeforeEach
     public void setUp() {
@@ -43,7 +43,7 @@ public class HMSGlueMetaStorePropertiesTest {
                 "aws.glue.socket-timeout", "45000",
                 "aws.glue.catalog.separator", "::"
         );
-        properties = new HMSGlueMetaStoreProperties(config);
+        properties = new HiveGlueMetaStoreProperties(config);
     }
 
     @Test
@@ -65,14 +65,14 @@ public class HMSGlueMetaStorePropertiesTest {
 
     @Test
     public void testConstructorSetsTypeCorrectly() {
-        Assertions.assertEquals(AbstractHMSProperties.Type.GLUE, 
properties.getType());
+        Assertions.assertEquals(AbstractHiveProperties.Type.GLUE, 
properties.getType());
     }
 
     @Test
     public void testMissingRequiredPropertyThrows() {
         Map<String, String> incompleteConfig = new 
HashMap<>(properties.getOrigProps());
         incompleteConfig.remove("aws.glue.secret-key");
-        HMSGlueMetaStoreProperties props = new 
HMSGlueMetaStoreProperties(incompleteConfig);
+        HiveGlueMetaStoreProperties props = new 
HiveGlueMetaStoreProperties(incompleteConfig);
         Exception exception = 
Assertions.assertThrows(IllegalArgumentException.class, 
props::initNormalizeAndCheckProps);
         Assertions.assertTrue(exception.getMessage().contains("glue.access_key 
and glue.secret_key must be set together"));
     }
@@ -81,7 +81,7 @@ public class HMSGlueMetaStorePropertiesTest {
     public void testInvalidNumberPropertyThrows() {
         Map<String, String> invalidConfig = new 
HashMap<>(properties.getOrigProps());
         invalidConfig.put("aws.glue.max-error-retries", "notANumber");
-        HMSGlueMetaStoreProperties props = new 
HMSGlueMetaStoreProperties(invalidConfig);
+        HiveGlueMetaStoreProperties props = new 
HiveGlueMetaStoreProperties(invalidConfig);
         Exception exception = Assertions.assertThrows(RuntimeException.class, 
props::initNormalizeAndCheckProps);
         Assertions.assertTrue(exception.getMessage().contains("Failed to set 
property"));
     }
@@ -90,17 +90,17 @@ public class HMSGlueMetaStorePropertiesTest {
     public void testDefaultValuesAreAppliedWhenMissing() {
         Map<String, String> partialConfig = new 
HashMap<>(properties.getOrigProps());
         partialConfig.remove("aws.glue.max-error-retries");
-        HMSGlueMetaStoreProperties props = new 
HMSGlueMetaStoreProperties(partialConfig);
+        HiveGlueMetaStoreProperties props = new 
HiveGlueMetaStoreProperties(partialConfig);
         props.initNormalizeAndCheckProps();
         HiveConf hiveConf = props.getHiveConf();
-        
Assertions.assertEquals(String.valueOf(HMSGlueMetaStoreProperties.DEFAULT_MAX_RETRY),
 hiveConf.get("aws.glue.max-error-retries"));
+        
Assertions.assertEquals(String.valueOf(HiveGlueMetaStoreProperties.DEFAULT_MAX_RETRY),
 hiveConf.get("aws.glue.max-error-retries"));
     }
 
     @Test
     public void testUnsupportedPropertyIsIgnored() {
         Map<String, String> configWithExtra = new 
HashMap<>(properties.getOrigProps());
         configWithExtra.put("some.unsupported.property", "value");
-        HMSGlueMetaStoreProperties props = new 
HMSGlueMetaStoreProperties(configWithExtra);
+        HiveGlueMetaStoreProperties props = new 
HiveGlueMetaStoreProperties(configWithExtra);
         props.initNormalizeAndCheckProps();
         HiveConf hiveConf = props.getHiveConf();
         Assertions.assertNull(hiveConf.get("some.unsupported.property"));
diff --git 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSPropertiesTest.java
 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSPropertiesTest.java
index c078a260cdd..88ca5fa7c95 100644
--- 
a/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSPropertiesTest.java
+++ 
b/fe/fe-core/src/test/java/org/apache/doris/datasource/property/metastore/HMSPropertiesTest.java
@@ -47,10 +47,10 @@ public class HMSPropertiesTest {
         Map<String, String> params = new HashMap<>();
         params.put("hive.conf.resources", "/hive-conf/hive1/hive-site.xml");
         params.put("type", "hms");
-        HMSProperties hmsProperties;
+        HiveHMSProperties hmsProperties;
         Assertions.assertThrows(IllegalArgumentException.class, () -> 
MetastoreProperties.create(params));
         params.put("hive.metastore.uris", "thrift://default:9083");
-        hmsProperties = (HMSProperties) MetastoreProperties.create(params);
+        hmsProperties = (HiveHMSProperties) MetastoreProperties.create(params);
         HiveConf hiveConf = hmsProperties.getHiveConf();
         Assertions.assertNotNull(hiveConf);
         Assertions.assertEquals("/user/hive/default", 
hiveConf.get("hive.metastore.warehouse.dir"));
@@ -65,7 +65,7 @@ public class HMSPropertiesTest {
         Map<String, String> params = createBaseParams();
 
         // Step 2: Test HMSProperties to PaimonOptions and Conf conversion
-        HMSProperties hmsProperties = getHMSProperties(params);
+        HiveHMSProperties hmsProperties = getHMSProperties(params);
         Assertions.assertNotNull(hmsProperties);
         Assertions.assertEquals("thrift://127.0.0.1:9083", 
hmsProperties.getHiveConf().get("hive.metastore.uris"));
         Assertions.assertEquals(HadoopExecutionAuthenticator.class, 
hmsProperties.getExecutionAuthenticator().getClass());
@@ -97,14 +97,14 @@ public class HMSPropertiesTest {
         return params;
     }
 
-    private HMSProperties getHMSProperties(Map<String, String> params) throws 
UserException {
-        return (HMSProperties) MetastoreProperties.create(params);
+    private HiveHMSProperties getHMSProperties(Map<String, String> params) 
throws UserException {
+        return (HiveHMSProperties) MetastoreProperties.create(params);
     }
 
     @Test
     public void testRefreshParams() throws UserException {
         Map<String, String> params = createBaseParams();
-        HMSProperties hmsProperties = getHMSProperties(params);
+        HiveHMSProperties hmsProperties = getHMSProperties(params);
         
Assertions.assertFalse(hmsProperties.isHmsEventsIncrementalSyncEnabled());
         params.put("hive.enable_hms_events_incremental_sync", "true");
         hmsProperties = getHMSProperties(params);
@@ -131,7 +131,7 @@ public class HMSPropertiesTest {
         Assertions.assertThrows(IllegalArgumentException.class, () -> 
MetastoreProperties.create(params),
                 "Hive metastore authentication type is kerberos, but service 
principal, client principal or client keytab is not set.");
         params.put("hive.metastore.client.principal", 
"hive/[email protected]");
-        HMSProperties hmsProperties = getHMSProperties(params);
+        HiveHMSProperties hmsProperties = getHMSProperties(params);
         Assertions.assertNotNull(hmsProperties);
     }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to