This is an automated email from the ASF dual-hosted git repository. kgyrtkirk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/hive.git
commit 2350662ee4fa17332bf546fbebee5cde9714717e Author: Rajkumar Singh <rajkrrsi...@gmail.com> AuthorDate: Mon Jul 15 11:37:13 2019 +0200 HIVE-21973: SHOW LOCKS prints the headers twice (Rajkumar Singh via Gopal V) Signed-off-by: Zoltan Haindrich <k...@rxd.hu> --- .../hive/ql/ddl/table/lock/ShowLocksOperation.java | 57 ++++++++++++---------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/lock/ShowLocksOperation.java b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/lock/ShowLocksOperation.java index 3457284..2636530 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/lock/ShowLocksOperation.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/ddl/table/lock/ShowLocksOperation.java @@ -183,33 +183,36 @@ public class ShowLocksOperation extends DDLOperation<ShowLocksDesc> { } public static void dumpLockInfo(DataOutputStream os, ShowLocksResponse response) throws IOException { - // Write a header - os.writeBytes("Lock ID"); - os.write(Utilities.tabCode); - os.writeBytes("Database"); - os.write(Utilities.tabCode); - os.writeBytes("Table"); - os.write(Utilities.tabCode); - os.writeBytes("Partition"); - os.write(Utilities.tabCode); - os.writeBytes("State"); - os.write(Utilities.tabCode); - os.writeBytes("Blocked By"); - os.write(Utilities.tabCode); - os.writeBytes("Type"); - os.write(Utilities.tabCode); - os.writeBytes("Transaction ID"); - os.write(Utilities.tabCode); - os.writeBytes("Last Heartbeat"); - os.write(Utilities.tabCode); - os.writeBytes("Acquired At"); - os.write(Utilities.tabCode); - os.writeBytes("User"); - os.write(Utilities.tabCode); - os.writeBytes("Hostname"); - os.write(Utilities.tabCode); - os.writeBytes("Agent Info"); - os.write(Utilities.newLineCode); + SessionState sessionState = SessionState.get(); + // Write a header for CliDriver + if(!sessionState.isHiveServerQuery()) { + os.writeBytes("Lock ID"); + os.write(Utilities.tabCode); + os.writeBytes("Database"); + os.write(Utilities.tabCode); + os.writeBytes("Table"); + os.write(Utilities.tabCode); + os.writeBytes("Partition"); + os.write(Utilities.tabCode); + os.writeBytes("State"); + os.write(Utilities.tabCode); + os.writeBytes("Blocked By"); + os.write(Utilities.tabCode); + os.writeBytes("Type"); + os.write(Utilities.tabCode); + os.writeBytes("Transaction ID"); + os.write(Utilities.tabCode); + os.writeBytes("Last Heartbeat"); + os.write(Utilities.tabCode); + os.writeBytes("Acquired At"); + os.write(Utilities.tabCode); + os.writeBytes("User"); + os.write(Utilities.tabCode); + os.writeBytes("Hostname"); + os.write(Utilities.tabCode); + os.writeBytes("Agent Info"); + os.write(Utilities.newLineCode); + } List<ShowLocksResponseElement> locks = response.getLocks(); if (locks != null) {