git commit: Added custom annotations to logs in query-related functionality in client- and server-side code for PHOENIX-1198

2014-09-26 Thread elilevine 
Repository: phoenix
Updated Branches:
  refs/heads/master 6b0461002 - 3acedb726


Added custom annotations to logs in query-related functionality in client- and 
server-side code for PHOENIX-1198


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3acedb72
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3acedb72
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3acedb72

Branch: refs/heads/master
Commit: 3acedb7262dbf5241e443a2769565e6750b4ac14
Parents: 6b04610
Author: Eli Levine elilev...@apache.org
Authored: Fri Sep 26 10:47:33 2014 -0700
Committer: Eli Levine elilev...@apache.org
Committed: Fri Sep 26 10:47:33 2014 -0700

--
 .../apache/phoenix/cache/ServerCacheClient.java | 18 +++--
 .../apache/phoenix/compile/FromCompiler.java|  3 +-
 .../coprocessor/BaseScannerRegionObserver.java  |  5 +++
 .../GroupedAggregateRegionObserver.java | 39 +++-
 .../UngroupedAggregateRegionObserver.java   |  7 ++--
 .../apache/phoenix/execute/BaseQueryPlan.java   | 15 
 .../apache/phoenix/execute/HashJoinPlan.java|  5 +--
 .../apache/phoenix/execute/MutationState.java   | 12 +++---
 .../phoenix/iterate/ChunkedResultIterator.java  | 14 +--
 .../phoenix/iterate/ConcatResultIterator.java   |  5 +++
 .../DefaultParallelIteratorRegionSplitter.java  |  3 +-
 .../DistinctAggregatingResultIterator.java  |  7 
 .../FilterAggregatingResultIterator.java|  6 +++
 .../phoenix/iterate/FilterResultIterator.java   |  6 +++
 .../GroupedAggregatingResultIterator.java   |  7 
 .../phoenix/iterate/LimitingResultIterator.java |  5 +++
 .../iterate/MergeSortRowKeyResultIterator.java  |  6 +++
 .../iterate/MergeSortTopNResultIterator.java|  7 
 .../phoenix/iterate/OrderedResultIterator.java  | 10 +
 .../phoenix/iterate/ParallelIterators.java  |  8 +++-
 .../iterate/RegionScannerResultIterator.java|  5 +++
 .../phoenix/iterate/ScanningResultIterator.java |  5 +++
 .../phoenix/iterate/SequenceResultIterator.java |  6 +++
 .../phoenix/iterate/TableResultIterator.java|  6 +++
 .../UngroupedAggregatingResultIterator.java |  6 +++
 .../query/ConnectionQueryServicesImpl.java  |  1 -
 .../apache/phoenix/schema/MetaDataClient.java   |  7 ++--
 .../org/apache/phoenix/trace/TraceReader.java   |  2 +-
 .../apache/phoenix/trace/TracingIterator.java   |  5 +++
 .../java/org/apache/phoenix/util/LogUtil.java   | 27 --
 .../java/org/apache/phoenix/util/ScanUtil.java  | 10 +
 .../org/apache/phoenix/util/LogUtilTest.java| 27 +++---
 32 files changed, 231 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3acedb72/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 1301fb7..fa19881 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -167,7 +167,7 @@ public class ServerCacheClient {
 if ( ! servers.contains(entry)  
 
keyRanges.intersect(entry.getRegionInfo().getStartKey(), 
entry.getRegionInfo().getEndKey())) {  // Call RPC once per server
 servers.add(entry);
-if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(Adding cache entry to be sent for  + entry, 
connection.getCustomTracingAnnotations()));}
+if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(Adding cache entry to be sent for  + entry, 
connection));}
 final byte[] key = entry.getRegionInfo().getStartKey();
 final HTableInterface htable = 
services.getTable(cacheUsingTableRef.getTable().getPhysicalName().getBytes());
 closeables.add(htable);
@@ -220,7 +220,7 @@ public class ServerCacheClient {
 }
 }));
 } else {
-if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(NOT adding cache entry to be sent for  + 
entry +  since one already exists for that entry, 
connection.getCustomTracingAnnotations()));}
+if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(NOT adding cache entry to be sent for  + 
entry +  since one already exists for that entry, connection));}
 }
 }
 
@@ -259,7 +259,7 @@ public class ServerCacheClient {
 }
 }
 }
-if (LOG.isDebugEnabled())

git commit: Added custom annotations to logs in query-related functionality in client- and server-side code for PHOENIX-1198

2014-09-26 Thread elilevine 
Repository: phoenix
Updated Branches:
  refs/heads/4.0 4070492a9 - 4edfed646


Added custom annotations to logs in query-related functionality in client- and 
server-side code for PHOENIX-1198


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4edfed64
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4edfed64
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4edfed64

Branch: refs/heads/4.0
Commit: 4edfed646f98e4065746020a5cfb3c354fc5bc45
Parents: 4070492
Author: Eli Levine elilev...@apache.org
Authored: Fri Sep 26 10:48:47 2014 -0700
Committer: Eli Levine elilev...@apache.org
Committed: Fri Sep 26 10:48:47 2014 -0700

--
 .../apache/phoenix/cache/ServerCacheClient.java | 18 +++--
 .../apache/phoenix/compile/FromCompiler.java|  3 +-
 .../coprocessor/BaseScannerRegionObserver.java  |  5 +++
 .../GroupedAggregateRegionObserver.java | 39 +++-
 .../UngroupedAggregateRegionObserver.java   |  7 ++--
 .../apache/phoenix/execute/BaseQueryPlan.java   | 15 
 .../apache/phoenix/execute/HashJoinPlan.java|  5 +--
 .../apache/phoenix/execute/MutationState.java   | 12 +++---
 .../phoenix/iterate/ChunkedResultIterator.java  | 14 +--
 .../phoenix/iterate/ConcatResultIterator.java   |  5 +++
 .../DefaultParallelIteratorRegionSplitter.java  |  3 +-
 .../DistinctAggregatingResultIterator.java  |  7 
 .../FilterAggregatingResultIterator.java|  6 +++
 .../phoenix/iterate/FilterResultIterator.java   |  6 +++
 .../GroupedAggregatingResultIterator.java   |  7 
 .../phoenix/iterate/LimitingResultIterator.java |  5 +++
 .../iterate/MergeSortRowKeyResultIterator.java  |  6 +++
 .../iterate/MergeSortTopNResultIterator.java|  7 
 .../phoenix/iterate/OrderedResultIterator.java  | 10 +
 .../phoenix/iterate/ParallelIterators.java  |  8 +++-
 .../iterate/RegionScannerResultIterator.java|  5 +++
 .../phoenix/iterate/ScanningResultIterator.java |  5 +++
 .../phoenix/iterate/SequenceResultIterator.java |  6 +++
 .../phoenix/iterate/TableResultIterator.java|  6 +++
 .../UngroupedAggregatingResultIterator.java |  6 +++
 .../query/ConnectionQueryServicesImpl.java  |  1 -
 .../apache/phoenix/schema/MetaDataClient.java   |  7 ++--
 .../org/apache/phoenix/trace/TraceReader.java   |  2 +-
 .../apache/phoenix/trace/TracingIterator.java   |  5 +++
 .../java/org/apache/phoenix/util/LogUtil.java   | 27 --
 .../java/org/apache/phoenix/util/ScanUtil.java  | 10 +
 .../org/apache/phoenix/util/LogUtilTest.java| 27 +++---
 32 files changed, 231 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4edfed64/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 1301fb7..fa19881 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -167,7 +167,7 @@ public class ServerCacheClient {
 if ( ! servers.contains(entry)  
 
keyRanges.intersect(entry.getRegionInfo().getStartKey(), 
entry.getRegionInfo().getEndKey())) {  // Call RPC once per server
 servers.add(entry);
-if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(Adding cache entry to be sent for  + entry, 
connection.getCustomTracingAnnotations()));}
+if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(Adding cache entry to be sent for  + entry, 
connection));}
 final byte[] key = entry.getRegionInfo().getStartKey();
 final HTableInterface htable = 
services.getTable(cacheUsingTableRef.getTable().getPhysicalName().getBytes());
 closeables.add(htable);
@@ -220,7 +220,7 @@ public class ServerCacheClient {
 }
 }));
 } else {
-if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(NOT adding cache entry to be sent for  + 
entry +  since one already exists for that entry, 
connection.getCustomTracingAnnotations()));}
+if (LOG.isDebugEnabled()) 
{LOG.debug(addCustomAnnotations(NOT adding cache entry to be sent for  + 
entry +  since one already exists for that entry, connection));}
 }
 }
 
@@ -259,7 +259,7 @@ public class ServerCacheClient {
 }
 }
 }
-if (LOG.isDebugEnabled())