This is an automated email from the ASF dual-hosted git repository. tkhurana pushed a commit to branch PHOENIX-7170 in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 1cd57db4309b830dd524e6fb38e857757c24966e Merge: 3da5007e1c 24960033cd Author: Tanuj Khurana <[email protected]> AuthorDate: Tue Oct 22 11:12:49 2024 -0700 Merge remote-tracking branch 'upstream/master' into PHOENIX-7170 bin/end2endTest.py | 36 ++- .../phoenix-client-embedded/pom.xml | 5 + phoenix-client-parent/phoenix-client-lite/pom.xml | 5 + .../org/apache/phoenix/compile/QueryCompiler.java | 29 +- .../apache/phoenix/compile/StatementContext.java | 12 + .../org/apache/phoenix/execute/HashJoinPlan.java | 3 + .../org/apache/phoenix/execute/MutationState.java | 12 + .../phoenix/iterate/MergeSortResultIterator.java | 5 +- .../phoenix/iterate/OffsetResultIterator.java | 1 - .../phoenix/iterate/OrderedResultIterator.java | 3 +- .../org/apache/phoenix/jdbc/PhoenixResultSet.java | 9 +- .../org/apache/phoenix/jdbc/PhoenixStatement.java | 16 +- .../apache/phoenix/optimize/QueryOptimizer.java | 3 +- .../org/apache/phoenix/schema/MetaDataClient.java | 6 +- .../org/apache/phoenix/util/PhoenixRuntime.java | 14 +- .../hbase/regionserver/ScannerContextUtil.java | 26 +- .../cache/aggcache/SpillableGroupByCache.java | 6 + .../phoenix/coprocessor/BaseRegionScanner.java | 7 +- .../coprocessor/BaseScannerRegionObserver.java | 4 +- .../phoenix/coprocessor/DelegateRegionScanner.java | 32 +- .../GroupedAggregateRegionObserver.java | 49 ++- .../phoenix/coprocessor/HashJoinRegionScanner.java | 28 +- .../coprocessor/IndexRebuildRegionScanner.java | 5 + .../coprocessor/IndexRepairRegionScanner.java | 5 + .../phoenix/coprocessor/IndexerRegionScanner.java | 5 + .../phoenix/coprocessor/MetaDataEndpointImpl.java | 29 +- .../phoenix/coprocessor/PagingRegionScanner.java | 55 +++- .../coprocessor/PhoenixTTLRegionObserver.java | 6 +- .../phoenix/coprocessor/TTLRegionScanner.java | 38 ++- .../coprocessor/UncoveredIndexRegionScanner.java | 5 + .../UncoveredLocalIndexRegionScanner.java | 5 + .../UngroupedAggregateRegionObserver.java | 24 ++ .../UngroupedAggregateRegionScanner.java | 17 +- .../phoenix/hbase/index/IndexRegionObserver.java | 19 +- .../apache/phoenix/index/GlobalIndexChecker.java | 19 +- .../iterate/NonAggregateRegionScannerFactory.java | 92 +++++- .../phoenix/iterate/RegionScannerFactory.java | 33 +- .../iterate/RegionScannerResultIterator.java | 23 +- .../apache/phoenix/mapreduce/OrphanViewTool.java | 7 +- phoenix-core/pom.xml | 10 - .../phoenix/end2end/AlterAddCascadeIndexIT.java | 61 +++- .../end2end/BackwardCompatibilityTestUtil.java | 12 +- .../org/apache/phoenix/end2end/CreateTableIT.java | 4 +- .../apache/phoenix/end2end/End2EndTestDriver.java | 103 +++++-- .../apache/phoenix/end2end/OnDuplicateKey2IT.java | 180 ++++++++++- .../apache/phoenix/end2end/OrphanViewToolIT.java | 31 +- .../end2end/ParameterizedIndexUpgradeToolIT.java | 26 +- .../apache/phoenix/end2end/PhoenixRuntimeIT.java | 27 +- .../org/apache/phoenix/end2end/ServerPagingIT.java | 40 +++ .../end2end/TableSnapshotReadsMapReduceIT.java | 62 ++-- .../org/apache/phoenix/end2end/TableTTLIT.java | 42 +-- .../phoenix/monitoring/CountRowsScannedIT.java | 332 +++++++++++++++++++++ .../src/it/resources/scripts/execute_query.sh | 10 +- .../java/org/apache/phoenix/SystemExitRule.java | 12 +- .../hbase/index/covered/NonTxIndexBuilderTest.java | 5 + pom.xml | 27 +- 56 files changed, 1424 insertions(+), 258 deletions(-)
