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

2016-05-11 Thread weiz 
Repository: hive
Updated Branches:
  refs/heads/branch-1 763c41333 -> 6c160bc1c


HIVE-11793 : SHOW LOCKS with DbTxnManager ignores filter options (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/6c160bc1
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6c160bc1
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6c160bc1

Branch: refs/heads/branch-1
Commit: 6c160bc1cdd2290861623e6437784ee39ca4eb91
Parents: 763c413
Author: Wei Zheng 
Authored: Wed May 11 14:30:55 2016 -0700
Committer: Wei Zheng 
Committed: Wed May 11 14:30:55 2016 -0700

--
 .../hive/hcatalog/streaming/TestStreaming.java  |   8 +-
 .../hive/metastore/HiveMetaStoreClient.java |   6 +
 .../hadoop/hive/metastore/IMetaStoreClient.java |  10 ++
 .../hadoop/hive/metastore/txn/TxnHandler.java   |  28 +
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |  25 +++-
 .../hadoop/hive/ql/lockmgr/DbLockManager.java   |   6 +-
 .../hadoop/hive/ql/plan/ShowLocksDesc.java  |   4 +-
 .../hive/ql/lockmgr/TestDbTxnManager2.java  | 126 +++
 .../queries/clientpositive/dbtxnmgr_showlocks.q |  14 +++
 .../clientpositive/dbtxnmgr_showlocks.q.out |  47 ++-
 10 files changed, 265 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/6c160bc1/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
--
diff --git 
a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
 
b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
index f4ee208..6016425 100644
--- 
a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
+++ 
b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
@@ -51,6 +51,7 @@ import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.GetOpenTxnsInfoResponse;
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.metastore.api.Partition;
+import org.apache.hadoop.hive.metastore.api.ShowLocksRequest;
 import org.apache.hadoop.hive.metastore.api.ShowLocksResponse;
 import org.apache.hadoop.hive.metastore.api.ShowLocksResponseElement;
 import org.apache.hadoop.hive.metastore.api.TxnAbortedException;
@@ -647,13 +648,16 @@ public class TestStreaming {
 //todo: this should ideally check Transaction heartbeat as well, but 
heartbeat
 //timestamp is not reported yet
 //GetOpenTxnsInfoResponse txnresp = msClient.showTxns();
-ShowLocksResponse response = msClient.showLocks();
+ShowLocksRequest request = new ShowLocksRequest();
+request.setDbname(dbName2);
+request.setTablename(tblName2);
+ShowLocksResponse response = msClient.showLocks(request);
 Assert.assertEquals("Wrong nubmer of locks: " + response, 1, 
response.getLocks().size());
 ShowLocksResponseElement lock = response.getLocks().get(0);
 long acquiredAt = lock.getAcquiredat();
 long heartbeatAt = lock.getLastheartbeat();
 txnBatch.heartbeat();
-response = msClient.showLocks();
+response = msClient.showLocks(request);
 Assert.assertEquals("Wrong number of locks2: " + response, 1, 
response.getLocks().size());
 lock = response.getLocks().get(0);
 Assert.assertEquals("Acquired timestamp didn't match", acquiredAt, 
lock.getAcquiredat());

http://git-wip-us.apache.org/repos/asf/hive/blob/6c160bc1/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
--
diff --git 
a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java 
b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index 6bef3f5..94d5d86 100644
--- 
a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ 
b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -1914,11 +1914,17 @@ public class HiveMetaStoreClient implements 
IMetaStoreClient {
   }
 
   @Override
+  @Deprecated
   public ShowLocksResponse showLocks() throws TException {
 return client.show_locks(new ShowLocksRequest());
   }
 
   @Override
+  public ShowLocksResponse showLocks(ShowLocksRequest request) throws 
TException {
+return client.show_locks(request);
+  }
+
+  @Override
   public void heartbeat(long txnid, long lockid)
   throws NoSuchLockException, NoSuchTxnException, TxnAbortedException,
   TException {

http://git-wip-us.apache.org/repos/asf/hive/blob/6c160bc1/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java

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

2016-05-11 Thread weiz 
Repository: hive
Updated Branches:
  refs/heads/master ece8226b6 -> 868413a37


HIVE-11793 : SHOW LOCKS with DbTxnManager ignores filter options (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/868413a3
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/868413a3
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/868413a3

Branch: refs/heads/master
Commit: 868413a37dae9d572fea810d1131de510ea3d817
Parents: ece8226
Author: Wei Zheng 
Authored: Wed May 11 14:16:45 2016 -0700
Committer: Wei Zheng 
Committed: Wed May 11 14:16:45 2016 -0700

--
 .../hive/hcatalog/streaming/TestStreaming.java  |   8 +-
 .../hive/metastore/HiveMetaStoreClient.java |   6 +
 .../hadoop/hive/metastore/IMetaStoreClient.java |  10 ++
 .../hadoop/hive/metastore/txn/TxnHandler.java   |  28 +
 .../org/apache/hadoop/hive/ql/exec/DDLTask.java |  25 +++-
 .../hadoop/hive/ql/lockmgr/DbLockManager.java   |   6 +-
 .../hadoop/hive/ql/plan/ShowLocksDesc.java  |   4 +-
 .../hive/ql/lockmgr/TestDbTxnManager2.java  | 126 +++
 .../queries/clientpositive/dbtxnmgr_showlocks.q |  14 +++
 .../clientpositive/dbtxnmgr_showlocks.q.out |  47 ++-
 10 files changed, 265 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hive/blob/868413a3/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
--
diff --git 
a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
 
b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
index f4ee208..6016425 100644
--- 
a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
+++ 
b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestStreaming.java
@@ -51,6 +51,7 @@ import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.hadoop.hive.metastore.api.GetOpenTxnsInfoResponse;
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.metastore.api.Partition;
+import org.apache.hadoop.hive.metastore.api.ShowLocksRequest;
 import org.apache.hadoop.hive.metastore.api.ShowLocksResponse;
 import org.apache.hadoop.hive.metastore.api.ShowLocksResponseElement;
 import org.apache.hadoop.hive.metastore.api.TxnAbortedException;
@@ -647,13 +648,16 @@ public class TestStreaming {
 //todo: this should ideally check Transaction heartbeat as well, but 
heartbeat
 //timestamp is not reported yet
 //GetOpenTxnsInfoResponse txnresp = msClient.showTxns();
-ShowLocksResponse response = msClient.showLocks();
+ShowLocksRequest request = new ShowLocksRequest();
+request.setDbname(dbName2);
+request.setTablename(tblName2);
+ShowLocksResponse response = msClient.showLocks(request);
 Assert.assertEquals("Wrong nubmer of locks: " + response, 1, 
response.getLocks().size());
 ShowLocksResponseElement lock = response.getLocks().get(0);
 long acquiredAt = lock.getAcquiredat();
 long heartbeatAt = lock.getLastheartbeat();
 txnBatch.heartbeat();
-response = msClient.showLocks();
+response = msClient.showLocks(request);
 Assert.assertEquals("Wrong number of locks2: " + response, 1, 
response.getLocks().size());
 lock = response.getLocks().get(0);
 Assert.assertEquals("Acquired timestamp didn't match", acquiredAt, 
lock.getAcquiredat());

http://git-wip-us.apache.org/repos/asf/hive/blob/868413a3/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
--
diff --git 
a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java 
b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
index 09091b8..7bca797 100644
--- 
a/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
+++ 
b/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
@@ -2113,11 +2113,17 @@ public class HiveMetaStoreClient implements 
IMetaStoreClient {
   }
 
   @Override
+  @Deprecated
   public ShowLocksResponse showLocks() throws TException {
 return client.show_locks(new ShowLocksRequest());
   }
 
   @Override
+  public ShowLocksResponse showLocks(ShowLocksRequest request) throws 
TException {
+return client.show_locks(request);
+  }
+
+  @Override
   public void heartbeat(long txnid, long lockid)
   throws NoSuchLockException, NoSuchTxnException, TxnAbortedException,
   TException {

http://git-wip-us.apache.org/repos/asf/hive/blob/868413a3/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java