[hive] branch master updated: HIVE-27330: Compaction entry dequeue order (Laszlo Vegh, reviewed by Attila Turoczy)

[veghlaci05]

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

veghlaci05 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 0fe8f0ddc9d HIVE-27330: Compaction entry dequeue order (Laszlo Vegh, 
reviewed by Attila Turoczy)
0fe8f0ddc9d is described below

commit 0fe8f0ddc9d4c492778457147a0d32cb83919486
Author: veghlaci05 <veghlac...@gmail.com>
AuthorDate: Fri May 12 16:27:17 2023 +0200

    HIVE-27330: Compaction entry dequeue order (Laszlo Vegh, reviewed by Attila 
Turoczy)
---
 .../org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java     | 1 +
 .../org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
index 5e3e31c1bc5..0f4720c4669 100644
--- 
a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
+++ 
b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java
@@ -258,6 +258,7 @@ class CompactionTxnHandler extends TxnHandler {
           sb.append("\"CQ_POOL_NAME\" IS NULL OR  \"CQ_ENQUEUE_TIME\" < (")
             .append(getEpochFn(dbProduct)).append(" - 
").append(poolTimeout).append(")");
         }
+        sb.append(" ORDER BY CQ_ID ASC");
         String query = sb.toString();
         stmt = dbConn.prepareStatement(query);
         if (hasPoolName) {
diff --git 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java
 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java
index a0722573344..ff735b786c8 100644
--- 
a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java
+++ 
b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java
@@ -117,11 +117,11 @@ public class TestHiveMetaStoreTimeout {
 
   @Test
   public void testResetTimeout() throws Exception {
-    HMSHandler.testTimeoutValue = 250;
     String dbName = "db";
 
     // no timeout before reset
     client.dropDatabase(dbName, true, true);
+    HMSHandler.testTimeoutValue = 250;
     Database db = new DatabaseBuilder()
         .setName(dbName)
         .build(conf);
@@ -130,6 +130,7 @@ public class TestHiveMetaStoreTimeout {
     } catch (Exception e) {
       Assert.fail("should not throw timeout exception: " + e.getMessage());
     }
+    HMSHandler.testTimeoutValue = -1;
     client.dropDatabase(dbName, true, true);
 
     // reset