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 2017/01/27 01:19:10 UTC
[26/26] 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/40549904
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/40549904
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/40549904
Branch: refs/heads/calcite
Commit: 4054990479990f4f6551eb97fff8ffd91d15d526
Parents: 948d009 069c371
Author: maryannxue <ma...@gmail.com>
Authored: Thu Jan 26 17:14:57 2017 -0800
Committer: maryannxue <ma...@gmail.com>
Committed: Thu Jan 26 17:14:57 2017 -0800
----------------------------------------------------------------------
bin/phoenix_utils.py | 5 +
bin/sqlline-thin.py | 17 +-
bin/sqlline.py | 52 +--
.../AlterMultiTenantTableWithViewsIT.java | 2 +-
.../apache/phoenix/end2end/AlterTableIT.java | 16 +-
.../phoenix/end2end/AlterTableWithViewsIT.java | 2 +-
.../phoenix/end2end/ArithmeticQueryIT.java | 2 +-
.../phoenix/end2end/ArrayFillFunctionIT.java | 28 +-
.../phoenix/end2end/AutomaticRebuildIT.java | 219 +++++++++
.../end2end/BaseTenantSpecificTablesIT.java | 4 +-
.../phoenix/end2end/CoalesceFunctionIT.java | 60 +--
.../end2end/ConvertTimezoneFunctionIT.java | 22 +-
.../org/apache/phoenix/end2end/DateTimeIT.java | 6 +-
.../org/apache/phoenix/end2end/DeleteIT.java | 26 +-
.../phoenix/end2end/End2EndTestDriver.java | 12 +-
.../phoenix/end2end/EvaluationOfORIT.java | 5 +-
.../apache/phoenix/end2end/GroupByCaseIT.java | 10 +-
.../org/apache/phoenix/end2end/GroupByIT.java | 6 +-
.../apache/phoenix/end2end/HashJoinMoreIT.java | 47 +-
.../end2end/IndexToolForPartialBuildIT.java | 298 ++++++++++++
...olForPartialBuildWithNamespaceEnabledIT.java | 70 +++
.../org/apache/phoenix/end2end/QueryMoreIT.java | 35 ++
.../phoenix/end2end/SortMergeJoinMoreIT.java | 37 +-
.../org/apache/phoenix/end2end/SortOrderIT.java | 8 +-
.../end2end/TenantSpecificTablesDDLIT.java | 12 +-
.../end2end/TenantSpecificTablesDMLIT.java | 66 +--
.../end2end/TenantSpecificViewIndexIT.java | 47 ++
.../end2end/UpsertSelectAutoCommitIT.java | 2 +-
.../apache/phoenix/end2end/UpsertSelectIT.java | 2 +-
.../apache/phoenix/end2end/UpsertValuesIT.java | 20 +-
.../phoenix/end2end/index/ImmutableIndexIT.java | 1 -
.../phoenix/end2end/index/IndexMetadataIT.java | 58 +++
.../end2end/index/MutableIndexFailureIT.java | 10 +-
.../phoenix/monitoring/PhoenixMetricsIT.java | 135 ++++++
.../org/apache/phoenix/tx/TransactionIT.java | 9 +-
.../org/apache/phoenix/tx/TxCheckpointIT.java | 2 +-
phoenix-core/src/main/antlr3/PhoenixSQL.g | 4 +-
.../apache/phoenix/compile/UpsertCompiler.java | 44 +-
.../apache/phoenix/compile/WhereCompiler.java | 3 +-
.../apache/phoenix/compile/WhereOptimizer.java | 7 +-
.../coprocessor/MetaDataEndpointImpl.java | 9 +-
.../coprocessor/MetaDataRegionObserver.java | 291 +++++++-----
.../UngroupedAggregateRegionObserver.java | 31 +-
.../phoenix/exception/SQLExceptionCode.java | 3 +-
.../apache/phoenix/execute/MutationState.java | 51 ++-
.../function/ConvertTimezoneFunction.java | 5 +-
.../expression/function/EncodeFormat.java | 4 +-
.../index/PhoenixIndexFailurePolicy.java | 52 +--
.../phoenix/iterate/OrderedResultIterator.java | 5 +-
.../apache/phoenix/jdbc/PhoenixConnection.java | 10 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 2 +
.../org/apache/phoenix/jdbc/PhoenixDriver.java | 99 ++--
.../apache/phoenix/jdbc/PhoenixStatement.java | 8 +-
.../phoenix/mapreduce/CsvBulkImportUtil.java | 7 +-
.../phoenix/mapreduce/CsvBulkLoadTool.java | 12 +-
.../phoenix/mapreduce/index/IndexTool.java | 455 +++++++++++++------
.../phoenix/mapreduce/index/IndexToolUtil.java | 6 +-
.../index/PhoenixIndexImportDirectMapper.java | 21 +-
.../index/PhoenixIndexPartialBuildMapper.java | 182 ++++++++
.../util/PhoenixConfigurationUtil.java | 31 ++
.../phoenix/monitoring/GlobalClientMetrics.java | 6 +-
.../apache/phoenix/monitoring/MetricType.java | 4 +-
.../phoenix/parse/AlterIndexStatement.java | 8 +-
.../apache/phoenix/parse/ParseNodeFactory.java | 6 +-
.../query/ConnectionQueryServicesImpl.java | 47 +-
.../java/org/apache/phoenix/query/KeyRange.java | 5 +-
.../org/apache/phoenix/query/QueryServices.java | 13 +
.../phoenix/query/QueryServicesOptions.java | 18 +-
.../apache/phoenix/schema/MetaDataClient.java | 47 +-
.../stats/DefaultStatisticsCollector.java | 32 +-
.../apache/phoenix/schema/types/PBinary.java | 6 +-
.../apache/phoenix/schema/types/PVarbinary.java | 5 +-
.../org/apache/phoenix/util/ExpressionUtil.java | 10 +
.../java/org/apache/phoenix/util/IndexUtil.java | 61 ++-
.../java/org/apache/phoenix/util/JDBCUtil.java | 6 +
.../org/apache/phoenix/util/PhoenixRuntime.java | 23 +-
.../phoenix/util/csv/CsvUpsertExecutor.java | 25 +
.../phoenix/util/json/JsonUpsertExecutor.java | 44 ++
.../phoenix/compile/JoinQueryCompilerTest.java | 6 +-
.../phoenix/compile/QueryCompilerTest.java | 8 +-
.../iterate/OrderedResultIteratorTest.java | 41 ++
.../apache/phoenix/jdbc/PhoenixDriverTest.java | 9 +
.../mapreduce/CsvBulkImportUtilTest.java | 8 +-
.../phoenix/query/KeyRangeIntersectTest.java | 9 +-
.../util/AbstractUpsertExecutorTest.java | 82 +++-
.../org/apache/phoenix/util/JDBCUtilTest.java | 21 +-
.../phoenix/util/csv/CsvUpsertExecutorTest.java | 26 +-
.../util/json/JsonUpsertExecutorTest.java | 6 +
phoenix-spark/src/it/resources/globalSetup.sql | 7 +-
.../apache/phoenix/spark/PhoenixSparkIT.scala | 42 +-
.../phoenix/spark/DataFrameFunctions.scala | 6 +-
.../org/apache/phoenix/spark/PhoenixRDD.scala | 22 +-
.../phoenix/spark/ProductRDDFunctions.scala | 3 +-
.../tracingwebapp/http/EntityFactory.java | 19 +-
.../tracingwebapp/http/TraceServlet.java | 21 +-
pom.xml | 16 +-
96 files changed, 2657 insertions(+), 756 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/40549904/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/40549904/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/40549904/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/40549904/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/40549904/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/40549904/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 1a18ceb,d47a6b8..4005ee4
--- a/pom.xml
+++ b/pom.xml
@@@ -97,12 -97,11 +97,12 @@@
<jodatime.version>1.6</jodatime.version>
<joni.version>2.1.2</joni.version>
<avatica.version>1.9.0</avatica.version>
+ <calcite.version>1.12.0-SNAPSHOT</calcite.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
<tephra.version>0.9.0-incubating</tephra.version>
- <spark.version>1.6.1</spark.version>
- <scala.version>2.10.4</scala.version>
- <scala.binary.version>2.10</scala.binary.version>
+ <spark.version>2.0.2</spark.version>
+ <scala.version>2.11.8</scala.version>
+ <scala.binary.version>2.11</scala.binary.version>
<!-- Test Dependencies -->
<mockito-all.version>1.8.5</mockito-all.version>