fix ut - 2

Author: dengzhhu653

ql/src/java/org/apache/hadoop/hive/ql/metadata/PartitionTree.java

@@ -188,10 +188,10 @@ void alterPartition(List<String> oldPartitionVals, Partition newPartition, boole
           "Partition with partition values " + Arrays.toString(oldPartitionVals.toArray()) + " is not found.");
     }
     if (!oldPartition.getDbName().equals(newPartition.getDbName())) {
-      throw new InvalidOperationException("Db name cannot be altered.");
+      throw new MetaException("Db name cannot be altered.");
     }
     if (!oldPartition.getTableName().equals(newPartition.getTableName())) {
-      throw new InvalidOperationException("Table name cannot be altered.");
+      throw new MetaException("Table name cannot be altered.");
     }
     if (isRename) {
       newPartition.getSd().setLocation(oldPartition.getSd().getLocation());

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java

@@ -488,6 +488,7 @@ public void shutdown() {
       pm.close();
       pm = null;
     }
+    cachedImpls.clear();
   }
 
   /**
@@ -525,25 +526,25 @@ public <T> T unwrap(Class<T> iface) {
       throw new IllegalArgumentException("Unable to unwrap the store as " + iface);
     }
     String implClassName = conf.get("metastore." + descriptor.alias() + ".store.impl", "");
+    T simpl;
     T impl = (T) cachedImpls.get(iface);
     if (impl != null &&
         (StringUtils.isEmpty(implClassName) || impl.getClass().getName().equals(implClassName))) {
-      return impl;
-    }
-
-    Class<?> ifaceImpl = descriptor.defaultImpl();
-    if (StringUtils.isNotEmpty(implClassName)) {
-      ifaceImpl = conf.getClass(implClassName, ifaceImpl);
+      simpl = impl;
+    } else {
+      Class<?> ifaceImpl = descriptor.defaultImpl();
+      if (StringUtils.isNotEmpty(implClassName)) {
+        ifaceImpl = conf.getClass(implClassName, ifaceImpl);
+      }
+      simpl = (T) JavaUtils.newInstance(ifaceImpl);
+      cachedImpls.put(iface, simpl);
     }
-    T simpl = (T) JavaUtils.newInstance(ifaceImpl);
-    List<Query> trackOpenedQueries = new LinkedList<>();
+    List<Query> openQueries = new LinkedList<>();
     if (simpl instanceof RawStoreAware rsa) {
       rsa.setBaseStore(this);
-      rsa.setPersistentManager(PersistenceManagerProxy.getProxy(pm, trackOpenedQueries));
+      rsa.setPersistentManager(PersistenceManagerProxy.getProxy(pm, openQueries));
     }
-    impl = TransactionHandler.getProxy(iface, new TransactionHandler<>(this, simpl, trackOpenedQueries));
-    cachedImpls.put(iface, impl);
-    return impl;
+    return TransactionHandler.getProxy(iface, new TransactionHandler<>(this, simpl, openQueries));
   }
 
   @Override
@@ -7498,7 +7499,6 @@ private boolean isCurrentStatsValidForTheQuery(MTable tbl, String queryValidWrit
    * ~ COLUMN_STATE_ACCURATE(CSA) state is true
    * ~ Isolation-level (snapshot) compliant with the query
    * @param queryValidWriteIdList  valid writeId list of the query
-   * @Precondition   "part" should be retrieved from the PARTITIONS table.
    */
   // TODO: move to somewhere else
   public static boolean isCurrentStatsValidForTheQuery(

standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/metastore/TransactionHandler.java

@@ -30,7 +30,7 @@
 
 import org.apache.hadoop.hive.metastore.RawStore;
 
-public record TransactionHandler<T> (RawStore rs, T simpl, List<Query> closeQueriesAfterUse)
+public record TransactionHandler<T> (RawStore rs, T simpl, List<Query> openQueries)
     implements InvocationHandler {
 
   @SuppressWarnings("unchecked")
@@ -61,10 +61,10 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
       if (openTxn && !success) {
         rs.rollbackTransaction();
       }
-      for (Query q : closeQueriesAfterUse) {
+      for (Query q : openQueries) {
         q.closeAll();
       }
-      closeQueriesAfterUse.clear();
+      openQueries.clear();
     }
   }
 }

standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/client/TestAlterPartitions.java

@@ -1158,6 +1158,7 @@ public void testRenamePartitionNullTblName() throws Exception {
   }
 
   @Test(expected = InvalidOperationException.class)
+  @ConditionalIgnoreOnSessionHiveMetastoreClient
   public void testRenamePartitionChangeTblName() throws Exception {
     List<List<String>> oldValues = createTable4PartColsParts(client);
     List<Partition> oldParts = client.listPartitions(DB_NAME, TABLE_NAME, (short)-1);
@@ -1169,6 +1170,7 @@ public void testRenamePartitionChangeTblName() throws Exception {
   }
 
   @Test(expected = InvalidOperationException.class)
+  @ConditionalIgnoreOnSessionHiveMetastoreClient
   public void testRenamePartitionChangeDbName() throws Exception {
     List<List<String>> oldValues = createTable4PartColsParts(client);
     List<Partition> oldParts = client.listPartitions(DB_NAME, TABLE_NAME, (short)-1);