[hive] branch master updated: HIVE-26860: Entries in HMS tables(SDS, SERDES, SERDE_PARAMS, SKEWED_COL_NAMES, SKEWED_COL_VALUE_LOC_MAP, SKEWED_VALUES) are not deleted upon drop partition table with skewed columns (#3899)

[ngangam]

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

ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 4d17b614143 HIVE-26860: Entries in HMS tables(SDS, SERDES, 
SERDE_PARAMS, SKEWED_COL_NAMES, SKEWED_COL_VALUE_LOC_MAP, SKEWED_VALUES) are 
not deleted upon drop partition table with skewed columns (#3899)
4d17b614143 is described below

commit 4d17b6141438f526e119df1bc7156d0827d332f5
Author: Venu Reddy <35334869+venureddy2...@users.noreply.github.com>
AuthorDate: Fri Jan 13 23:19:16 2023 +0530

    HIVE-26860: Entries in HMS tables(SDS, SERDES, SERDE_PARAMS, 
SKEWED_COL_NAMES, SKEWED_COL_VALUE_LOC_MAP, SKEWED_VALUES) are not deleted upon 
drop partition table with skewed columns (#3899)
---
 .../apache/hadoop/hive/metastore/MetaStoreDirectSql.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
index d89e7ea87c7..6f4c7192ebc 100644
--- 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
+++ 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreDirectSql.java
@@ -2755,12 +2755,11 @@ class MetaStoreDirectSql {
     List<Object> skewedStringListIdList = new ArrayList<>(0);
 
     try (QueryWrapper query = new 
QueryWrapper(pm.newQuery("javax.jdo.query.SQL", queryText))) {
-      List<Object[]> sqlResult = MetastoreDirectSqlUtils
-          .ensureList(executeWithArray(query.getInnerQuery(), null, 
queryText));
+      List<Object> sqlResult = executeWithArray(query.getInnerQuery(), null, 
queryText);
 
       if (!sqlResult.isEmpty()) {
-        for (Object[] fields : sqlResult) {
-          
skewedStringListIdList.add(MetastoreDirectSqlUtils.extractSqlLong(fields[0]));
+        for (Object stringListId : sqlResult) {
+          
skewedStringListIdList.add(MetastoreDirectSqlUtils.extractSqlLong(stringListId));
         }
       }
     }
@@ -2874,12 +2873,12 @@ class MetaStoreDirectSql {
             + "GROUP BY " + SDS + ".\"CD_ID\"";
     Set<Long> danglingColumnDescriptorIdSet = new 
HashSet<>(columnDescriptorIdList);
     try (QueryWrapper query = new 
QueryWrapper(pm.newQuery("javax.jdo.query.SQL", queryText))) {
-      List<Long> sqlResult = executeWithArray(query.getInnerQuery(), null, 
queryText);
+      List<Object> sqlResult = executeWithArray(query.getInnerQuery(), null, 
queryText);
 
       if (!sqlResult.isEmpty()) {
-        for (Long cdId : sqlResult) {
+        for (Object cdId : sqlResult) {
           // the returned CD is not dangling, so remove it from the list
-          danglingColumnDescriptorIdSet.remove(cdId);
+          
danglingColumnDescriptorIdSet.remove(MetastoreDirectSqlUtils.extractSqlLong(cdId));
         }
       }
     }