This is an automated email from the ASF dual-hosted git repository. vjasani pushed a commit to branch PHOENIX-6978-feature in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit a2664420d263cb98355acb765226d19e3fa03db2 Merge: 86ba545834 d6278a0f70 Author: Viraj Jasani <vjas...@apache.org> AuthorDate: Wed Sep 20 23:40:51 2023 -0700 Merge branch 'master' into PHOENIX-6978-feature phoenix-assembly/pom.xml | 5 + phoenix-core/pom.xml | 3 + .../IndexHalfStoreFileReaderGenerator.java | 8 +- .../iterate/TableSnapshotResultIterator.java | 2 + .../java/org/apache/phoenix/util/ScanUtil.java | 12 ++- .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +- .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +- .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +- phoenix-hbase-compat-2.5.4/pom.xml | 113 +++++++++++++++++++++ .../phoenix/compat/hbase/CompatDelegateHTable.java | 44 ++++++++ .../compat/hbase/CompatOmidTransactionTable.java | 38 +++++++ .../compat/hbase/CompatPhoenixRpcScheduler.java | 44 ++++++++ .../apache/phoenix/compat/hbase/CompatUtil.java | 7 +- .../compat/hbase/HbaseCompatCapabilities.java | 24 +++++ .../hbase/ReplicationSinkCompatEndpoint.java | 63 ++++++++++++ pom.xml | 44 ++++++-- 16 files changed, 407 insertions(+), 21 deletions(-)