hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject hive git commit: HIVE-11793 : SHOW LOCKS with DbTxnManager ignores filter options, ADDENDUM (Wei Zheng, reviewed by Eugene Koifman)
Date Fri, 13 May 2016 23:23:34 GMT
Repository: hive
Updated Branches:
  refs/heads/master 5cd5aae3c -> a9864f3f8


HIVE-11793 : SHOW LOCKS with DbTxnManager ignores filter options, ADDENDUM (Wei Zheng, reviewed
by Eugene Koifman)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/a9864f3f
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/a9864f3f
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/a9864f3f

Branch: refs/heads/master
Commit: a9864f3f8c95e1dfb7a6424f97b024d384abbf87
Parents: 5cd5aae
Author: Wei Zheng <weiz@apache.org>
Authored: Fri May 13 16:22:57 2016 -0700
Committer: Wei Zheng <weiz@apache.org>
Committed: Fri May 13 16:22:57 2016 -0700

----------------------------------------------------------------------
 .../hadoop/hive/ql/lockmgr/TestDbTxnManager2.java     | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/a9864f3f/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
index 6986b10..8840fd9 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestDbTxnManager2.java
@@ -696,14 +696,12 @@ public class TestDbTxnManager2 {
 
     // SHOW LOCKS (no filter)
     List<ShowLocksResponseElement> locks = getLocks();
-    Assert.assertEquals("Unexpected lock count", 7, locks.size());
-    // locks.get(0) is a lock on tmp table in default database used for insert
-    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db1", "t14", "ds=today", locks.get(1));
-    // locks.get(2) is a lock on tmp table in default database used for insert
-    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db1", "t14", "ds=tomorrow", locks.get(3));
-    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db2", "t15", null, locks.get(4));
-    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db2", "t16", null, locks.get(5));
-    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db2", "t14", null, locks.get(6));
+    Assert.assertEquals("Unexpected lock count", 5, locks.size());
+    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db1", "t14", "ds=today", locks.get(0));
+    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db1", "t14", "ds=tomorrow", locks.get(1));
+    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db2", "t15", null, locks.get(2));
+    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db2", "t16", null, locks.get(3));
+    checkLock(LockType.SHARED_READ, LockState.ACQUIRED, "db2", "t14", null, locks.get(4));
 
     // SHOW LOCKS db2
     locks = getLocksWithFilterOptions(txnMgr3, "db2", null, null);


Mime
View raw message