You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2016/03/29 21:51:02 UTC
[29/30] phoenix git commit: Merge remote-tracking branch
'origin/master' into calcite
Merge remote-tracking branch 'origin/master' into calcite
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c55f74de
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c55f74de
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c55f74de
Branch: refs/heads/calcite
Commit: c55f74dedd73142e0c585742a2c1e913ad43fac5
Parents: 86b9ded b988050
Author: maryannxue <ma...@gmail.com>
Authored: Tue Mar 29 14:51:43 2016 -0400
Committer: maryannxue <ma...@gmail.com>
Committed: Tue Mar 29 14:51:43 2016 -0400
----------------------------------------------------------------------
phoenix-assembly/pom.xml | 2 +-
phoenix-core/pom.xml | 2 +-
.../org/apache/phoenix/end2end/DateTimeIT.java | 20 +
.../org/apache/phoenix/end2end/DeleteIT.java | 12 +
.../org/apache/phoenix/end2end/IndexToolIT.java | 6 +-
.../phoenix/end2end/MutableIndexToolIT.java | 2 +-
.../phoenix/end2end/PhoenixRuntimeIT.java | 13 +-
.../phoenix/end2end/StatsCollectorIT.java | 13 +-
.../phoenix/end2end/ToCharFunctionIT.java | 15 +
.../phoenix/end2end/ToDateFunctionIT.java | 15 +
.../phoenix/end2end/index/LocalIndexIT.java | 2 +-
.../phoenix/end2end/index/ViewIndexIT.java | 2 +-
.../ipc/controller/MetadataRpcController.java | 2 +-
.../regionserver/IndexHalfStoreFileReader.java | 8 -
.../apache/phoenix/compile/DeleteCompiler.java | 28 +-
.../phoenix/coprocessor/MetaDataProtocol.java | 2 +-
.../coprocessor/SequenceRegionObserver.java | 12 +-
.../phoenix/expression/LiteralExpression.java | 12 +-
.../expression/function/ToCharFunction.java | 13 +-
.../expression/function/ToDateFunction.java | 17 +-
.../expression/function/ToNumberFunction.java | 14 +-
.../expression/function/ToTimeFunction.java | 13 +-
.../function/ToTimestampFunction.java | 13 +-
.../hbase/index/covered/KeyValueStore.java | 4 +-
.../hbase/index/covered/LocalTableState.java | 27 --
.../hbase/index/covered/data/IndexMemStore.java | 48 +--
.../index/scanner/FilteredKeyValueScanner.java | 65 +---
.../hbase/index/scanner/ReseekableScanner.java | 28 ++
.../hbase/index/scanner/ScannerBuilder.java | 6 +-
.../phoenix/iterate/BaseResultIterators.java | 9 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 19 +-
.../phoenix/mapreduce/AbstractBulkLoadTool.java | 12 +-
.../phoenix/mapreduce/CsvToKeyValueMapper.java | 2 +-
.../mapreduce/FormatToBytesWritableMapper.java | 388 +++++++++++++++++++
.../mapreduce/FormatToKeyValueMapper.java | 378 ------------------
.../mapreduce/FormatToKeyValueReducer.java | 31 +-
.../phoenix/mapreduce/JsonToKeyValueMapper.java | 2 +-
.../bulkload/TargetTableRefFunctions.java | 2 +-
.../util/PhoenixConfigurationUtil.java | 4 +-
.../apache/phoenix/optimize/QueryOptimizer.java | 14 +-
.../query/ConnectionQueryServicesImpl.java | 27 +-
.../org/apache/phoenix/schema/PTableImpl.java | 2 +-
.../org/apache/phoenix/schema/Sequence.java | 46 +--
.../stats/DefaultStatisticsCollector.java | 6 +-
.../phoenix/schema/stats/PTableStatsImpl.java | 2 +-
.../stats/StatisticsCollectorFactory.java | 3 +-
.../org/apache/phoenix/util/MetaDataUtil.java | 2 +-
.../org/apache/phoenix/util/PhoenixRuntime.java | 31 ++
.../org/apache/phoenix/util/SchemaUtil.java | 4 +-
.../org/apache/phoenix/util/UpgradeUtil.java | 18 +-
.../phoenix/compile/QueryOptimizerTest.java | 28 ++
.../BuiltinFunctionConstructorTest.java | 11 +-
.../index/covered/data/TestIndexMemStore.java | 6 +-
.../FormatToBytesWritableMapperTest.java | 102 +++++
.../mapreduce/FormatToKeyValueMapperTest.java | 102 -----
.../java/org/apache/phoenix/query/BaseTest.java | 2 +-
.../org/apache/phoenix/query/QueryPlanTest.java | 25 ++
.../apache/phoenix/util/PhoenixRuntimeTest.java | 13 +-
phoenix-flume/pom.xml | 2 +-
phoenix-pherf/pom.xml | 2 +-
phoenix-pig/pom.xml | 2 +-
phoenix-server-client/pom.xml | 6 +-
phoenix-server/pom.xml | 14 +-
.../src/build/query-server-runnable.xml | 2 +-
phoenix-spark/pom.xml | 2 +-
phoenix-tracing-webapp/pom.xml | 2 +-
pom.xml | 43 +-
67 files changed, 952 insertions(+), 830 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c55f74de/phoenix-core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c55f74de/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 22c0197,c36a72b..2a0d3b3
--- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@@ -1006,8 -882,23 +1006,15 @@@ public abstract class BaseResultIterato
}
}
buf.append(getName()).append(" ").append(size()).append("-WAY ");
+ try {
+ if (plan.useRoundRobinIterator()) {
+ buf.append("ROUND ROBIN ");
+ }
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
explain(buf.toString(),planSteps);
}
-
- public Long getEstimatedRowCount() {
- return this.estimatedRows;
- }
-
- public Long getEstimatedByteCount() {
- return this.estimatedSize;
- }
@Override
public String toString() {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c55f74de/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c55f74de/pom.xml
----------------------------------------------------------------------