Merge branch '4.x-HBase-1.3' into omid2
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cf087158 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cf087158 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cf087158 Branch: refs/heads/omid2 Commit: cf087158170dbf7c9d18c02bedb76f5ec91d7b23 Parents: 0f2b1b8 169270d Author: James Taylor <jamestay...@apache.org> Authored: Sat Nov 10 12:14:49 2018 -0800 Committer: James Taylor <jamestay...@apache.org> Committed: Sat Nov 10 12:14:49 2018 -0800 ---------------------------------------------------------------------- bin/phoenix_utils.py | 2 + phoenix-assembly/pom.xml | 4 + .../src/build/components/all-common-jars.xml | 8 + .../org/apache/phoenix/end2end/AggregateIT.java | 987 +------------- .../apache/phoenix/end2end/BaseAggregateIT.java | 1022 ++++++++++++++ .../apache/phoenix/end2end/BaseOrderByIT.java | 940 +++++++++++++ .../phoenix/end2end/BasePermissionsIT.java | 4 +- .../phoenix/end2end/CsvBulkLoadToolIT.java | 51 + .../phoenix/end2end/DropTableWithViewsIT.java | 151 +++ .../MigrateSystemTablesToSystemNamespaceIT.java | 4 +- .../org/apache/phoenix/end2end/OrderByIT.java | 943 ++----------- .../end2end/ParallelStatsDisabledIT.java | 40 + .../phoenix/end2end/PropertiesInSyncIT.java | 172 ++- .../end2end/QueryDatabaseMetaDataIT.java | 4 + .../SystemCatalogCreationOnConnectionIT.java | 4 +- .../end2end/TableSnapshotReadsMapReduceIT.java | 122 +- .../end2end/TenantSpecificTablesDDLIT.java | 4 +- .../phoenix/end2end/index/IndexMetadataIT.java | 145 +- .../end2end/salted/BaseSaltedTableIT.java | 474 +++++++ .../phoenix/end2end/salted/SaltedTableIT.java | 450 +------ .../monitoring/BasePhoenixMetricsIT.java | 4 +- .../org/apache/phoenix/rpc/UpdateCacheIT.java | 134 +- .../apache/phoenix/compile/DeleteCompiler.java | 5 +- .../apache/phoenix/compile/FromCompiler.java | 66 +- .../apache/phoenix/compile/JoinCompiler.java | 53 +- .../compile/TupleProjectionCompiler.java | 60 +- .../apache/phoenix/compile/UnionCompiler.java | 41 +- .../apache/phoenix/compile/UpsertCompiler.java | 12 +- .../coprocessor/MetaDataEndpointImpl.java | 142 +- .../phoenix/coprocessor/TaskRegionObserver.java | 295 ++++ .../UngroupedAggregateRegionObserver.java | 6 +- .../coprocessor/WhereConstantParser.java | 3 +- .../phoenix/exception/SQLExceptionCode.java | 7 +- .../index/write/DelegateIndexFailurePolicy.java | 5 +- .../index/PhoenixIndexFailurePolicy.java | 6 + .../iterate/MapReduceParallelScanGrouper.java | 32 +- .../iterate/TableSnapshotResultIterator.java | 28 +- .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 9 +- .../mapreduce/FormatToBytesWritableMapper.java | 10 +- .../query/ConnectionQueryServicesImpl.java | 28 +- .../query/ConnectionlessQueryServicesImpl.java | 18 +- .../apache/phoenix/query/QueryConstants.java | 17 +- .../org/apache/phoenix/query/QueryServices.java | 9 + .../phoenix/query/QueryServicesOptions.java | 5 + .../apache/phoenix/schema/MetaDataClient.java | 248 +++- .../apache/phoenix/schema/PMetaDataImpl.java | 28 +- .../java/org/apache/phoenix/schema/PTable.java | 31 +- .../org/apache/phoenix/schema/PTableImpl.java | 1259 +++++++++++------- .../org/apache/phoenix/schema/TableRef.java | 17 +- .../phoenix/schema/stats/StatisticsUtil.java | 2 + .../org/apache/phoenix/util/MetaDataUtil.java | 6 +- .../org/apache/phoenix/util/QueryBuilder.java | 211 +++ .../java/org/apache/phoenix/util/QueryUtil.java | 38 +- .../org/apache/phoenix/util/SchemaUtil.java | 10 + .../org/apache/phoenix/util/UpgradeUtil.java | 79 +- .../phoenix/execute/CorrelatePlanTest.java | 32 +- .../execute/LiteralResultIteratorPlanTest.java | 33 +- .../index/IndexScrutinyTableOutputTest.java | 6 +- .../util/PhoenixConfigurationUtilTest.java | 6 +- .../java/org/apache/phoenix/query/BaseTest.java | 15 +- .../org/apache/phoenix/util/QueryUtilTest.java | 10 +- phoenix-server/pom.xml | 1 + phoenix-spark/pom.xml | 8 + .../org/apache/phoenix/spark/AggregateIT.java | 91 ++ .../org/apache/phoenix/spark/OrderByIT.java | 460 +++++++ .../org/apache/phoenix/spark/SaltedTableIT.java | 53 + .../org/apache/phoenix/spark/SparkUtil.java | 87 ++ .../apache/phoenix/spark/PhoenixSparkIT.scala | 9 +- .../apache/phoenix/spark/SparkResultSet.java | 1056 +++++++++++++++ .../org/apache/phoenix/spark/PhoenixRDD.scala | 27 +- 70 files changed, 7235 insertions(+), 3114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/cf087158/phoenix-assembly/pom.xml ---------------------------------------------------------------------- diff --cc phoenix-assembly/pom.xml index f9d6d92,e41d7e6..9d3c891 --- a/phoenix-assembly/pom.xml +++ b/phoenix-assembly/pom.xml @@@ -127,19 -127,8 +127,23 @@@ <artifactId>phoenix-queryserver-client</artifactId> </dependency> <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + <version>3.0</version> + </dependency> + <dependency> + <groupId>org.apache.omid</groupId> + <artifactId>omid-hbase-tools-hbase1.x</artifactId> + <version>${omid.version}</version> + </dependency> + <dependency> + <groupId>org.apache.htrace</groupId> + <artifactId>htrace-core</artifactId> + <version>3.2.0-incubating</version> + </dependency> ++ <dependency> + <groupId>org.apache.phoenix</groupId> + <artifactId>phoenix-load-balancer</artifactId> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/phoenix/blob/cf087158/phoenix-server/pom.xml ----------------------------------------------------------------------
