Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9f38170a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9f38170a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9f38170a Branch: refs/heads/omid Commit: 9f38170a41eb1fe2cc49d42b4c99aff9b05d5710 Parents: 6f7d42f f51c0db Author: Ohad Shacham <[email protected]> Authored: Mon May 8 14:33:07 2017 +0300 Committer: Ohad Shacham <[email protected]> Committed: Mon May 8 14:33:07 2017 +0300 ---------------------------------------------------------------------- phoenix-assembly/pom.xml | 2 +- phoenix-client/pom.xml | 2 +- phoenix-core/pom.xml | 2 +- ...ReplayWithIndexWritesAndCompressedWALIT.java | 2 +- .../apache/phoenix/end2end/AlterTableIT.java | 9 +- .../org/apache/phoenix/end2end/ArrayIT.java | 2 +- .../phoenix/end2end/AutomaticRebuildIT.java | 4 +- .../phoenix/end2end/CoalesceFunctionIT.java | 12 +- .../apache/phoenix/end2end/CreateTableIT.java | 2 +- .../end2end/IndexToolForPartialBuildIT.java | 4 +- .../phoenix/end2end/NthValueFunctionIT.java | 99 +++++++ .../end2end/SequenceBulkAllocationIT.java | 44 ++-- .../org/apache/phoenix/end2end/SequenceIT.java | 44 ++-- .../phoenix/end2end/SortMergeJoinMoreIT.java | 135 ++++++++++ .../phoenix/end2end/SpillableGroupByIT.java | 2 +- .../phoenix/end2end/StatsCollectorIT.java | 11 +- .../phoenix/end2end/StoreNullsPropIT.java | 2 +- .../end2end/SystemTablePermissionsIT.java | 263 +++++++++++++++++++ .../apache/phoenix/end2end/UpsertSelectIT.java | 39 ++- .../apache/phoenix/end2end/index/IndexIT.java | 5 +- .../phoenix/end2end/index/IndexMetadataIT.java | 6 +- .../phoenix/end2end/index/IndexTestUtil.java | 2 +- .../phoenix/end2end/index/LocalIndexIT.java | 47 +++- .../org/apache/phoenix/rpc/UpdateCacheIT.java | 2 +- .../phoenix/tx/ParameterizedTransactionIT.java | 8 +- .../hadoop/hbase/ipc/PhoenixRpcScheduler.java | 10 + .../apache/phoenix/compile/JoinCompiler.java | 6 +- .../phoenix/compile/SubselectRewriter.java | 137 +++++++++- .../apache/phoenix/compile/UpsertCompiler.java | 2 +- .../coprocessor/MetaDataEndpointImpl.java | 213 +++++++-------- .../phoenix/coprocessor/MetaDataProtocol.java | 4 +- .../phoenix/exception/SQLExceptionCode.java | 1 + .../apache/phoenix/execute/DelegateHTable.java | 22 +- .../phoenix/execute/DelegateQueryPlan.java | 4 + .../phoenix/execute/SortMergeJoinPlan.java | 8 + .../FirstLastValueServerAggregator.java | 2 - .../org/apache/phoenix/hbase/index/Indexer.java | 66 ++--- .../write/ParallelWriterIndexCommitter.java | 8 +- .../TrackingParallelWriterIndexCommitter.java | 8 +- .../apache/phoenix/index/IndexMaintainer.java | 3 + .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 7 +- .../query/ConnectionQueryServicesImpl.java | 60 ++++- .../apache/phoenix/schema/MetaDataClient.java | 24 +- .../java/org/apache/phoenix/schema/PTable.java | 10 +- .../org/apache/phoenix/schema/PTableImpl.java | 15 +- .../org/apache/phoenix/util/MetaDataUtil.java | 17 ++ .../org/apache/phoenix/util/RepairUtil.java | 11 +- .../org/apache/phoenix/util/UpgradeUtil.java | 75 +++++- .../hbase/ipc/PhoenixIndexRpcSchedulerTest.java | 2 +- .../phoenix/compile/QueryCompilerTest.java | 187 +++++++++++++ .../recovery/TestPerRegionIndexWriteCache.java | 2 +- .../query/ConnectionQueryServicesImplTest.java | 73 +++++ phoenix-flume/pom.xml | 2 +- phoenix-hive/pom.xml | 2 +- phoenix-kafka/pom.xml | 2 +- phoenix-pherf/pom.xml | 2 +- phoenix-pig/pom.xml | 2 +- phoenix-queryserver-client/pom.xml | 2 +- phoenix-queryserver/pom.xml | 2 +- phoenix-server/pom.xml | 2 +- phoenix-spark/pom.xml | 2 +- phoenix-spark/src/it/resources/globalSetup.sql | 3 +- .../apache/phoenix/spark/PhoenixSparkIT.scala | 27 +- .../phoenix/spark/DataFrameFunctions.scala | 19 +- .../apache/phoenix/spark/DefaultSource.scala | 2 +- .../org/apache/phoenix/spark/PhoenixRDD.scala | 4 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml | 6 +- 68 files changed, 1484 insertions(+), 324 deletions(-) ----------------------------------------------------------------------
