You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ve...@apache.org on 2023/05/16 07:34:53 UTC
[hive] branch master updated: Revert "HIVE-27330: Compaction entry dequeue order (Laszlo Vegh, reviewed by Attila Turoczy)"
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 d70ec8675c3 Revert "HIVE-27330: Compaction entry dequeue order (Laszlo Vegh, reviewed by Attila Turoczy)"
d70ec8675c3 is described below
commit d70ec8675c34fa33813305d102d7e79a97d61b76
Author: Ayush Saxena <ay...@apache.org>
AuthorDate: Tue May 16 13:04:39 2023 +0530
Revert "HIVE-27330: Compaction entry dequeue order (Laszlo Vegh, reviewed by Attila Turoczy)"
This reverts commit 0fe8f0ddc9d4c492778457147a0d32cb83919486.
---
.../org/apache/hadoop/hive/metastore/txn/CompactionTxnHandler.java | 1 -
.../org/apache/hadoop/hive/metastore/TestHiveMetaStoreTimeout.java | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
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 0f4720c4669..5e3e31c1bc5 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,7 +258,6 @@ 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 ff735b786c8..a0722573344 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,7 +130,6 @@ public class TestHiveMetaStoreTimeout {
} catch (Exception e) {
Assert.fail("should not throw timeout exception: " + e.getMessage());
}
- HMSHandler.testTimeoutValue = -1;
client.dropDatabase(dbName, true, true);
// reset