You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2014/09/20 22:06:15 UTC
[2/2] git commit: Merge branch '4.0' of
https://git-wip-us.apache.org/repos/asf/phoenix into 4.0
Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6262e483
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6262e483
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6262e483
Branch: refs/heads/4.0
Commit: 6262e4837ff14a53e26c79f9efd6d6cf772285df
Parents: d6a8b33 b6d6770
Author: Eli Levine <el...@apache.org>
Authored: Sat Sep 20 13:04:59 2014 -0700
Committer: Eli Levine <el...@apache.org>
Committed: Sat Sep 20 13:04:59 2014 -0700
----------------------------------------------------------------------
phoenix-assembly/pom.xml | 4 +-
.../src/build/server-without-antlr.xml | 42 +
phoenix-assembly/src/build/server.xml | 2 +-
.../org/apache/phoenix/end2end/ArrayIT.java | 12 +-
.../end2end/BaseClientManagedTimeIT.java | 2 +-
.../BaseParallelIteratorsRegionSplitterIT.java | 9 +-
.../org/apache/phoenix/end2end/BaseQueryIT.java | 8 +-
.../org/apache/phoenix/end2end/BaseViewIT.java | 2 -
...efaultParallelIteratorsRegionSplitterIT.java | 55 +-
.../phoenix/end2end/GuidePostsLifeCycleIT.java | 148 ++
.../org/apache/phoenix/end2end/HashJoinIT.java | 2 -
.../org/apache/phoenix/end2end/KeyOnlyIT.java | 61 +-
.../phoenix/end2end/MultiCfQueryExecIT.java | 78 +-
.../end2end/QueryDatabaseMetaDataIT.java | 4 +
.../org/apache/phoenix/end2end/QueryIT.java | 39 +-
.../phoenix/end2end/RegexpSubstrFunctionIT.java | 90 ++
.../apache/phoenix/end2end/ReverseScanIT.java | 2 -
...ipRangeParallelIteratorRegionSplitterIT.java | 32 +-
.../phoenix/end2end/StatsCollectorIT.java | 231 ++++
.../apache/phoenix/end2end/StatsManagerIT.java | 2 +-
.../end2end/TenantSpecificTablesDDLIT.java | 4 +
.../end2end/TenantSpecificTablesDMLIT.java | 23 +-
.../end2end/TenantSpecificViewIndexIT.java | 2 +-
.../phoenix/end2end/index/MutableIndexIT.java | 1 -
.../phoenix/end2end/index/SaltedIndexIT.java | 17 +-
.../salted/SaltedTableUpsertSelectIT.java | 21 +-
phoenix-core/src/main/antlr3/PhoenixSQL.g | 10 +-
.../org/apache/phoenix/cache/GlobalCache.java | 7 +-
.../coprocessor/MetaDataEndpointImpl.java | 132 +-
.../coprocessor/generated/MetaDataProtos.java | 1223 ++++++++++++++++-
.../generated/StatCollectorProtos.java | 1269 ++++++++++++++++++
.../function/RegexpSubstrFunction.java | 8 +
.../DefaultParallelIteratorRegionSplitter.java | 198 +--
...ocalIndexParallelIteratorRegionSplitter.java | 6 +-
.../iterate/ParallelIteratorRegionSplitter.java | 2 -
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 16 +
.../apache/phoenix/jdbc/PhoenixStatement.java | 49 +
.../apache/phoenix/parse/ParseNodeFactory.java | 4 +
.../parse/UpdateStatisticsStatement.java | 26 +
.../phoenix/query/ConnectionQueryServices.java | 6 +-
.../query/ConnectionQueryServicesImpl.java | 164 ++-
.../query/ConnectionlessQueryServicesImpl.java | 43 +-
.../query/DelegateConnectionQueryServices.java | 16 +-
.../apache/phoenix/query/QueryConstants.java | 28 +-
.../org/apache/phoenix/query/QueryServices.java | 8 +-
.../phoenix/query/QueryServicesOptions.java | 34 +-
.../apache/phoenix/schema/MetaDataClient.java | 225 +++-
.../apache/phoenix/schema/PColumnFamily.java | 3 +
.../phoenix/schema/PColumnFamilyImpl.java | 25 +-
.../java/org/apache/phoenix/schema/PTable.java | 7 +-
.../org/apache/phoenix/schema/PTableImpl.java | 118 +-
.../apache/phoenix/schema/stat/PTableStats.java | 27 +-
.../phoenix/schema/stat/PTableStatsImpl.java | 37 +-
.../schema/stat/StatisticsCollector.java | 447 ++++++
.../phoenix/schema/stat/StatisticsScanner.java | 117 ++
.../phoenix/schema/stat/StatisticsTable.java | 168 +++
.../phoenix/schema/stat/StatisticsTracker.java | 62 +
.../phoenix/schema/stat/StatisticsUtils.java | 80 ++
.../java/org/apache/phoenix/query/BaseTest.java | 17 +-
.../phoenix/query/QueryServicesTestImpl.java | 6 +-
phoenix-protocol/src/main/MetaDataService.proto | 15 +-
phoenix-protocol/src/main/PTable.proto | 2 +-
.../src/main/StatisticsCollect.proto | 20 +
pom.xml | 2 +-
64 files changed, 4973 insertions(+), 547 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6262e483/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 a352f3a,fd4152b..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
@@@ -132,10 -128,11 +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
*/