This is an automated email from the ASF dual-hosted git repository.
shahrs87 pushed a change to branch PHOENIX-6883-feature
in repository https://gitbox.apache.org/repos/asf/phoenix.git
from 4f8811b456 PHOENIX-7212 : Handle inherited view indexes when
validating LAST_DDL_TIMESTAMPS (#1823)
add ed7871eb37 PHOENIX-7160 Change the TSO default port to be compatible
with Omid 1.1.1 (#1774)
add a90b87deec PHOENIX-7137 Create phoenix-client-lite shaded JAR without
server-side dependencies
add fec83cc3c6 PHOENIX-7139 Create phoenix-mapreduce-byo-shaded-hbase
artifact
add 2fc8b33c92 PHOENIX-7156 enabling category-wise integration test
execution capability (#1770)
add a45c78943e PHOENIX-7173 Update default HBase versions to 2.4.17 and
2.5.7 respectively
add 8106c24c19 PHOENIX-7043 Split FailoverPhoenixConnectionIT
add 2d7bfe6f1b PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with
incorrect error message
add 1f7c3d4ee4 PHOENIX-7178 Use skipITs instead of skip to disable
failsafe tests
add d331a15bfd PHOENIX-7138 Import netty-bom to make sure all netty 4.1
modules share the same version
add d0839b97e1 PHOENIX-7179 Remove HBase 2.3 leftover files (#1795)
add 8dfb19abce PHOENIX-7163 Update commons-configuration2 to 2.8.0
add 226a9ba027 Revert "PHOENIX-7163 Update commons-configuration2 to 2.8.0"
add d936032078 PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with
incorrect error message (addendum: accept exactly 1000ms in timeout check)
add 3492933940 PHOENIX-7181 Do not declare commons-configuration2
dependency
add 25cdd7fbf4 PHOENIX-7171 Update Zookeeper to 3.8.3 when building with
HBase 2.4+
add b70f01812f PHOENIX-7175 Set java.io.tmpdir to the maven build
directory for tests
add 1671c989a9 PHOENIX-7187 Improvement of Integration test case with
Explain Plan for Partial Index (#1803)
add 802d30938a PHOENIX-7194 Yetus does not run tests in phoenix-core if
phoenix-core-client or phoenix-core-server changes
add 97c28919d3 PHOENIX-7195 Exclude reload4j dependencies from Hadoop and
add explicit log4j2 test dependencies
add 87e3361e1f PHOENIX-7106 Data Integrity issues due to invalid rowkeys
returned by various coprocessors (#1736)
add 06f5abc5b9 PHOENIX-6769 Align mockito version with Hadoop and HBase
add 4ba8a33a03 PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
add d0ed96f2aa PHOENIX-7141 Use relocate by default for phoenix-server
shading
add 02944504a0 PHOENIX-7165 getTable should retrieve PTable from server if
not cached (#1777)
add 25329d5bce PHOENIX-7189 Update Omid to 1.1.1 (#1818)
add 3d2e0e4288 PHOENIX-7191 Connectionless CQSs don't work with non-ZK
registries
add 354716eed9 PHOENIX-7213 Add option for unlimited
phoenix.query.QueueSize
add 185fe32bde PHOENIX-7157 Upgrade to phoenix-thirdparty 2.1.0 (#1771)
add bf3a6226e6 PHOENIX-7193 Fix cluster override for mapreduce jobs for
non-ZK registries
add bd56d7ceea PHOENIX-7218 Drop HBase 2.4.0 support in 5.2
add 8a94074c67 PHOENIX-7220 Make HBase 2.5 profile the default
new d7fef5c853 Merge branch 'master' into PHOENIX-6883-feature
new ef48b93e02 Fix merge conflicts with master
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/hbase-omid-client-config.yml | 5 +-
dev/phoenix-personality.sh | 9 +-
phoenix-assembly/pom.xml | 55 +-
.../src/build/components/all-common-jars.xml | 16 +
.../pom.xml | 10 +-
phoenix-client-parent/pom.xml | 2 -
phoenix-core-client/pom.xml | 9 +-
.../BaseScannerRegionObserverConstants.java | 30 +
....java => ResultSetOutOfScanRangeException.java} | 22 +-
.../apache/phoenix/exception/SQLExceptionCode.java | 1 +
.../org/apache/phoenix/filter/PagingFilter.java | 24 +-
.../phoenix/iterate/BaseResultIterators.java | 5 +-
.../phoenix/iterate/OffsetResultIterator.java | 47 +-
.../phoenix/iterate/OrderedResultIterator.java | 212 ++-
.../phoenix/iterate/ScanningResultIterator.java | 31 +
.../ScanningResultPostDummyResultCaller.java} | 14 +-
.../ScanningResultPostValidResultCaller.java} | 14 +-
.../phoenix/iterate/TableResultIterator.java | 36 +-
.../phoenix/jdbc/AbstractRPCConnectionInfo.java | 6 +-
.../org/apache/phoenix/jdbc/ConnectionInfo.java | 25 +-
.../apache/phoenix/jdbc/MasterConnectionInfo.java | 15 +-
.../org/apache/phoenix/jdbc/RPCConnectionInfo.java | 17 +-
.../org/apache/phoenix/jdbc/ZKConnectionInfo.java | 19 +-
.../phoenix/job/AbstractRoundRobinQueue.java | 16 +-
.../phoenix/mapreduce/util/ConnectionUtil.java | 89 +-
.../util/PhoenixConfigurationUtilHelper.java | 50 +-
.../org/apache/phoenix/query/QueryConstants.java | 3 +-
.../org/apache/phoenix/query/QueryServices.java | 29 +
.../apache/phoenix/query/QueryServicesOptions.java | 31 +-
.../phoenix/transaction/OmidTransactionTable.java | 7 +-
.../java/org/apache/phoenix/util/ByteUtil.java | 124 ++
.../java/org/apache/phoenix/util/QueryUtil.java | 17 +-
.../java/org/apache/phoenix/util/ScanUtil.java | 126 +-
.../java/org/apache/phoenix/util/TupleUtil.java | 44 +-
.../cache/aggcache/SpillableGroupByCache.java | 66 +-
.../coprocessor/BaseScannerRegionObserver.java | 42 +-
.../apache/phoenix/coprocessor/GroupByCache.java | 1 +
.../GroupedAggregateRegionObserver.java | 501 ++++++-
.../coprocessor/IndexRebuildRegionScanner.java | 56 +-
.../coprocessor/IndexRepairRegionScanner.java | 27 +-
.../phoenix/coprocessor/IndexerRegionScanner.java | 31 +-
.../phoenix/coprocessor/PagingRegionScanner.java | 35 +-
.../coprocessor/UncoveredIndexRegionScanner.java | 76 +-
.../UngroupedAggregateRegionObserver.java | 50 +-
.../UngroupedAggregateRegionScanner.java | 13 +-
.../apache/phoenix/index/GlobalIndexChecker.java | 47 +-
.../iterate/NonAggregateRegionScannerFactory.java | 176 ++-
.../phoenix/mapreduce/PhoenixOutputFormat.java | 5 +-
.../phoenix/mapreduce/PhoenixRecordWriter.java | 2 +-
.../mapreduce/util/PhoenixConfigurationUtil.java | 26 +-
.../java/org/apache/phoenix/util/ServerUtil.java | 16 +
phoenix-core/pom.xml | 39 +-
.../end2end/AggregateQueryWithRegionMoves2IT.java | 136 ++
...T.java => AggregateQueryWithRegionMovesIT.java} | 224 ++--
.../end2end/AggregateWithRegionMoves2IT.java | 124 ++
.../end2end/AggregateWithRegionMovesIT.java | 537 ++++++++
.../apache/phoenix/end2end/AppendOnlySchemaIT.java | 27 +-
.../phoenix/end2end/BackwardCompatibilityIT.java | 90 ++
.../end2end/BackwardCompatibilityTestUtil.java | 12 +
.../end2end/BaseAggregateWithRegionMoves2IT.java | 633 +++++++++
.../end2end/BaseAggregateWithRegionMoves3IT.java | 124 ++
.../end2end/BaseAggregateWithRegionMoves4IT.java | 136 ++
.../end2end/BaseAggregateWithRegionMovesIT.java | 998 ++++++++++++++
.../end2end/BaseOrderByWithRegionMovesIT.java | 1406 ++++++++++++++++++++
...ueryIT.java => BaseQueryWithRegionMovesIT.java} | 90 +-
.../phoenix/end2end/ConfigurableCacheIT.java | 3 +-
.../java/org/apache/phoenix/end2end/GroupByIT.java | 51 +
...rderByIT.java => OrderByWithRegionMovesIT.java} | 4 +-
.../end2end/OrderByWithServerMemoryLimitIT.java | 13 +-
.../ParallelStatsDisabledWithRegionMovesIT.java | 310 +++++
.../end2end/ParameterizedIndexUpgradeToolIT.java | 2 +-
.../org/apache/phoenix/end2end/QueryTimeoutIT.java | 38 +-
.../apache/phoenix/end2end/QueryWithLimitIT.java | 67 +-
.../end2end/RebuildIndexConnectionPropsIT.java | 21 +-
.../end2end/ScanUncommittedWithRegionMovesIT.java | 551 ++++++++
.../org/apache/phoenix/end2end/ServerPagingIT.java | 9 +-
.../end2end/ServerPagingWithRegionMovesIT.java | 840 ++++++++++++
.../org/apache/phoenix/end2end/SortOrderIT.java | 60 +-
.../end2end/SortOrderWithRegionMoves2IT.java | 200 +++
.../end2end/SortOrderWithRegionMovesIT.java | 210 +++
.../org/apache/phoenix/end2end/SumFunctionIT.java | 13 +-
.../end2end/UncoveredIndexWithRegionMovesIT.java | 391 ++++++
...tIT.java => UpsertSelectWithRegionMovesIT.java} | 217 ++-
.../apache/phoenix/end2end/UpsertWithSCNIT.java | 25 +-
...ndexIT.java => BaseIndexWithRegionMovesIT.java} | 853 +++++++-----
...lobalImmutableNonTxIndexWithRegionMovesIT.java} | 21 +-
...> GlobalImmutableTxIndexWithRegionMovesIT.java} | 25 +-
...va => GlobalIndexCheckerWithRegionMovesIT.java} | 715 +++++++---
... GlobalMutableNonTxIndexWithRegionMovesIT.java} | 16 +-
.../phoenix/end2end/index/PartialIndexIT.java | 56 +
... => UncoveredGlobalImmutableNonTxIndex2IT.java} | 20 +-
...a => UncoveredGlobalIndexRegionScanner2IT.java} | 438 ++++--
.../end2end/join/SortMergeJoinNoSpoolingIT.java | 5 +-
.../end2end/transform/TransformMonitorIT.java | 3 +-
.../phoenix/iterate/PhoenixQueryTimeoutIT.java | 116 +-
.../phoenix/jdbc/FailoverPhoenixConnection2IT.java | 374 ++++++
.../phoenix/jdbc/FailoverPhoenixConnectionIT.java | 231 ----
.../phoenix/jdbc/HighAvailabilityGroupTestIT.java | 10 +-
.../monitoring/PhoenixMetricsDisabledIT.java | 5 +-
.../phoenix/monitoring/PhoenixMetricsIT.java | 23 +-
.../ConnectionQueryServicesMetricsIT.java | 6 +-
.../rpc/UpdateCacheConnectionLevelPropIT.java | 4 +-
.../java/org/apache/phoenix/rpc/UpdateCacheIT.java | 6 +-
.../it/resources/compatible_client_versions.json | 2 +-
...ld_query_add_data.txt => gold_query_offset.txt} | 39 +-
...y_add_data.txt => gold_query_orderby_nonpk.txt} | 44 +-
...d_delete.txt => gold_query_ordered_groupby.txt} | 23 +-
...y_delete.txt => gold_query_unorder_groupby.txt} | 10 +-
.../src/it/resources/sql_files/create_offset.sql | 48 +
.../resources/sql_files/create_orderby_nonpk.sql | 48 +
.../resources/sql_files/create_ordered_groupby.sql | 48 +
.../resources/sql_files/create_unorder_groupby.sql | 44 +
.../src/it/resources/sql_files/query_offset.sql | 6 +-
.../it/resources/sql_files/query_orderby_nonpk.sql | 6 +-
.../resources/sql_files/query_ordered_groupby.sql | 6 +-
.../resources/sql_files/query_unorder_groupby.sql | 6 +-
.../phoenix/cache/ServerMetadataCacheTest.java | 6 +-
.../coprocessor/TaskMetaDataEndpointTest.java | 8 +-
.../phoenix/hbase/index/write/TestIndexWriter.java | 2 +-
.../hbase/index/write/TestParalleIndexWriter.java | 2 +-
.../write/TestParalleWriterIndexCommitter.java | 2 +-
.../apache/phoenix/index/IndexUpgradeToolTest.java | 15 +-
.../org/apache/phoenix/index/ShouldVerifyTest.java | 8 +-
.../phoenix/index/VerifySingleIndexRowTest.java | 22 +-
.../phoenix/iterate/OrderedResultIteratorTest.java | 3 +
.../jdbc/ClusterRoleRecordGeneratorToolTest.java | 2 +-
.../jdbc/FailoverPhoenixConnectionTest.java | 2 +-
.../phoenix/jdbc/ParallelPhoenixResultSetTest.java | 2 +-
.../phoenix/jdbc/ParallelPhoenixUtilTest.java | 2 +-
.../phoenix/jdbc/PhoenixHAAdminToolTest.java | 8 +-
.../apache/phoenix/jdbc/PhoenixStatementTest.java | 24 +-
.../mapreduce/PhoenixMultiViewInputFormatTest.java | 29 +-
.../util/PhoenixConfigurationUtilTest.java | 24 +-
.../apache/phoenix/monitoring/MetricUtilTest.java | 2 +-
.../java/org/apache/phoenix/query/BaseTest.java | 3 +-
.../query/ConnectionQueryServicesImplTest.java | 7 +-
.../apache/phoenix/query/ConnectionlessTest.java | 6 +-
.../schema/stats/StatisticsScannerTest.java | 12 +-
.../phoenix/util/AbstractUpsertExecutorTest.java | 4 +-
.../java/org/apache/phoenix/util/LogUtilTest.java | 2 +-
.../org/apache/phoenix/util/QueryUtilTest.java | 5 +
phoenix-hbase-compat-2.3.0/pom.xml | 113 --
.../phoenix/compat/hbase/CompatDelegateHTable.java | 37 -
.../compat/hbase/CompatOmidTransactionTable.java | 31 -
.../compat/hbase/CompatPhoenixRpcScheduler.java | 40 -
.../apache/phoenix/compat/hbase/CompatUtil.java | 77 --
.../compat/hbase/HbaseCompatCapabilities.java | 24 -
.../hbase/ReplicationSinkCompatEndpoint.java | 37 -
phoenix-hbase-compat-2.4.0/pom.xml | 113 --
.../phoenix/compat/hbase/CompatDelegateHTable.java | 38 -
.../compat/hbase/CompatOmidTransactionTable.java | 32 -
.../compat/hbase/CompatPhoenixRpcScheduler.java | 39 -
.../apache/phoenix/compat/hbase/CompatUtil.java | 80 --
.../compat/hbase/HbaseCompatCapabilities.java | 24 -
.../hbase/ReplicationSinkCompatEndpoint.java | 37 -
.../compat/hbase/CompatOmidTransactionTable.java | 12 +
.../compat/hbase/CompatOmidTransactionTable.java | 12 +
.../compat/hbase/CompatOmidTransactionTable.java | 12 +
phoenix-mapreduce-byo-shaded-hbase/pom.xml | 613 +++++++++
phoenix-pherf/pom.xml | 7 -
.../org/apache/phoenix/pherf/ResourceTest.java | 16 +-
phoenix-server/pom.xml | 673 ++++++----
phoenix-tracing-webapp/pom.xml | 2 +-
pom.xml | 273 +++-
164 files changed, 12997 insertions(+), 2735 deletions(-)
copy phoenix-client-parent/{phoenix-client-embedded =>
phoenix-client-lite}/pom.xml (94%)
copy
phoenix-core-client/src/main/java/org/apache/phoenix/exception/{FailoverSQLException.java
=> ResultSetOutOfScanRangeException.java} (57%)
copy
phoenix-core-client/src/main/java/org/apache/phoenix/{parse/ExplainType.java =>
iterate/ScanningResultPostDummyResultCaller.java} (74%)
copy
phoenix-core-client/src/main/java/org/apache/phoenix/{parse/ExplainType.java =>
iterate/ScanningResultPostValidResultCaller.java} (74%)
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryWithRegionMoves2IT.java
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/{AggregateQueryIT.java =>
AggregateQueryWithRegionMovesIT.java} (58%)
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMoves2IT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateWithRegionMovesIT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves2IT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves3IT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMoves4IT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseAggregateWithRegionMovesIT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseOrderByWithRegionMovesIT.java
copy phoenix-core/src/it/java/org/apache/phoenix/end2end/{BaseQueryIT.java =>
BaseQueryWithRegionMovesIT.java} (75%)
copy phoenix-core/src/it/java/org/apache/phoenix/end2end/{OrderByIT.java =>
OrderByWithRegionMovesIT.java} (88%)
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/ParallelStatsDisabledWithRegionMovesIT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/ScanUncommittedWithRegionMovesIT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerPagingWithRegionMovesIT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMoves2IT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderWithRegionMovesIT.java
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/end2end/UncoveredIndexWithRegionMovesIT.java
copy phoenix-core/src/it/java/org/apache/phoenix/end2end/{UpsertSelectIT.java
=> UpsertSelectWithRegionMovesIT.java} (93%)
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/index/{BaseIndexIT.java =>
BaseIndexWithRegionMovesIT.java} (71%)
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/index/{GlobalImmutableNonTxIndexIT.java
=> GlobalImmutableNonTxIndexWithRegionMovesIT.java} (71%)
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/index/{GlobalImmutableTxIndexIT.java
=> GlobalImmutableTxIndexWithRegionMovesIT.java} (65%)
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/index/{GlobalIndexCheckerIT.java
=> GlobalIndexCheckerWithRegionMovesIT.java} (71%)
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/index/{GlobalMutableNonTxIndexIT.java
=> GlobalMutableNonTxIndexWithRegionMovesIT.java} (75%)
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/index/{UncoveredGlobalImmutableNonTxIndexIT.java
=> UncoveredGlobalImmutableNonTxIndex2IT.java} (75%)
copy
phoenix-core/src/it/java/org/apache/phoenix/end2end/index/{UncoveredGlobalIndexRegionScannerIT.java
=> UncoveredGlobalIndexRegionScanner2IT.java} (71%)
create mode 100644
phoenix-core/src/it/java/org/apache/phoenix/jdbc/FailoverPhoenixConnection2IT.java
copy phoenix-core/src/it/resources/gold_files/{gold_query_add_data.txt =>
gold_query_offset.txt} (77%)
copy phoenix-core/src/it/resources/gold_files/{gold_query_add_data.txt =>
gold_query_orderby_nonpk.txt} (69%)
copy phoenix-core/src/it/resources/gold_files/{gold_query_add_delete.txt =>
gold_query_ordered_groupby.txt} (81%)
copy phoenix-core/src/it/resources/gold_files/{gold_query_delete.txt =>
gold_query_unorder_groupby.txt} (92%)
create mode 100644 phoenix-core/src/it/resources/sql_files/create_offset.sql
create mode 100644
phoenix-core/src/it/resources/sql_files/create_orderby_nonpk.sql
create mode 100644
phoenix-core/src/it/resources/sql_files/create_ordered_groupby.sql
create mode 100644
phoenix-core/src/it/resources/sql_files/create_unorder_groupby.sql
copy
phoenix-core-client/src/main/java/org/apache/phoenix/expression/BaseDecimalAddSubtractExpression.java
=> phoenix-core/src/it/resources/sql_files/query_offset.sql (86%)
copy
phoenix-core-client/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionClient.java
=> phoenix-core/src/it/resources/sql_files/query_orderby_nonpk.sql (85%)
copy
phoenix-core-client/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionClient.java
=> phoenix-core/src/it/resources/sql_files/query_ordered_groupby.sql (85%)
copy
phoenix-core-client/src/main/java/org/apache/phoenix/transaction/PhoenixTransactionClient.java
=> phoenix-core/src/it/resources/sql_files/query_unorder_groupby.sql (84%)
delete mode 100644 phoenix-hbase-compat-2.3.0/pom.xml
delete mode 100644
phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
delete mode 100644
phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
delete mode 100644
phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
delete mode 100644
phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
delete mode 100644
phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
delete mode 100644
phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/ReplicationSinkCompatEndpoint.java
delete mode 100644 phoenix-hbase-compat-2.4.0/pom.xml
delete mode 100644
phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
delete mode 100644
phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
delete mode 100644
phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
delete mode 100644
phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
delete mode 100644
phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
delete mode 100644
phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/ReplicationSinkCompatEndpoint.java
create mode 100644 phoenix-mapreduce-byo-shaded-hbase/pom.xml
