commit 00594cc900a57e8bdcae13a548d0dc1d4ccc9b15
author Christine Feng <chfeng15@gmail.com> Thu Jan 23 12:27:36 2020 -0800
committer Chinmay Kulkarni <chinmayskulkarni@apache.org> Fri Feb 14 15:20:26 2020 -0800
tree e23b640c4ccd28ed85d6adab5c9d64db1f0fbf62
parent 16f6a46c19bc9b131697cc5abec73faffc62af18

PHOENIX-5633: Add table name info to scan logging

Signed-off-by: Chinmay Kulkarni <chinmayskulkarni@apache.org>

phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java
index caa60a0..89c5233 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java
@@ -359,13 +359,13 @@
         
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug(LogUtil.addCustomAnnotations(
-        	        "Scan ready for iteration: " + scan, connection));
+                    "Scan on table " + context.getCurrentTable().getTable().getName() + " ready for iteration: " + scan, connection));
         }
         
         ResultIterator iterator =  newIterator(scanGrouper, scan, caches);
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug(LogUtil.addCustomAnnotations(
-        	        "Iterator ready: " + iterator, connection));
+                    "Iterator for table " + context.getCurrentTable().getTable().getName() + " ready: " + iterator, connection));
         }
 
         // wrap the iterator so we start/end tracing as we expect

phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 45b4d4d..56c27c9 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -1229,7 +1229,7 @@
     public List<PeekingResultIterator> getIterators() throws SQLException {
         if (LOGGER.isDebugEnabled()) {
             LOGGER.debug(LogUtil.addCustomAnnotations("Getting iterators for " + this,
-                    ScanUtil.getCustomAnnotations(scan)));
+                    ScanUtil.getCustomAnnotations(scan)) + "on table " + context.getCurrentTable().getTable().getName());
         }
         boolean isReverse = ScanUtil.isReversed(scan);
         boolean isLocalIndex = getTable().getIndexType() == IndexType.LOCAL;