This is an automated email from the ASF dual-hosted git repository. lokiore pushed a commit to branch PHOENIX-7904-feature in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 45329378722d5d3055eaeac81d44dd9840d1bc9f Merge: 87278a8865 96c05a47cb Author: lokiore <[email protected]> AuthorDate: Mon Sep 21 11:18:19 2026 -0700 Merge remote-tracking branch 'upstream/master' into PHOENIX-7904-feature-mm .../org/apache/phoenix/compile/DeleteCompiler.java | 19 +- .../org/apache/phoenix/compile/UpsertCompiler.java | 21 +- .../org/apache/phoenix/execute/MutationState.java | 8 +- .../phoenix/expression/CoerceExpression.java | 36 +- .../metrics/MetricsIndexCDCConsumerSource.java | 87 ++- .../metrics/MetricsIndexCDCConsumerSourceImpl.java | 63 ++ .../org/apache/phoenix/index/IndexMaintainer.java | 8 +- .../phoenix/index/IndexMetaDataCacheClient.java | 9 +- .../org/apache/phoenix/jdbc/PhoenixConnection.java | 8 +- .../phoenix/query/ConnectionQueryServicesImpl.java | 162 ++++- .../org/apache/phoenix/schema/types/PBinary.java | 3 + .../org/apache/phoenix/schema/types/PDataType.java | 6 +- .../apache/phoenix/schema/types/PVarbinary.java | 5 +- .../java/org/apache/phoenix/util/IndexUtil.java | 23 +- .../java/org/apache/phoenix/util/ScanUtil.java | 99 +++ phoenix-core-server/pom.xml | 12 + .../coprocessor/BaseScannerRegionObserver.java | 8 + .../phoenix/coprocessor/CompactionScanner.java | 21 +- .../coprocessor/ServerCachingEndpointImpl.java | 16 +- .../apache/phoenix/coprocessor/ServerScanUtil.java | 123 ++++ .../phoenix/hbase/index/IndexCDCConsumer.java | 332 +++++---- .../hbase/index/IndexCDCConsumerProgress.java | 92 +++ .../phoenix/hbase/index/IndexRegionObserver.java | 227 +++++- .../hbase/index/builder/BaseIndexBuilder.java | 5 - .../hbase/index/builder/IndexBuildManager.java | 3 - .../phoenix/hbase/index/builder/IndexBuilder.java | 7 - .../apache/phoenix/index/PhoenixIndexBuilder.java | 6 - .../phoenix/mapreduce/MultiHfileOutputFormat.java | 2 + .../phoenix/mapreduce/PhoenixSyncTableTool.java | 1 + .../phoenix/mapreduce/index/IndexScrutinyTool.java | 1 + .../apache/phoenix/mapreduce/index/IndexTool.java | 1 + .../phoenix/mapreduce/transform/TransformTool.java | 1 + .../mapreduce/util/PhoenixMapReduceUtil.java | 61 ++ .../phoenix/schema/stats/UpdateStatisticsTool.java | 9 +- phoenix-core/pom.xml | 9 + .../org/apache/phoenix/end2end/AuditLoggingIT.java | 92 +-- .../end2end/BackwardCompatibilityTestUtil.java | 18 +- .../java/org/apache/phoenix/end2end/Bson5IT.java | 2 - .../java/org/apache/phoenix/end2end/CDCBaseIT.java | 27 +- .../org/apache/phoenix/end2end/CDCQueryIT.java | 11 +- .../phoenix/end2end/CDCStreamCompactionTTLIT.java | 153 ++++ ...ncurrentMutationsCoveredEventualGenerateIT.java | 2 - .../ConcurrentMutationsExtendedGenerateIT.java | 2 - .../end2end/ConcurrentMutationsExtendedIT.java | 6 +- .../phoenix/end2end/ConcurrentMutationsIT.java | 2 +- .../ConcurrentMutationsLazyPostBatchWriteIT.java | 2 - ...urrentMutationsUncoveredEventualGenerateIT.java | 2 - .../java/org/apache/phoenix/end2end/DeleteIT.java | 10 +- .../phoenix/end2end/IndexCDCConsumerLagIT.java | 142 ++++ ...xToolForNonTxGlobalIndexEventualGenerateIT.java | 2 - .../IndexToolForNonTxGlobalIndexEventualIT.java | 2 - .../org/apache/phoenix/end2end/IndexToolIT.java | 9 +- .../apache/phoenix/end2end/MetaDataEndPointIT.java | 21 +- .../end2end/MetadataGetTableReadLockIT.java | 20 + .../MultiTenantEventualIndexGenerateIT.java | 2 - .../end2end/MultiTenantEventualIndexIT.java | 2 - .../end2end/OrphanDeleteMarkerCompactionIT.java | 432 ++++++++++++ .../end2end/TableSnapshotReadsMapReduceIT.java | 22 +- .../phoenix/end2end/UCFWithDisabledIndexIT.java | 27 +- .../org/apache/phoenix/end2end/UpsertSelectIT.java | 19 +- .../phoenix/end2end/VarBinaryEncoded1IT.java | 290 +++++++- .../phoenix/end2end/VarBinaryEncoded2IT.java | 2 - .../VarBinaryEncodedIndexUpsertSelectIT.java | 138 ++++ .../VarBinaryEncodedServerUpsertSelectIT.java | 118 ++++ .../VarBinaryEncodedUpsertSelectTestUtil.java | 173 +++++ .../end2end/index/BaseImmutableIndexIT.java | 454 ++++++++++++ .../apache/phoenix/end2end/index/BaseIndexIT.java | 17 +- .../end2end/index/BaseIndexWithRegionMovesIT.java | 14 +- .../GlobalIndexCheckerEventualGenerateIT.java | 2 - .../index/GlobalIndexCheckerEventualIT.java | 2 - .../end2end/index/GlobalIndexCheckerIT.java | 71 ++ .../end2end/index/IndexDataTableSyncIT.java | 772 +++++++++++++++++++++ .../end2end/index/MutableIndexFailureIT.java | 5 +- .../phoenix/iterate/PhoenixQueryTimeoutIT.java | 19 + .../phoenix/monitoring/BasePhoenixMetricsIT.java | 2 + .../monitoring/PhoenixTableLevelMetricsIT.java | 2 + .../phoenix/query/MaxConcurrentConnectionsIT.java | 10 +- .../org/apache/phoenix/rpc/PhoenixClientRpcIT.java | 9 +- .../java/org/apache/phoenix/rpc/UpdateCacheIT.java | 19 +- .../it/resources/compatible_client_versions.json | 181 +++-- .../hbase/index/IndexCDCConsumerProgressTest.java | 121 ++++ .../mapreduce/util/PhoenixMapReduceUtilTest.java | 50 ++ .../java/org/apache/phoenix/query/BaseTest.java | 23 + .../query/ConnectionQueryServicesImplTest.java | 54 ++ .../apache/phoenix/schema/types/PDataTypeTest.java | 32 + .../workload/mt/TenantViewOperationWorkloadIT.java | 1 + pom.xml | 14 +- 87 files changed, 4686 insertions(+), 432 deletions(-)
