[phoenix] branch 4.15-HBase-1.5 updated: PHOENIX-5633: Add table name info to scan logging

[chinmayskulkarni]

This is an automated email from the ASF dual-hosted git repository.

chinmayskulkarni pushed a commit to branch 4.15-HBase-1.5
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.15-HBase-1.5 by this push:
     new 3a3eee6  PHOENIX-5633: Add table name info to scan logging
3a3eee6 is described below

commit 3a3eee64a47927afecaf4b3c8f058ffa7238bc2e
Author: Christine Feng <chfen...@gmail.com>
AuthorDate: Thu Jan 23 12:27:36 2020 -0800

    PHOENIX-5633: Add table name info to scan logging
    
    Signed-off-by: Chinmay Kulkarni <chinmayskulka...@apache.org>
---
 .../src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java       | 4 ++--
 .../src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 @@ public abstract class BaseQueryPlan implements QueryPlan {
         
         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
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 abstract class BaseResultIterators extends 
ExplainTable implements Result
     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;