Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2e9677d3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2e9677d3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2e9677d3 Branch: refs/heads/master Commit: 2e9677d35682131569d986602c62e3c92ab4e27d Parents: 1359689 1f54dfe Author: James Taylor <[email protected]> Authored: Fri Sep 19 16:38:53 2014 -0700 Committer: James Taylor <[email protected]> Committed: Fri Sep 19 16:38:53 2014 -0700 ---------------------------------------------------------------------- .../phoenix/trace/PhoenixTracingEndToEndIT.java | 2 +- .../apache/phoenix/cache/ServerCacheClient.java | 23 +++++++--- .../apache/phoenix/execute/HashJoinPlan.java | 16 +++++-- .../org/apache/phoenix/query/QueryServices.java | 1 + .../org/apache/phoenix/trace/TraceReader.java | 24 ++++++++--- .../org/apache/phoenix/trace/util/Tracing.java | 3 +- .../java/org/apache/phoenix/util/LogUtil.java | 34 +++++++++++++++ .../org/apache/phoenix/util/LogUtilTest.java | 45 ++++++++++++++++++++ .../org/apache/phoenix/trace/TracingCompat.java | 2 +- 9 files changed, 131 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2e9677d3/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java index fd4152b,a352f3a..2da52d3 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java @@@ -128,11 -132,10 +128,12 @@@ public interface QueryServices extends public static final String TRACING_PAGE_SIZE_ATTRIB = "phoenix.trace.read.pagesize"; public static final String TRACING_PROBABILITY_THRESHOLD_ATTRIB = "phoenix.trace.probability.threshold"; public static final String TRACING_STATS_TABLE_NAME_ATTRIB = "phoenix.trace.statsTableName"; + public static final String TRACING_CUSTOM_ANNOTATION_ATTRIB_PREFIX = "phoenix.trace.custom.annotation."; public static final String USE_REVERSE_SCAN_ATTRIB = "phoenix.query.useReverseScan"; - + + public static final String HISTOGRAM_BYTE_DEPTH_CONF_KEY = "phoenix.guidepost.width"; + /** * Get executor service used for parallel scans */
