This is an automated email from the ASF dual-hosted git repository. vjasani pushed a commit to branch PHOENIX-6883-feature in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 52c2ded3ea4263475bd581c2b21b58668348f6c4 Merge: 3a4630bf21 bbc915437e Author: Viraj Jasani <vjas...@apache.org> AuthorDate: Thu Jul 20 21:51:26 2023 -0700 Merge branch 'master' into PHOENIX-6883-feature .../phoenix/end2end/ParallelStatsDisabledIT.java | 6 - .../apache/phoenix/end2end/index/BaseIndexIT.java | 109 +++++ .../end2end/index/GlobalMutableNonTxIndexIT.java | 1 - .../end2end/salted/SaltedTableMergeBucketsIT.java | 487 +++++++++++++++++++++ .../apache/phoenix/compile/ExpressionCompiler.java | 4 +- .../org/apache/phoenix/compile/JoinCompiler.java | 6 +- .../apache/phoenix/compile/ProjectionCompiler.java | 99 +++-- .../org/apache/phoenix/compile/ScanRanges.java | 65 ++- .../phoenix/compile/TupleProjectionCompiler.java | 12 +- .../org/apache/phoenix/compile/WhereOptimizer.java | 1 + .../phoenix/iterate/BaseResultIterators.java | 106 ++--- .../iterate/DefaultParallelScanGrouper.java | 64 +-- .../iterate/MapReduceParallelScanGrouper.java | 6 +- .../phoenix/iterate/ParallelScanGrouper.java | 20 +- .../phoenix/iterate/ParallelScansCollector.java | 57 +++ .../apache/phoenix/optimize/QueryOptimizer.java | 7 +- .../org/apache/phoenix/query/QueryServices.java | 5 + .../apache/phoenix/query/QueryServicesOptions.java | 6 +- ...mnRef.java => IndexUncoveredDataColumnRef.java} | 10 +- .../java/org/apache/phoenix/schema/PTableImpl.java | 29 +- .../java/org/apache/phoenix/util/ScanUtil.java | 4 +- .../java/org/apache/phoenix/util/SchemaUtil.java | 8 +- .../apache/phoenix/compile/QueryCompilerTest.java | 56 +++ .../java/org/apache/phoenix/query/BaseTest.java | 42 +- .../java/org/apache/phoenix/util/TestUtil.java | 3 +- 25 files changed, 1023 insertions(+), 190 deletions(-)