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

dengzh 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 d14d329f26c HIVE-28456: ObjectStore 
updatePartitionColumnStatisticsInBatch can cause connection starvation (#5398) 
(Zhihua Deng, reviewed by Denys Kuzmenko)
d14d329f26c is described below

commit d14d329f26cc8b3aacf817d1ae30c510c6d2a15b
Author: dengzh <[email protected]>
AuthorDate: Mon Aug 26 10:32:28 2024 +0800

    HIVE-28456: ObjectStore updatePartitionColumnStatisticsInBatch can cause 
connection starvation (#5398) (Zhihua Deng, reviewed by Denys Kuzmenko)
---
 .../hadoop/hive/metastore/DirectSqlUpdatePart.java | 181 ++++++++++-----------
 1 file changed, 87 insertions(+), 94 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 4059d5df384..18d6f4be97e 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
@@ -51,6 +51,7 @@ import org.slf4j.LoggerFactory;
 import org.apache.hadoop.conf.Configuration;
 
 import javax.jdo.PersistenceManager;
+import javax.jdo.Transaction;
 import javax.jdo.datastore.JDOConnection;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -101,14 +102,6 @@ class DirectSqlUpdatePart {
     sqlGenerator = new SQLGenerator(dbType, conf);
   }
 
-  void rollbackDBConn(Connection dbConn) {
-    try {
-      if (dbConn != null && !dbConn.isClosed()) dbConn.rollback();
-    } catch (SQLException e) {
-      LOG.warn("Failed to rollback db connection ", e);
-    }
-  }
-
   void closeDbConn(JDOConnection jdoConn) {
     try {
       if (jdoConn != null) {
@@ -484,60 +477,63 @@ class DirectSqlUpdatePart {
                                                       String validWriteIds, 
long writeId,
                                                       
List<TransactionalMetaStoreEventListener> transactionalListeners)
           throws MetaException {
-    JDOConnection jdoConn = null;
-    Connection dbConn = null;
-    boolean committed = false;
+
+    Transaction tx = pm.currentTransaction();
     try {
       dbType.lockInternal();
-      jdoConn = pm.getDataStoreConnection();
-      dbConn = (Connection) (jdoConn.getNativeConnection());
+      tx.begin();
+      JDOConnection jdoConn = null;
+      Map<String, Map<String, String>> result;
+      try {
+        jdoConn = pm.getDataStoreConnection();
+        Connection dbConn = (Connection) jdoConn.getNativeConnection();
+        setAnsiQuotes(dbConn);
 
-      setAnsiQuotes(dbConn);
+        Map<PartitionInfo, ColumnStatistics> partitionInfoMap = 
getPartitionInfo(dbConn, tbl.getId(), partColStatsMap);
 
-      Map<PartitionInfo, ColumnStatistics> partitionInfoMap = 
getPartitionInfo(dbConn, tbl.getId(), partColStatsMap);
+        result = updatePartitionParamTable(dbConn, partitionInfoMap, 
validWriteIds,
+            writeId, TxnUtils.isAcidTable(tbl));
 
-      Map<String, Map<String, String>> result =
-              updatePartitionParamTable(dbConn, partitionInfoMap, 
validWriteIds, writeId, TxnUtils.isAcidTable(tbl));
+        Map<PartColNameInfo, MPartitionColumnStatistics> insertMap = new 
HashMap<>();
+        Map<PartColNameInfo, MPartitionColumnStatistics> updateMap = new 
HashMap<>();
+        populateInsertUpdateMap(partitionInfoMap, updateMap, insertMap, 
dbConn, tbl);
 
-      Map<PartColNameInfo, MPartitionColumnStatistics> insertMap = new 
HashMap<>();
-      Map<PartColNameInfo, MPartitionColumnStatistics> updateMap = new 
HashMap<>();
-      populateInsertUpdateMap(partitionInfoMap, updateMap, insertMap, dbConn, 
tbl);
+        LOG.info("Number of stats to insert  " + insertMap.size() + " update " 
+ updateMap.size());
 
-      LOG.info("Number of stats to insert  " + insertMap.size() + " update " + 
updateMap.size());
-
-      if (insertMap.size() != 0) {
-        insertIntoPartColStatTable(insertMap, csId, dbConn);
-      }
+        if (insertMap.size() != 0) {
+          insertIntoPartColStatTable(insertMap, csId, dbConn);
+        }
 
-      if (updateMap.size() != 0) {
-        updatePartColStatTable(updateMap, dbConn);
-      }
+        if (updateMap.size() != 0) {
+          updatePartColStatTable(updateMap, dbConn);
+        }
 
-      if (transactionalListeners != null) {
-        UpdatePartitionColumnStatEventBatch eventBatch = new 
UpdatePartitionColumnStatEventBatch(null);
-        for (Map.Entry entry : result.entrySet()) {
-          Map<String, String> parameters = (Map<String, String>) 
entry.getValue();
-          ColumnStatistics colStats = partColStatsMap.get(entry.getKey());
-          List<String> partVals = getPartValsFromName(tbl, 
colStats.getStatsDesc().getPartName());
-          UpdatePartitionColumnStatEvent event = new 
UpdatePartitionColumnStatEvent(colStats, partVals, parameters,
-                  tbl, writeId, null);
-          eventBatch.addPartColStatEvent(event);
+        if (transactionalListeners != null) {
+          UpdatePartitionColumnStatEventBatch eventBatch = new 
UpdatePartitionColumnStatEventBatch(null);
+          for (Map.Entry entry : result.entrySet()) {
+            Map<String, String> parameters = (Map<String, String>) 
entry.getValue();
+            ColumnStatistics colStats = partColStatsMap.get(entry.getKey());
+            List<String> partVals = getPartValsFromName(tbl, 
colStats.getStatsDesc().getPartName());
+            UpdatePartitionColumnStatEvent event = new 
UpdatePartitionColumnStatEvent(colStats, partVals, parameters,
+                tbl, writeId, null);
+            eventBatch.addPartColStatEvent(event);
+          }
+          
MetaStoreListenerNotifier.notifyEventWithDirectSql(transactionalListeners,
+              EventMessage.EventType.UPDATE_PARTITION_COLUMN_STAT_BATCH, 
eventBatch, dbConn, sqlGenerator);
         }
-        
MetaStoreListenerNotifier.notifyEventWithDirectSql(transactionalListeners,
-                EventMessage.EventType.UPDATE_PARTITION_COLUMN_STAT_BATCH, 
eventBatch, dbConn, sqlGenerator);
+      } finally {
+        closeDbConn(jdoConn);
       }
-      dbConn.commit();
-      committed = true;
+      tx.commit();
       return result;
     } catch (Exception e) {
       LOG.error("Unable to update Column stats for  " + tbl.getTableName(), e);
       throw new MetaException("Unable to update Column stats for  " + 
tbl.getTableName()
               + " due to: "  + e.getMessage());
     } finally {
-      if (!committed) {
-        rollbackDBConn(dbConn);
+      if (tx.isActive()) {
+        tx.rollback();
       }
-      closeDbConn(jdoConn);
       dbType.unlockInternal();
     }
   }
@@ -548,72 +544,69 @@ class DirectSqlUpdatePart {
    */
   public long getNextCSIdForMPartitionColumnStatistics(long numStats) throws 
MetaException {
     long maxCsId = 0;
-    boolean committed = false;
-    Connection dbConn = null;
-    JDOConnection jdoConn = null;
-
+    Transaction tx = pm.currentTransaction();
     try {
       dbType.lockInternal();
-      jdoConn = pm.getDataStoreConnection();
-      dbConn = (Connection) (jdoConn.getNativeConnection());
-
-      setAnsiQuotes(dbConn);
-
-      // This loop will be iterated at max twice. If there is no records, it 
will first insert and then do a select.
-      // We are not using any upsert operations as select for update and then 
update is required to make sure that
-      // the caller gets a reserved range for CSId not used by any other 
thread.
-      boolean insertDone = false;
-      while (maxCsId == 0) {
-        String query = sqlGenerator.addForUpdateClause("SELECT \"NEXT_VAL\" 
FROM \"SEQUENCE_TABLE\" "
-                + "WHERE \"SEQUENCE_NAME\"= "
-                + 
quoteString("org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics"));
-        LOG.debug("Execute query: " + query);
-        try (Statement statement = dbConn.createStatement();
-             ResultSet rs = statement.executeQuery(query)) {
-          if (rs.next()) {
-            maxCsId = rs.getLong(1);
-          } else if (insertDone) {
-            throw new MetaException("Invalid state of SEQUENCE_TABLE for 
MPartitionColumnStatistics");
-          } else {
-            insertDone = true;
-            query = "INSERT INTO \"SEQUENCE_TABLE\" (\"SEQUENCE_NAME\", 
\"NEXT_VAL\")  VALUES ( "
-                    + 
quoteString("org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics")
 + "," + 1
-                    + ")";
-            try {
-              statement.executeUpdate(query);
-            } catch (SQLException e) {
-              // If the record is already inserted by some other thread 
continue to select.
-              if (dbType.isDuplicateKeyError(e)) {
-                continue;
+      tx.begin();
+      JDOConnection jdoConn = null;
+      try {
+        jdoConn = pm.getDataStoreConnection();
+        Connection dbConn = (Connection) jdoConn.getNativeConnection();
+
+        setAnsiQuotes(dbConn);
+
+        // This loop will be iterated at max twice. If there is no records, it 
will first insert and then do a select.
+        // We are not using any upsert operations as select for update and 
then update is required to make sure that
+        // the caller gets a reserved range for CSId not used by any other 
thread.
+        boolean insertDone = false;
+        while (maxCsId == 0) {
+          String query = sqlGenerator.addForUpdateClause(
+              "SELECT \"NEXT_VAL\" FROM \"SEQUENCE_TABLE\" " + "WHERE 
\"SEQUENCE_NAME\"= " + quoteString(
+                  
"org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics"));
+          LOG.debug("Execute query: " + query);
+          try (Statement statement = dbConn.createStatement(); ResultSet rs = 
statement.executeQuery(query)) {
+            if (rs.next()) {
+              maxCsId = rs.getLong(1);
+            } else if (insertDone) {
+              throw new MetaException("Invalid state of SEQUENCE_TABLE for 
MPartitionColumnStatistics");
+            } else {
+              insertDone = true;
+              query = "INSERT INTO \"SEQUENCE_TABLE\" (\"SEQUENCE_NAME\", 
\"NEXT_VAL\")  VALUES ( " + quoteString(
+                  
"org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics") + "," + 1 
+ ")";
+              try {
+                statement.executeUpdate(query);
+              } catch (SQLException e) {
+                // If the record is already inserted by some other thread 
continue to select.
+                if (dbType.isDuplicateKeyError(e)) {
+                  continue;
+                }
+                LOG.error("Unable to insert into SEQUENCE_TABLE for 
MPartitionColumnStatistics.", e);
+                throw e;
               }
-              LOG.error("Unable to insert into SEQUENCE_TABLE for 
MPartitionColumnStatistics.", e);
-              throw e;
             }
           }
         }
-      }
 
-      long nextMaxCsId = maxCsId + numStats + 1;
-      String query = "UPDATE \"SEQUENCE_TABLE\" SET \"NEXT_VAL\" = "
-              + nextMaxCsId
-              + " WHERE \"SEQUENCE_NAME\" = "
-              + 
quoteString("org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics");
+        long nextMaxCsId = maxCsId + numStats + 1;
+        String query = "UPDATE \"SEQUENCE_TABLE\" SET \"NEXT_VAL\" = " + 
nextMaxCsId + " WHERE \"SEQUENCE_NAME\" = " + quoteString(
+            
"org.apache.hadoop.hive.metastore.model.MPartitionColumnStatistics");
 
-      try (Statement statement = dbConn.createStatement()) {
-        statement.executeUpdate(query);
+        try (Statement statement = dbConn.createStatement()) {
+          statement.executeUpdate(query);
+        }
+      } finally {
+        closeDbConn(jdoConn);
       }
-      dbConn.commit();
-      committed = true;
+      tx.commit();
       return maxCsId;
     } catch (Exception e) {
       LOG.error("Unable to getNextCSIdForMPartitionColumnStatistics", e);
       throw new MetaException("Unable to 
getNextCSIdForMPartitionColumnStatistics  "
               + " due to: " + e.getMessage());
     } finally {
-      if (!committed) {
-        rollbackDBConn(dbConn);
+      if (tx.isActive()) {
+        tx.rollback();
       }
-      closeDbConn(jdoConn);
       dbType.unlockInternal();
     }
   }

Reply via email to