This is an automated email from the ASF dual-hosted git repository. shahrs87 pushed a commit to branch PHOENIX-6883-feature in repository https://gitbox.apache.org/repos/asf/phoenix.git
commit 1fceba9d9617b0211a1b9b076ba611017cba65ca Merge: 34ed816fd0 22b0b346e6 Author: Rushabh Shah <rushabh.s...@rushabh-ltmflld.internal.salesforce.com> AuthorDate: Thu Mar 7 11:25:33 2024 -0800 Merge branch 'master' into PHOENIX-6883-feature dev/create-release/README.txt | 3 + dev/create-release/do-release-docker.sh | 8 +- dev/create-release/do-release.sh | 5 + dev/create-release/mac-sshd-gpg-agent/Dockerfile | 2 +- dev/create-release/phoenix-rm/Dockerfile | 48 ++++--- dev/create-release/release-util.sh | 4 +- phoenix-assembly/pom.xml | 2 +- .../phoenix-client-embedded/pom.xml | 4 +- phoenix-client-parent/phoenix-client-lite/pom.xml | 4 +- phoenix-client-parent/pom.xml | 2 +- phoenix-core-client/pom.xml | 2 +- .../coprocessorclient/MetaDataProtocol.java | 6 +- .../org/apache/phoenix/execute/MutationState.java | 15 +- .../phoenix/iterate/BaseResultIterators.java | 17 ++- .../phoenix/jdbc/AbstractRPCConnectionInfo.java | 4 +- .../jdbc/ClusterRoleRecordGeneratorTool.java | 19 ++- .../org/apache/phoenix/jdbc/ConnectionInfo.java | 19 ++- .../apache/phoenix/jdbc/MasterConnectionInfo.java | 8 +- .../org/apache/phoenix/jdbc/PhoenixDriver.java | 13 +- .../apache/phoenix/jdbc/PhoenixHAAdminTool.java | 63 ++++---- .../org/apache/phoenix/jdbc/RPCConnectionInfo.java | 9 +- .../org/apache/phoenix/jdbc/ZKConnectionInfo.java | 9 +- .../phoenix/query/ConnectionQueryServicesImpl.java | 46 +++--- .../org/apache/phoenix/query/QueryServices.java | 2 + .../apache/phoenix/query/QueryServicesOptions.java | 2 + .../org/apache/phoenix/schema/tool/SchemaTool.java | 29 ++-- phoenix-core-server/pom.xml | 2 +- .../phoenix/mapreduce/AbstractBulkLoadTool.java | 159 ++++++++++++--------- .../apache/phoenix/mapreduce/OrphanViewTool.java | 2 + .../phoenix/mapreduce/index/IndexUpgradeTool.java | 11 +- .../phoenix/schema/stats/UpdateStatisticsTool.java | 19 ++- .../util/MergeViewIndexIdSequencesTool.java | 17 +-- phoenix-core/pom.xml | 4 +- .../apache/phoenix/end2end/CsvBulkLoadToolIT.java | 41 +++--- .../apache/phoenix/end2end/PhoenixDriverIT.java | 17 ++- .../phoenix/end2end/RegexBulkLoadToolIT.java | 20 +-- .../apache/phoenix/jdbc/PhoenixTestDriverIT.java | 19 +++ .../apache/phoenix/compile/WhereOptimizerTest.java | 50 +++++++ .../java/org/apache/phoenix/util/TestUtil.java | 5 + phoenix-hbase-compat-2.4.1/pom.xml | 2 +- phoenix-hbase-compat-2.5.0/pom.xml | 2 +- phoenix-hbase-compat-2.5.4/pom.xml | 2 +- phoenix-mapreduce-byo-shaded-hbase/pom.xml | 4 +- phoenix-pherf/pom.xml | 2 +- phoenix-server/pom.xml | 4 +- phoenix-tracing-webapp/pom.xml | 2 +- pom.xml | 14 +- 47 files changed, 482 insertions(+), 261 deletions(-)