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

ayushsaxena 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 797818c8c65 HIVE-28271: DirectSql fails for AlterPartitions. (#5256). 
(Ayush Saxena, reviewed by Butao Zhang, Wechar Yu)
797818c8c65 is described below

commit 797818c8c6571cb4f9e36d4330645d925f717b4e
Author: Ayush Saxena <[email protected]>
AuthorDate: Wed May 22 22:42:05 2024 +0530

    HIVE-28271: DirectSql fails for AlterPartitions. (#5256). (Ayush Saxena, 
reviewed by Butao Zhang, Wechar Yu)
---
 .../hadoop/hive/metastore/DirectSqlUpdatePart.java     | 15 ++++++++-------
 .../org/apache/hadoop/hive/metastore/ObjectStore.java  | 18 ++++++++++--------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
index 2e908ebc1f1..4059d5df384 100644
--- 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
+++ 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/DirectSqlUpdatePart.java
@@ -72,6 +72,7 @@ import java.util.stream.Collectors;
 import static 
org.apache.hadoop.hive.common.StatsSetupConst.COLUMN_STATS_ACCURATE;
 import static org.apache.hadoop.hive.metastore.HMSHandler.getPartValsFromName;
 import static 
org.apache.hadoop.hive.metastore.MetastoreDirectSqlUtils.executeWithArray;
+import static 
org.apache.hadoop.hive.metastore.MetastoreDirectSqlUtils.extractSqlClob;
 import static 
org.apache.hadoop.hive.metastore.MetastoreDirectSqlUtils.extractSqlInt;
 import static 
org.apache.hadoop.hive.metastore.MetastoreDirectSqlUtils.extractSqlLong;
 
@@ -755,8 +756,8 @@ class DirectSqlUpdatePart {
           List<Object[]> sqlResult = executeWithArray(query.getInnerQuery(), 
null, queryText);
           for (Object[] row : sqlResult) {
             Long id = extractSqlLong(row[0]);
-            String paramKey = (String) row[1];
-            String paramVal = (String) row[2];
+            String paramKey = extractSqlClob(row[1]);
+            String paramVal = extractSqlClob(row[2]);
             idToParams.computeIfAbsent(id, key -> new 
HashMap<>()).put(paramKey, paramVal);
           }
         }
@@ -930,8 +931,8 @@ class DirectSqlUpdatePart {
               StorageDescriptor sd = idToSd.get(sdId);
               statement.setLong(1, idToCdId.get(sdId));
               statement.setString(2, sd.getInputFormat());
-              statement.setBoolean(3, sd.isCompressed());
-              statement.setBoolean(4, sd.isStoredAsSubDirectories());
+              statement.setObject(3, dbType.getBoolean(sd.isCompressed()));
+              statement.setObject(4, 
dbType.getBoolean(sd.isStoredAsSubDirectories()));
               statement.setString(5, sd.getLocation());
               statement.setInt(6, sd.getNumBuckets());
               statement.setString(7, sd.getOutputFormat());
@@ -1234,9 +1235,9 @@ class DirectSqlUpdatePart {
           List<Object[]> sqlResult = executeWithArray(query.getInnerQuery(), 
null, queryText);
           for (Object[] row : sqlResult) {
             Long id = extractSqlLong(row[0]);
-            String comment = (String) row[1];
-            String name = (String) row[2];
-            String type = (String) row[3];
+            String comment = extractSqlClob(row[1]);
+            String name = extractSqlClob(row[2]);
+            String type = extractSqlClob(row[3]);
             int index = extractSqlInt(row[4]);
             FieldSchema field = new FieldSchema(name, type, comment);
             cdIdToColIdxPair.computeIfAbsent(id, k -> new 
ArrayList<>()).add(Pair.of(index, field));
diff --git 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
index a0d548943d1..ec0b62e78a8 100644
--- 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
+++ 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ObjectStore.java
@@ -5364,6 +5364,16 @@ public class ObjectStore implements RawStore, 
Configurable {
         partNames.add(Warehouse.makePartName(partCols, partVal));
       }
 
+      for (Partition tmpPart : newParts) {
+        if 
(!tmpPart.getDbName().equalsIgnoreCase(table.getDatabase().getName())) {
+          throw new MetaException("Invalid DB name : " + tmpPart.getDbName());
+        }
+
+        if (!tmpPart.getTableName().equalsIgnoreCase(table.getTableName())) {
+          throw new MetaException("Invalid table name : " + 
tmpPart.getDbName());
+        }
+      }
+
       results = new GetListHelper<Partition>(catName, dbName, tblName, true, 
true) {
         @Override
         protected List<Partition> getSqlResult(GetHelper<List<Partition>> ctx)
@@ -5420,14 +5430,6 @@ public class ObjectStore implements RawStore, 
Configurable {
       Set<MColumnDescriptor> oldCds = new HashSet<>();
       Ref<MColumnDescriptor> oldCdRef = new Ref<>();
       for (Partition tmpPart : newParts) {
-        if (!tmpPart.getDbName().equalsIgnoreCase(dbName)) {
-          throw new MetaException("Invalid DB name : " + tmpPart.getDbName());
-        }
-
-        if (!tmpPart.getTableName().equalsIgnoreCase(tblName)) {
-          throw new MetaException("Invalid table   name : " + 
tmpPart.getDbName());
-        }
-
         oldCdRef.t = null;
         Partition result = alterPartitionNoTxn(catName, dbName, tblName,
             mPartsMap.get(tmpPart.getValues()), tmpPart, queryWriteIdList, 
oldCdRef, table);

Reply via email to