From eb76dc33c0fc96a88979dfaa302156f5da0273fc Mon Sep 17 00:00:00 2001 From: srdo Date: Wed, 13 Mar 2019 12:53:07 +0100 Subject: [PATCH] HIVE-21348: Add currentTransactionBatch and staticPartitionValues to HiveStreamingConnection toString output --- .../apache/hive/streaming/HiveStreamingConnection.java | 8 ++++++-- .../java/org/apache/hive/streaming/TransactionBatch.java | 4 +++- .../apache/hive/streaming/UnManagedSingleTransaction.java | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java b/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java index a32aa62bbc..63b937ab16 100644 --- a/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java +++ b/streaming/src/java/org/apache/hive/streaming/HiveStreamingConnection.java @@ -146,7 +146,6 @@ public String toString() { private boolean manageTransactions; private int countTransactions = 0; private Set partitions; - private Long tableId; private Runnable onShutdownRunner; private HiveStreamingConnection(Builder builder) throws StreamingException { @@ -405,7 +404,12 @@ private void setPartitionedTable(Boolean isPartitionedTable) { @Override public String toString() { - return "{ metaStoreUri: " + metastoreUri + ", database: " + database + ", table: " + table + " }"; + return "{ metaStoreUri: " + metastoreUri + + ", database: " + database + + ", table: " + table + + ", currentTransactionBatch: " + currentTransactionBatch + + ", staticPartitionValues: " + staticPartitionValues + + " }"; } private String toConnectionInfoString() { diff --git a/streaming/src/java/org/apache/hive/streaming/TransactionBatch.java b/streaming/src/java/org/apache/hive/streaming/TransactionBatch.java index a625759c0b..e73f139476 100644 --- a/streaming/src/java/org/apache/hive/streaming/TransactionBatch.java +++ b/streaming/src/java/org/apache/hive/streaming/TransactionBatch.java @@ -226,7 +226,9 @@ public String toString() { + "..." + txnToWriteIds.get(txnToWriteIds.size() - 1).getTxnId() + "/" + txnToWriteIds.get(txnToWriteIds.size() - 1).getWriteId() - + "] on connection = " + conn + "; " + sb; + + "] on connection = { metaStoreUri: " + conn.getMetastoreUri() + + ", database: " + conn.getDatabase() + + ", table: " + conn.getTable() + " }" + "; " + sb; } public void beginNextTransaction() throws StreamingException { diff --git a/streaming/src/java/org/apache/hive/streaming/UnManagedSingleTransaction.java b/streaming/src/java/org/apache/hive/streaming/UnManagedSingleTransaction.java index 75779d50c7..f207f7e25b 100644 --- a/streaming/src/java/org/apache/hive/streaming/UnManagedSingleTransaction.java +++ b/streaming/src/java/org/apache/hive/streaming/UnManagedSingleTransaction.java @@ -122,7 +122,9 @@ public String toString() { return "{}"; } return "TxnId/WriteIds=[" + txnToWriteIds.get(0).getWriteId() - + "] on connection = " + conn + "; " + "status=" + state; + + "] on connection = { metaStoreUri: " + conn.getMetastoreUri() + + ", database: " + conn.getDatabase() + + ", table: " + conn.getTable() + " }; " + "status=" + state; } /** -- 2.19.2