Repository: hive Updated Branches: refs/heads/branch-1 917fc8727 -> 14ac6de6c
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/14ac6de6 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/14ac6de6 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/14ac6de6 Branch: refs/heads/branch-1 Commit: 14ac6de6c172a14c2cb6348ecec6b18fec86b17b Parents: 917fc87 Author: Wei Zheng <w...@apache.org> Authored: Fri May 13 16:27:06 2016 -0700 Committer: Wei Zheng <w...@apache.org> Committed: Fri May 13 16:27:06 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/14ac6de6/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 04e556b..0770298 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 @@ -684,14 +684,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);
