(phoenix) branch 5.1 updated: PHOENIX-7275 Update HBase 2.5 default version to 2.5.8

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 3a258c97fe PHOENIX-7275 Update HBase 2.5 default version to 2.5.8
3a258c97fe is described below

commit 3a258c97fe01f166eada6870470c231a096a0182
Author: Istvan Toth 
AuthorDate: Thu Mar 14 06:15:54 2024 +0100

PHOENIX-7275 Update HBase 2.5 default version to 2.5.8
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 97c98575be..49413dc863 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
 2.4.0
 2.4.17
 2.5.3-hadoop3
-2.5.7-hadoop3
+2.5.8-hadoop3
 
 1.8
 ${compileSource}

(phoenix) branch master updated: PHOENIX-7275 Update HBase 2.5 default version to 2.5.8

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new fcbb742f51 PHOENIX-7275 Update HBase 2.5 default version to 2.5.8
fcbb742f51 is described below

commit fcbb742f51638926094dfd0c1183df65fa2f822c
Author: Istvan Toth 
AuthorDate: Thu Mar 14 06:15:54 2024 +0100

PHOENIX-7275 Update HBase 2.5 default version to 2.5.8
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d8562626be..59106dee3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
 
 2.4.17
 2.5.3-hadoop3
-2.5.7-hadoop3
+2.5.8-hadoop3
 
 1.8
 ${compileSource}

(phoenix-queryserver) branch master updated (a5af0c9 -> 7c76899)

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


from a5af0c9  PHOENIX-7246 Crash Due to Unhandled JDBC Type Code 0 for NULL 
Values
 add 7c76899  PHOENIX-7256 Set java.io.tmpdir to the maven build directory 
for tests in PQS

No new revisions were added by this update.

Summary of changes:
 pom.xml | 7 +++
 1 file changed, 7 insertions(+)

(phoenix) branch master updated: PHOENIX-7255 Non-existent artifacts referred in compatible_client_versions.json

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 909f4bc174 PHOENIX-7255 Non-existent artifacts referred in 
compatible_client_versions.json
909f4bc174 is described below

commit 909f4bc1741956e78db0b4343e53e548a0f470a1
Author: Istvan Toth 
AuthorDate: Fri Mar 8 08:00:07 2024 +0100

PHOENIX-7255 Non-existent artifacts referred in 
compatible_client_versions.json

also remove old HBase 1.x entries
also bump 5.1.0 to 5.1.2 for HBase 2.4, because pre 5.1.2 only supports 
2.4.0
---
 phoenix-core/src/it/resources/compatible_client_versions.json | 8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/phoenix-core/src/it/resources/compatible_client_versions.json 
b/phoenix-core/src/it/resources/compatible_client_versions.json
index 037289bce0..547f2f9f92 100644
--- a/phoenix-core/src/it/resources/compatible_client_versions.json
+++ b/phoenix-core/src/it/resources/compatible_client_versions.json
@@ -17,13 +17,9 @@
  */
 {
 "_comment": "Lists all phoenix compatible client versions against the 
current branch version for a given hbase profile If hbase profile is 1.3, 
phoenix client versions 4.14.3 and 4.15.0 are tested against current branch 
version",
-"1.3": [ {"artifactId":"phoenix-client", "version":"4.14.3-HBase-1.3"}, 
{"artifactId":"phoenix-client", "version":"4.15.0-HBase-1.3"}, 
{"artifactId":"phoenix-client-hbase-1.3", "version":"4.16.0"} ],
-"1.4": [ {"artifactId":"phoenix-client", "version":"4.14.3-HBase-1.4"}, 
{"artifactId":"phoenix-client", "version":"4.15.0-HBase-1.4"}, 
{"artifactId":"phoenix-client-hbase-1.4", "version":"4.16.0"} ],
-"1.5": [ {"artifactId":"phoenix-client", "version":"4.15-HBase-1.5"}, 
{"artifactId":"phoenix-client-hbase-1.5", "version":"4.16.0"} ],
-"1.6": [ {"artifactId":"phoenix-client-hbase-1.6", "version":"4.16.0"} ],
 "2.1": [ {"artifactId":"phoenix-client-hbase-2.1", "version":"5.1.0"} ],
 "2.2": [ {"artifactId":"phoenix-client-hbase-2.2", "version":"5.1.0"} ],
-"2.3": [ {"artifactId":"phoenix-client-hbase-2.3", "version":"5.1.0"}, 
{"artifactId":"phoenix-client-hbase-2.3", "version":"5.2.0"} ],
-"2.4": [ {"artifactId":"phoenix-client-hbase-2.4", "version":"5.1.0"}, 
{"artifactId":"phoenix-client-hbase-2.3", "version":"5.2.0"} ],
+"2.3": [ {"artifactId":"phoenix-client-hbase-2.3", "version":"5.1.0"} ],
+"2.4": [ {"artifactId":"phoenix-client-hbase-2.4", "version":"5.1.2"} ],
 "2.5": [ {"artifactId":"phoenix-client-hbase-2.5", "version":"5.1.3"} ]
 }

(phoenix) branch 5.1 updated: PHOENIX-7130 Support skipping of shade sources jar creation

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new c8930e32dd PHOENIX-7130 Support skipping of shade sources jar creation
c8930e32dd is described below

commit c8930e32dd771ec706d4f4b9b713416b7106f545
Author: Jain, Nihal 
AuthorDate: Wed Feb 28 22:02:09 2024 +0530

PHOENIX-7130 Support skipping of shade sources jar creation
---
 phoenix-client-parent/phoenix-client-embedded/pom.xml | 2 +-
 phoenix-client-parent/phoenix-client/pom.xml  | 2 +-
 pom.xml   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml 
b/phoenix-client-parent/phoenix-client-embedded/pom.xml
index bf98474708..f59b0830fa 100644
--- a/phoenix-client-parent/phoenix-client-embedded/pom.xml
+++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -45,7 +45,7 @@
 
   
true
   false
-  true
+  ${shadeSources}
   
${basedir}/target/pom.xml
   
 
diff --git a/phoenix-client-parent/phoenix-client/pom.xml 
b/phoenix-client-parent/phoenix-client/pom.xml
index 17db621762..e03a23415a 100644
--- a/phoenix-client-parent/phoenix-client/pom.xml
+++ b/phoenix-client-parent/phoenix-client/pom.xml
@@ -45,7 +45,7 @@
 
   
true
   false
-  true
+  ${shadeSources}
   
${basedir}/target/pom.xml
   
 
diff --git a/pom.xml b/pom.xml
index dec3ade754..97c98575be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
 true
 ${project.basedir}/..
 ${project.build.directory}
+true
 
 
 2.14.1

svn commit: r1916119 - in /phoenix/site/publish: ./ language/

[stoty]

Author: stoty
Date: Tue Mar  5 07:28:22 2024
New Revision: 1916119

URL: http://svn.apache.org/viewvc?rev=1916119&view=rev
Log:
PHOENIX-7249 Starting HTTP Server with Python3 For website validation fails 
with error No module named SimpleHTTPServer

Modified:
phoenix/site/publish/Phoenix-in-15-minutes-or-less.html
phoenix/site/publish/array_type.html
phoenix/site/publish/atomic_upsert.html
phoenix/site/publish/building.html
phoenix/site/publish/building_website.html
phoenix/site/publish/bulk_dataload.html
phoenix/site/publish/classpath_and_url.html
phoenix/site/publish/columnencoding.html
phoenix/site/publish/contributing.html
phoenix/site/publish/cursors.html
phoenix/site/publish/develop.html
phoenix/site/publish/download.html
phoenix/site/publish/dynamic_columns.html
phoenix/site/publish/explainplan.html
phoenix/site/publish/faq.html
phoenix/site/publish/flume.html
phoenix/site/publish/hive_storage_handler.html
phoenix/site/publish/index.html
phoenix/site/publish/installation.html
phoenix/site/publish/issues.html
phoenix/site/publish/joins.html
phoenix/site/publish/kafka.html
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/publish/mailing_list.html
phoenix/site/publish/metrics.html
phoenix/site/publish/multi-tenancy.html
phoenix/site/publish/namspace_mapping.html
phoenix/site/publish/news.html
phoenix/site/publish/omid.html
phoenix/site/publish/paged.html
phoenix/site/publish/performance.html
phoenix/site/publish/pherf.html
phoenix/site/publish/phoenix_mr.html
phoenix/site/publish/phoenix_on_emr.html
phoenix/site/publish/phoenix_orm.html
phoenix/site/publish/phoenix_python.html
phoenix/site/publish/phoenix_spark.html
phoenix/site/publish/phoenixcon.html
phoenix/site/publish/pig_integration.html
phoenix/site/publish/python.html
phoenix/site/publish/recent.html
phoenix/site/publish/release.html
phoenix/site/publish/release_notes.html
phoenix/site/publish/resources.html
phoenix/site/publish/roadmap.html
phoenix/site/publish/rowtimestamp.html
phoenix/site/publish/salted.html
phoenix/site/publish/secondary_indexing.html
phoenix/site/publish/sequences.html
phoenix/site/publish/server.html
phoenix/site/publish/skip_scan.html
phoenix/site/publish/source.html
phoenix/site/publish/subqueries.html
phoenix/site/publish/tablesample.html
phoenix/site/publish/team.html
phoenix/site/publish/tech_talks.html
phoenix/site/publish/tephra.html
phoenix/site/publish/tracing.html
phoenix/site/publish/transactions.html
phoenix/site/publish/tuning.html
phoenix/site/publish/tuning_guide.html
phoenix/site/publish/udf.html
phoenix/site/publish/update_statistics.html
phoenix/site/publish/upgrading.html
phoenix/site/publish/views.html
phoenix/site/publish/who_is_using.html

Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/Phoenix-in-15-minutes-or-less.html?rev=1916119&r1=1916118&r2=1916119&view=diff
==
--- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original)
+++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Tue Mar  5 07:28:22 
2024
@@ -1,7 +1,7 @@
 
 
 
 
@@ -505,7 +505,7 @@ ORDER BY sum(population) DESC;


Back to 
top
-   Copyright ©2023 http://www.apache.org";>Apache Software Foundation. All Rights 
Reserved.
+   Copyright ©2024 http://www.apache.org";>Apache Software Foundation. All Rights 
Reserved.




Modified: phoenix/site/publish/array_type.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/array_type.html?rev=1916119&r1=1916118&r2=1916119&view=diff
==
--- phoenix/site/publish/array_type.html (original)
+++ phoenix/site/publish/array_type.html Tue Mar  5 07:28:22 2024
@@ -1,7 +1,7 @@
 
 
 
 
@@ -502,7 +502,7 @@ SELECT region_name FROM regions WHERE '9


Back to 
top
-   Copyright ©2023 http://www.apache.org";>Apache Software Foundation. All Rights 
Reserved.
+   Copyright ©2024 http://www.apache.org";>Apache Software Foundation. All Rights 
Reserved.




Modified: phoenix/site/publish/atomic_upsert.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publi

(phoenix-queryserver) branch master updated: PHOENIX-7246 Crash Due to Unhandled JDBC Type Code 0 for NULL Values

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new a5af0c9  PHOENIX-7246 Crash Due to Unhandled JDBC Type Code 0 for NULL 
Values
a5af0c9 is described below

commit a5af0c9bf33554f3740587bf47d0e0b77f00908a
Author: Satya Kommula 
AuthorDate: Sat Mar 2 09:40:04 2024 +0530

PHOENIX-7246 Crash Due to Unhandled JDBC Type Code 0 for NULL Values
---
 python-phoenixdb/phoenixdb/tests/test_types.py | 5 +
 python-phoenixdb/phoenixdb/types.py| 7 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/python-phoenixdb/phoenixdb/tests/test_types.py 
b/python-phoenixdb/phoenixdb/tests/test_types.py
index 5d6cf8d..9354cc5 100644
--- a/python-phoenixdb/phoenixdb/tests/test_types.py
+++ b/python-phoenixdb/phoenixdb/tests/test_types.py
@@ -378,3 +378,8 @@ class TypesTest(DatabaseTestCase):
 [4, [True, True, True]],
 [5, None]
 ])
+
+def test_select_null(self):
+with self.conn.cursor() as cursor:
+cursor.execute("SELECT NULL")
+self.assertEqual(cursor.fetchall(), [[None]])
diff --git a/python-phoenixdb/phoenixdb/types.py 
b/python-phoenixdb/phoenixdb/types.py
index 21421b5..80f8fe8 100644
--- a/python-phoenixdb/phoenixdb/types.py
+++ b/python-phoenixdb/phoenixdb/types.py
@@ -166,6 +166,9 @@ FIELD_MAP = {
 'double_value': [
 (common_pb2.DOUBLE, float, float),
 (common_pb2.PRIMITIVE_DOUBLE, float, float)
+],
+"null_value": [
+(common_pb2.NULL, None, None)
 ]
 }
 """The master map that describes how to handle types, keyed by TypedData 
field"""
@@ -206,6 +209,7 @@ JDBC_TO_REP = dict([
 (13, common_pb2.SHORT),  # UNSIGNED_SMALLINT
 (20, common_pb2.JAVA_SQL_TIMESTAMP),  # UNSIGNED_TIMESTAMP
 (11, common_pb2.BYTE),  # UNSIGNED_TINYINT
+(0, common_pb2.NULL),  # NULL
 # The following are not used by Phoenix, but some of these are used by 
Avaticafor
 # parameter types
 (-7, common_pb2.BOOLEAN),  # BIT
@@ -222,9 +226,8 @@ JDBC_TO_REP = dict([
 (2011, common_pb2.STRING),  # NCLOB
 (2009, common_pb2.STRING),  # SQLXML
 # Returned by Avatica for Arrays in EMPTY resultsets
-(2000, common_pb2.BYTE_STRING)  # JAVA_OBJECT
+(2000, common_pb2.BYTE_STRING),  # JAVA_OBJECT
 # These are defined by JDBC, but cannot be mapped
-# NULL
 # OTHER
 # DISTINCT
 # STRUCT

(phoenix-omid) branch master updated: OMID-280 Use Hbase 2.5 for building OMID

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git


The following commit(s) were added to refs/heads/master by this push:
 new 1fb914f5 OMID-280 Use Hbase 2.5 for building OMID
1fb914f5 is described below

commit 1fb914f522d6bd989f17a89c6ea340184d4f2766
Author: Istvan Toth 
AuthorDate: Thu Feb 29 11:18:24 2024 +0100

OMID-280 Use Hbase 2.5 for building OMID
---
 pom.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0e577cd8..db149cf2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,8 +152,8 @@
 UTF-8
 
 
-2.4.17
-3.1.4
+2.5.7-hadoop3
+3.2.4
 2.1.0
 5.1.0
 6.10
@@ -174,8 +174,7 @@
 1.3
 32.1.3-jre
 
-4.2.0
-3.5.9
+5.6.0
 2.0
 1.9.4
 2.11.0
@@ -1153,6 +1152,10 @@
 org.apache.zookeeper
 zookeeper
   
+  
+org.junit.jupiter
+junit-jupiter-api
+  
 
 ${curator.version}
 

(phoenix-omid) branch master updated (91260e35 -> 470fed9f)

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git


from 91260e35 OMID-277 Omid 1.1.2 fails with Phoenix 5.2
 add 470fed9f OMID-278 Change default waitStrategy to LOW_CPU

No new revisions were added by this update.

Summary of changes:
 tso-server/src/main/resources/default-omid-server-configuration.yml | 2 +-
 tso-server/src/test/resources/tlstest-omid-server-config.yml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(phoenix-omid) branch master updated: OMID-277 Omid 1.1.2 fails with Phoenix 5.2

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git


The following commit(s) were added to refs/heads/master by this push:
 new 91260e35 OMID-277 Omid 1.1.2 fails with Phoenix 5.2
91260e35 is described below

commit 91260e355d0e6c004420eef6cead2cda3dbc8971
Author: Istvan Toth 
AuthorDate: Thu Feb 29 07:22:13 2024 +0100

OMID-277 Omid 1.1.2 fails with Phoenix 5.2

* remove overlooked unrelecated Guava references
* add maven enforcer plugin to catch future problems
---
 .../org/apache/omid/transaction/HBaseCellId.java   |  2 +-
 .../org/apache/omid/transaction/TestCellUtils.java | 28 -
 .../apache/omid/transaction/TestOmidLLRaces.java   |  2 +-
 .../apache/omid/transaction/TestShadowCells.java   |  2 +-
 .../committable/hbase/HBaseCommitTableConfig.java  |  2 +-
 pom.xml| 67 ++
 .../timestamp/storage/HBaseTimestampStorage.java   |  2 +-
 .../omid/tso/client/TestUnconnectedTSOClient.java  |  2 +-
 8 files changed, 87 insertions(+), 20 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java 
b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
index 7c21bc8e..736ab3dc 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseCellId.java
@@ -17,7 +17,7 @@
  */
 package org.apache.omid.transaction;
 
-import static com.google.common.base.Charsets.UTF_8;
+import static 
org.apache.phoenix.thirdparty.com.google.common.base.Charsets.UTF_8;
 
 import org.apache.omid.tso.client.CellId;
 
diff --git 
a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java 
b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
index 50a4a9ba..d5a162fd 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestCellUtils.java
@@ -57,13 +57,13 @@ public class TestCellUtils {
 public void testShadowCellQualifiers(byte[] shadowCellSuffixToTest) throws 
IOException {
 
 final byte[] validShadowCellQualifier =
-com.google.common.primitives.Bytes.concat(qualifier, 
shadowCellSuffixToTest);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(qualifier,
 shadowCellSuffixToTest);
 final byte[] sandwichValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(shadowCellSuffixToTest, 
validShadowCellQualifier);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(shadowCellSuffixToTest,
 validShadowCellQualifier);
 final byte[] doubleEndedValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(validShadowCellQualifier, 
shadowCellSuffixToTest);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
 shadowCellSuffixToTest);
 final byte[] interleavedValidShadowCellQualifier =
-
com.google.common.primitives.Bytes.concat(validShadowCellQualifier, 
com.google.common.primitives.Bytes
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(validShadowCellQualifier,
 org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes
 .concat(validShadowCellQualifier, 
validShadowCellQualifier));
 final byte[] value = Bytes.toBytes("test-value");
 
@@ -100,11 +100,11 @@ public class TestCellUtils {
 public void testCorrectMapingOfCellsToShadowCells() throws IOException {
 // Create the required data
 final byte[] validShadowCellQualifier =
-com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX, 
qualifier, SHADOW_CELL_SUFFIX);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
 qualifier, SHADOW_CELL_SUFFIX);
 
 final byte[] qualifier2 = Bytes.toBytes("test-qual2");
 final byte[] validShadowCellQualifier2 =
-com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX, 
qualifier2, SHADOW_CELL_SUFFIX);
+
org.apache.phoenix.thirdparty.com.google.common.primitives.Bytes.concat(SHADOW_CELL_PREFIX,
 qualifier2, SHADOW_CELL_SUFFIX);
 
 final byte[] qualifier3 = Bytes.toBytes("test-qual3");
 
@@ -176,7 +176,7 @@ public class TestCellUtils {
 byte[] suffixedQualifier = 
CellUtils.addShadowCellSuffixPrefix(cell.getQualifierArray(),
  
cell.getQualifierOffset(),
  
cell.getQualifierLength());
-  

(phoenix-queryserver) branch master updated: PHOENIX-7012 Expose keystore_type parameter in sqlline-thin.py

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new 69b5899  PHOENIX-7012 Expose keystore_type parameter in sqlline-thin.py
69b5899 is described below

commit 69b58991e87af4840c3a3e6fbd278bc95e3dcf15
Author: Istvan Toth 
AuthorDate: Thu Aug 3 17:13:55 2023 +0200

PHOENIX-7012 Expose keystore_type parameter in sqlline-thin.py
---
 bin/sqlline-thin.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/sqlline-thin.py b/bin/sqlline-thin.py
index af76434..327ca72 100755
--- a/bin/sqlline-thin.py
+++ b/bin/sqlline-thin.py
@@ -69,6 +69,9 @@ parser.add_argument('-kt', '--keytab', help='Kerberos keytab 
file for SPNEGO aut
 # Avatica HTTPS truststore
 parser.add_argument('-t', '--truststore', help='Truststore file that contains 
the TLS certificate of the server.')
 parser.add_argument('-tp', '--truststore-password', help='Password for the 
server TLS certificate truststore')
+# Keystore type
+parser.add_argument('-st', '--keystore-type', help='Type of key- and 
truststore files (i.e. JKS).')
+
 # Common arguments across sqlline.py and sqlline-thin.py
 phoenix_queryserver_utils.common_sqlline_args(parser)
 # Parse the args
@@ -201,7 +204,8 @@ if args.truststore:
 jdbc_url += ';truststore=' + tryDecode(args.truststore)
 if args.truststore_password:
 jdbc_url += ';truststore_password=' + tryDecode(args.truststore_password)
-
+if args.keystore_type:
+jdbc_url += ';keystore_type=' + tryDecode(args.keystore_type)
 
 # Add SPENGO auth if this cluster uses it, and there are no conflicting HBase 
parameters
 if (get_hbase_authentication() == 'kerberos' and get_spnego_auth_disabled() == 
'false'

(phoenix-queryserver) branch master updated: PHOENIX-7221 Manage requests-gssapi version for Phython 3.7 and lower

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new 01ca7af  PHOENIX-7221 Manage requests-gssapi version for Phython 3.7 
and lower
01ca7af is described below

commit 01ca7af5a4374e8b01a70c3aa2e5fd720cf01e3f
Author: Istvan Toth 
AuthorDate: Tue Feb 27 07:39:52 2024 +0100

PHOENIX-7221 Manage requests-gssapi version for Phython 3.7 and lower
---
 python-phoenixdb/README.rst | 11 +--
 python-phoenixdb/setup.py   | 10 +++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/python-phoenixdb/README.rst b/python-phoenixdb/README.rst
index 0c609a8..a8aa96c 100644
--- a/python-phoenixdb/README.rst
+++ b/python-phoenixdb/README.rst
@@ -26,10 +26,17 @@ from <https://github.com/apache/phoenix-queryserver>
 
 Extract the archive and then install it manually::
 
-cd /path/to/phoenix-queryserver-x.y.z/python/phoenixdb
+cd /path/to/phoenix-queryserver-x.y.z/python-phoenixdb
 pip install -r requirements.txt
 python setup.py install
 
+Note that old versions of pip and setuptools have various bugs and 
incompatibilities that
+may result in installation errors, especially on old python versions.
+If you encounter problems while building, update your pip and setuptools, and 
try again::
+pip install --upgrade pip
+pip install --upgrade setuptools
+
+
 Usage
 -
 
@@ -83,7 +90,7 @@ this will also create a shell script in 
phoenix-queryserver-it/target/krb_setup.
 use to set up the environment for the tests.
 
 Note: Depending on the Phoenix version used for building, you may or may not 
need the
-`-Pshade-javax-servlet` option. Check BUILDING.md in the repository root.
+`-Pshade-javax-servlet` option. See BUILDING.md in the repository root for 
more information.
 
 If you want to use the library without installing the phoenixdb library, you 
can use
 the `PYTHONPATH` environment variable to point to the library directly::
diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py
index c3acca5..36a33f5 100644
--- a/python-phoenixdb/setup.py
+++ b/python-phoenixdb/setup.py
@@ -40,8 +40,11 @@ if setuptools.__version__ < '20.8.1':
 install_requires=[
 'protobuf>=3.0.0',
 'requests',
-'requests-gssapi',
 ]
+if sys.version_info < (3,8):
+install_requires.append('requests-gssapi<1.3.0')
+else:
+install_requires.append('requests-gssapi')
 if sys.version_info < (3,6):
 install_requires.append('gssapi<1.6.0')
 #Don't build the docs on an old stack
@@ -50,8 +53,9 @@ else:
 install_requires=[
 'protobuf>=3.0.0',
 'requests',
-'requests-gssapi',
-'gssapi<1.6.0;python_version<"3.6"',
+'requests-gssapi; python_version>="3.8.0"',
+'requests-gssapi<1.3.0; python_version<"3.8.0"',
+'gssapi<1.6.0; python_version<"3.6.0"',
 ]
 setup_requires=[
 'Sphinx;python_version>="3.6"',

(phoenix) branch master updated: PHOENIX-7236 Fix release scripts for 5.2

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 9934c3db15 PHOENIX-7236 Fix release scripts for 5.2
9934c3db15 is described below

commit 9934c3db15339f9f611ec7f1f560ef4bc0f503cc
Author: Istvan Toth 
AuthorDate: Mon Feb 26 10:31:46 2024 +0100

PHOENIX-7236 Fix release scripts for 5.2

* Update base docker image to Ubuntu 22.04
* Add -L switch to curl when downloading pom.xml
* set -x for bash when running in debug mode
---
 dev/create-release/do-release-docker.sh  |  4 +++
 dev/create-release/do-release.sh |  5 
 dev/create-release/phoenix-rm/Dockerfile | 48 +---
 dev/create-release/release-util.sh   |  2 +-
 4 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/dev/create-release/do-release-docker.sh 
b/dev/create-release/do-release-docker.sh
index 8d201e8dfc..3025d7147a 100755
--- a/dev/create-release/do-release-docker.sh
+++ b/dev/create-release/do-release-docker.sh
@@ -107,6 +107,9 @@ if (( $# > 0 )); then
   error "Arguments can only be provided with option flags, invalid args: $*"
 fi
 export DEBUG
+if [ "$DEBUG" = "1" ]; then
+  set -x
+fi
 
 if [ -z "$WORKDIR" ] || [ ! -d "$WORKDIR" ]; then
   error "Work directory (-d) must be defined and exist. Run with -h for help."
@@ -223,6 +226,7 @@ ASF_PASSWORD=$ASF_PASSWORD
 RELEASE_STEP=$RELEASE_STEP
 API_DIFF_TAG=$API_DIFF_TAG
 HOST_OS=$HOST_OS
+DEBUG=$DEBUG
 EOF
 
 JAVA_MOUNT=()
diff --git a/dev/create-release/do-release.sh b/dev/create-release/do-release.sh
index fd613e2f6f..e6aa1ddfb1 100755
--- a/dev/create-release/do-release.sh
+++ b/dev/create-release/do-release.sh
@@ -18,6 +18,11 @@
 #
 
 set -e
+
+if [ "$DEBUG" = "1" ]; then
+  set -x
+fi
+
 # Use the adjacent do-release-docker.sh instead, if you can.
 # Otherwise, this runs core of the release creation.
 # Will ask you questions on what to build and for logins
diff --git a/dev/create-release/phoenix-rm/Dockerfile 
b/dev/create-release/phoenix-rm/Dockerfile
index 9aa97aae18..01de8c2634 100644
--- a/dev/create-release/phoenix-rm/Dockerfile
+++ b/dev/create-release/phoenix-rm/Dockerfile
@@ -21,7 +21,7 @@
 #
 # Includes:
 # * Java 8
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 # Install extra needed repos and refresh.
 #
@@ -29,25 +29,39 @@ FROM ubuntu:18.04
 # the most current package versions (instead of potentially using old versions 
cached by docker).
 RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
   && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install 
--no-install-recommends \
-curl='7.58.0-*' \
-git='1:2.17.1-*' \
-gnupg='2.2.4-*' \
-libcurl4-openssl-dev='7.58.0-*' \
-libxml2-dev='2.9.4+dfsg1-*' \
-lsof='4.89+dfsg-*' \
-maven='3.6.0-*' \
-openjdk-8-jdk='8*' \
-python-pip='9.0.1-*' \
-python3-pip='9.0.1-*' \
-subversion='1.9.7-*' \
-wget='1.19.4-*' \
+curl='7.81.0-*' \
+git='1:2.34.1-*' \
+gnupg='2.2.27-*' \
+libcurl4-openssl-dev='7.81.0-*' \
+libxml2-dev='2.9.13+dfsg-*' \
+libxml2-utils='2.9.13+dfsg-*' \
+lsof='4.93.2+dfsg-*' \
+openjdk-8-jdk='8u*' \
+python3='3.10.6-1~22.04' \
+python2='2.7.18-3' \
+python3-pip='22.0.2+dfsg-*' \
+subversion='1.14.1-*' \
+wget='1.21.2-*' \
+patch='2.7.6-*' \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/* \
   && update-alternatives --set java 
/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java \
-  && pip install \
-python-dateutil==2.8.1 \
-  && pip3 install \
-python-dateutil==2.8.1
+  && update-alternatives --install /usr/bin/python python /usr/bin/python2 1 \
+  && pip3 install --no-cache-dir python-dateutil==2.8.2 \
+  && pip install --no-cache-dir python-dateutil==2.8.2
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+# Install maven
+ENV MAVEN_VERSION=3.8.6
+ARG 
MAVEN_URL="https://archive.apache.org/dist/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz";
+ARG 
MAVEN_SHA512="f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26"
+RUN mkdir -p /opt/maven \
+  && curl -fsSL -o /tmp/apache-maven.tar.gz "${MAVEN_URL}" \
+  && echo "${MAVEN_SHA512}  /tmp/apache-maven.tar.gz" | sha512sum -c - \
+  && tar -xzf /tmp/apache-maven.tar.gz -C /op

(phoenix-queryserver) branch master updated: PHOENIX-7222 Fix tox tests and add Python 3.12 to supported versions and the test matrix

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new e0fd69e  PHOENIX-7222 Fix tox tests and add Python 3.12 to supported 
versions and the test matrix
e0fd69e is described below

commit e0fd69e85e80ec2c5a01fc56e943abc94868ffe0
Author: Istvan Toth 
AuthorDate: Wed Feb 21 08:14:48 2024 +0100

PHOENIX-7222 Fix tox tests and add Python 3.12 to supported versions and 
the test matrix
---
 python-phoenixdb/.gitignore  |  1 +
 python-phoenixdb/Dockerfile  |  4 ++--
 python-phoenixdb/README.rst  | 11 +++
 python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py |  2 +-
 python-phoenixdb/setup.py|  3 ++-
 python-phoenixdb/tox.ini |  5 -
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/python-phoenixdb/.gitignore b/python-phoenixdb/.gitignore
index d7a54af..369f6a2 100644
--- a/python-phoenixdb/.gitignore
+++ b/python-phoenixdb/.gitignore
@@ -11,3 +11,4 @@ dev-support/work
 phoenixdb/.eggs
 phoenixdb/build
 phoenixdb/e
+phoenixdb/.python-version
diff --git a/python-phoenixdb/Dockerfile b/python-phoenixdb/Dockerfile
index 95f6b2d..daf8a4e 100644
--- a/python-phoenixdb/Dockerfile
+++ b/python-phoenixdb/Dockerfile
@@ -13,13 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from advian/tox-base:ubuntu as tox
+from advian/tox-base:ubuntu-jammy-2024-02-07 as tox
 
 ###
 # Prebuild given versions #
 ###
 ARG BUILD_PYTHON_VERSIONS="3.11 3.10 3.9 3.8" #Can we take this from the 
parent image ?
-ARG EXTRA_PYTHON_VERSIONS="3.5 3.6 3.7 2.7"
+ARG EXTRA_PYTHON_VERSIONS="3.12 3.5 3.6 3.7 2.7"
 RUN export RESOLVED_VERSIONS=`pyenv_resolve $BUILD_PYTHON_VERSIONS` \
 && export EXTRA_RESOLVED_VERSIONS=`pyenv_resolve $EXTRA_PYTHON_VERSIONS` \
 && for pyver in $EXTRA_RESOLVED_VERSIONS; do pyenv install $pyver; done \
diff --git a/python-phoenixdb/README.rst b/python-phoenixdb/README.rst
index 3858ea0..0c609a8 100644
--- a/python-phoenixdb/README.rst
+++ b/python-phoenixdb/README.rst
@@ -68,19 +68,22 @@ necessary requirements::
 You can start a Phoenix QueryServer instance on http://localhost:8765 for 
testing by running
 the following command in the pohoenix-queryserver-parent directory::
 
-mvn clean verify -am -pl phoenix-queryserver-it -Dtest=foo \
+mvn clean verify -Pshade-javax-servlet -am -pl phoenix-queryserver-it 
-Dtest=foo \
 -Dit.test=QueryServerBasicsIT#startLocalPQS \
 -Ddo.not.randomize.pqs.port=true -Dstart.unsecure.pqs=true
 
 You can start a secure (https+kerberos) Phoenix QueryServer instance on 
https://localhost:8765
 for testing by running the following command in the phoenix-queryserver-parent 
directory::
 
-mvn clean verify -am -pl phoenix-queryserver-it -Dtest=foo \
+mvn clean verify -Pshade-javax-servlet -am -pl phoenix-queryserver-it 
-Dtest=foo \
 -Dit.test=SecureQueryServerPhoenixDBIT#startLocalPQS \
 -Ddo.not.randomize.pqs.port=true -Dstart.secure.pqs=true
 
-this will also create a shell script in 
phoenix-queryserver-it/target/krb_setup.sh, that you can use to set
-up the environment for the tests.
+this will also create a shell script in 
phoenix-queryserver-it/target/krb_setup.sh, that you can
+use to set up the environment for the tests.
+
+Note: Depending on the Phoenix version used for building, you may or may not 
need the
+`-Pshade-javax-servlet` option. Check BUILDING.md in the repository root.
 
 If you want to use the library without installing the phoenixdb library, you 
can use
 the `PYTHONPATH` environment variable to point to the library directly::
diff --git a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py 
b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
index d21b827..3df83ef 100644
--- a/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
+++ b/python-phoenixdb/phoenixdb/sqlalchemy_phoenix.py
@@ -22,7 +22,7 @@ from sqlalchemy import types
 from sqlalchemy.engine.default import DefaultDialect, DefaultExecutionContext
 from sqlalchemy.exc import CompileError
 from sqlalchemy.sql.compiler import DDLCompiler
-from sqlalchemy.types import BIGINT, BOOLEAN, CHAR, DATE, DECIMAL, FLOAT, 
INTEGER, NUMERIC,\
+from sqlalchemy.types import BIGINT, BOOLEAN, CHAR, DATE, DECIMAL, FLOAT, 
INTEGER, NUMERIC, \
 SMALLINT, TIME, TIMESTAMP, VARBINARY, VARCHAR
 
 if sys.version_info.major == 3:
diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py
index 3245433..c3acca5 100644
--- a/python-phoenixdb/setup.py
+++ b/python-phoenixdb/setup.py
@@ -88,7 +88,8 @@ setup(
 'Programming Language :: Python :: 3.8',
 'Programming Languag

(phoenix) branch 5.1 updated: PHOENIX-7223 Make Sure Tools Always Close HBase Connections on Exit

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 2699e530e4 PHOENIX-7223 Make Sure Tools Always Close HBase Connections 
on Exit
2699e530e4 is described below

commit 2699e530e41a5c0b1f08b607d2c3aca9064aae81
Author: Istvan Toth 
AuthorDate: Tue Feb 20 13:01:19 2024 +0100

PHOENIX-7223 Make Sure Tools Always Close HBase Connections on Exit

* don't throw exceptions from Tools, log the error and return non-zero exit 
code
* Close all Phoenix Connections in Tools
* Close cached CQSI objects on PhoenixDriver.close()
---
 .../apache/phoenix/end2end/CsvBulkLoadToolIT.java  |  40 +++---
 .../phoenix/end2end/RegexBulkLoadToolIT.java   |  20 +--
 .../org/apache/phoenix/jdbc/PhoenixDriver.java |  13 +-
 .../phoenix/mapreduce/AbstractBulkLoadTool.java| 157 -
 .../apache/phoenix/mapreduce/OrphanViewTool.java   |   2 +
 .../phoenix/mapreduce/index/IndexUpgradeTool.java  |  11 +-
 .../phoenix/schema/stats/UpdateStatisticsTool.java |  19 ++-
 .../org/apache/phoenix/schema/tool/SchemaTool.java |  29 ++--
 .../util/MergeViewIndexIdSequencesTool.java|  17 +--
 9 files changed, 174 insertions(+), 134 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
index c6e8246c0a..60d7071f89 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CsvBulkLoadToolIT.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.FileAlreadyExistsException;
 import org.apache.phoenix.end2end.index.IndexTestUtil;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.mapreduce.CsvBulkLoadTool;
@@ -146,12 +145,10 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
 "--table", "table1",
 "--schema", "s",
 "--zookeeper", zkQuorum});
-fail("Bulk loading error should have happened earlier");
-} catch (Exception e){
-assertTrue(e.getMessage().contains("Bulk Loading error: Bulk 
loading is disabled for " +
-"non empty tables with global indexes, because it will 
corrupt " +
-"the global index table in most cases.\n" +
-"Use the --corruptindexes option to override this 
check."));
+assertTrue("Bulk loading error should have happened earlier", 
exitCode != 0);
+} catch (Exception e) {
+fail("Tools should return non-zero exit codes on failure"
++ " instead of throwing an exception");
 }
 
 ResultSet rs = stmt.executeQuery("SELECT id, name, t FROM s.table1 
ORDER BY id");
@@ -393,7 +390,7 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
 + " (FIRST_NAME ASC)"
 + " INCLUDE (LAST_NAME)";
 stmt.execute(ddl);
-
+
 FileSystem fs = FileSystem.get(getUtility().getConfiguration());
 FSDataOutputStream outputStream = fs.create(new 
Path("/tmp/input3.csv"));
 PrintWriter printWriter = new PrintWriter(outputStream);
@@ -518,17 +515,17 @@ public class CsvBulkLoadToolIT extends BaseOwnClusterIT {
 CsvBulkLoadTool csvBulkLoadTool = new CsvBulkLoadTool();
 csvBulkLoadTool.setConf(getUtility().getConfiguration());
 try {
-csvBulkLoadTool.run(new String[] {
+int exitCode = csvBulkLoadTool.run(new String[] {
 "--input", "/tmp/input4.csv",
 "--table", tableName,
 "--zookeeper", zkQuorum });
-fail(String.format("Table %s not created, hence should 
fail",tableName));
+assertTrue(String.format("Table %s not created, hence should 
fail", tableName),
+exitCode != 0);
 } catch (Exception ex) {
-assertTrue(ex instanceof IllegalArgumentException); 
-assertTrue(ex.getMessage().contains(String.format("Table %s not 
found", tableName)));
-}
+fail("Tools should return non-zero exit codes on failure"
++ " instead of throwing an exception");}
 }
-
+
 @Test
 public void testAlreadyExistsOutputPath() {
 String tableName = "TABLE9&

(phoenix) branch master updated: PHOENIX-7223 Make Sure Tools Always Close HBase Connections on Exit

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 49ad9db27e PHOENIX-7223 Make Sure Tools Always Close HBase Connections 
on Exit
49ad9db27e is described below

commit 49ad9db27e6a196edfa469274a949954e3ea23a5
Author: Istvan Toth 
AuthorDate: Tue Feb 20 13:01:19 2024 +0100

PHOENIX-7223 Make Sure Tools Always Close HBase Connections on Exit

* don't throw exceptions from Tools, log the error and return non-zero exit 
code
* Close all Phoenix Connections in Tools
* Close cached CQSI objects on PhoenixDriver.close()
---
 .../jdbc/ClusterRoleRecordGeneratorTool.java   |  19 ++-
 .../org/apache/phoenix/jdbc/PhoenixDriver.java |  13 +-
 .../apache/phoenix/jdbc/PhoenixHAAdminTool.java|  63 
 .../org/apache/phoenix/schema/tool/SchemaTool.java |  29 ++--
 .../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 +--
 .../apache/phoenix/end2end/CsvBulkLoadToolIT.java  |  41 +++---
 .../phoenix/end2end/RegexBulkLoadToolIT.java   |  20 +--
 11 files changed, 221 insertions(+), 172 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ClusterRoleRecordGeneratorTool.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ClusterRoleRecordGeneratorTool.java
index 49ec3db61a..93899f87a2 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ClusterRoleRecordGeneratorTool.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ClusterRoleRecordGeneratorTool.java
@@ -66,13 +66,18 @@ public class ClusterRoleRecordGeneratorTool extends 
Configured implements Tool {
 
 @Override
 public int run(String[] args) throws Exception {
-String fileName = getConf().get(PHOENIX_HA_GENERATOR_FILE_ATTR);
-File file = StringUtils.isEmpty(fileName)
-? File.createTempFile("phoenix.ha.cluster.role.records", 
".json")
-: new File(fileName);
-JacksonUtil.getObjectWriterPretty().writeValue(file, 
listAllRecordsByZk());
-System.out.println("Created JSON file '" + file + "'");
-return 0;
+try {
+String fileName = getConf().get(PHOENIX_HA_GENERATOR_FILE_ATTR);
+File file = StringUtils.isEmpty(fileName)
+? File.createTempFile("phoenix.ha.cluster.role.records", 
".json")
+: new File(fileName);
+JacksonUtil.getObjectWriterPretty().writeValue(file, 
listAllRecordsByZk());
+System.out.println("Created JSON file '" + file + "'");
+return 0;
+} catch (Exception e) {
+e.printStackTrace();
+return -1;
+}
 }
 
 List listAllRecordsByZk() throws IOException {
diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
index ca412d5238..8bdc6ea182 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java
@@ -144,6 +144,7 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
 }
 
 // One entry per cluster here
+// TODO that's not true, we can have multiple connections with different 
configs / principals
 private final Cache 
connectionQueryServicesCache =
 initializeConnectionCache();
 
@@ -341,8 +342,18 @@ public final class PhoenixDriver extends 
PhoenixEmbeddedDriver {
 services = null;
 }
 }
+
+if (connectionQueryServicesCache != null) {
+try {
+for (ConnectionQueryServices cqsi : 
connectionQueryServicesCache.asMap().values()) {
+cqsi.close();
+}
+} catch (Exception e) {
+LOGGER.warn("Failed to close ConnectionQueryServices 
instance", e);
+}
+}
 }
-
+
 private enum LockMode {
 READ, WRITE
 };
diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixHAAdminTool.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixHAAdminTool.java
index c6bdadc335..e7a9cd7a22 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixHAAdminTool.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/PhoenixHAAdminTool.java
@@ -105,38

(phoenix) branch 5.1 updated: PHOENIX-7216 Bump Hadoop version to 3.2.4 for 2.5.x profile (#1825)

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 5b476b18cd PHOENIX-7216 Bump Hadoop version to 3.2.4 for 2.5.x profile 
(#1825)
5b476b18cd is described below

commit 5b476b18cd2d38aa7f5a4f6b1086affcdab8c615
Author: Istvan Toth 
AuthorDate: Thu Feb 22 21:21:18 2024 +0100

PHOENIX-7216 Bump Hadoop version to 3.2.4 for 2.5.x profile (#1825)
---
 pom.xml | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 86ee18e18e..edf1ebb582 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
 
 
-3.1.4
+3.2.4
 
 2.1.0
 hbase-${hbase.profile}
@@ -1663,7 +1663,7 @@
   
 2.5
 2.5.4
-3.2.3
+3.2.4
 ${hbase-2.5.runtime.version}
 3.8.3
 2.4
@@ -1683,8 +1683,8 @@
   
 2.1
 2.1.6
-${hbase-2.1.runtime.version}
 3.0.3
+${hbase-2.1.runtime.version}
 4.0
 2.1
   
@@ -1700,9 +1700,9 @@
   
   
 2.2
+3.1.3
 2.2.5
 ${hbase-2.2.runtime.version}
-3.1.3
 2.2
   
 
@@ -1718,9 +1718,9 @@
   
 2.3
 2.3.0
+3.1.3
 ${hbase-2.3.runtime.version}
 3.5.7
-3.1.3
 2.3
   
 
@@ -1736,6 +1736,7 @@
   
 2.4.0
 2.4.0
+3.1.4
 ${hbase-2.4.0.runtime.version}
 3.8.3
 2.4
@@ -1753,6 +1754,7 @@
   
 2.4
 2.4.1
+3.1.4
 ${hbase-2.4.runtime.version}
 3.8.3
 2.4
@@ -1770,7 +1772,7 @@
   
 2.5.0
 2.5.0
-3.2.3
+3.2.4
 ${hbase-2.5.runtime.version}
 3.8.3
 2.4
@@ -1788,7 +1790,7 @@
   
 2.5
 2.5.4
-3.2.3
+3.2.4
 ${hbase-2.5.runtime.version}
 3.8.3
 2.4

(phoenix) branch 5.1 updated: PHOENIX-7193 Fix cluster override for mapreduce jobs for non-ZK registries

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 21f4532ba3 PHOENIX-7193 Fix cluster override for mapreduce jobs for 
non-ZK registries
21f4532ba3 is described below

commit 21f4532ba3781d653ac66f1ba03b579dc41f8641
Author: Istvan Toth 
AuthorDate: Wed Jan 31 15:56:04 2024 +0100

PHOENIX-7193 Fix cluster override for mapreduce jobs for non-ZK registries
---
 .../phoenix/mapreduce/PhoenixOutputFormat.java |  5 +-
 .../phoenix/mapreduce/PhoenixRecordWriter.java |  2 +-
 .../phoenix/mapreduce/util/ConnectionUtil.java | 89 ++
 .../mapreduce/util/PhoenixConfigurationUtil.java   | 79 ++-
 .../apache/phoenix/index/IndexUpgradeToolTest.java | 15 +++-
 .../mapreduce/PhoenixMultiViewInputFormatTest.java | 29 ---
 .../util/PhoenixConfigurationUtilTest.java | 24 +++---
 .../apache/phoenix/query/ConnectionlessTest.java   |  6 +-
 .../org/apache/phoenix/util/QueryUtilTest.java |  5 ++
 9 files changed, 153 insertions(+), 101 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixOutputFormat.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixOutputFormat.java
index 055ce1f93c..23847cb397 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixOutputFormat.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixOutputFormat.java
@@ -38,14 +38,13 @@ import org.slf4j.LoggerFactory;
  */
 public class PhoenixOutputFormat  extends 
OutputFormat {
 private static final Logger LOGGER = 
LoggerFactory.getLogger(PhoenixOutputFormat.class);
-private final Set propsToIgnore;
 
 public PhoenixOutputFormat() {
 this(Collections.emptySet());
 }
 
+// FIXME Never used, and the ignore feature didn't work anyway
 public PhoenixOutputFormat(Set propsToIgnore) {
-this.propsToIgnore = propsToIgnore;
 }
 
 @Override
@@ -63,7 +62,7 @@ public class PhoenixOutputFormat  
extends OutputFormat getRecordWriter(TaskAttemptContext 
context) throws IOException, InterruptedException {
 try {
-return new PhoenixRecordWriter(context.getConfiguration(), 
propsToIgnore);
+return new PhoenixRecordWriter(context.getConfiguration());
 } catch (SQLException e) {
 LOGGER.error("Error calling PhoenixRecordWriter "  + 
e.getMessage());
 throw new RuntimeException(e);
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixRecordWriter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixRecordWriter.java
index 6f5b84e366..14e986c159 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixRecordWriter.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixRecordWriter.java
@@ -54,7 +54,7 @@ public class PhoenixRecordWriter  
extends RecordWriter 
propsToIgnore) throws SQLException {
 Connection connection = null;
 try {
-connection = 
ConnectionUtil.getOutputConnectionWithoutTheseProps(configuration, 
propsToIgnore);
+connection = ConnectionUtil.getOutputConnection(configuration);
 this.batchSize = 
PhoenixConfigurationUtil.getBatchSize(configuration);
 final String upsertQuery = 
PhoenixConfigurationUtil.getUpsertStatement(configuration);
 this.statement = connection.prepareStatement(upsertQuery);
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index ccd55fd059..7b7d8431be 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -20,30 +20,25 @@ package org.apache.phoenix.mapreduce.util;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.Properties;
-import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.phoenix.thirdparty.com.google.common.base.Preconditions;
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
-import org.apache.phoenix.util.QueryUtil;
 
 /**
  * Utility class to return a {@link Connection} .
  */
 public class ConnectionUtil {
 
-private static String TEST_PARAM =
-PhoenixRuntime.JDBC_PROTOCOL_TERMINATOR + 
PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
-
 /**
  * Retrieve the configured input Connection.
  * @param conf configuration containing connection information
  * @return the configured i

(phoenix) branch 5.1 updated: PHOENIX-7220 Make HBase 2.5 profile the default

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 2ffb334101 PHOENIX-7220 Make HBase 2.5 profile the default
2ffb334101 is described below

commit 2ffb334101e5b0d041142416a3a64bd5387c8ac6
Author: Istvan Toth 
AuthorDate: Fri Feb 16 20:26:31 2024 +0100

PHOENIX-7220 Make HBase 2.5 profile the default
---
 pom.xml | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index f22ed8d63d..86ee18e18e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1652,19 +1652,20 @@
 
 
-  
-  
-  phoenix-hbase-compat-2.4.1-default
+  
+  
+  phoenix-hbase-compat-2.5.4-default
   
 
   !hbase.profile
 
   
   
-2.4
-2.4.1
-${hbase-2.4.runtime.version}
-3.5.7
+2.5
+2.5.4
+3.2.3
+${hbase-2.5.runtime.version}
+3.8.3
 2.4
   
 
@@ -1758,7 +1759,7 @@
   
 
 
-  
+  
   phoenix-hbase-compat-2.5.0
   
 
@@ -1776,7 +1777,7 @@
   
 
 
-  
+  
   phoenix-hbase-compat-2.5.4
   
 

(phoenix) branch master updated: PHOENIX-7220 Make HBase 2.5 profile the default

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 8a94074c67 PHOENIX-7220 Make HBase 2.5 profile the default
8a94074c67 is described below

commit 8a94074c67e596ba952b7b9206aaa60ab29e295c
Author: Istvan Toth 
AuthorDate: Fri Feb 16 20:26:31 2024 +0100

PHOENIX-7220 Make HBase 2.5 profile the default
---
 pom.xml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 14ca1a98d0..1d2afc02a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1763,18 +1763,19 @@
 
 
-  
-  
-  phoenix-hbase-compat-2.4.1-default
+  
+  
+  phoenix-hbase-compat-2.5.4-default
   
 
   !hbase.profile
 
   
   
-2.4
-2.4.1
-${hbase-2.4.runtime.version}
+2.5
+2.5.4
+3.2.3
+${hbase-2.5.runtime.version}
   
 
 

(phoenix) branch master updated: PHOENIX-7218 Drop HBase 2.4.0 support in 5.2

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new bd56d7ceea PHOENIX-7218 Drop HBase 2.4.0 support in 5.2
bd56d7ceea is described below

commit bd56d7ceea2e57c9c2cefe94515a2cebe2d710cd
Author: Istvan Toth 
AuthorDate: Fri Feb 16 09:22:21 2024 +0100

PHOENIX-7218 Drop HBase 2.4.0 support in 5.2
---
 phoenix-assembly/pom.xml   |   5 -
 phoenix-core-client/pom.xml|   5 +-
 phoenix-hbase-compat-2.4.0/pom.xml | 113 -
 .../phoenix/compat/hbase/CompatDelegateHTable.java |  38 ---
 .../compat/hbase/CompatOmidTransactionTable.java   |  44 
 .../compat/hbase/CompatPhoenixRpcScheduler.java|  39 ---
 .../apache/phoenix/compat/hbase/CompatUtil.java|  80 ---
 .../compat/hbase/HbaseCompatCapabilities.java  |  24 -
 .../hbase/ReplicationSinkCompatEndpoint.java   |  37 ---
 pom.xml|  44 +---
 10 files changed, 2 insertions(+), 427 deletions(-)

diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 2d941765f1..b271c8a0a0 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -261,11 +261,6 @@
   phoenix-tracing-webapp
   ${project.version}
 
-
-  org.apache.phoenix
-  phoenix-hbase-compat-2.4.0
-  ${project.version}
-
 
   org.apache.phoenix
   phoenix-hbase-compat-2.4.1
diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
index ba02beaa33..983c082813 100644
--- a/phoenix-core-client/pom.xml
+++ b/phoenix-core-client/pom.xml
@@ -57,10 +57,7 @@
   hbasePatch = Integer.parseInt(versionMatcher.group(3));
 
   hbaseMajor == 2 && (
-("${hbase.compat.version}".equals("2.4.0")
-  && hbaseMinor == 4
-  && hbasePatch == 0)
-|| ("${hbase.compat.version}".equals("2.4.1")
+("${hbase.compat.version}".equals("2.4.1")
   && hbaseMinor == 4
   && hbasePatch >=1)
 || ("${hbase.compat.version}".equals("2.5.0")
diff --git a/phoenix-hbase-compat-2.4.0/pom.xml 
b/phoenix-hbase-compat-2.4.0/pom.xml
deleted file mode 100644
index fd1074dd79..00
--- a/phoenix-hbase-compat-2.4.0/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-  xsi:schemaLocation=
-"http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
-  4.0.0
-  
-org.apache.phoenix
-phoenix
-5.2.0-SNAPSHOT
-  
-
-  phoenix-hbase-compat-2.4.0
-  Phoenix Hbase 2.4.0 compatibility
-  Compatibility module for HBase 2.4.0
-
-  
-2.4.0
-  
-
-  
- 
-
-  org.apache.hbase
-  hbase-client
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-common
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-server
-  ${hbase24.compat.version}
-  provided
-
-
-
-  org.apache.hbase
-  hbase-hadoop-compat
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-hadoop2-compat
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-protocol
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-protocol-shaded
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-zookeeper
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-metrics
-  ${hbase24.compat.version}
-  provided
-
-
-  org.apache.hbase
-  hbase-metrics-api
-  ${hbase24.compat.version}
-  provided
-
-
-  org.slf4j
-  slf4j-api
-  ${slf4j.version}
-  provided
-
-
-  junit
-  junit
-  test
-
-  
-
-
diff --git 
a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
 
b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
deleted file mode 100644
index b6e360cba4..00
--- 
a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * d

(phoenix) branch master updated: PHOENIX-7193 Fix cluster override for mapreduce jobs for non-ZK registries

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new bf3a6226e6 PHOENIX-7193 Fix cluster override for mapreduce jobs for 
non-ZK registries
bf3a6226e6 is described below

commit bf3a6226e6b836703d1b7b61e6e0c3bed8995d66
Author: Istvan Toth 
AuthorDate: Wed Jan 31 15:56:04 2024 +0100

PHOENIX-7193 Fix cluster override for mapreduce jobs for non-ZK registries
---
 .../phoenix/mapreduce/util/ConnectionUtil.java | 89 ++
 .../util/PhoenixConfigurationUtilHelper.java   | 50 +++-
 .../phoenix/mapreduce/PhoenixOutputFormat.java |  5 +-
 .../phoenix/mapreduce/PhoenixRecordWriter.java |  2 +-
 .../mapreduce/util/PhoenixConfigurationUtil.java   | 26 ++-
 .../apache/phoenix/index/IndexUpgradeToolTest.java | 15 +++-
 .../mapreduce/PhoenixMultiViewInputFormatTest.java | 29 ---
 .../util/PhoenixConfigurationUtilTest.java | 24 +++---
 .../apache/phoenix/query/ConnectionlessTest.java   |  6 +-
 .../org/apache/phoenix/util/QueryUtilTest.java |  5 ++
 10 files changed, 151 insertions(+), 100 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 268518f65b..3df02e48dc 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -20,30 +20,25 @@ package org.apache.phoenix.mapreduce.util;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
-import java.util.Collections;
 import java.util.Properties;
-import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.phoenix.thirdparty.com.google.common.base.Preconditions;
-import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
-import org.apache.phoenix.util.QueryUtil;
 
 /**
  * Utility class to return a {@link Connection} .
  */
 public class ConnectionUtil {
 
-private static String TEST_PARAM =
-PhoenixRuntime.JDBC_PROTOCOL_TERMINATOR + 
PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
-
 /**
  * Retrieve the configured input Connection.
  * @param conf configuration containing connection information
  * @return the configured input connection
  */
 public static Connection getInputConnection(final Configuration conf) 
throws SQLException {
+Preconditions.checkNotNull(conf);
 return getInputConnection(conf, new Properties());
 }
 
@@ -55,22 +50,17 @@ public class ConnectionUtil {
  */
 public static Connection getInputConnection(final Configuration conf, 
final Properties props)
 throws SQLException {
-Preconditions.checkNotNull(conf);
-String zkQuorumOverride = 
PhoenixConfigurationUtilHelper.getInputClusterZkQuorum(conf);
-if (zkQuorumOverride != null) {
-return DriverManager.getConnection("jdbc:phoenix+zk:" + 
zkQuorumOverride,
-PropertiesUtil.combineProperties(props, conf));
-} else {
-// FIXME find some better way to get tests working
-String zkQuorumForTest = 
PhoenixConfigurationUtilHelper.getZKQuorum(conf);
-if (zkQuorumForTest != null && 
(zkQuorumForTest.contains(TEST_PARAM)
-|| zkQuorumForTest.equals(PhoenixRuntime.CONNECTIONLESS))) 
{
-return DriverManager.getConnection("jdbc:phoenix+zk:" + 
zkQuorumForTest,
-PropertiesUtil.combineProperties(props, conf));
-}
-return DriverManager.getConnection("jdbc:phoenix",
-PropertiesUtil.combineProperties(props, conf));
+String inputQuorum = 
PhoenixConfigurationUtilHelper.getInputCluster(conf);
+if (inputQuorum != null) {
+// This will not override the quorum set with setInputClusterUrl
+Properties copyProps = PropertiesUtil.deepCopy(props);
+copyProps.setProperty(HConstants.CLIENT_ZOOKEEPER_QUORUM, 
inputQuorum);
+return DriverManager.getConnection(
+PhoenixConfigurationUtilHelper.getInputClusterUrl(conf),
+PropertiesUtil.combineProperties(copyProps, conf));
 }
+return 
DriverManager.getConnection(PhoenixConfigurationUtilHelper.getInputClusterUrl(conf),
+PropertiesUtil.combineProperties(props, conf));
 }
 
 /**
@@ -82,16 +72,6 @@ public class ConnectionUtil {
 return getOutputConnection(conf, new Properties());
 }
 
-/**
- * Create the configured output Connection.
- 

(phoenix) branch 5.1 updated: PHOENIX-7191 Connectionless CQSs don't work with non-ZK registries

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 10b810a790 PHOENIX-7191 Connectionless CQSs don't work with non-ZK 
registries
10b810a790 is described below

commit 10b810a79025414589131f7ad6e1713cbe4654b4
Author: Istvan Toth 
AuthorDate: Wed Jan 31 09:40:05 2024 +0100

PHOENIX-7191 Connectionless CQSs don't work with non-ZK registries
---
 .../phoenix/end2end/ConfigurableCacheIT.java   |  3 ++-
 .../phoenix/jdbc/AbstractRPCConnectionInfo.java|  6 --
 .../org/apache/phoenix/jdbc/ConnectionInfo.java| 25 +++---
 .../apache/phoenix/jdbc/MasterConnectionInfo.java  | 15 +
 .../org/apache/phoenix/jdbc/RPCConnectionInfo.java | 17 ++-
 .../org/apache/phoenix/jdbc/ZKConnectionInfo.java  | 19 ++--
 6 files changed, 64 insertions(+), 21 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java
index 96fae49061..eca73ce50b 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ConfigurableCacheIT.java
@@ -18,6 +18,7 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.Properties;
 
+import org.apache.phoenix.jdbc.ConnectionInfo;
 import org.apache.phoenix.query.ITGuidePostsCacheFactory;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
@@ -70,7 +71,7 @@ public class ConfigurableCacheIT extends 
ParallelStatsEnabledIT {
 
 // As there is a map of connections in the phoenix driver need to 
differentiate the url to
 // pick different QueryServices
-url = url + PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + principal;
+url = ConnectionInfo.create(url, null, 
null).withPrincipal(principal).toUrl();
 
 // Load defaults from QueryServicesTestImpl
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
index d362a86714..d193a911eb 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hbase.thirdparty.com.google.common.base.Strings;
+import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.ReadOnlyProps;
 
 /**
@@ -198,9 +199,10 @@ public abstract class AbstractRPCConnectionInfo extends 
ConnectionInfo {
 }
 // At this point, masterPort is guaranteed not to be 0
 
+isConnectionless = PhoenixRuntime.CONNECTIONLESS.equals(hostsList);
+
 if (isConnectionless) {
-// We probably don't create connectionless 
MasterConnectionInfo objects
-if (hostsList != null || port != null) {
+if (port != null) {
 throw getMalFormedUrlException(url);
 } else {
 return;
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
index 0347b1dfb4..641e12c19e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
@@ -160,11 +160,11 @@ public abstract class ConnectionInfo {
 builder = new RPCConnectionInfo.Builder(url, configuration, props, 
info);
 } else if (url.toLowerCase().startsWith(PhoenixRuntime.JDBC_PROTOCOL)) 
{
 // The generic protocol was specified. Try to Determine the 
protocol from the config
-if (MasterConnectionInfo.isMaster(configuration)) {
+if (MasterConnectionInfo.Builder.isMaster(configuration, props, 
info)) {
 builder = new MasterConnectionInfo.Builder(url, configuration, 
props, info);
-} else if (RPCConnectionInfo.isRPC(configuration)) {
+} else if (RPCConnectionInfo.Builder.isRPC(configuration, props, 
info)) {
 builder = new RPCConnectionInfo.Builder(url, configuration, 
props, info);
-} else if (ZKConnectionInfo.isZK(configuration)) {
+} else if (ZKConnectionInfo.Builder.isZK(configuration, props, 
info)) {
 builder = new ZKConnectionInfo.Builder(url, configuration, 
props, info);

(phoenix) branch master updated: PHOENIX-7191 Connectionless CQSs don't work with non-ZK registries

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 3d2e0e4288 PHOENIX-7191 Connectionless CQSs don't work with non-ZK 
registries
3d2e0e4288 is described below

commit 3d2e0e42882aa93be6fad2209d2ecef5b825a721
Author: Istvan Toth 
AuthorDate: Wed Jan 31 09:40:05 2024 +0100

PHOENIX-7191 Connectionless CQSs don't work with non-ZK registries
---
 .../phoenix/jdbc/AbstractRPCConnectionInfo.java|  6 --
 .../org/apache/phoenix/jdbc/ConnectionInfo.java| 25 +++---
 .../apache/phoenix/jdbc/MasterConnectionInfo.java  | 15 +
 .../org/apache/phoenix/jdbc/RPCConnectionInfo.java | 17 ++-
 .../org/apache/phoenix/jdbc/ZKConnectionInfo.java  | 19 ++--
 .../phoenix/end2end/ConfigurableCacheIT.java   |  3 ++-
 .../end2end/transform/TransformMonitorIT.java  |  3 ++-
 .../ConnectionQueryServicesMetricsIT.java  |  6 --
 8 files changed, 70 insertions(+), 24 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
index 869f40d2d5..0e4920c4c9 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/AbstractRPCConnectionInfo.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hbase.thirdparty.com.google.common.base.Strings;
+import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.ReadOnlyProps;
 
 /**
@@ -199,9 +200,10 @@ public abstract class AbstractRPCConnectionInfo extends 
ConnectionInfo {
 }
 // At this point, masterPort is guaranteed not to be 0
 
+isConnectionless = PhoenixRuntime.CONNECTIONLESS.equals(hostsList);
+
 if (isConnectionless) {
-// We probably don't create connectionless 
MasterConnectionInfo objects
-if (hostsList != null || port != null) {
+if (port != null) {
 throw getMalFormedUrlException(url);
 } else {
 return;
diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
index b982b1d6a1..3acdfa8f6a 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
@@ -152,11 +152,11 @@ public abstract class ConnectionInfo {
 builder = new RPCConnectionInfo.Builder(url, configuration, props, 
info);
 } else if (url.toLowerCase().startsWith(PhoenixRuntime.JDBC_PROTOCOL)) 
{
 // The generic protocol was specified. Try to Determine the 
protocol from the config
-if (MasterConnectionInfo.isMaster(configuration)) {
+if (MasterConnectionInfo.Builder.isMaster(configuration, props, 
info)) {
 builder = new MasterConnectionInfo.Builder(url, configuration, 
props, info);
-} else if (RPCConnectionInfo.isRPC(configuration)) {
+} else if (RPCConnectionInfo.Builder.isRPC(configuration, props, 
info)) {
 builder = new RPCConnectionInfo.Builder(url, configuration, 
props, info);
-} else if (ZKConnectionInfo.isZK(configuration)) {
+} else if (ZKConnectionInfo.Builder.isZK(configuration, props, 
info)) {
 builder = new ZKConnectionInfo.Builder(url, configuration, 
props, info);
 } else {
 // No registry class set in config. Use version-dependent 
default
@@ -354,6 +354,8 @@ public abstract class ConnectionInfo {
 return false;
 }
 
+public abstract ConnectionInfo withPrincipal(String principal);
+
 /**
  * Parent of the Builder classes for the immutable ConnectionInfo classes
  *
@@ -541,5 +543,22 @@ public abstract class ConnectionInfo {
 }
 return tokenizer;
 }
+
+protected static String get(String key, Configuration config, 
ReadOnlyProps props,
+Properties info) {
+String result = null;
+if (info != null) {
+result = info.getProperty(key);
+}
+if (result == null) {
+if (props != null) {
+result = props.get(key);
+}
+if (result == null) {
+result = config.get(key, null);
+}
+}
+  

(phoenix-connectors) branch master updated: PHOENIX-6166 Make Tephra support optional for phoenix 5 connectors

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 48472b4  PHOENIX-6166 Make Tephra support optional for phoenix 5 
connectors
48472b4 is described below

commit 48472b473fbcd1f55fc67d25474e2dafb002b666
Author: Istvan Toth 
AuthorDate: Fri Feb 9 18:14:36 2024 +0100

PHOENIX-6166 Make Tephra support optional for phoenix 5 connectors
---
 phoenix5-hive/pom.xml   | 51 +
 phoenix5-spark/pom.xml  | 51 +
 phoenix5-spark3/pom.xml | 51 +
 3 files changed, 153 insertions(+)

diff --git a/phoenix5-hive/pom.xml b/phoenix5-hive/pom.xml
index 69ce48a..19a20cf 100644
--- a/phoenix5-hive/pom.xml
+++ b/phoenix5-hive/pom.xml
@@ -498,4 +498,55 @@
 
   
 
+  
+
+  
+  exclude-tephra
+  
+
+  without.tephra
+
+  
+  
+
+  org.apache.phoenix
+  phoenix-core
+  
+
+  org.apache.tephra
+  tephra-api
+
+
+  org.apache.tephra
+  tephra-core-shaded
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.0
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.1
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.2
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.3
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.4
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-jersey
+
+  
+
+  
+
+  
 
diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index e6be35c..17e02bb 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -609,4 +609,55 @@
 this should be kept in sync with Phoenix as much as possible -->
   
   
+
+
+  
+  exclude-tephra
+  
+
+  without.tephra
+
+  
+  
+
+  org.apache.phoenix
+  phoenix-core
+  
+
+  org.apache.tephra
+  tephra-api
+
+
+  org.apache.tephra
+  tephra-core-shaded
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.0
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.1
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.2
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.3
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.4
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-jersey
+
+  
+
+  
+
+  
 
diff --git a/phoenix5-spark3/pom.xml b/phoenix5-spark3/pom.xml
index ffd04f4..aecb6b6 100644
--- a/phoenix5-spark3/pom.xml
+++ b/phoenix5-spark3/pom.xml
@@ -183,4 +183,55 @@
 
 
   
+
+
+  
+  exclude-tephra
+  
+
+  without.tephra
+
+  
+  
+
+  org.apache.phoenix
+  phoenix-core
+  
+
+  org.apache.tephra
+  tephra-api
+
+
+  org.apache.tephra
+  tephra-core-shaded
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.0
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.1
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.2
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.3
+
+
+  org.apache.tephra
+  tephra-hbase-compat-2.4
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-jersey
+
+  
+
+  
+
+  
 

(phoenix) branch master updated: PHOENIX-7141 Use relocate by default for phoenix-server shading

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new d0ed96f2aa PHOENIX-7141 Use relocate by default for phoenix-server 
shading
d0ed96f2aa is described below

commit d0ed96f2aa23c487f60207062835183e35cabfb4
Author: Istvan Toth 
AuthorDate: Fri Jan 5 08:28:36 2024 +0100

PHOENIX-7141 Use relocate by default for phoenix-server shading
---
 phoenix-server/pom.xml | 672 +++--
 1 file changed, 429 insertions(+), 243 deletions(-)

diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index e61af7d963..6c48589fad 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -39,294 +39,470 @@
   
 
   
+
+  
+
+  org.apache.maven.plugins
+  maven-site-plugin
+  
+true
+  
+
+
+  
+  org.apache.rat
+  apache-rat-plugin
+  
+true
+  
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+
+
+  org.apache.maven.plugins
+  maven-dependency-plugin
+  
+
+  *
+
+   
+
+
+  org.apache.maven.plugins
+  maven-shade-plugin
+  
+
+  
+*:*
+
+  META-INF/*.SF
+  META-INF/*.DSA
+  META-INF/*.RSA
+  META-INF/license/*
+  META-INF/NOTICE
+  LICENSE.*
+  NOTICE.*
+  NOTICE
+  README*
+
+  
+ 
+org.apache.hadoop:hadoop-yarn-common
+
+  
org/apache/hadoop/yarn/factories/package-info.class
+  
org/apache/hadoop/yarn/util/package-info.class
+  
org/apache/hadoop/yarn/factory/providers/package-info.class
+  
org/apache/hadoop/yarn/client/api/impl/package-info.class
+  
org/apache/hadoop/yarn/client/api/package-info.class
+  webapps/**
+
+  
+  
+  
+org.apache.commons:commons-math3
+
+  assets/**
+
+  
+  
+org.apache.hbase:hbase-server
+
+  hbase-webapps/**
+
+  
+  
+org.apache.hbase.thirdparty:*
+
+  /**
+  webapps/**
+
+  
+  
+
+
+  
+  
+csv-bulk-load-config.properties
+
+  ${project.basedir}/../config/csv-bulk-load-config.properties
+
+  
+  
+README.md
+${project.basedir}/../README.md
+  
+  
+LICENSE.txt
+${project.basedir}/../LICENSE
+  
+  
+NOTICE
+${project.basedir}/../NOTICE
+  
+
+
+  
+org/
+${shaded.package}.org.
+
+  org/apache/hadoop/**
+  
+  org/apache/htrace/**
+  org/slf4j/**
+  org/apache/commons/logging/**
+  org/apache/log4j/**
+  org/apache/logging/log4j/**
+  
+  org/ietf/jgss/**
+  org/omg/**
+  org/w3c/dom/**
+  org/xml/sax/**
+  
+  org/eclipse/jetty/**
+  
+  
+  org/apache/hbase/**
+  
+  org/apache/phoenix/**
+  
+  org/apache/omid/**
+  
+org/apache/commons/configuration2/**
+
+  
+  
+  
+com/
+${shaded.package}.com.
+
+  
+  com/sun/tools/**
+  com/sun/javadoc/**
+  com/sun/security/**
+  com/sun/jndi/**
+  com/sun/management/**
+  com/sun/management/**
+  
+  com/google/protobuf/**
+
+  
+  
+io/
+${shaded.package}.io.
+
+  
+  io/compression/**
+  io/mapfile

(phoenix) branch 5.1 updated: PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 105876a501 PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
105876a501 is described below

commit 105876a501e0d3fe74938e0bcb3579f5ba1f
Author: Istvan Toth 
AuthorDate: Thu Feb 8 08:30:10 2024 +0100

PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
---
 .../org/apache/phoenix/transaction/OmidTransactionTable.java |  7 ++-
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 8 files changed, 86 insertions(+), 5 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index cdd8349987..335489f16c 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -65,6 +65,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 private final boolean addShadowCells;
 
 public OmidTransactionTable() throws SQLException {
+super(null);
 this.tTable = null;
 this.tx = null;
 this.addShadowCells = false;
@@ -79,6 +80,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 }
 
 public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, 
boolean isConflictFree, boolean addShadowCells) throws SQLException  {
+super(hTable);
 assert(ctx instanceof OmidTransactionContext);
 
 OmidTransactionContext omidTransactionContext = 
(OmidTransactionContext) ctx;
@@ -121,11 +123,6 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 return tTable.getConfiguration();
 }
 
-@Override
-public HTableDescriptor getTableDescriptor() throws IOException {
-return tTable.getTableDescriptor();
-}
-
 @Override
 public boolean exists(Get get) throws IOException {
return tTable.exists(tx, get);
diff --git 
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index 573196e59b..d5c893abc2 100644
--- 
a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,11 +19,23 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return hTable.getTableDescriptor();
+}
+
 @Override
 public void mutateRow(RowMutations rm) throws IOException {
 throw new UnsupportedOperationException();
diff --git 
a/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index 573196e59b..d5c893abc2 100644
--- 
a/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,11 +19,23 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return

(phoenix) branch master updated: PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 4ba8a33a03 PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
4ba8a33a03 is described below

commit 4ba8a33a03429af0214a2cbd1e1abf81aa4604ba
Author: Istvan Toth 
AuthorDate: Thu Feb 8 08:30:10 2024 +0100

PHOENIX-7188 Remove Omid TTable.getTableDescriptor() calls
---
 .../org/apache/phoenix/transaction/OmidTransactionTable.java |  7 ++-
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 .../phoenix/compat/hbase/CompatOmidTransactionTable.java | 12 
 5 files changed, 50 insertions(+), 5 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index 7d4d7bdf77..0e9ddb41a5 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -66,6 +66,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 private final boolean addShadowCells;
 
 public OmidTransactionTable() throws SQLException {
+super(null);
 this.tTable = null;
 this.tx = null;
 this.addShadowCells = false;
@@ -80,6 +81,7 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 }
 
 public OmidTransactionTable(PhoenixTransactionContext ctx, Table hTable, 
boolean isConflictFree, boolean addShadowCells) throws SQLException  {
+super(hTable);
 assert(ctx instanceof OmidTransactionContext);
 
 OmidTransactionContext omidTransactionContext = 
(OmidTransactionContext) ctx;
@@ -122,11 +124,6 @@ public class OmidTransactionTable extends 
CompatOmidTransactionTable implements
 return tTable.getConfiguration();
 }
 
-@Override
-public HTableDescriptor getTableDescriptor() throws IOException {
-return tTable.getTableDescriptor();
-}
-
 @Override
 public boolean exists(Get get) throws IOException {
return tTable.exists(tx, get);
diff --git 
a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index bddc7a57ec..b2997a86a1 100644
--- 
a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,12 +19,24 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return hTable.getTableDescriptor();
+}
+
 @Override
 public Result mutateRow(RowMutations rm) throws IOException {
 throw new UnsupportedOperationException();
diff --git 
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
 
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
index bddc7a57ec..b2997a86a1 100644
--- 
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ 
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
@@ -19,12 +19,24 @@ package org.apache.phoenix.compat.hbase;
 
 import java.io.IOException;
 
+import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Table;
 
 public abstract class CompatOmidTransactionTable implements Table {
 
+protected Table hTable;
+
+public CompatOmidTransactionTable(Table hTable) {
+this.hTable = hTable;
+}
+
+@Override
+public HTableDescriptor getTableDescriptor() throws IOException {
+return hTable.getTableDescriptor();
+}
+
 @Override
 public Result mutateRow(RowMutations rm) throws

(phoenix) branch master updated: PHOENIX-6769 Align mockito version with Hadoop and HBase

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 06f5abc5b9 PHOENIX-6769 Align mockito version with Hadoop and HBase
06f5abc5b9 is described below

commit 06f5abc5b94a94a0187c1655bfda2b1440a5a4c2
Author: Istvan Toth 
AuthorDate: Thu Feb 1 16:56:19 2024 +0100

PHOENIX-6769 Align mockito version with Hadoop and HBase

* Update mockito to 4.11.0, same as HBase branch-3
* Remove org.hamcrest usage and direct dependency
---
 phoenix-core/pom.xml   |  5 
 .../apache/phoenix/end2end/AppendOnlySchemaIT.java | 27 +++---
 .../end2end/OrderByWithServerMemoryLimitIT.java|  5 ++--
 .../end2end/ParameterizedIndexUpgradeToolIT.java   |  2 +-
 .../end2end/RebuildIndexConnectionPropsIT.java | 21 -
 .../org/apache/phoenix/end2end/SumFunctionIT.java  | 13 ++-
 .../apache/phoenix/end2end/UpsertWithSCNIT.java| 25 ++--
 .../end2end/join/SortMergeJoinNoSpoolingIT.java|  5 ++--
 .../phoenix/jdbc/HighAvailabilityGroupTestIT.java  | 10 
 .../monitoring/PhoenixMetricsDisabledIT.java   |  5 ++--
 .../phoenix/monitoring/PhoenixMetricsIT.java   | 23 +++---
 .../rpc/UpdateCacheConnectionLevelPropIT.java  |  4 ++--
 .../java/org/apache/phoenix/rpc/UpdateCacheIT.java |  6 ++---
 .../coprocessor/TaskMetaDataEndpointTest.java  |  8 +++
 .../phoenix/hbase/index/write/TestIndexWriter.java |  2 +-
 .../hbase/index/write/TestParalleIndexWriter.java  |  2 +-
 .../write/TestParalleWriterIndexCommitter.java |  2 +-
 .../org/apache/phoenix/index/ShouldVerifyTest.java |  8 +++
 .../phoenix/index/VerifySingleIndexRowTest.java| 22 +-
 .../jdbc/ClusterRoleRecordGeneratorToolTest.java   |  2 +-
 .../jdbc/FailoverPhoenixConnectionTest.java|  2 +-
 .../phoenix/jdbc/ParallelPhoenixResultSetTest.java |  2 +-
 .../phoenix/jdbc/ParallelPhoenixUtilTest.java  |  2 +-
 .../phoenix/jdbc/PhoenixHAAdminToolTest.java   |  8 ---
 .../apache/phoenix/jdbc/PhoenixStatementTest.java  | 24 +++
 .../apache/phoenix/monitoring/MetricUtilTest.java  |  2 +-
 .../query/ConnectionQueryServicesImplTest.java |  7 +++---
 .../schema/stats/StatisticsScannerTest.java| 12 +-
 .../phoenix/util/AbstractUpsertExecutorTest.java   |  4 ++--
 .../java/org/apache/phoenix/util/LogUtilTest.java  |  2 +-
 phoenix-pherf/pom.xml  |  5 
 .../org/apache/phoenix/pherf/ResourceTest.java | 16 -
 pom.xml| 14 ---
 33 files changed, 152 insertions(+), 145 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 9a78ada110..6b0738e365 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -451,11 +451,6 @@
 mockito-core
 test
 
-
-org.hamcrest
-hamcrest-core
-test
-
 
 
 
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
index 82a8e8e40f..3d25c1a932 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AppendOnlySchemaIT.java
@@ -22,14 +22,13 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyList;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyMap;
-import static org.mockito.Matchers.anySetOf;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
@@ -112,14 +111,14 @@ public class AppendOnlySchemaIT extends 
ParallelStatsDisabledIT {
 fail("Create Table should not fail");
 }
 }
-
+
 // verify getTable rpcs
 verify(connectionQueryServices, never())
 .getTable((PName) isNull(), AdditionalMatchers.aryEq(n

(phoenix) branch master updated: PHOENIX-7195 Exclude reload4j dependencies from Hadoop and add explicit log4j2 test dependencies

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 97c28919d3 PHOENIX-7195 Exclude reload4j dependencies from Hadoop and 
add explicit log4j2 test dependencies
97c28919d3 is described below

commit 97c28919d361290631d00f0e3ed81562b784eb58
Author: Istvan Toth 
AuthorDate: Mon Feb 5 10:59:13 2024 +0100

PHOENIX-7195 Exclude reload4j dependencies from Hadoop and add explicit 
log4j2 test dependencies
---
 phoenix-core/pom.xml |  35 
 pom.xml  | 112 ---
 2 files changed, 141 insertions(+), 6 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 704bb5d55e..9a78ada110 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -93,6 +93,18 @@
 
 
org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}
 
+
+org.apache.logging.log4j:log4j-api
+
+
+org.apache.logging.log4j:log4j-core
+
+
+org.apache.logging.log4j:log4j-slf4j-impl
+
+
+org.apache.logging.log4j:log4j-1.2-api
+
 
 
 
@@ -444,5 +456,28 @@
 hamcrest-core
 test
 
+
+
+
+org.apache.logging.log4j
+log4j-api
+test
+
+
+org.apache.logging.log4j
+log4j-core
+test
+
+
+org.apache.logging.log4j
+log4j-slf4j-impl
+test
+
+
+org.apache.logging.log4j
+log4j-1.2-api
+test
+
+
 
 
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1be954d154..10e2bba01d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,12 +432,6 @@
 
   org.apache.logging.log4j:log4j-1.2-api
 
-
-  org.apache.logging.log4j:log4j-api
-
-
-  org.apache.logging.log4j:log4j-core
-
   
   
 
@@ -852,6 +846,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
   
 
 commons-beanutils
@@ -877,6 +879,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
   
 
 commons-beanutils
@@ -897,6 +907,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
 
   
   
@@ -912,6 +930,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
 
   
   
@@ -949,6 +975,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
 
   
   
@@ -975,6 +1009,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
 
 ${hadoop.version}
   
@@ -1003,6 +1045,24 @@
 hadoop-minicluster
 ${hadoop.version}
 test
+
+  
+log4j
+log4j
+  
+  
+org.slf4j
+slf4j-log4j12
+  
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
+
 true
   
   
@@ -1019,6 +1079,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.reload4j
+reload4j
+  
+  
+org.slf4j
+slf4j-reload4j
+  
 
   
   
@@ -1041,6 +1109,14 @@
 org.slf4j

(phoenix) branch master updated: PHOENIX-7194 Yetus does not run tests in phoenix-core if phoenix-core-client or phoenix-core-server changes

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 802d30938a PHOENIX-7194 Yetus does not run tests in phoenix-core if 
phoenix-core-client or phoenix-core-server changes
802d30938a is described below

commit 802d30938acc175c4da1b74cb1946d22bcb60de8
Author: Istvan Toth 
AuthorDate: Thu Feb 1 07:45:12 2024 +0100

PHOENIX-7194 Yetus does not run tests in phoenix-core if 
phoenix-core-client or phoenix-core-server changes
---
 dev/phoenix-personality.sh | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 7c3b360de6..706cfb85b3 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -155,9 +155,6 @@ function personality_modules
   # I have been unable to get Jacoco running reliably on ASF Jenkins, thus it 
is disabled.
 
   extra="--threads=1 -DPhoenixPatchProcess -Dskip.code-coverage "
-  if [[ "${PATCH_BRANCH}" = 4* ]]; then
-extra="${extra} -Dhttps.protocols=TLSv1.2"
-  fi
 
   # If we have HBASE_PROFILE specified pass along
   # the hbase.profile system property.
@@ -182,6 +179,12 @@ function personality_modules
 MODULES=(.)
   fi
 
+  # Yetus logic cannot handle the tests for a module being in another module, 
which has been the
+  # case since we split the client and server code, so always run the UTs/ITs 
on the root.
+  if [[ ${testtype} == unit ]]; then
+MODULES=(.)
+  fi
+
   if [[ ${testtype} == mvninstall ]]; then
 # shellcheck disable=SC2086
 personality_enqueue_module . ${extra}

(phoenix-omid) branch master updated: OMID-275 Expose backing HBase Table from TTable

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git


The following commit(s) were added to refs/heads/master by this push:
 new 1f9873df OMID-275 Expose backing HBase Table from TTable
1f9873df is described below

commit 1f9873dfebd4b2e3618c6e6fac3db553975f5e26
Author: Istvan Toth 
AuthorDate: Tue Jan 23 08:26:03 2024 +0100

OMID-275 Expose backing HBase Table from TTable
---
 .../src/main/java/org/apache/omid/transaction/TTable.java | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java 
b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
index b80e328c..dd8cffab 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
@@ -499,6 +499,17 @@ public class TTable implements Closeable {
 return snapshotFilter.getScanner(tsscan, transaction);
 }
 
+/**
+* Return the raw HBase table
+*
+* This is needed to resolve API incompatibilities between HBase 2 and 3 in 
Phoenix.
+*
+* @return the backing table
+*/
+public Table getHBaseTable() {
+   return table;
+}
+
 /**
  *
  * @return array of byte

(phoenix) branch 5.1 updated: PHOENIX-7175 Set java.io.tmpdir to the maven build directory for tests

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 7063d0c055 PHOENIX-7175 Set java.io.tmpdir to the maven build 
directory for tests
7063d0c055 is described below

commit 7063d0c05553e74b8d971f07eb4e58dd62e74c77
Author: divneet-kaur 
AuthorDate: Wed Jan 17 09:12:41 2024 -0800

PHOENIX-7175 Set java.io.tmpdir to the maven build directory for tests
---
 pom.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 702a45eb21..e5618fb71b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,6 +102,7 @@
 target/generated-sources/antlr3
 true
 ${project.basedir}/..
+${project.build.directory}
 
 
 2.14.1
@@ -367,6 +368,9 @@
 
 false
 
+
+  ${test.tmp.dir}
+
   
   
 
@@ -632,6 +636,9 @@
   exit
   false
   
+  
+${test.tmp.dir}
+  
 
   
   

(phoenix) branch master updated: PHOENIX-7175 Set java.io.tmpdir to the maven build directory for tests

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new b70f01812f PHOENIX-7175 Set java.io.tmpdir to the maven build 
directory for tests
b70f01812f is described below

commit b70f01812fa97ec5a5d37c5289d8e69bee79840c
Author: divneet-kaur 
AuthorDate: Wed Jan 17 09:12:41 2024 -0800

PHOENIX-7175 Set java.io.tmpdir to the maven build directory for tests
---
 pom.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 052b5c4a55..1be954d154 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,7 @@
 target/generated-sources/antlr3
 true
 ${project.basedir}/..
+${project.build.directory}
 
 
 2.14.1
@@ -365,6 +366,9 @@
 
 false
 
+
+  ${test.tmp.dir}
+
   
   
 
@@ -627,6 +631,9 @@
   exit
   false
   
+  
+${test.tmp.dir}
+  
 
   
   

(phoenix-omid) branch master updated: OMID-249 Improve default network address logic

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git


The following commit(s) were added to refs/heads/master by this push:
 new a9c14a37 OMID-249 Improve default network address logic
a9c14a37 is described below

commit a9c14a37427a03dbb04c3292082f8d2c9b25e350
Author: Istvan Toth 
AuthorDate: Fri Jan 19 14:33:59 2024 +0100

OMID-249 Improve default network address logic
---
 .../org/apache/omid/tso/NetworkInterfaceUtils.java | 40 +-
 .../java/org/apache/omid/tso/TSOServerConfig.java  |  2 +-
 2 files changed, 40 insertions(+), 2 deletions(-)

diff --git 
a/tso-server/src/main/java/org/apache/omid/tso/NetworkInterfaceUtils.java 
b/tso-server/src/main/java/org/apache/omid/tso/NetworkInterfaceUtils.java
index ad39bf31..ab932389 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/NetworkInterfaceUtils.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/NetworkInterfaceUtils.java
@@ -17,12 +17,16 @@
  */
 package org.apache.omid.tso;
 
+import org.apache.omid.NetworkUtils;
 import org.apache.phoenix.thirdparty.com.google.common.net.HostAndPort;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.inject.Module;
+
 import java.net.InetAddress;
 import java.net.NetworkInterface;
+import java.net.Socket;
 import java.net.SocketException;
 import java.net.UnknownHostException;
 import java.util.Enumeration;
@@ -106,9 +110,24 @@ final public class NetworkInterfaceUtils {
 }
 
 public static String getTSOHostAndPort(TSOServerConfig config) throws 
SocketException, UnknownHostException {
+if (config.getNetworkIfaceName() == null) {
+try {
+return getTSOHostAndPortRelativeToZK(config);
+} catch (Exception e) {
+LOG.info("Could not determine local address relative to ZK 
server", e);
+// Fall back to interface guessing
+}
+};
+return getTSOHostAndPortFromInterface(config);
+}
+
+public static String getTSOHostAndPortFromInterface(TSOServerConfig 
config) throws SocketException, UnknownHostException {
 
 // Build TSO host:port string and validate it
-final String tsoNetIfaceName = config.getNetworkIfaceName();
+String tsoNetIfaceName = config.getNetworkIfaceName();
+if (tsoNetIfaceName == null) {
+tsoNetIfaceName = NetworkUtils.getDefaultNetworkInterface();
+}
 InetAddress addr = getIPAddressFromNetworkInterface(tsoNetIfaceName);
 final int tsoPort = config.getPort();
 
@@ -120,7 +139,26 @@ final public class NetworkInterfaceUtils {
 throw e;
 }
 return tsoHostAndPortAsString;
+}
 
+public static String getTSOHostAndPortRelativeToZK(TSOServerConfig config) 
throws Exception {
+Module leaseModule = config.getLeaseModule();
+String zkQuorum;
+if (leaseModule instanceof HALeaseManagementModule) {
+LOG.info("HA is configured. Trying to determine local address 
facing ZK server");
+zkQuorum = ((HALeaseManagementModule) leaseModule).getZkCluster();
+// Zookeeper doesn't expose its socket, so we have to try and 
parse the quorum.
+String firstHost = zkQuorum.split(",")[0];
+LOG.info("ZK quorum is {}, first server is {}", zkQuorum, 
firstHost);
+HostAndPort hostAndPort = HostAndPort.fromString(firstHost);
+Socket socket = new Socket(hostAndPort.getHost(), 
hostAndPort.getPort());
+InetAddress addr = socket.getLocalAddress();
+socket.close();
+LOG.info("Local address facing ZK server is {}", addr);
+return HostAndPort.fromParts(addr.getHostAddress(), 
config.getPort()).toString();
+} else {
+throw new Exception("HA is not configured");
+}
 }
 
 }
diff --git a/tso-server/src/main/java/org/apache/omid/tso/TSOServerConfig.java 
b/tso-server/src/main/java/org/apache/omid/tso/TSOServerConfig.java
index 53d8c011..b1e7a066 100644
--- a/tso-server/src/main/java/org/apache/omid/tso/TSOServerConfig.java
+++ b/tso-server/src/main/java/org/apache/omid/tso/TSOServerConfig.java
@@ -87,7 +87,7 @@ public class TSOServerConfig extends SecureHBaseConfig {
 
 private String waitStrategy;
 
-private String networkIfaceName = 
NetworkUtils.getDefaultNetworkInterface();
+private String networkIfaceName;
 
 private String timestampType;
 

(phoenix) branch 5.1 updated: PHOENIX-7182 Update Curator to 4.2 on the 5.1 branch

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 190f42cbd2 PHOENIX-7182 Update Curator to 4.2 on the 5.1 branch
190f42cbd2 is described below

commit 190f42cbd2465a9243e10fa88e81205eec9ec11d
Author: Istvan Toth 
AuthorDate: Wed Jan 17 09:59:28 2024 +0100

PHOENIX-7182 Update Curator to 4.2 on the 5.1 branch
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4fa9e2028d..702a45eb21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
 72.1
 5.1.0
 3.4.14
-4.0.0
+4.2.0
 1.0.55
 0.9.3-1
 9.4.53.v20231009

(phoenix-omid) branch master updated: OMID-272 Support JDK17

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git


The following commit(s) were added to refs/heads/master by this push:
 new edc79fc3 OMID-272 Support JDK17
edc79fc3 is described below

commit edc79fc3038d326c811ffe342bafccd9245c4ef7
Author: Istvan Toth 
AuthorDate: Fri Jan 19 07:55:12 2024 +0100

OMID-272 Support JDK17
---
 pom.xml| 55 +++
 tso-server/bin/omid.sh | 88 ++
 2 files changed, 143 insertions(+)

diff --git a/pom.xml b/pom.xml
index 89d00561..f9dc9e60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,6 +209,37 @@
 hbase-client
 ${hbase.version}
 -Xdoclint:none
+
+
+2200m
+1000m
+-enableassertions -Xmx${surefire.Xmx}
+  -Xms${surefire.Xms} -Djava.security.egd=file:/dev/./urandom 
-Djava.net.preferIPv4Stack=true
+  -Djava.awt.headless=true 
-Djdk.net.URLClassPath.disableClassPathURLCheck=true
+  -Dorg.apache.hbase.thirdparty.io.netty.leakDetection.level=advanced
+  -Dio.netty.eventLoopThreads=3 
-Dio.opentelemetry.context.enableStrictContext=true
+
+
-Dorg.apache.hbase.thirdparty.io.netty.tryReflectionSetAccessible=true
+  --add-modules jdk.unsupported
+  --add-opens java.base/java.io=ALL-UNNAMED
+  --add-opens java.base/java.nio=ALL-UNNAMED
+  --add-opens java.base/sun.nio.ch=ALL-UNNAMED
+  --add-opens java.base/java.lang=ALL-UNNAMED
+  --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
+  --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+  --add-opens java.base/java.util=ALL-UNNAMED
+  --add-opens java.base/java.util.concurrent=ALL-UNNAMED
+  --add-exports java.base/jdk.internal.misc=ALL-UNNAMED
+  --add-exports java.security.jgss/sun.security.krb5=ALL-UNNAMED
+  --add-exports java.base/sun.net.dns=ALL-UNNAMED
+  --add-exports 
java.base/sun.net.util=ALL-UNNAMED
+
+
+--add-opens 
java.base/jdk.internal.util.random=ALL-UNNAMED
+${omid-surefire.argLine}
 
 
 
@@ -481,6 +512,30 @@
 
 
 
+
+build-with-jdk11
+
+[11,)
+
+
+
${releaseTarget}
+
+${omid-surefire.jdk11.flags}
+${omid-surefire.argLine}
+
+
+
+
+build-with-jdk17
+
+[17,)
+
+
+${omid-surefire.jdk11.flags}
+${omid-surefire.jdk17.flags}
+${omid-surefire.argLine}
+
+
 
 
 site-deploy
diff --git a/tso-server/bin/omid.sh b/tso-server/bin/omid.sh
index fa5afac5..01e918bb 100755
--- a/tso-server/bin/omid.sh
+++ b/tso-server/bin/omid.sh
@@ -39,6 +39,92 @@ for j in ../lib/*.jar; do
 CLASSPATH=$CLASSPATH:$j
 done
 
+#JVM detection and list of JDK11 options copied from HBase with slight 
modifications
+
+function read_java_version() {
+  # Avoid calling java repeatedly
+  if [ -z "$read_java_version_cached" ]; then
+properties="$("${JAVA_HOME}/bin/java" -XshowSettings:properties -version 
2>&1)"
+read_java_version_cached="$(echo "${properties}" | "${GREP}" 
java.runtime.version | head -1 | "${SED}" -e 's/.* = \([^ ]*\)/\1/')"
+  fi
+  echo "$read_java_version_cached"
+}
+
+# Inspect the system properties exposed by this JVM to identify the major
+# version number. Normalize on the popular version number, thus consider JDK
+# 1.8 as version "8".
+function parse_java_major_version() {
+  complete_version=$1
+  # split off suffix version info like '-b10' or '+10' or '_10'
+  # careful to not use GNU Sed extensions
+  version="$(echo "$complete_version" | "${SED}" -e 's/+/_/g' -e 's/-/_/g' | 
cut -d'_' -f1)"
+  case "$version" in
+  1.*)
+echo "$version" | cut -d'.' -f2
+;;
+  *)
+echo "$version" | cut -d'.' -f1
+;;
+  esac
+}
+
+add_jdk11_jvm_flags() {
+  # Keep in sync with omid-surefire.jdk11.flags in the root pom.xml
+  OMID_OPTS="$OMID_OPTS 
-Dorg.apache.hbase.thirdparty.io.netty.tryReflectionSetAccessible=true 
--add-modules jdk.unsupported --add-opens java.base/java.io=ALL-UNNAMED 
--add-opens java.base/java.nio=ALL-UNNAMED --add-opens 
java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED 
--add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens 
java.base/java.lang.reflect=ALL-UNNAMED --add-opens 
java.base/java.util=ALL-UNNAMED --add-opens jav

(phoenix) branch 5.1 updated: PHOENIX-7171 Update Zookeeper to 3.8.3 when building with HBase 2.4+

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new e6c0bc082b PHOENIX-7171 Update Zookeeper to 3.8.3 when building with 
HBase 2.4+
e6c0bc082b is described below

commit e6c0bc082b3a14096ea032042898839b890762b2
Author: Istvan Toth 
AuthorDate: Wed Jan 10 17:19:00 2024 +0100

PHOENIX-7171 Update Zookeeper to 3.8.3 when building with HBase 2.4+
---
 pom.xml | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index c923b3e6f6..4fa9e2028d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1347,6 +1347,24 @@
 org.apache.zookeeper
 zookeeper
 ${zookeeper.version}
+
+  
+log4j
+log4j
+  
+  
+org.slf4j
+slf4j-log4j12
+  
+  
+ch.qos.logback
+logback-core
+  
+  
+ch.qos.logback
+logback-classic
+  
+
   
   
 org.apache.zookeeper
@@ -1711,7 +1729,7 @@
 2.4.0
 2.4.0
 ${hbase-2.4.0.runtime.version}
-3.5.7
+3.8.3
 2.4
   
 
@@ -1728,7 +1746,7 @@
 2.4
 2.4.1
 ${hbase-2.4.runtime.version}
-3.5.7
+3.8.3
 2.4
   
 
@@ -1746,7 +1764,7 @@
 2.5.0
 3.2.3
 ${hbase-2.5.runtime.version}
-3.5.7
+3.8.3
 2.4
   
 
@@ -1764,7 +1782,7 @@
 2.5.4
 3.2.3
 ${hbase-2.5.runtime.version}
-3.5.7
+3.8.3
 2.4
   
 

(phoenix) branch master updated: PHOENIX-7171 Update Zookeeper to 3.8.3 when building with HBase 2.4+

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 25cdd7fbf4 PHOENIX-7171 Update Zookeeper to 3.8.3 when building with 
HBase 2.4+
25cdd7fbf4 is described below

commit 25cdd7fbf4fc2a8e7d07877595459a9d4803a0c7
Author: Istvan Toth 
AuthorDate: Wed Jan 10 17:19:00 2024 +0100

PHOENIX-7171 Update Zookeeper to 3.8.3 when building with HBase 2.4+
---
 pom.xml | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7c598fb80c..052b5c4a55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
 2.9.5
 72.1
 5.1.0
-3.5.7
+3.8.3
 4.2.0
 1.0.55
 9.4.53.v20231009
@@ -1430,6 +1430,14 @@
 org.slf4j
 slf4j-log4j12
   
+  
+ch.qos.logback
+logback-core
+  
+  
+ch.qos.logback
+logback-classic
+  
 
   
   

(phoenix) branch 5.1 updated: PHOENIX-7181 Do not declare commons-configuration2 dependency

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 569f931d8e PHOENIX-7181 Do not declare commons-configuration2 
dependency
569f931d8e is described below

commit 569f931d8e1dae1990a26f40a445b6920e11be08
Author: Istvan Toth 
AuthorDate: Mon Jan 15 15:39:03 2024 +0100

PHOENIX-7181 Do not declare commons-configuration2 dependency
---
 phoenix-core/pom.xml |  4 
 pom.xml  | 13 +++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 22c81d9d00..3f6193793a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -500,10 +500,6 @@
   org.apache.commons
   commons-lang3
 
-
-  org.apache.commons
-  commons-configuration2
-
 
   commons-io
   commons-io
diff --git a/pom.xml b/pom.xml
index ddf4ac6495..c923b3e6f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,6 @@
 1.0
 1.21
 1.9.0
-2.1.1
 1.0-1
 2.0.1
 0.3
@@ -450,6 +449,13 @@
   
   org.apache.hbase.thirdparty:*
 
+
+  
+  org.apache.commons:commons-configuration2
+
   
 
   
@@ -1434,11 +1440,6 @@
 commons-lang3
 ${commons-lang.version}
   
-  
-org.apache.commons
-commons-configuration2
-${commons-configuration2.version}
-  
   
 commons-io
 commons-io

(phoenix) branch master updated: PHOENIX-7181 Do not declare commons-configuration2 dependency

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 3492933940 PHOENIX-7181 Do not declare commons-configuration2 
dependency
3492933940 is described below

commit 3492933940807737f08ef778469db9fa84b281d0
Author: Istvan Toth 
AuthorDate: Mon Jan 15 15:39:03 2024 +0100

PHOENIX-7181 Do not declare commons-configuration2 dependency

also remove redundant commons-configuration2 from 
phoenix-mapreduce-byo-shaded-hbase
---
 phoenix-core-client/pom.xml|  4 
 phoenix-core/pom.xml   |  5 -
 phoenix-mapreduce-byo-shaded-hbase/pom.xml |  9 +
 pom.xml| 13 +++--
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
index 1d886b3bae..ba02beaa33 100644
--- a/phoenix-core-client/pom.xml
+++ b/phoenix-core-client/pom.xml
@@ -394,10 +394,6 @@
   org.apache.commons
   commons-lang3
 
-
-  org.apache.commons
-  commons-configuration2
-
 
   commons-io
   commons-io
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 85f95b5bf3..704bb5d55e 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -349,11 +349,6 @@
 phoenix-shaded-commons-cli
 test
 
-
-org.apache.commons
-commons-configuration2
-test
-
 
 com.github.stephenc.findbugs
 findbugs-annotations
diff --git a/phoenix-mapreduce-byo-shaded-hbase/pom.xml 
b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
index 7cf6a98ea8..d9ccfd30c9 100644
--- a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
+++ b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
@@ -574,6 +574,15 @@
   4.0.0
   provided
 
+
+   
+  org.apache.commons
+  commons-configuration2
+  
+  2.1.1
+  provided
+
+
 
 
diff --git a/pom.xml b/pom.xml
index 807baa4002..7c598fb80c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,6 @@
 1.0
 1.21
 1.9.0
-2.1.1
 1.0-1
 2.0.1
 0.3
@@ -445,6 +444,13 @@
   
   org.apache.hbase.thirdparty:*
 
+
+  
+  org.apache.commons:commons-configuration2
+
   
 
   
@@ -1518,11 +1524,6 @@
 commons-lang3
 ${commons-lang.version}
   
-  
-org.apache.commons
-commons-configuration2
-${commons-configuration2.version}
-  
   
 commons-io
 commons-io

(phoenix) branch 5.1 updated: PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error message (addendum: accept exactly 1000ms in timeout check)

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 3bb97d476f PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with 
incorrect error message (addendum: accept exactly 1000ms in timeout check)
3bb97d476f is described below

commit 3bb97d476f423c69414ab4a65323a0f69e27bbb4
Author: Aron Meszaros 
AuthorDate: Tue Jan 16 11:13:19 2024 +0100

PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error 
message (addendum: accept exactly 1000ms in timeout check)
---
 .../src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index 4103655e16..0ac5d50c10 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -130,7 +130,8 @@ public class QueryTimeoutIT extends BaseTest {
 } catch (SQLTimeoutException e) {
 long elapsedTimeMillis = System.currentTimeMillis() - startTime;
 assertEquals(SQLExceptionCode.OPERATION_TIMED_OUT.getErrorCode(), 
e.getErrorCode());
-assertTrue(elapsedTimeMillis > 1000);
+assertTrue("Total time of query was " + elapsedTimeMillis + " ms, 
but expected to be greater or equal to 1000",
+elapsedTimeMillis >= 1000);
 }
 conn.close();
 }

(phoenix) branch master updated: PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error message (addendum: accept exactly 1000ms in timeout check)

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new d936032078 PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with 
incorrect error message (addendum: accept exactly 1000ms in timeout check)
d936032078 is described below

commit d936032078fdfa41b13905b251a9e92d5fb4e01b
Author: Aron Meszaros 
AuthorDate: Tue Jan 16 11:13:19 2024 +0100

PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error 
message (addendum: accept exactly 1000ms in timeout check)
---
 .../src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index 4103655e16..0ac5d50c10 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -130,7 +130,8 @@ public class QueryTimeoutIT extends BaseTest {
 } catch (SQLTimeoutException e) {
 long elapsedTimeMillis = System.currentTimeMillis() - startTime;
 assertEquals(SQLExceptionCode.OPERATION_TIMED_OUT.getErrorCode(), 
e.getErrorCode());
-assertTrue(elapsedTimeMillis > 1000);
+assertTrue("Total time of query was " + elapsedTimeMillis + " ms, 
but expected to be greater or equal to 1000",
+elapsedTimeMillis >= 1000);
 }
 conn.close();
 }

(phoenix) branch 5.1 updated: Revert "PHOENIX-7163 Update commons-configuration2 to 2.8.0"

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new e8ac8e3e78 Revert "PHOENIX-7163 Update commons-configuration2 to 2.8.0"
e8ac8e3e78 is described below

commit e8ac8e3e78a00161f43749365dfcebe46207d6dd
Author: Istvan Toth 
AuthorDate: Mon Jan 15 15:17:13 2024 +0100

Revert "PHOENIX-7163 Update commons-configuration2 to 2.8.0"

This reverts commit 1f6470384e71e53355fa171fddec20c5d56b413a.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0bafaa9aa8..ddf4ac6495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
 1.0
 1.21
 1.9.0
-2.8.0
+2.1.1
 1.0-1
 2.0.1
 0.3

(phoenix) branch master updated: Revert "PHOENIX-7163 Update commons-configuration2 to 2.8.0"

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 226a9ba027 Revert "PHOENIX-7163 Update commons-configuration2 to 2.8.0"
226a9ba027 is described below

commit 226a9ba0275bc8cc020b2bfd34131d2951d761be
Author: Istvan Toth 
AuthorDate: Mon Jan 15 15:15:49 2024 +0100

Revert "PHOENIX-7163 Update commons-configuration2 to 2.8.0"

This reverts commit 8dfb19abcea0e80e3413a0c0f924e7de3d672771.
---
 phoenix-mapreduce-byo-shaded-hbase/pom.xml | 6 --
 pom.xml| 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/phoenix-mapreduce-byo-shaded-hbase/pom.xml 
b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
index b1ebe06cae..7cf6a98ea8 100644
--- a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
+++ b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
@@ -574,12 +574,6 @@
   4.0.0
   provided
 
-
-  
-  org.apache.commons
-  commons-configuration2
-  provided
-
 
 
diff --git a/pom.xml b/pom.xml
index c087522b8d..807baa4002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
 1.0
 1.21
 1.9.0
-2.8.0
+2.1.1
 1.0-1
 2.0.1
 0.3

(phoenix) branch 5.1 updated: PHOENIX-7163 Update commons-configuration2 to 2.8.0

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 1f6470384e PHOENIX-7163 Update commons-configuration2 to 2.8.0
1f6470384e is described below

commit 1f6470384e71e53355fa171fddec20c5d56b413a
Author: Istvan Toth 
AuthorDate: Mon Jan 15 10:11:23 2024 +0100

PHOENIX-7163 Update commons-configuration2 to 2.8.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ddf4ac6495..0bafaa9aa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
 1.0
 1.21
 1.9.0
-2.1.1
+2.8.0
 1.0-1
 2.0.1
 0.3

(phoenix) branch master updated: PHOENIX-7163 Update commons-configuration2 to 2.8.0

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 8dfb19abce PHOENIX-7163 Update commons-configuration2 to 2.8.0
8dfb19abce is described below

commit 8dfb19abcea0e80e3413a0c0f924e7de3d672771
Author: Istvan Toth 
AuthorDate: Mon Jan 15 10:11:23 2024 +0100

PHOENIX-7163 Update commons-configuration2 to 2.8.0

also remove redundant commons-configuration2 from 
phoenix-mapreduce-byo-shaded-hbase
---
 phoenix-mapreduce-byo-shaded-hbase/pom.xml | 6 ++
 pom.xml| 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/phoenix-mapreduce-byo-shaded-hbase/pom.xml 
b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
index 7cf6a98ea8..b1ebe06cae 100644
--- a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
+++ b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
@@ -574,6 +574,12 @@
   4.0.0
   provided
 
+
+  
+  org.apache.commons
+  commons-configuration2
+  provided
+
 
 
diff --git a/pom.xml b/pom.xml
index 807baa4002..c087522b8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
 1.0
 1.21
 1.9.0
-2.1.1
+2.8.0
 1.0-1
 2.0.1
 0.3

(phoenix) branch 5.1 updated: PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new db2541c129 PHOENIX-7138 Import netty-bom to make sure all netty 4.1 
modules share the same version
db2541c129 is described below

commit db2541c12957113f6c6ac2e605a9aa7529f9ae09
Author: Istvan Toth 
AuthorDate: Mon Jan 8 15:37:38 2024 +0100

PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the 
same version
---
 pom.xml | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index 9db2b381af..ddf4ac6495 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,7 @@
 
 
 2.14.1
+4.1.104.Final
 3.5.2
 1.2.24
 
@@ -1383,6 +1384,16 @@
 import
 pom
   
+  
+  
+io.netty
+netty-bom
+${netty-bom.version}
+import
+pom
+  
   
 com.google.protobuf
 protobuf-java

(phoenix) branch master updated: PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the same version

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new d331a15bfd PHOENIX-7138 Import netty-bom to make sure all netty 4.1 
modules share the same version
d331a15bfd is described below

commit d331a15bfd90f908a2f4b16a5764ac1513c31408
Author: Istvan Toth 
AuthorDate: Mon Jan 8 15:37:38 2024 +0100

PHOENIX-7138 Import netty-bom to make sure all netty 4.1 modules share the 
same version
---
 pom.xml | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/pom.xml b/pom.xml
index a2eae9..807baa4002 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
 
 
 2.14.1
+4.1.104.Final
 3.5.2
 
 1.2.19
@@ -1467,6 +1468,16 @@
 import
 pom
   
+  
+  
+io.netty
+netty-bom
+${netty-bom.version}
+import
+pom
+  
   
 com.google.protobuf
 protobuf-java

(phoenix) branch master updated: PHOENIX-7178 Use skipITs instead of skip to disable failsafe tests

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 1f7c3d4ee4 PHOENIX-7178 Use skipITs instead of skip to disable 
failsafe tests
1f7c3d4ee4 is described below

commit 1f7c3d4ee453248421f012aeb7ce3151229880be
Author: Istvan Toth 
AuthorDate: Thu Jan 11 10:01:34 2024 +0100

PHOENIX-7178 Use skipITs instead of skip to disable failsafe tests
---
 phoenix-tracing-webapp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 338cd3146d..58faa0abab 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -97,7 +97,7 @@
   org.apache.maven.plugins
 maven-failsafe-plugin
 
-  true
+  true
 
 
 

(phoenix) branch 5.1 updated: PHOENIX-7178 Use skipITs instead of skip to disable failsafe tests

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new ae2da942d5 PHOENIX-7178 Use skipITs instead of skip to disable 
failsafe tests
ae2da942d5 is described below

commit ae2da942d5e772ca227b505c520dd019b771451f
Author: Istvan Toth 
AuthorDate: Thu Jan 11 10:01:34 2024 +0100

PHOENIX-7178 Use skipITs instead of skip to disable failsafe tests
---
 phoenix-tracing-webapp/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 05e9ee2f48..ecfc072046 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -86,7 +86,7 @@
   org.apache.maven.plugins
 maven-failsafe-plugin
 
-  true
+  true
 
 
 

(phoenix) branch master updated: PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error message

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 2d7bfe6f1b PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with 
incorrect error message
2d7bfe6f1b is described below

commit 2d7bfe6f1bbe7244ffcdd04615bf36ee73d98143
Author: Aron Meszaros 
AuthorDate: Wed Jan 10 10:29:44 2024 +0100

PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error 
message
---
 .../org/apache/phoenix/end2end/QueryTimeoutIT.java | 35 --
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index 27bc211db5..4103655e16 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -23,15 +23,19 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLTimeoutException;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.coprocessor.ObserverContext;
+import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
+import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
+import org.apache.hadoop.hbase.regionserver.InternalScanner;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixStatement;
@@ -42,6 +46,7 @@ import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -107,30 +112,19 @@ public class QueryTimeoutIT extends BaseTest {
 
 @Test
 public void testQueryTimeout() throws Exception {
-int nRows = 6;
 Connection conn;
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 conn = DriverManager.getConnection(getUrl(), props);
 conn.createStatement().execute(
 "CREATE TABLE " + tableName + "(k BIGINT PRIMARY KEY, v 
VARCHAR)");
-PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + 
tableName + " VALUES(?, '')");
-for (int i = 1; i <= nRows; i++) {
-stmt.setLong(1, i);
-stmt.executeUpdate();
-if ((i % 2000) == 0) {
-conn.commit();
-}
-}
-conn.commit();
-conn.createStatement().execute("UPDATE STATISTICS " + tableName);
-
+TestUtil.addCoprocessor(conn, tableName, 
QueryTimeoutIT.SleepingRegionObserver.class);
+
 PhoenixStatement pstmt = 
conn.createStatement().unwrap(PhoenixStatement.class);
 pstmt.setQueryTimeout(1);
 long startTime = System.currentTimeMillis();
 try {
 ResultSet rs = pstmt.executeQuery("SELECT count(*) FROM " + 
tableName);
-// Force lots of chunks so query is cancelled
-assertTrue(pstmt.getQueryPlan().getSplits().size() > 1000);
+startTime = System.currentTimeMillis();
 rs.next();
 fail("Total time of query was " + (System.currentTimeMillis() - 
startTime) + " ms, but expected to be greater than 1000");
 } catch (SQLTimeoutException e) {
@@ -140,4 +134,15 @@ public class QueryTimeoutIT extends BaseTest {
 }
 conn.close();
 }
+
+public static class SleepingRegionObserver extends SimpleRegionObserver {
+@Override
+public void 
preScannerClose(ObserverContext c, 
InternalScanner s)
+throws IOException {
+try {
+Thread.sleep(1200); // Wait long enough
+} catch (InterruptedException e) {
+}
+}
+}
 }

(phoenix) branch 5.1 updated: PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error message

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 646d63b2b0 PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with 
incorrect error message
646d63b2b0 is described below

commit 646d63b2b098bf9185e49e55941b79028518f09c
Author: Aron Meszaros 
AuthorDate: Wed Jan 10 10:29:44 2024 +0100

PHOENIX-7176 QueryTimeoutIT#testQueryTimeout fails with incorrect error 
message
---
 .../org/apache/phoenix/end2end/QueryTimeoutIT.java | 35 --
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
index 27bc211db5..4103655e16 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryTimeoutIT.java
@@ -23,15 +23,19 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.DriverManager;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.SQLTimeoutException;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.coprocessor.ObserverContext;
+import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
+import org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
+import org.apache.hadoop.hbase.regionserver.InternalScanner;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.jdbc.PhoenixStatement;
@@ -42,6 +46,7 @@ import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
+import org.apache.phoenix.util.TestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -107,30 +112,19 @@ public class QueryTimeoutIT extends BaseTest {
 
 @Test
 public void testQueryTimeout() throws Exception {
-int nRows = 6;
 Connection conn;
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 conn = DriverManager.getConnection(getUrl(), props);
 conn.createStatement().execute(
 "CREATE TABLE " + tableName + "(k BIGINT PRIMARY KEY, v 
VARCHAR)");
-PreparedStatement stmt = conn.prepareStatement("UPSERT INTO " + 
tableName + " VALUES(?, '')");
-for (int i = 1; i <= nRows; i++) {
-stmt.setLong(1, i);
-stmt.executeUpdate();
-if ((i % 2000) == 0) {
-conn.commit();
-}
-}
-conn.commit();
-conn.createStatement().execute("UPDATE STATISTICS " + tableName);
-
+TestUtil.addCoprocessor(conn, tableName, 
QueryTimeoutIT.SleepingRegionObserver.class);
+
 PhoenixStatement pstmt = 
conn.createStatement().unwrap(PhoenixStatement.class);
 pstmt.setQueryTimeout(1);
 long startTime = System.currentTimeMillis();
 try {
 ResultSet rs = pstmt.executeQuery("SELECT count(*) FROM " + 
tableName);
-// Force lots of chunks so query is cancelled
-assertTrue(pstmt.getQueryPlan().getSplits().size() > 1000);
+startTime = System.currentTimeMillis();
 rs.next();
 fail("Total time of query was " + (System.currentTimeMillis() - 
startTime) + " ms, but expected to be greater than 1000");
 } catch (SQLTimeoutException e) {
@@ -140,4 +134,15 @@ public class QueryTimeoutIT extends BaseTest {
 }
 conn.close();
 }
+
+public static class SleepingRegionObserver extends SimpleRegionObserver {
+@Override
+public void 
preScannerClose(ObserverContext c, 
InternalScanner s)
+throws IOException {
+try {
+Thread.sleep(1200); // Wait long enough
+} catch (InterruptedException e) {
+}
+}
+}
 }

(phoenix) branch master updated: PHOENIX-7043 Split FailoverPhoenixConnectionIT

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 8106c24c19 PHOENIX-7043 Split FailoverPhoenixConnectionIT
8106c24c19 is described below

commit 8106c24c1903ee3795a8e4a805ce6008d976e400
Author: divneet-kaur 
AuthorDate: Tue Jan 9 10:45:22 2024 -0800

PHOENIX-7043 Split FailoverPhoenixConnectionIT
---
 .../phoenix/jdbc/FailoverPhoenixConnection2IT.java | 374 +
 .../phoenix/jdbc/FailoverPhoenixConnectionIT.java  | 231 -
 2 files changed, 374 insertions(+), 231 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/jdbc/FailoverPhoenixConnection2IT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/jdbc/FailoverPhoenixConnection2IT.java
new file mode 100644
index 00..8d3361fd2f
--- /dev/null
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/jdbc/FailoverPhoenixConnection2IT.java
@@ -0,0 +1,374 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.jdbc;
+
+import static org.apache.hadoop.test.GenericTestUtils.waitFor;
+import static 
org.apache.phoenix.jdbc.HighAvailabilityTestingUtility.HBaseTestingUtilityPair.doTestWhenOneZKDown;
+import static 
org.apache.phoenix.jdbc.HighAvailabilityTestingUtility.doTestBasicOperationsWithConnection;
+import static 
org.apache.phoenix.jdbc.HighAvailabilityGroup.PHOENIX_HA_GROUP_ATTR;
+import static 
org.apache.phoenix.jdbc.HighAvailabilityTestingUtility.getHighAvailibilityGroup;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Test failover basics for {@link FailoverPhoenixConnection}.
+ */
+@Category(NeedsOwnMiniClusterTest.class)
+public class FailoverPhoenixConnection2IT {
+private static final Logger LOG = 
LoggerFactory.getLogger(FailoverPhoenixConnectionIT.class);
+private static final 
HighAvailabilityTestingUtility.HBaseTestingUtilityPair CLUSTERS = new 
HighAvailabilityTestingUtility.HBaseTestingUtilityPair();
+
+@Rule
+public final TestName testName = new TestName();
+
+/** Client properties to create a connection per test. */
+private Properties clientProperties;
+/** HA group for this test. */
+private HighAvailabilityGroup haGroup;
+/** Table name per test case. */
+private String tableName;
+/** HA Group name for this test. */
+private String haGroupName;
+
+@BeforeClass
+public static void setUpBeforeClass() throws Exception {
+CLUSTERS.start();
+DriverManager.registerDriver(PhoenixDriver.INSTANCE);
+}
+
+@AfterClass
+public static void tearDownAfterClass() throws Exception {
+DriverManager.deregisterDriver(PhoenixDriver.INSTANCE);
+CLUSTERS.close();
+}
+
+@Before
+public void setup() throws Exception {
+haGroupName = testName.getMethodName();
+clientProperties = 
HighAvailabilityTestingUtility.getHATestProperties();
+clientProperties.setProperty(PHOENIX_HA_GROUP_ATTR, haGroupName);
+
+// Make 

(phoenix-connectors) branch master updated: PHOENIX-7168 Remove shaded protobuf from shaded connector JARs

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 6d57726  PHOENIX-7168 Remove shaded protobuf from shaded connector JARs
6d57726 is described below

commit 6d57726c0173671c1b46b1530d9520e6c9c234a1
Author: Istvan Toth 
AuthorDate: Mon Jan 8 16:10:42 2024 +0100

PHOENIX-7168 Remove shaded protobuf from shaded connector JARs
---
 phoenix5-hive-shaded/pom.xml   | 5 +
 phoenix5-spark-shaded/pom.xml  | 5 +
 phoenix5-spark3-shaded/pom.xml | 5 +
 3 files changed, 15 insertions(+)

diff --git a/phoenix5-hive-shaded/pom.xml b/phoenix5-hive-shaded/pom.xml
index dd24215..52fdade 100644
--- a/phoenix5-hive-shaded/pom.xml
+++ b/phoenix5-hive-shaded/pom.xml
@@ -286,6 +286,11 @@
   hbase-shaded-protobuf
   provided
 
+
+  com.google.protobuf
+  protobuf-java
+  provided
+
 
 
diff --git a/phoenix5-spark-shaded/pom.xml b/phoenix5-spark-shaded/pom.xml
index 1b9ff72..f9fb93d 100644
--- a/phoenix5-spark-shaded/pom.xml
+++ b/phoenix5-spark-shaded/pom.xml
@@ -217,6 +217,11 @@
   hbase-shaded-protobuf
   provided
 
+
+  com.google.protobuf
+  protobuf-java
+  provided
+
 
 
diff --git a/phoenix5-spark3-shaded/pom.xml b/phoenix5-spark3-shaded/pom.xml
index cfc90a0..f3bc82c 100644
--- a/phoenix5-spark3-shaded/pom.xml
+++ b/phoenix5-spark3-shaded/pom.xml
@@ -217,6 +217,11 @@
   hbase-shaded-protobuf
   provided
 
+
+  com.google.protobuf
+  protobuf-java
+  provided
+
 
 

(phoenix) branch master updated: PHOENIX-7173 Update default HBase versions to 2.4.17 and 2.5.7 respectively

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new a45c78943e PHOENIX-7173 Update default HBase versions to 2.4.17 and 
2.5.7 respectively
a45c78943e is described below

commit a45c78943e4d09ddf4bff39271d1a8257dd646ad
Author: Istvan Toth 
AuthorDate: Tue Jan 9 10:11:51 2024 +0100

PHOENIX-7173 Update default HBase versions to 2.4.17 and 2.5.7 respectively
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ac2be6f650..a2eae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,9 +84,9 @@
 2.4.0 2.4 2.5.0 2.5
 
 2.4.0
-2.4.16
+2.4.17
 2.5.3-hadoop3
-2.5.5-hadoop3
+2.5.7-hadoop3
 
 1.8
 ${compileSource}

(phoenix) branch 5.1 updated: PHOENIX-7173 Update default HBase versions to 2.4.17 and 2.5.7 respectively

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 925b4840b7 PHOENIX-7173 Update default HBase versions to 2.4.17 and 
2.5.7 respectively
925b4840b7 is described below

commit 925b4840b7b2de4b094aec20cb476f83bec0ad2b
Author: Istvan Toth 
AuthorDate: Tue Jan 9 10:11:51 2024 +0100

PHOENIX-7173 Update default HBase versions to 2.4.17 and 2.5.7 respectively
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b0dabad1b3..9db2b381af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,9 +89,9 @@
 2.2.7
 2.3.7
 2.4.0
-2.4.16
+2.4.17
 2.5.3-hadoop3
-2.5.5-hadoop3
+2.5.7-hadoop3
 
 1.8
 ${compileSource}

(phoenix-connectors) branch master updated: PHOENIX-7174 Rebuild HBase in connectors github action CI script

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 60d4172  PHOENIX-7174 Rebuild HBase in connectors github action CI 
script
60d4172 is described below

commit 60d4172169d14d13632f9abaef28f02978c3013a
Author: Istvan Toth 
AuthorDate: Tue Jan 9 11:12:37 2024 +0100

PHOENIX-7174 Rebuild HBase in connectors github action CI script
---
 .github/workflows/maven.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 55fb909..4085ad1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -29,5 +29,7 @@ jobs:
   uses: actions/setup-java@v1
   with:
 java-version: 1.8
+- name: Rebuild HBase
+  run: /bin/bash dev/rebuild_hbase.sh 2.4.16
 - name: Test
   run: mvn -B -fae clean install

(phoenix-queryserver) branch master updated: PHOENIX-7136 Update Avatica to 1.24.0 in Query Server

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new 1a359e8  PHOENIX-7136 Update Avatica to 1.24.0 in Query Server
1a359e8 is described below

commit 1a359e8e9fe73d1f5eec2ac1c935f7902cd47fbf
Author: Istvan Toth 
AuthorDate: Wed Dec 13 15:19:45 2023 +0100

PHOENIX-7136 Update Avatica to 1.24.0 in Query Server
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6e1aa17..d93ca8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
 3.2.2
 1.9.0
 1.7.36
-1.23.0
+1.24.0
 3.1.0
 3.0.0
 2.20.0

(phoenix) branch master updated: PHOENIX-7139 Create phoenix-mapreduce-byo-shaded-hbase artifact

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new fec83cc3c6 PHOENIX-7139 Create phoenix-mapreduce-byo-shaded-hbase 
artifact
fec83cc3c6 is described below

commit fec83cc3c66d633c8a47144b9e1a479e6d052b7c
Author: Istvan Toth 
AuthorDate: Wed Jan 3 13:03:23 2024 +0100

PHOENIX-7139 Create phoenix-mapreduce-byo-shaded-hbase artifact
---
 phoenix-assembly/pom.xml   |  25 +
 .../src/build/components/all-common-jars.xml   |   8 +
 phoenix-client-parent/pom.xml  |   2 -
 phoenix-mapreduce-byo-shaded-hbase/pom.xml | 604 +
 phoenix-pherf/pom.xml  |   2 -
 phoenix-server/pom.xml |   1 -
 pom.xml|  44 +-
 7 files changed, 680 insertions(+), 6 deletions(-)

diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 7f929c118c..2d941765f1 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -105,6 +105,27 @@
   
 
   
+  
+mapreduce without version
+compile
+
+  exec
+
+
+  ln
+  
${project.basedir}/../phoenix-mapreduce-byo-shaded-hbase/target
+  
+-fnsv
+
+  
phoenix-mapreduce-byo-shaded-hbase-${hbase.suffix}-${project.version}.jar
+
+
+  
+  phoenix-mapreduce-byo-shaded-hbase-${hbase.suffix}.jar
+
+  
+
+  
   
 pherf without version
 compile
@@ -170,6 +191,10 @@
   org.apache.phoenix
   phoenix-server-${hbase.suffix}
 
+
+  org.apache.phoenix
+  
phoenix-mapreduce-byo-shaded-hbase-${hbase.suffix}
+
 
   org.apache.phoenix
   phoenix-client-embedded-${hbase.suffix}
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml 
b/phoenix-assembly/src/build/components/all-common-jars.xml
index c51ff9c98e..c2f943fc39 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -47,6 +47,14 @@
 phoenix-server-${hbase.suffix}.jar
   
 
+
+  
${project.basedir}/../phoenix-mapreduce-byo-shaded-hbase/target
+  /
+  
+
phoenix-mapreduce-byo-shaded-hbase-${hbase.suffix}-${project.version}.jar
+
phoenix-mapreduce-byo-shaded-hbase-${hbase.suffix}.jar
+  
+
 
   ${project.basedir}/../phoenix-pherf/target
   /
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 42bee5c047..49c4b6869d 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -34,8 +34,6 @@
 
 true
 true
-org.apache.phoenix.shaded
-
   
 
   
diff --git a/phoenix-mapreduce-byo-shaded-hbase/pom.xml 
b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
new file mode 100644
index 00..7cf6a98ea8
--- /dev/null
+++ b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
@@ -0,0 +1,604 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+  4.0.0
+  
+org.apache.phoenix
+phoenix
+5.2.0-SNAPSHOT
+  
+  phoenix-mapreduce-byo-shaded-hbase-${hbase.suffix}
+  Phoenix Mapreduce
+  Phoenix Mapreduce JAR for use with the "hbase mapredcp" 
classpath
+  jar
+  
+
+true
+
+true
+true
+  
+
+  
+
+  
+
+  org.apache.maven.plugins
+  maven-site-plugin
+  
+true
+  
+
+
+  
+  org.apache.rat
+  apache-rat-plugin
+  
+true
+  
+
+
+  org.apache.maven.plugins
+  maven-jar-plugin
+
+
+  org.apache.maven.plugins
+  maven-dependency-plugin
+  
+
+  *
+
+   
+
+
+  org.apache.maven.plugins
+  maven-shade-plugin
+  
+
+  
+*:*
+
+  META-INF/*.SF
+  META-INF/*.DSA
+  META-INF/*.RSA
+  META-INF/license/*
+  META-INF/NOTICE
+  LICENSE.*
+  NOTICE.*
+  NOTICE
+  README*
+
+  
+ 
+org.apache.hadoop:hadoop-yarn-common
+
+ 

(phoenix) branch master updated: PHOENIX-7137 Create phoenix-client-lite shaded JAR without server-side dependencies

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new a90b87deec PHOENIX-7137 Create phoenix-client-lite shaded JAR without 
server-side dependencies
a90b87deec is described below

commit a90b87deec6a70078f5fdc9b8c564913b170dfc3
Author: Istvan Toth 
AuthorDate: Mon Dec 4 14:13:23 2023 +0100

PHOENIX-7137 Create phoenix-client-lite shaded JAR without server-side 
dependencies
---
 phoenix-assembly/pom.xml   |  25 
 .../src/build/components/all-common-jars.xml   |   8 ++
 phoenix-client-parent/phoenix-client-lite/pom.xml  | 135 +
 pom.xml|  21 
 4 files changed, 189 insertions(+)

diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 52d337618f..7f929c118c 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -63,6 +63,27 @@
   
 
   
+  
+lite client without version
+compile
+
+  exec
+
+
+  ln
+  
${project.basedir}/../phoenix-client-parent/phoenix-client-lite/target
+  
+-fnsv
+
+  phoenix-client-lite-${hbase.suffix}-${project.version}.jar
+
+
+  
+  phoenix-client-lite-${hbase.suffix}.jar
+
+  
+
+  
   
 server without version
 compile
@@ -153,6 +174,10 @@
   org.apache.phoenix
   phoenix-client-embedded-${hbase.suffix}
 
+
+  org.apache.phoenix
+  phoenix-client-lite-${hbase.suffix}
+
 
   org.apache.phoenix
   phoenix-pherf
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml 
b/phoenix-assembly/src/build/components/all-common-jars.xml
index 1a6abd3193..c51ff9c98e 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -31,6 +31,14 @@
 phoenix-client-embedded-${hbase.suffix}.jar
   
 
+
+  
${project.basedir}/../phoenix-client-parent/phoenix-client-lite/target
+  /
+  
+
phoenix-client-lite-${hbase.suffix}-${project.version}.jar
+phoenix-client-lite-${hbase.suffix}.jar
+  
+
 
   ${project.basedir}/../phoenix-server/target
   /
diff --git a/phoenix-client-parent/phoenix-client-lite/pom.xml 
b/phoenix-client-parent/phoenix-client-lite/pom.xml
new file mode 100644
index 00..8ca940eb37
--- /dev/null
+++ b/phoenix-client-parent/phoenix-client-lite/pom.xml
@@ -0,0 +1,135 @@
+
+
+http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+  4.0.0
+  
+org.apache.phoenix
+phoenix-client-parent
+5.2.0-SNAPSHOT
+  
+
+  phoenix-client-lite-${hbase.suffix}
+  Phoenix Client Lite
+  Phoenix Client without server-side code and 
dependencies
+  jar
+
+  
+
+  
+org.apache.maven.plugins
+maven-shade-plugin
+
+  
+lite-shaded
+package
+
+  shade
+
+
+  
true
+  false
+  true
+  
${basedir}/target/pom.xml
+  
+
+  *:*
+
+
+  org.apache.phoenix:phoenix-client
+  xom:xom
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
+
+  org.apache.phoenix
+  phoenix-core-client
+  
+
+  org.slf4j
+  slf4j-reload4j
+
+
+  ch.qos.reload4j
+  reload4j
+
+
+
+  org.slf4j
+  slf4j-log4j12
+
+
+  log4j
+  log4j
+
+  
+
+
+  org.apache.phoenix
+  phoenix-hbase-compat-${hbase.compat.version}
+  false
+
+
+
+  org.eclipse.jetty
+  jetty-server
+  provided
+  ${jetty.version}
+
+
+  org.eclipse.jetty
+  jetty-util
+  provided
+  ${jetty.version}
+
+
+  org.eclipse.jetty
+  jetty-util-ajax
+  provided
+  ${jetty.version}
+
+
+  org.eclipse.jetty
+  jetty-servlet
+  provided
+  ${jetty.version}
+
+
+  org.eclipse.jetty
+  jetty-webapp
+  provided
+  ${jetty.version}
+
+
+  javax.servlet
+  javax.servlet-api
+  provided
+  ${javax.servlet-api.versi

svn commit: r1914832 - in /phoenix/site: publish/download.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/download.md

[stoty]

Author: stoty
Date: Thu Dec 21 19:56:35 2023
New Revision: 1914832

URL: http://svn.apache.org/viewvc?rev=1914832&view=rev
Log:
Add phoenix-thirdparty release 2.1.0


Modified:
phoenix/site/publish/download.html
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/source/src/site/markdown/download.md

Modified: phoenix/site/publish/download.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1914832&r1=1914831&r2=1914832&view=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Thu Dec 21 19:56:35 2023
@@ -1,7 +1,7 @@
 
 
 
 
@@ -256,6 +256,7 @@
 addRelease2('5.1.3', '30/dec/2022', '2.1', '2.2', '2.3', '2.4', '2.4.0', 
'2.5');
 addRelease2('4.16.1', '21/may/2021', '1.3', '1.4', '1.5', '1.6');
 addPhoenixdbRelease('1.2.1','25/oct/2022');
+addPhoenixThirdpartyRelease('2.1.0','20/dec/2023');
 addPhoenixThirdpartyRelease('2.0.0','19/apr/2022');
 addPhoenixOmidRelease('1.1.0','17/oct/2022');
 addPhoenixTephraRelease('0.16.1','13/may/2021');

Modified: phoenix/site/publish/language/datatypes.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1914832&r1=1914831&r2=1914832&view=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Thu Dec 21 19:56:35 2023
@@ -1,7 +1,7 @@
 
 
 
 

Modified: phoenix/site/publish/language/functions.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1914832&r1=1914831&r2=1914832&view=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Thu Dec 21 19:56:35 2023
@@ -1,7 +1,7 @@
 
 
 
 

Modified: phoenix/site/publish/language/index.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1914832&r1=1914831&r2=1914832&view=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Thu Dec 21 19:56:35 2023
@@ -1,7 +1,7 @@
 
 
 
 

Modified: phoenix/site/source/src/site/markdown/download.md
URL: 
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/download.md?rev=1914832&r1=1914831&r2=1914832&view=diff
==
--- phoenix/site/source/src/site/markdown/download.md (original)
+++ phoenix/site/source/src/site/markdown/download.md Thu Dec 21 19:56:35 2023
@@ -78,6 +78,7 @@ If you are looking for an old release th
 addRelease2('5.1.3', '30/dec/2022', '2.1', '2.2', '2.3', '2.4', '2.4.0', 
'2.5');
 addRelease2('4.16.1', '21/may/2021', '1.3', '1.4', '1.5', '1.6');
 addPhoenixdbRelease('1.2.1','25/oct/2022');
+addPhoenixThirdpartyRelease('2.1.0','20/dec/2023');
 addPhoenixThirdpartyRelease('2.0.0','19/apr/2022');
 addPhoenixOmidRelease('1.1.0','17/oct/2022');
 addPhoenixTephraRelease('0.16.1','13/may/2021');

(phoenix) branch master updated: PHOENIX-7152 SchemaExtractionProcessor package does not match directory

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 2426212be2 PHOENIX-7152 SchemaExtractionProcessor package does not 
match directory
2426212be2 is described below

commit 2426212be275c0d39ecdb7fb763592c69829e80c
Author: Istvan Toth 
AuthorDate: Thu Dec 14 08:19:05 2023 +0100

PHOENIX-7152 SchemaExtractionProcessor package does not match directory
---
 .../org/apache/phoenix/schema/{ => tool}/SchemaExtractionProcessor.java   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/SchemaExtractionProcessor.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/tool/SchemaExtractionProcessor.java
similarity index 100%
rename from 
phoenix-core-client/src/main/java/org/apache/phoenix/schema/SchemaExtractionProcessor.java
rename to 
phoenix-core-client/src/main/java/org/apache/phoenix/schema/tool/SchemaExtractionProcessor.java

(phoenix) branch 5.1 updated: PHOENIX-6721 CSV bulkload tool fails with FileNotFoundException if --output points to the S3 location

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 6fd287a08e PHOENIX-6721 CSV bulkload tool fails with 
FileNotFoundException if --output points to the S3 location
6fd287a08e is described below

commit 6fd287a08e55a2bd06c15a543c4c211b5e815986
Author: Sergey Soldatov 
AuthorDate: Tue May 31 13:37:20 2022 -0700

PHOENIX-6721 CSV bulkload tool fails with FileNotFoundException if --output 
points to the S3 location

Co-authored-by: Istvan Toth 
---
 .../phoenix/mapreduce/MultiHfileOutputFormat.java  | 25 +++---
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
index 3a9071e123..a027f00400 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
@@ -67,10 +67,11 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.OutputCommitter;
 import org.apache.hadoop.mapreduce.RecordWriter;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+import org.apache.hadoop.mapreduce.lib.output.PathOutputCommitter;
 import org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner;
 import org.apache.phoenix.compat.hbase.CompatUtil;
 import org.apache.phoenix.mapreduce.bulkload.TableRowkeyPair;
@@ -113,7 +114,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat 
getRecordWriter(TaskAttemptContext context)
 throws IOException, InterruptedException {
-return createRecordWriter(context);
+return createRecordWriter(context, this.getOutputCommitter(context));
 }
 
 /**
@@ -122,11 +123,11 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat RecordWriter 
createRecordWriter(final TaskAttemptContext context)
+static  RecordWriter 
createRecordWriter(
+final TaskAttemptContext context, final OutputCommitter committer)
 throws IOException {
 // Get the path of the temporary output file
-final Path outputPath = FileOutputFormat.getOutputPath(context);
-final Path outputdir = new FileOutputCommitter(outputPath, 
context).getWorkPath();
+final Path outputdir = ((PathOutputCommitter) committer).getWorkPath();
 final Configuration conf = context.getConfiguration();
 final FileSystem fs = outputdir.getFileSystem(conf);
  
@@ -336,7 +337,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat createFamilyCompressionMap(Configuration 
conf,final String tableName) {
 Map compressionMap = new 
TreeMap(Bytes.BYTES_COMPARATOR);
 Map tableConfigs = getTableConfigurations(conf, 
tableName);
-if(tableConfigs == null) {
+if (tableConfigs == null) {
 return compressionMap;
 }
 Map stringMap = 
createFamilyConfValueMap(tableConfigs,COMPRESSION_FAMILIES_CONF_KEY);
@@ -355,7 +356,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat getTableConfigurations(Configuration 
conf, final String tableName) {
 String tableDefn = conf.get(tableName);
-if(StringUtils.isEmpty(tableDefn)) {
+if (StringUtils.isEmpty(tableDefn)) {
 return null;
 }
 TargetTableRef table = 
TargetTableRefFunctions.FROM_JSON.apply(tableDefn);
@@ -374,7 +375,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat createFamilyBloomTypeMap(Configuration 
conf,final String tableName) {
 Map bloomTypeMap = new 
TreeMap(Bytes.BYTES_COMPARATOR);
 Map tableConfigs = getTableConfigurations(conf, 
tableName);
-if(tableConfigs == null) {
+if (tableConfigs == null) {
 return bloomTypeMap;
 }
 Map stringMap = 
createFamilyConfValueMap(tableConfigs,BLOOM_TYPE_FAMILIES_CONF_KEY);
@@ -396,7 +397,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat createFamilyBlockSizeMap(Configuration 
conf,final String tableName) {
 Map blockSizeMap = new 
TreeMap(Bytes.BYTES_COMPARATOR);
 Map tableConfigs = getTableConfigurations(conf, 
tableName);
-if(tableConfigs == null) {
+if (tableConfigs == null) {
 return blockSizeMap;
 }
 Map stringMap = 
createFamilyConfValueMap(tableConfigs,BLOCK_SIZE_FAMILIES_CONF_KEY);
@@ -420,7 +421,7 @@ public class MultiHfileOutputFormat extends

(phoenix) branch master updated: PHOENIX-6721 CSV bulkload tool fails with FileNotFoundException if --output points to the S3 location

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 0ed534f4cf PHOENIX-6721 CSV bulkload tool fails with 
FileNotFoundException if --output points to the S3 location
0ed534f4cf is described below

commit 0ed534f4cfefb059f5c8633f0db9c4a188ba97df
Author: Sergey Soldatov 
AuthorDate: Tue May 31 13:37:20 2022 -0700

PHOENIX-6721 CSV bulkload tool fails with FileNotFoundException if --output 
points to the S3 location

Co-authored-by: Istvan Toth 
---
 .../phoenix/mapreduce/MultiHfileOutputFormat.java  | 25 +++---
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git 
a/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
 
b/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
index 3b2d4c47bf..b792958b7a 100644
--- 
a/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
+++ 
b/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/MultiHfileOutputFormat.java
@@ -68,10 +68,11 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapreduce.Job;
+import org.apache.hadoop.mapreduce.OutputCommitter;
 import org.apache.hadoop.mapreduce.RecordWriter;
 import org.apache.hadoop.mapreduce.TaskAttemptContext;
-import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
 import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat;
+import org.apache.hadoop.mapreduce.lib.output.PathOutputCommitter;
 import org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner;
 import org.apache.phoenix.compat.hbase.CompatUtil;
 import org.apache.phoenix.mapreduce.bulkload.TableRowkeyPair;
@@ -114,7 +115,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat 
getRecordWriter(TaskAttemptContext context)
 throws IOException, InterruptedException {
-return createRecordWriter(context);
+return createRecordWriter(context, this.getOutputCommitter(context));
 }
 
 /**
@@ -123,11 +124,11 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat RecordWriter 
createRecordWriter(final TaskAttemptContext context)
+static  RecordWriter 
createRecordWriter(
+final TaskAttemptContext context, final OutputCommitter committer)
 throws IOException {
 // Get the path of the temporary output file
-final Path outputPath = FileOutputFormat.getOutputPath(context);
-final Path outputdir = new FileOutputCommitter(outputPath, 
context).getWorkPath();
+final Path outputdir = ((PathOutputCommitter) committer).getWorkPath();
 final Configuration conf = context.getConfiguration();
 final FileSystem fs = outputdir.getFileSystem(conf);
  
@@ -336,7 +337,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat createFamilyCompressionMap(Configuration 
conf,final String tableName) {
 Map compressionMap = new 
TreeMap(Bytes.BYTES_COMPARATOR);
 Map tableConfigs = getTableConfigurations(conf, 
tableName);
-if(tableConfigs == null) {
+if (tableConfigs == null) {
 return compressionMap;
 }
 Map stringMap = 
createFamilyConfValueMap(tableConfigs,COMPRESSION_FAMILIES_CONF_KEY);
@@ -355,7 +356,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat getTableConfigurations(Configuration 
conf, final String tableName) {
 String tableDefn = conf.get(tableName);
-if(StringUtils.isEmpty(tableDefn)) {
+if (StringUtils.isEmpty(tableDefn)) {
 return null;
 }
 TargetTableRef table = 
TargetTableRefFunctions.FROM_JSON.apply(tableDefn);
@@ -374,7 +375,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat createFamilyBloomTypeMap(Configuration 
conf,final String tableName) {
 Map bloomTypeMap = new 
TreeMap(Bytes.BYTES_COMPARATOR);
 Map tableConfigs = getTableConfigurations(conf, 
tableName);
-if(tableConfigs == null) {
+if (tableConfigs == null) {
 return bloomTypeMap;
 }
 Map stringMap = 
createFamilyConfValueMap(tableConfigs,BLOOM_TYPE_FAMILIES_CONF_KEY);
@@ -396,7 +397,7 @@ public class MultiHfileOutputFormat extends 
FileOutputFormat createFamilyBlockSizeMap(Configuration 
conf,final String tableName) {
 Map blockSizeMap = new 
TreeMap(Bytes.BYTES_COMPARATOR);
 Map tableConfigs = getTableConfigurations(conf, 
tableName);
-if(tableConfigs == null) {
+if (tableConfigs == null) {
 return blockSizeMap;
 }
 Map stringMap = 
createFamilyConfValueMap(tableConfigs,BLOCK_SIZE_FAMILIES_CONF_KEY);
@@ -420,7 +421,7 @@ public class

(phoenix) branch 5.1 updated: PHOENIX-7153 Fix Warnings Flagged as Errors by Eclipse

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new dae7d64559 PHOENIX-7153 Fix Warnings Flagged as Errors by Eclipse
dae7d64559 is described below

commit dae7d6455983f47bf5676f9dad4656ce67babf45
Author: Istvan Toth 
AuthorDate: Thu Dec 14 08:35:55 2023 +0100

PHOENIX-7153 Fix Warnings Flagged as Errors by Eclipse
---
 .../org/apache/phoenix/expression/RowValueConstructorExpression.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
index f92d1e22cb..e62e8599b6 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
@@ -121,7 +121,7 @@ public class RowValueConstructorExpression extends 
BaseCompoundExpression {
 public void write(DataOutput output) throws IOException {
 super.write(output);
 byte[] b = extraFields.toByteArray();
-output.writeByte((int)(b.length > 0 ? b[0] & 0xff  : 0));
+output.writeByte((b.length > 0 ? b[0] & 0xff  : 0));
 }
 
 private void init() {

(phoenix) branch master updated: PHOENIX-7153 Fix Warnings Flagged as Errors by Eclipse

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 75e085b93c PHOENIX-7153 Fix Warnings Flagged as Errors by Eclipse
75e085b93c is described below

commit 75e085b93c94c8bfff8141dacd9185f09d13e5c3
Author: Istvan Toth 
AuthorDate: Thu Dec 14 08:35:55 2023 +0100

PHOENIX-7153 Fix Warnings Flagged as Errors by Eclipse
---
 .../org/apache/phoenix/expression/RowValueConstructorExpression.java | 2 +-
 .../apache/phoenix/jdbc/ParallelPhoenixNullComparingResultSet.java   | 2 +-
 .../java/org/apache/phoenix/mapreduce/transform/TransformTool.java   | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
index f92d1e22cb..e62e8599b6 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/expression/RowValueConstructorExpression.java
@@ -121,7 +121,7 @@ public class RowValueConstructorExpression extends 
BaseCompoundExpression {
 public void write(DataOutput output) throws IOException {
 super.write(output);
 byte[] b = extraFields.toByteArray();
-output.writeByte((int)(b.length > 0 ? b[0] & 0xff  : 0));
+output.writeByte((b.length > 0 ? b[0] & 0xff  : 0));
 }
 
 private void init() {
diff --git 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ParallelPhoenixNullComparingResultSet.java
 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ParallelPhoenixNullComparingResultSet.java
index 58b8b6dbee..ae8ebf3dd7 100644
--- 
a/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ParallelPhoenixNullComparingResultSet.java
+++ 
b/phoenix-core-client/src/main/java/org/apache/phoenix/jdbc/ParallelPhoenixNullComparingResultSet.java
@@ -128,7 +128,7 @@ public class ParallelPhoenixNullComparingResultSet extends 
DelegateResultSet imp
 boolean secondResult;
 try {
 secondResult =
-(boolean) 
ParallelPhoenixUtil.INSTANCE.getFutureNoRetry(
+ParallelPhoenixUtil.INSTANCE.getFutureNoRetry(
 
candidateResultPair.getSecond().getCandidate(), context);
 } catch (Exception e) {
 LOG.warn(
diff --git 
a/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/transform/TransformTool.java
 
b/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/transform/TransformTool.java
index d9a761a88b..ccaf84cb76 100644
--- 
a/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/transform/TransformTool.java
+++ 
b/phoenix-core-server/src/main/java/org/apache/phoenix/mapreduce/transform/TransformTool.java
@@ -711,9 +711,8 @@ public class TransformTool extends Configured implements 
Tool {
 byte[][] newSplitPoints = null;
 // TODO : if the rowkey changes via transform, we need to create new 
split points
 try (Table hDataTable =
- (Table) pConnection.getQueryServices()
- .getTable(oldTable.getPhysicalName().getBytes());
- org.apache.hadoop.hbase.client.Connection connection =
+
pConnection.getQueryServices().getTable(oldTable.getPhysicalName().getBytes());
+org.apache.hadoop.hbase.client.Connection connection =
  
HBaseFactoryProvider.getHConnectionFactory().createConnection(configuration)) {
 // Avoid duplicate split keys and remove the empty key
 oldSplitPoints = 
connection.getRegionLocator(hDataTable.getName()).getStartKeys();

(phoenix) branch 5.1 updated: PHOENIX-7140 Update Apache Parent and Maven Plugin Versions in Core

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new b236aa7269 PHOENIX-7140 Update Apache Parent and Maven Plugin Versions 
in Core
b236aa7269 is described below

commit b236aa7269666e2769447a01f6dac507cf98d37c
Author: Jain, Nihal 
AuthorDate: Wed Dec 13 11:24:34 2023 +0530

PHOENIX-7140 Update Apache Parent and Maven Plugin Versions in Core

- Apache Parent pom updated to v30
- Versions for the following plugins removed as they are derived from 
parent pom:
  - maven-enforcer-plugin
  - maven-shade-plugin
  - maven-project-info-reports-plugin
- Unused property surefire.version has been removed
- Properties findbugs-annotations.version, maven-owasp-plugin.version, and 
os.maven.version have been relocated
- Versions for these plugins are now managed via properties:
  - jasmine-maven-plugin
  - lifecycle-mapping
  - maven-bundle-plugin
  - exec-maven-plugin
  - maven-checkstyle-plugin
- Upgraded versions for these plugins:
  - maven-eclipse-plugin to 2.10
  - maven-build-helper-plugin to 3.5.0
  - restrict-imports.enforcer to 2.4.0
  - spotbugs-maven-plugin to 4.8.1.0
  - spotbugs to 4.8.1
  - jacoco-maven-plugin to 0.8.11
  - sonar-maven-plugin to 3.10.0.2594
  - maven-owasp-plugin to 8.4.0
  - os.maven to 1.7.1
  - maven-bundle-plugin to 5.1.9
  - exec-maven-plugin to 3.1.1
  - maven-checkstyle-plugin to 3.3.0
- Updated checker.xml based on updated checkstyle, refer 
https://github.com/checkstyle/checkstyle/issues/2116
- Updated DTD version to be inline with phoenix-omid
- Switched to  as the old declaration variant no longer 
supported, refer 
https://github.com/skuzzle/restrict-imports-enforcer-rule/releases/tag/v2.0.0
- Temporarily retained old version of apache parent for 
maven-dependency-plugin as upgrading is causing build to fail
---
 phoenix-core/pom.xml   |  1 -
 .../src/main/config/checkstyle/checker.xml | 21 ---
 pom.xml| 68 --
 src/main/config/checkstyle/checker.xml | 21 ---
 4 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 8cc1d18626..22c81d9d00 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -40,7 +40,6 @@
  
   org.apache.maven.plugins
   maven-enforcer-plugin
-  ${maven-enforcer-plugin.version}
   
 
   
diff --git a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml 
b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml
index 323aac0d9e..8e840543ce 100755
--- a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml
+++ b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml
@@ -26,7 +26,9 @@ limitations under the License.
   http://checkstyle.sourceforge.net
 -->
 
-http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+https://checkstyle.org/dtds/configuration_1_3.dtd";>
 
 
 
@@ -56,6 +58,15 @@ limitations under the License.
 
   
 
+  
+  
+  
+  
+
+
+  
+
   
 
 
@@ -216,14 +227,6 @@ limitations under the License.
   
 
 
-
-
-
-
-  
-  
-
   
 
   
diff --git a/pom.xml b/pom.xml
index e9ab4d2228..776103c483 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
   
 org.apache
 apache
-23
+30
   
 
   
@@ -121,7 +121,6 @@
 1.21
 1.9.0
 2.1.1
-1.3.9-1
 1.0-1
 2.0.1
 0.3
@@ -147,18 +146,22 @@
 1.3
 
 
-2.9
-
1.9.1
-3.0.0-M3
-
1.1.0
-3.2.4
+2.10
+
3.5.0
+
2.4.0
 
${antlr.version}
-
3.1.1
-
-3.0.0
-4.4.1
-4.4.1
-0.8.7
+4.8.1.0
+4.8.1
+0.8.11
+3.10.0.2594
+1.3.9-1
+8.4.0
+1.7.1
+2.2
+1.0.0
+5.1.9
+3.1.1
+3.3.0
 
 
 8
@@ -211,9 +214,7 @@
 
0.700
 
0.600
 
-6.5.3
 0.6.1
-1.5.0.Final
 
 ${os.detected.classifier}
@@ -233,7 +234,6 @@
 
   org.apache.maven.plugins
   maven-project-info-reports-plugin
-  ${maven-project-info-reports-plugin.version}
 
 
   org.apache.maven.plugins
@@ -247,7 +247,7 @@
 
   com.github.searls
   jasmine-maven-plugin
-  2.2
+  ${jasmine-maven-plugin.version}
 
 
   com.github.spotbugs
@@ -271,7 +271,7 @@
 
   org.eclipse.m2e
   lifecycle-mapping
-  1.0.0
+  ${lifecycle-mapping.version}
   
 
   
@@ -403,6 +403,7 @@
 
 
   maven-dependency-plug

(phoenix) branch master updated: PHOENIX-7140 Update Apache Parent and Maven Plugin Versions in Core

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 8839ebf377 PHOENIX-7140 Update Apache Parent and Maven Plugin Versions 
in Core
8839ebf377 is described below

commit 8839ebf3776f4f670d7284d7011dd79126802b9e
Author: Jain, Nihal 
AuthorDate: Wed Dec 13 11:24:34 2023 +0530

PHOENIX-7140 Update Apache Parent and Maven Plugin Versions in Core

- Apache Parent pom updated to v30
- Versions for the following plugins removed as they are derived from 
parent pom:
  - maven-enforcer-plugin
  - maven-shade-plugin
  - maven-project-info-reports-plugin
- Unused property surefire.version has been removed
- Properties findbugs-annotations.version, maven-owasp-plugin.version, and 
os.maven.version have been relocated
- Versions for these plugins are now managed via properties:
  - jasmine-maven-plugin
  - lifecycle-mapping
  - maven-bundle-plugin
  - exec-maven-plugin
  - maven-checkstyle-plugin
- Upgraded versions for these plugins:
  - maven-eclipse-plugin to 2.10
  - maven-build-helper-plugin to 3.5.0
  - restrict-imports.enforcer to 2.4.0
  - spotbugs-maven-plugin to 4.8.1.0
  - spotbugs to 4.8.1
  - jacoco-maven-plugin to 0.8.11
  - sonar-maven-plugin to 3.10.0.2594
  - maven-owasp-plugin to 8.4.0
  - os.maven to 1.7.1
  - maven-bundle-plugin to 5.1.9
  - exec-maven-plugin to 3.1.1
  - maven-checkstyle-plugin to 3.3.0
- Updated checker.xml based on updated checkstyle, refer 
https://github.com/checkstyle/checkstyle/issues/2116
- Updated DTD version to be inline with phoenix-omid
- Switched to  as the old declaration variant no longer 
supported, refer 
https://github.com/skuzzle/restrict-imports-enforcer-rule/releases/tag/v2.0.0
- Temporarily retained old version of apache parent for 
maven-dependency-plugin as upgrading is causing build to fail
---
 .../src/main/config/checkstyle/checker.xml | 21 ---
 pom.xml| 66 +++---
 src/main/config/checkstyle/checker.xml | 21 ---
 3 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml 
b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml
index 323aac0d9e..8e840543ce 100755
--- a/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml
+++ b/phoenix-tracing-webapp/src/main/config/checkstyle/checker.xml
@@ -26,7 +26,9 @@ limitations under the License.
   http://checkstyle.sourceforge.net
 -->
 
-http://www.puppycrawl.com/dtds/configuration_1_1.dtd";>
+https://checkstyle.org/dtds/configuration_1_3.dtd";>
 
 
 
@@ -56,6 +58,15 @@ limitations under the License.
 
   
 
+  
+  
+  
+  
+
+
+  
+
   
 
 
@@ -216,14 +227,6 @@ limitations under the License.
   
 
 
-
-
-
-
-  
-  
-
   
 
   
diff --git a/pom.xml b/pom.xml
index 9886991d36..635a551023 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
   
 org.apache
 apache
-23
+30
   
 
   
@@ -117,7 +117,6 @@
 1.21
 1.9.0
 2.1.1
-1.3.9-1
 1.0-1
 2.0.1
 0.3
@@ -142,19 +141,22 @@
 2.1.12
 
 
-2.9
-
1.9.1
-3.0.0-M3
-
1.1.0
-3.2.4
+2.10
+
3.5.0
+
2.4.0
 
${antlr.version}
-
3.1.1
-
-3.0.0
-4.4.1
-4.4.1
-0.8.8
-3.9.1.2184
+4.8.1.0
+4.8.1
+0.8.11
+3.10.0.2594
+1.3.9-1
+8.4.0
+1.7.1
+2.2
+1.0.0
+5.1.9
+3.1.1
+3.3.0
 
 
 8
@@ -207,9 +209,7 @@
 
0.700
 
0.600
 
-6.5.3
 0.6.1
-1.5.0.Final
 
 ${os.detected.classifier}
@@ -231,7 +231,6 @@
 
   org.apache.maven.plugins
   maven-project-info-reports-plugin
-  ${maven-project-info-reports-plugin.version}
 
 
   org.apache.maven.plugins
@@ -245,7 +244,7 @@
 
   com.github.searls
   jasmine-maven-plugin
-  2.2
+  ${jasmine-maven-plugin.version}
 
 
   com.github.spotbugs
@@ -269,7 +268,7 @@
 
   org.eclipse.m2e
   lifecycle-mapping
-  1.0.0
+  ${lifecycle-mapping.version}
   
 
   
@@ -401,6 +400,7 @@
 
 
   maven-dependency-plugin
+  3.1.1
   
   
 
@@ -465,18 +465,17 @@
 
   org.apache.maven.plugins
   maven-shade-plugin
-  ${maven-shade-plugin.version}
 
 
   
   org.apache.felix
   maven-bundle-plugin
-  2.5.3
+  ${maven-bundle-plugin.version}
 
 
 

(phoenix) branch 5.1 updated: PHOENIX-7150 PHOENIX-6523 has broken HBase 2.1 and 2.2 support

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 4812ee60f7 PHOENIX-7150 PHOENIX-6523 has broken HBase 2.1 and 2.2 
support
4812ee60f7 is described below

commit 4812ee60f7bb1513324563fa2f6978d8a80f92f3
Author: Istvan Toth 
AuthorDate: Wed Dec 13 08:52:35 2023 +0100

PHOENIX-7150 PHOENIX-6523 has broken HBase 2.1 and 2.2 support
---
 .../src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java  | 6 ++
 .../src/main/java/org/apache/phoenix/jdbc/ZKConnectionInfo.java| 7 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
index 1b566dd362..0347b1dfb4 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ConnectionInfo.java
@@ -57,22 +57,28 @@ public abstract class ConnectionInfo {
 
 protected static final boolean HAS_MASTER_REGISTRY;
 protected static final boolean HAS_RPC_REGISTRY;
+// HBase 2.2 and older doesn't have the ZK registry class by the expected 
name
+protected static final boolean DO_NOT_SET_REGISTRY;
 
 static {
 String version = VersionInfo.getVersion();
 if (getMajorVersion(version) >= 3) {
 HAS_MASTER_REGISTRY = true;
 HAS_RPC_REGISTRY = true;
+DO_NOT_SET_REGISTRY = false;
 } else {
 if (VersionInfo.compareVersion(VersionInfo.getVersion(), "2.3.0") 
< 0) {
 HAS_MASTER_REGISTRY = false;
 HAS_RPC_REGISTRY = false;
+DO_NOT_SET_REGISTRY = true;
 } else if (VersionInfo.compareVersion(VersionInfo.getVersion(), 
"2.5.0") < 0) {
 HAS_MASTER_REGISTRY = true;
 HAS_RPC_REGISTRY = false;
+DO_NOT_SET_REGISTRY = false;
 } else {
 HAS_MASTER_REGISTRY = true;
 HAS_RPC_REGISTRY = true;
+DO_NOT_SET_REGISTRY = false;
 }
 }
 }
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ZKConnectionInfo.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ZKConnectionInfo.java
index 841b0073ab..4460082f64 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ZKConnectionInfo.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/ZKConnectionInfo.java
@@ -75,9 +75,10 @@ public class ZKConnectionInfo extends ConnectionInfo {
 }
 
 Map connectionProps = getCommonProps();
-connectionProps.put(CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY,
-ZK_REGISTRY_NAME);
-
+if (!DO_NOT_SET_REGISTRY) {
+connectionProps.put(CLIENT_CONNECTION_REGISTRY_IMPL_CONF_KEY,
+ZK_REGISTRY_NAME);
+}
 if (getZkHosts() != null) {
 //This has the highest priority
 connectionProps.put(HConstants.CLIENT_ZOOKEEPER_QUORUM, 
getZkHosts());

(phoenix-queryserver) branch master updated: PHOENIX-7148 Use getColumnLabel Instead of getColumnName in QueryServerBasicsIT

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new a0238df  PHOENIX-7148 Use getColumnLabel Instead of getColumnName in 
QueryServerBasicsIT
a0238df is described below

commit a0238df55e5b532df116ce74da14cfb9fb53f67f
Author: Istvan Toth 
AuthorDate: Tue Dec 12 19:45:55 2023 +0100

PHOENIX-7148 Use getColumnLabel Instead of getColumnName in 
QueryServerBasicsIT
---
 .../src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
 
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
index e19ea62..66820bd 100644
--- 
a/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
+++ 
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
@@ -110,7 +110,7 @@ public class QueryServerBasicsIT extends BaseTest {
 final ResultSetMetaData metaData = resultSet.getMetaData();
 assertFalse("unexpected populated resultSet", resultSet.next());
 assertEquals(1, metaData.getColumnCount());
-assertEquals(TABLE_CAT, metaData.getColumnName(1));
+assertEquals(TABLE_CAT, metaData.getColumnLabel(1));
   }
 }
   }
@@ -126,8 +126,8 @@ public class QueryServerBasicsIT extends BaseTest {
 final ResultSetMetaData metaData = resultSet.getMetaData();
 assertTrue("unexpected empty resultset", resultSet.next());
 assertEquals(2, metaData.getColumnCount());
-assertEquals(TABLE_SCHEM, metaData.getColumnName(1));
-assertEquals(TABLE_CATALOG, metaData.getColumnName(2));
+assertEquals(TABLE_SCHEM, metaData.getColumnLabel(1));
+assertEquals(TABLE_CATALOG, metaData.getColumnLabel(2));
 boolean containsSystem = false;
 do {
   if (resultSet.getString(1).equalsIgnoreCase(SYSTEM_SCHEMA_NAME)) 
containsSystem = true;

(phoenix) branch 5.1 updated: PHOENIX-7143 Detect JVM version and add the necessary module flags in startup scripts

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new c3714c1777 PHOENIX-7143 Detect JVM version and add the necessary 
module flags in startup scripts
c3714c1777 is described below

commit c3714c1777b237efb2f49f0124f0f992d0dd7dab
Author: Istvan Toth 
AuthorDate: Mon Dec 11 14:08:57 2023 +0100

PHOENIX-7143 Detect JVM version and add the necessary module flags in 
startup scripts
---
 bin/performance.py  | 43 ---
 bin/pherf-standalone.py | 37 ++-
 bin/phoenix_utils.py| 78 +
 bin/psql.py | 38 ++--
 bin/sqlline.py  | 35 +-
 5 files changed, 90 insertions(+), 141 deletions(-)

diff --git a/bin/performance.py b/bin/performance.py
index 212a1f659d..5b09a29c93 100755
--- a/bin/performance.py
+++ b/bin/performance.py
@@ -63,44 +63,13 @@ statements = ""
 
 phoenix_utils.setPath()
 
-# HBase configuration folder path (where hbase-site.xml reside) for
-# HBase/Phoenix client side property override
-hbase_config_path = phoenix_utils.hbase_conf_dir
-
-java_home = os.getenv('JAVA_HOME')
-
-# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = None
-hbase_env_cmd  = None
-if os.name == 'posix':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
-hbase_env_cmd = ['bash', '-c', 'source %s && env' % hbase_env_path]
-elif os.name == 'nt':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
-hbase_env_cmd = ['cmd.exe', '/c', 'call %s & set' % hbase_env_path]
-if not hbase_env_path or not hbase_env_cmd:
-sys.stderr.write("hbase-env file unknown on platform {}{}".format(os.name, 
os.linesep))
-sys.exit(-1)
-
-hbase_env = {}
-if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
-for x in p.stdout:
-(k, _, v) = x.decode().partition('=')
-hbase_env[k.strip()] = v.strip()
-
-if 'JAVA_HOME' in hbase_env:
-java_home = hbase_env['JAVA_HOME']
-
-if java_home:
-java_cmd = os.path.join(java_home, 'bin', 'java')
-else:
-java_cmd = 'java'
-
-execute = ('%s $PHOENIX_OPTS -cp "%s%s%s%s%s" -Dlog4j.configuration=file:' +
-   os.path.join(phoenix_utils.current_dir, "log4j.properties") +
+java_cmd = phoenix_utils.java
+
+execute = ('%s %s $PHOENIX_OPTS -cp 
"%s%s%s%s%s"-Dlog4j2.configurationFile=file:' +
+   os.path.join(phoenix_utils.current_dir, "log4j2.properties") +
' org.apache.phoenix.util.PhoenixRuntime -t %s %s ') % \
-(java_cmd, hbase_config_path, os.pathsep, phoenix_utils.slf4j_backend_jar, 
os.pathsep,
+(java_cmd, phoenix_utils.jvm_module_flags, hbase_config_path, os.pathsep,
+ phoenix_utils.slf4j_backend_jar, os.pathsep,
  phoenix_utils.logging_jar, os.pathsep, 
phoenix_utils.phoenix_client_embedded_jar,
  table, zookeeper)
 
diff --git a/bin/pherf-standalone.py b/bin/pherf-standalone.py
index 16617d6b6a..ddd7804913 100755
--- a/bin/pherf-standalone.py
+++ b/bin/pherf-standalone.py
@@ -30,41 +30,8 @@ phoenix_utils.setPath()
 
 args = phoenix_utils.shell_quote(sys.argv[1:])
 
-# HBase configuration folder path (where hbase-site.xml reside) for
-# HBase/Phoenix client side property override
-hbase_config_path = phoenix_utils.hbase_conf_dir
-
-java_home = os.getenv('JAVA_HOME')
-
-# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = None
-hbase_env_cmd  = None
-if os.name == 'posix':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
-hbase_env_cmd = ['bash', '-c', 'source %s && env' % hbase_env_path]
-elif os.name == 'nt':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
-hbase_env_cmd = ['cmd.exe', '/c', 'call %s & set' % hbase_env_path]
-if not hbase_env_path or not hbase_env_cmd:
-sys.stderr.write("hbase-env file unknown on platform {}{}".format(os.name, 
os.linesep))
-sys.exit(-1)
-
-hbase_env = {}
-if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
-for x in p.stdout:
-(k, _, v) = tryDecode(x).partition('=')
-hbase_env[k.strip()] = v.strip()
-
-if 'JAVA_HOME' in hbase_env:
-java_home = hbase_env['JAVA_HOME']
-
-if java_home:
-java = os.path.join(java_home, 'bin'

(phoenix) branch master updated: PHOENIX-7143 Detect JVM version and add the necessary module flags in startup scripts

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new e21763aca9 PHOENIX-7143 Detect JVM version and add the necessary 
module flags in startup scripts
e21763aca9 is described below

commit e21763aca986c0def413603a4b86da30eb5afd94
Author: Istvan Toth 
AuthorDate: Mon Dec 11 14:08:57 2023 +0100

PHOENIX-7143 Detect JVM version and add the necessary module flags in 
startup scripts
---
 bin/performance.py  | 41 --
 bin/pherf-standalone.py | 37 ++-
 bin/phoenix_utils.py| 78 +
 bin/psql.py | 38 ++--
 bin/sqlline.py  | 35 +-
 5 files changed, 89 insertions(+), 140 deletions(-)

diff --git a/bin/performance.py b/bin/performance.py
index 8599ccde49..5b09a29c93 100755
--- a/bin/performance.py
+++ b/bin/performance.py
@@ -63,44 +63,13 @@ statements = ""
 
 phoenix_utils.setPath()
 
-# HBase configuration folder path (where hbase-site.xml reside) for
-# HBase/Phoenix client side property override
-hbase_config_path = phoenix_utils.hbase_conf_dir
-
-java_home = os.getenv('JAVA_HOME')
-
-# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = None
-hbase_env_cmd  = None
-if os.name == 'posix':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
-hbase_env_cmd = ['bash', '-c', 'source %s && env' % hbase_env_path]
-elif os.name == 'nt':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
-hbase_env_cmd = ['cmd.exe', '/c', 'call %s & set' % hbase_env_path]
-if not hbase_env_path or not hbase_env_cmd:
-sys.stderr.write("hbase-env file unknown on platform {}{}".format(os.name, 
os.linesep))
-sys.exit(-1)
-
-hbase_env = {}
-if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
-for x in p.stdout:
-(k, _, v) = x.decode().partition('=')
-hbase_env[k.strip()] = v.strip()
-
-if 'JAVA_HOME' in hbase_env:
-java_home = hbase_env['JAVA_HOME']
-
-if java_home:
-java_cmd = os.path.join(java_home, 'bin', 'java')
-else:
-java_cmd = 'java'
-
-execute = ('%s $PHOENIX_OPTS -cp "%s%s%s%s%s" 
-Dlog4j2.configurationFile=file:' +
+java_cmd = phoenix_utils.java
+
+execute = ('%s %s $PHOENIX_OPTS -cp 
"%s%s%s%s%s"-Dlog4j2.configurationFile=file:' +
os.path.join(phoenix_utils.current_dir, "log4j2.properties") +
' org.apache.phoenix.util.PhoenixRuntime -t %s %s ') % \
-(java_cmd, hbase_config_path, os.pathsep, phoenix_utils.slf4j_backend_jar, 
os.pathsep,
+(java_cmd, phoenix_utils.jvm_module_flags, hbase_config_path, os.pathsep,
+ phoenix_utils.slf4j_backend_jar, os.pathsep,
  phoenix_utils.logging_jar, os.pathsep, 
phoenix_utils.phoenix_client_embedded_jar,
  table, zookeeper)
 
diff --git a/bin/pherf-standalone.py b/bin/pherf-standalone.py
index 5ace94685b..14f5500fb1 100755
--- a/bin/pherf-standalone.py
+++ b/bin/pherf-standalone.py
@@ -30,41 +30,8 @@ phoenix_utils.setPath()
 
 args = phoenix_utils.shell_quote(sys.argv[1:])
 
-# HBase configuration folder path (where hbase-site.xml reside) for
-# HBase/Phoenix client side property override
-hbase_config_path = phoenix_utils.hbase_conf_dir
-
-java_home = os.getenv('JAVA_HOME')
-
-# load hbase-env.??? to extract JAVA_HOME, HBASE_PID_DIR, HBASE_LOG_DIR
-hbase_env_path = None
-hbase_env_cmd  = None
-if os.name == 'posix':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.sh')
-hbase_env_cmd = ['bash', '-c', 'source %s && env' % hbase_env_path]
-elif os.name == 'nt':
-hbase_env_path = os.path.join(hbase_config_path, 'hbase-env.cmd')
-hbase_env_cmd = ['cmd.exe', '/c', 'call %s & set' % hbase_env_path]
-if not hbase_env_path or not hbase_env_cmd:
-sys.stderr.write("hbase-env file unknown on platform {}{}".format(os.name, 
os.linesep))
-sys.exit(-1)
-
-hbase_env = {}
-if os.path.isfile(hbase_env_path):
-p = subprocess.Popen(hbase_env_cmd, stdout = subprocess.PIPE)
-for x in p.stdout:
-(k, _, v) = tryDecode(x).partition('=')
-hbase_env[k.strip()] = v.strip()
-
-if 'JAVA_HOME' in hbase_env:
-java_home = hbase_env['JAVA_HOME']
-
-if java_home:
-java = os.path.join(java_home, 'bin', 'java')
-else:
-java = 'java'
-
-java_cmd = 

(phoenix-connectors) branch master updated: PHOENIX-7133 Update maven plugin versions in connectors

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 80abdb4  PHOENIX-7133 Update maven plugin versions in connectors
80abdb4 is described below

commit 80abdb4e7886765af6bc8cfc7f893cf7e74f0b8c
Author: Istvan Toth 
AuthorDate: Fri Dec 1 10:50:06 2023 +0100

PHOENIX-7133 Update maven plugin versions in connectors
---
 pom.xml | 36 
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a43a8c..42b7056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,17 +121,14 @@
 2.11.0
 
 
-3.1.1
-3.0.0
-
3.1.1
-3.1.0
-
3.2.0
-3.4.4
+
3.5.0
+4.8.1
 
-1.6.0
-4.1.3
-4.1.3
-6.5.3
+3.1.0
+4.8.1.0
+4.8.2
+9.0.1
+3.3.0
 
 
 8
@@ -181,7 +178,6 @@
 
   org.apache.maven.plugins
   maven-project-info-reports-plugin
-  ${maven-project-info-reports-plugin.version}
 
 
   org.apache.maven.plugins
@@ -190,7 +186,6 @@
 
 org.apache.maven.plugins
 maven-assembly-plugin
-${maven-assembly-plugin-version}
 
 
@@ -221,7 +216,6 @@
 
   org.apache.maven.plugins
   maven-checkstyle-plugin
-  ${maven-checkstyle-plugin.version}
 
 
   org.apache.rat
@@ -297,7 +291,7 @@
 
   net.alchim31.maven
   scala-maven-plugin
-  ${maven-scala-plugin.version}
+  ${scala-maven-plugin.version}
 
 
   org.apache.maven.plugins
@@ -346,10 +340,11 @@
   
 
 
-  
+  
   org.apache.felix
   maven-bundle-plugin
-  2.5.3
+  ${maven.bundle.version}
 
   
 
@@ -375,6 +370,15 @@
 
   
 
+
+
+  
+com.puppycrawl.tools
+checkstyle
+8.19
+  
+
   
   
 org.apache.maven.plugins

(phoenix) branch 5.1 updated: PHOENIX-7109 Incorrect query results when using OFFSET

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new a5fe9e1905 PHOENIX-7109 Incorrect query results when using OFFSET
a5fe9e1905 is described below

commit a5fe9e19057638dd3e90fb24cc4725ab22a9c29a
Author: Aron Meszaros 
AuthorDate: Wed Nov 22 16:14:28 2023 +0100

PHOENIX-7109 Incorrect query results when using OFFSET
---
 .../src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
index e00a9fbeb4..61de07500b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
@@ -49,7 +49,7 @@ public class OffsetResultIterator extends 
DelegateResultIterator {
 while (rowCount < offset) {
 Tuple tuple = super.next();
 if (tuple == null) { return null; }
-if (isDummy(tuple)) {
+if (tuple.size() == 0 || isDummy(tuple)) {
 // while rowCount < offset absorb the dummy and call next on 
the underlying scanner
 continue;
 }

svn commit: r1914267 - in /phoenix/site: publish/ publish/language/ source/src/site/markdown/

[stoty]

Author: stoty
Date: Fri Dec  1 17:02:03 2023
New Revision: 1914267

URL: http://svn.apache.org/viewvc?rev=1914267&view=rev
Log:
Update Hive connector page, and document webpage building quirks


Modified:
phoenix/site/publish/building_website.html
phoenix/site/publish/classpath_and_url.html
phoenix/site/publish/hive_storage_handler.html
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/source/src/site/markdown/building_website.md
phoenix/site/source/src/site/markdown/hive_storage_handler.md

Modified: phoenix/site/publish/building_website.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/building_website.html?rev=1914267&r1=1914266&r2=1914267&view=diff
==
--- phoenix/site/publish/building_website.html (original)
+++ phoenix/site/publish/building_website.html Fri Dec  1 17:02:03 2023
@@ -1,14 +1,14 @@
 
 
 
 
 


-   Building Phoenix Project Web Site | Apache 
Phoenix
+   Prerequisites | Apache Phoenix



@@ -168,8 +168,14 @@


 
- Building Phoenix Project Web Site
+ Prerequisites
  
+The Website build script has severely bit-rotted see https://issues.apache.org/jira/browse/PHOENIX-6867";>PHOENIX-6867 
+ 
+ The maven site.xml must have proxy set for the 
http://conjars.org org repo 
+ The mvn command must be configured to use Java 1.8. Newer versions 
won’t work. 
+ 
+Building Phoenix Project Web Site 
  
  Make a local copy of source markdown files and html web pages 
  

Modified: phoenix/site/publish/classpath_and_url.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/classpath_and_url.html?rev=1914267&r1=1914266&r2=1914267&view=diff
==
--- phoenix/site/publish/classpath_and_url.html (original)
+++ phoenix/site/publish/classpath_and_url.html Fri Dec  1 17:02:03 2023
@@ -1,7 +1,7 @@
 
 
 
 
@@ -263,7 +263,7 @@
  
  Notes 
  Support for master and RPC registries is only available in 
Phoenix 5.1.4 and later and 5.2.0 and later. Earlier version only support the 
jdbc:phoenix: protocol variant implementing the the original HBase Zookeeper 
Connection Registry. 
- Support for the registry variants is only available for the HBase versions 
that support them. Phoenix will throw an error if a variant that the HBase 
version doesn’t support is speci. 
+ Support for the registry variants is only available for the HBase versions 
that support them. Phoenix will throw an error if a variant that the HBase 
client version doesn’t support is specified. 
  Phoenix 5.2 also supports Hight Availability connections. Documentation 
for that is only available in the https://issues.apache.org/jira/browse/PHOENIX-6491";>JIRA ticket 
 


Modified: phoenix/site/publish/hive_storage_handler.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/hive_storage_handler.html?rev=1914267&r1=1914266&r2=1914267&view=diff
==
--- phoenix/site/publish/hive_storage_handler.html (original)
+++ phoenix/site/publish/hive_storage_handler.html Fri Dec  1 17:02:03 2023
@@ -1,7 +1,7 @@
 
 
 
 
@@ -173,54 +173,61 @@
 The Apache Phoenix Storage Handler is a plugin that enables Apache Hive 
access to Phoenix tables from the Apache Hive command line using HiveQL. 
  
  Prerequisites 
+ This document describes the plugin available in the phoenix-connectors 
source repo, as of December 2023. 
   
-  Phoenix 4.8.0+ 
-  Hive 1.2.1+ 
+  Phoenix 5.1.0+ 
+  Hive 3.1.2+ 
+  phoenix-connectors 6.0.0-SNAPSHOT 
   
+ The Phoenix Storage handler currently only supports Hive 3.1. It has only 
been tested with Hive Hive 3.1.3, and Phoenix 5.1.3. 
+ A variant for Hive 4 is planned to be provided after Hive 4.0.0 has been 
released 
  
  
- Hive Setup 
- Make phoenix-version-hive.jar available for Hive: 
- Step 1: Add to hive-env.sh: 
+ Building 
+ The Phoenix Storage Handler used to be part of the main Phoenix repo, but 
it has been refactored into the separate phoenix-connectors repo after the 
release of Phoenix 5.0. At the time of writing there is no released version of 
the connectors project, it must be built from the git source repository 
HEAD. 
+ Official releases will be available at the Download page. 
+ Check the value of the hbase.version property in the root pom.xml If it is 
older than HBase 2.5.0, then you need to rebuild HBase locally as described in 
the BUILDING.md file in the main phoenix repository. 
+ Check out the HEAD version of the https://github.com/apache/phoenix-connectors";>https://github.com/apache/phoenix-connectors
 repo. Build it wit

(phoenix-connectors) branch master updated: PHOENIX-7128 Run ITs with Failsafe in Connectors

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new e0444eb  PHOENIX-7128 Run ITs with Failsafe in Connectors
e0444eb is described below

commit e0444ebfd17244f849f4153db5ee4f488c66a152
Author: Istvan Toth 
AuthorDate: Wed Nov 29 14:48:18 2023 +0100

PHOENIX-7128 Run ITs with Failsafe in Connectors
---
 phoenix5-spark3/pom.xml | 4 
 pom.xml | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/phoenix5-spark3/pom.xml b/phoenix5-spark3/pom.xml
index f2cec4a..ffd04f4 100644
--- a/phoenix5-spark3/pom.xml
+++ b/phoenix5-spark3/pom.xml
@@ -164,10 +164,6 @@
 
   
 
-  
-org.apache.maven.plugins
-maven-failsafe-plugin
-  
   
   maven-dependency-plugin
   
diff --git a/pom.xml b/pom.xml
index 47b2556..1a43a8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
 
 
 8
-7
+4
 false
 false
 
@@ -310,7 +310,6 @@
 alphabetical
 
${test.output.tofile}
 kill
-${basedir}/src/it/java
 false
   
   

(phoenix-connectors) 06/07: PHOENIX-6939 Change phoenix-hive connector shading to work with hbase-shaded-mapreduce

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git

commit af1045964ba90e553d346a50d3570565790a4884
Author: Istvan Toth 
AuthorDate: Wed Nov 22 15:54:46 2023 +0100

PHOENIX-6939 Change phoenix-hive connector shading to work with 
hbase-shaded-mapreduce
---
 phoenix5-hive-shaded/pom.xml | 248 +--
 phoenix5-hive/pom.xml|   1 -
 2 files changed, 215 insertions(+), 34 deletions(-)

diff --git a/phoenix5-hive-shaded/pom.xml b/phoenix5-hive-shaded/pom.xml
index d5fafdc..dd24215 100644
--- a/phoenix5-hive-shaded/pom.xml
+++ b/phoenix5-hive-shaded/pom.xml
@@ -48,12 +48,6 @@
   phoenix-hbase-compat-${hbase.compat.version}
   runtime
 
-
-  org.apache.zookeeper
-  zookeeper-jute
-  ${zookeeper.version}
-  provided
-
 
 
@@ -121,14 +115,27 @@
 
   
 
+
+
 
-  org.apache.hbase
-  hbase-mapreduce
-  provided
+  commons-beanutils
+  commons-beanutils
+  compile
 
+
+
 
-  org.apache.hbase
-  hbase-zookeeper
+  org.apache.hadoop
+  hadoop-common
+  
+  
+  commons-beanutils
+  commons-beanutils
+  
+  
   provided
 
 
@@ -137,13 +144,23 @@
   provided
 
 
-  org.apache.hbase
-  hbase-protocol-shaded
+  org.apache.hadoop
+  hadoop-annotations
   provided
 
 
-  org.apache.hbase
-  hbase-endpoint
+  org.apache.hadoop
+  hadoop-auth
+  provided
+
+
+  org.apache.hadoop
+  hadoop-yarn-api
+  provided
+
+
+  org.apache.hadoop
+  hadoop-hdfs
   provided
 
 
@@ -153,21 +170,138 @@
 
 
   org.apache.hadoop
-  hadoop-minicluster
-  test
+  hadoop-distcp
+  provided
+
+
+  org.apache.hadoop
+  hadoop-client
+  provided
 
 
-  org.apache.zookeeper
-  zookeeper
-  ${zookeeper.version}
+  org.apache.hadoop
+  hadoop-mapreduce-client-jobclient
+  provided
+
+
+  org.apache.hadoop
+  hadoop-mapreduce-client-common
   provided
 
 
+
+  org.slf4j
+  slf4j-log4j12
+  provided
+
 
   log4j
   log4j
   provided
 
+
+
+
+  org.apache.hbase
+  hbase-client
+  provided
+
+
+  org.apache.hbase
+  hbase-common
+  provided
+
+
+  org.apache.hbase
+  hbase-mapreduce
+  provided
+
+
+  org.apache.hbase
+  hbase-replication
+  provided
+
+
+  org.apache.hbase
+  hbase-endpoint
+  provided
+
+
+  org.apache.hbase
+  hbase-endpoint
+  provided
+
+
+  org.apache.hbase
+  hbase-metrics-api
+  provided
+
+
+  org.apache.hbase
+  hbase-metrics
+  provided
+
+
+  org.apache.hbase
+  hbase-protocol
+  provided
+
+
+  org.apache.hbase
+  hbase-protocol-shaded
+  provided
+
+
+  org.apache.hbase
+  hbase-server
+  provided
+
+
+  org.apache.hbase
+  hbase-hadoop-compat
+  provided
+
+
+  org.apache.hbase
+  hbase-hadoop2-compat
+  provided
+
+
+  org.apache.hbase
+  hbase-zookeeper
+  provided
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-netty
+  provided
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-miscellaneous
+  provided
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-protobuf
+  provided
+
+
+
+  com.google.guava
+  guava
+  
+  11.0.2
+  provided
+
+
+  com.github.stephenc.findbugs
+  findbugs-annotations
+  
+  1.3.9-1
+  provided
+
   
   
   
@@ -248,6 +382,7 @@
 
   
   
+
 
   org/
   ${shaded.package}.org.
@@ -266,27 +401,74 @@
 
 
 org/apache/hbase/**
+
+org/apache/spark/**
 
 org/apache/phoenix/**
 org/apache/omid/**
 
+
+org/apache/commons/configuration2/**
   
 
+
 
-  com/
-  ${shaded.package}.com.
-  
-
-com/sun/tools/**
-com/sun/javadoc/**
-com/sun/security/**
-com/sun/jndi/**
-com/sun/management/**
-
-com/google/protobuf/**
-  
+  com/beust/
+  ${shaded.package}.com.beust.
+
+
+  com

(phoenix-connectors) 01/07: PHOENIX-7122 Build connectors with Hbase 2.4

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git

commit b2a283a3b2e2b1d2d11dcecf594f9d8c10e3cec2
Author: Istvan Toth 
AuthorDate: Thu Nov 23 08:13:54 2023 +0100

PHOENIX-7122 Build connectors with Hbase 2.4

also update apache parent to 31, and fix some dependency issues found by 
the newer maven-dependency-plugin
---
 phoenix5-hive/pom.xml  | 21 +++--
 phoenix5-spark/pom.xml |  8 
 phoenix5-spark3-it/pom.xml |  8 
 pom.xml| 17 -
 4 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/phoenix5-hive/pom.xml b/phoenix5-hive/pom.xml
index 25f90ae..bd23b41 100644
--- a/phoenix5-hive/pom.xml
+++ b/phoenix5-hive/pom.xml
@@ -197,19 +197,25 @@
   provided
 
 
+
+
+  com.google.code.findbugs
+  jsr305
+  3.0.0
+  test
+
 
   org.apache.commons
   commons-compress
   ${commons-compress.version}
+  test
 
-
 
   commons-io
   commons-io
   ${commons-io.version}
+  test
 
-
-
 
   org.apache.phoenix
   phoenix-core
@@ -385,13 +391,16 @@
   
   
 
-
-  com.google.code.findbugs:jsr305
-
 
   org.apache.calcite.avatica:avatica
 
+
+  org.antlr:antlr-runtime
+
   
+  
+  org.antlr:antlr-runtime
+  
 
   
   
diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index 7b26396..cd33ca3 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -401,6 +401,14 @@
   test
 
 
+
+  
+  org.apache.zookeeper
+  zookeeper
+  ${zookeeper.version}
+  test
+
+
 
 
   org.apache.hadoop
diff --git a/phoenix5-spark3-it/pom.xml b/phoenix5-spark3-it/pom.xml
index 37f9ca8..3d8c25b 100644
--- a/phoenix5-spark3-it/pom.xml
+++ b/phoenix5-spark3-it/pom.xml
@@ -130,6 +130,13 @@
 
 
 
+
+  
+  org.apache.zookeeper
+  zookeeper
+  ${zookeeper.version}
+  test
+
 
   org.apache.hbase
   hbase-it
@@ -233,6 +240,7 @@
 
org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}
 org.apache.hbase:hbase-it
 org.apache.omid:*
+
org.apache.zookeeper:zookeeper
   
 
   
diff --git a/pom.xml b/pom.xml
index a415667..b795ff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
   
 org.apache
 apache
-23
+31
   
 
   
@@ -58,14 +58,13 @@
 5.1.3
 1.0.2
 2.0.0
-
-2.1.10
-2.1.6
-3.0.3
-3.5.9
-
-2.1.0
-
+
+2.4.16
+2.4.1
+3.1.2
+3.5.7
+4.1.4
+
 
 
 true

(phoenix-connectors) 05/07: PHOENIX-7118 Fix Shading Regressions in Spark Connector

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git

commit bfbfb8d14e63f39adb2bce3e9ed281dccf4dd875
Author: Istvan Toth 
AuthorDate: Wed Nov 22 15:54:46 2023 +0100

PHOENIX-7118 Fix Shading Regressions in Spark Connector
---
 phoenix5-spark-shaded/pom.xml  | 271 ++---
 phoenix5-spark3-shaded/pom.xml |  38 +++---
 pom.xml|   7 +-
 3 files changed, 282 insertions(+), 34 deletions(-)

diff --git a/phoenix5-spark-shaded/pom.xml b/phoenix5-spark-shaded/pom.xml
index 7cab58c..1b9ff72 100644
--- a/phoenix5-spark-shaded/pom.xml
+++ b/phoenix5-spark-shaded/pom.xml
@@ -30,13 +30,15 @@
   4.0.0
 
   phoenix5-spark-shaded
-  Shaded Phoenix Spark Connector for Phoenix 5
+  Shaded Phoenix Spark 2 Connector for Phoenix 5
 
   
 ${project.basedir}/..
   
 
   
+
+
 
   org.apache.phoenix
   phoenix5-spark
@@ -44,18 +46,199 @@
 
   org.apache.phoenix
   phoenix-hbase-compat-${hbase.compat.version}
-  runtime
+
+
+  org.slf4j
+  slf4j-api
+  provided
+
+
+
+
+  commons-beanutils
+  commons-beanutils
+  compile
+
+
+
+
+  org.apache.hadoop
+  hadoop-common
+  provided
+
+
+  org.apache.hadoop
+  hadoop-mapreduce-client-core
+  provided
+
+
+  org.apache.hadoop
+  hadoop-annotations
+  provided
+
+
+  org.apache.hadoop
+  hadoop-auth
+  provided
+
+
+  org.apache.hadoop
+  hadoop-yarn-api
+  provided
+
+
+  org.apache.hadoop
+  hadoop-hdfs
+  provided
+
+
+  org.apache.hadoop
+  hadoop-hdfs-client
+  provided
+
+
+  org.apache.hadoop
+  hadoop-distcp
+  provided
+
+
+  org.apache.hadoop
+  hadoop-client
+  provided
+
+
+  org.apache.hadoop
+  hadoop-mapreduce-client-jobclient
+  provided
+
+
+  org.apache.hadoop
+  hadoop-mapreduce-client-common
+  provided
 
 
+
+  org.slf4j
+  slf4j-log4j12
+  provided
+
 
   log4j
   log4j
   provided
 
+
+
+
+  org.apache.hbase
+  hbase-client
+  provided
+
+
+  org.apache.hbase
+  hbase-common
+  provided
+
+
+  org.apache.hbase
+  hbase-mapreduce
+  provided
+
+
+  org.apache.hbase
+  hbase-replication
+  provided
+
+
+  org.apache.hbase
+  hbase-endpoint
+  provided
+
+
+  org.apache.hbase
+  hbase-endpoint
+  provided
+
+
+  org.apache.hbase
+  hbase-metrics-api
+  provided
+
+
+  org.apache.hbase
+  hbase-metrics
+  provided
+
+
+  org.apache.hbase
+  hbase-protocol
+  provided
+
+
+  org.apache.hbase
+  hbase-protocol-shaded
+  provided
+
+
+  org.apache.hbase
+  hbase-server
+  provided
+
+
+  org.apache.hbase
+  hbase-hadoop-compat
+  provided
+
+
+  org.apache.hbase
+  hbase-hadoop2-compat
+  provided
+
+
+  org.apache.hbase
+  hbase-zookeeper
+  provided
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-netty
+  provided
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-miscellaneous
+  provided
+
+
+  org.apache.hbase.thirdparty
+  hbase-shaded-protobuf
+  provided
+
+
+
+  com.google.guava
+  guava
+  
+  11.0.2
+  provided
+
+
+  com.github.stephenc.findbugs
+  findbugs-annotations
+  
+  1.3.9-1
+  provided
+
   
 
   
 
+  
   
 org.apache.maven.plugins
 maven-shade-plugin
@@ -75,6 +258,7 @@
 NOTICE.*
 NOTICE
 README*
+
META-INF/versions/11/org/glassfish/jersey/internal/jsr166/*.class
 
 log4j.properties
   
@@ -107,31 +291,32 @@
   
   
 
+  
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
 />
 
+  
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
   csv-bulk-load-config.properties
   
 ${project.basedir}/../config/csv-bulk-load-config.properties
   
 
 
+  
implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
   README.md
   ${project.basedir}/../README.md
 
 
+  
implementation="org.apache.maven.plugins.shade.resource.IncludeReso

(phoenix-connectors) 04/07: PHOENIX-6923 Always run Scala tests for Phoenix-Spark connector

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git

commit 17f408ce6cac4a66677c6d1502a45fa06821016a
Author: Istvan Toth 
AuthorDate: Tue Nov 21 14:53:42 2023 +0100

PHOENIX-6923 Always run Scala tests for Phoenix-Spark connector
---
 phoenix5-spark/pom.xml | 16 +---
 phoenix5-spark3-it/pom.xml | 15 +--
 pom.xml| 13 +++--
 3 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index 78eedfa..e6be35c 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -35,7 +35,6 @@
 
   
 ${project.basedir}/..
-true
 ${scala.version.for.spark2}
 
${scala.binary.version.for.spark2}
   
@@ -551,7 +550,7 @@
 
${project.build.directory}/surefire-reports
 .
 WDF TestSuite.txt
-${skip-scala-tests}
+${skip.scalatest}
   
   
 
@@ -610,17 +609,4 @@
 this should be kept in sync with Phoenix as much as possible -->
   
   
-  
-
-  scala-tests-enabled
-  
-
-  scala-tests-enabled
-
-  
-  
-false
-  
-
-  
 
diff --git a/phoenix5-spark3-it/pom.xml b/phoenix5-spark3-it/pom.xml
index 5ce08df..5a8aaf1 100644
--- a/phoenix5-spark3-it/pom.xml
+++ b/phoenix5-spark3-it/pom.xml
@@ -219,7 +219,7 @@
   
${project.build.directory}/surefire-reports
   .
   WDF TestSuite.txt
-  ${skip-scala-tests}
+  ${skip.scalatest}
 
 
   
@@ -257,17 +257,4 @@
   
 
   
-  
-
-  scala-tests-enabled
-  
-
-  scala-tests-enabled
-
-  
-  
-false
-  
-
-  
 
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5f796e4..5dbfdec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
 org.apache.hadoop.hbase.shaded
 5
 
-true
+false
 false
   
 
@@ -858,10 +858,7 @@
 [11,17)
   
   
-${phoenix-surefire.jdk11.flags}
-  ${phoenix-surefire.jdk11.tuning.flags}
-  ${phoenix-surefire.argLine}
-  @{jacocoArgLine}
+${phoenix-surefire.jdk11.flags} 
${phoenix-surefire.jdk11.tuning.flags} ${phoenix-surefire.argLine}
   
 
 
@@ -870,11 +867,7 @@
 [17,)
   
   
-${phoenix-surefire.jdk11.flags}
-  ${phoenix-surefire.jdk17.flags}
-  ${phoenix-surefire.jdk17.tuning.flags}
-  ${phoenix-surefire.argLine}
-  @{jacocoArgLine}
+${phoenix-surefire.jdk11.flags} 
${phoenix-surefire.jdk17.flags} ${phoenix-surefire.jdk17.tuning.flags} 
${phoenix-surefire.argLine}
   
 
 

(phoenix-connectors) 03/07: PHOENIX-7119 Java ITs are not run for either Spark Connector

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git

commit 592803ee37ea502c5a72b942f17aa597043087bd
Author: Istvan Toth 
AuthorDate: Tue Nov 21 15:33:45 2023 +0100

PHOENIX-7119 Java ITs are not run for either Spark Connector
---
 phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java   | 3 +++
 .../src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java  | 3 +++
 phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java | 3 +++
 phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java | 3 +++
 .../src/it/java/org/apache/phoenix/spark/AggregateIT.java  | 3 +++
 .../src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java  | 3 +++
 phoenix5-spark3-it/src/it/java/org/apache/phoenix/spark/OrderByIT.java | 3 +++
 .../src/it/java/org/apache/phoenix/spark/SaltedTableIT.java| 3 +++
 8 files changed, 24 insertions(+)

diff --git 
a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java 
b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java
index e4b96a3..b00c613 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/AggregateIT.java
@@ -27,8 +27,11 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.phoenix.end2end.BaseAggregateIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
 import org.apache.phoenix.util.QueryBuilder;
+import org.junit.experimental.categories.Category;
 
+@Category(ParallelStatsDisabledTest.class)
 public class AggregateIT extends BaseAggregateIT {
 
 @Override
diff --git 
a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java 
b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
index bc2637d..a49bc0a 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/DataSourceApiIT.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.spark;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
 import org.apache.phoenix.query.ConfigurationFactory;
 import org.apache.phoenix.spark.datasource.v2.PhoenixDataSource;
 import org.apache.phoenix.util.InstanceResolver;
@@ -32,6 +33,7 @@ import org.apache.spark.sql.types.StructType;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import java.sql.*;
 import java.util.Arrays;
@@ -42,6 +44,7 @@ import static 
org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL;
 import static org.apache.phoenix.util.PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR;
 import static org.junit.Assert.*;
 
+@Category(ParallelStatsDisabledTest.class)
 public class DataSourceApiIT extends ParallelStatsDisabledIT {
 
 public DataSourceApiIT() {
diff --git a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java 
b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java
index 043bb32..342edae 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/OrderByIT.java
@@ -36,6 +36,7 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.phoenix.end2end.BaseOrderByIT;
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
 import org.apache.phoenix.spark.datasource.v2.PhoenixDataSource;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryBuilder;
@@ -44,6 +45,7 @@ import org.apache.spark.sql.Row;
 import org.apache.spark.sql.SQLContext;
 import org.apache.spark.sql.sources.v2.DataSourceOptions;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.Ignore;
 
 
@@ -51,6 +53,7 @@ import org.junit.Ignore;
 import scala.Option;
 import scala.collection.JavaConverters;
 
+@Category(ParallelStatsDisabledTest.class)
 public class OrderByIT extends BaseOrderByIT {
 
 @Override
diff --git 
a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java 
b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
index d72acbd..9f2cc91 100644
--- a/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
+++ b/phoenix5-spark/src/it/java/org/apache/phoenix/spark/SaltedTableIT.java
@@ -26,9 +26,12 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.phoenix.end2end.ParallelStatsDisabledTest;
 import org.apache.phoenix.end2end.salted.BaseSaltedTableIT;
 import org.apache.phoenix.util.QueryBuilder;
+import org.junit.experimental.categories.Category;
 
+@Category(ParallelStatsDisabledTest.class)
 public class

(phoenix-connectors) branch master updated (26c1aba -> d032bd5)

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


from 26c1aba  PHOENIX-7114 Use Phoenix 5.1.3 for building Connectiors
 new b2a283a  PHOENIX-7122 Build connectors with Hbase 2.4
 new e7ad177  PHOENIX-7065 Spark3 connector tests fail with Spark 3.4.1
 new 592803e  PHOENIX-7119 Java ITs are not run for either Spark Connector
 new 17f408c  PHOENIX-6923 Always run Scala tests for Phoenix-Spark 
connector
 new bfbfb8d  PHOENIX-7118 Fix Shading Regressions in Spark Connector
 new af10459  PHOENIX-6939 Change phoenix-hive connector shading to work 
with hbase-shaded-mapreduce
 new d032bd5  PHOENIX-7124 Build connectors with Spark 2.4.8, Spark 3.2.4, 
and Hive 3.1.3

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 phoenix5-hive-shaded/pom.xml   | 248 ---
 phoenix5-hive/pom.xml  |  22 +-
 phoenix5-spark-shaded/pom.xml  | 271 +++--
 phoenix5-spark/README.md   |  18 +-
 phoenix5-spark/pom.xml |  37 +--
 .../java/org/apache/phoenix/spark/AggregateIT.java |   3 +
 .../org/apache/phoenix/spark/DataSourceApiIT.java  |   9 +-
 .../java/org/apache/phoenix/spark/OrderByIT.java   |   3 +
 .../org/apache/phoenix/spark/SaltedTableIT.java|   3 +
 .../java/org/apache/phoenix/spark/SparkUtil.java   |   3 +-
 .../phoenix/spark/AbstractPhoenixSparkIT.scala |   2 +
 phoenix5-spark3-it/pom.xml |  38 +--
 .../java/org/apache/phoenix/spark/AggregateIT.java |   3 +
 .../org/apache/phoenix/spark/DataSourceApiIT.java  |   3 +
 .../java/org/apache/phoenix/spark/OrderByIT.java   |   3 +
 .../org/apache/phoenix/spark/SaltedTableIT.java|   3 +
 .../phoenix/spark/AbstractPhoenixSparkIT.scala |   1 +
 phoenix5-spark3-shaded/pom.xml |  38 +--
 phoenix5-spark3/README.md  |  21 +-
 phoenix5-spark3/pom.xml|   4 +-
 pom.xml|  49 ++--
 21 files changed, 638 insertions(+), 144 deletions(-)

(phoenix-connectors) 02/07: PHOENIX-7065 Spark3 connector tests fail with Spark 3.4.1

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git

commit e7ad177c40f0c34e9120ddb13ac337486c282800
Author: Istvan Toth 
AuthorDate: Thu Nov 23 21:06:13 2023 +0100

PHOENIX-7065 Spark3 connector tests fail with Spark 3.4.1

Fix test classpath issue
use spark.hadoopRDD.ignoreEmptySplits=false for Spark3 tests
---
 phoenix5-spark/README.md| 18 +-
 phoenix5-spark/pom.xml  | 13 +
 .../org/apache/phoenix/spark/DataSourceApiIT.java   |  6 --
 .../it/java/org/apache/phoenix/spark/SparkUtil.java |  3 ++-
 .../phoenix/spark/AbstractPhoenixSparkIT.scala  |  2 ++
 phoenix5-spark3-it/pom.xml  | 15 +--
 .../phoenix/spark/AbstractPhoenixSparkIT.scala  |  1 +
 phoenix5-spark3/README.md   | 21 -
 phoenix5-spark3/pom.xml |  4 ++--
 pom.xml |  6 --
 10 files changed, 70 insertions(+), 19 deletions(-)

diff --git a/phoenix5-spark/README.md b/phoenix5-spark/README.md
index f443cb0..73d68c2 100644
--- a/phoenix5-spark/README.md
+++ b/phoenix5-spark/README.md
@@ -38,6 +38,7 @@ val spark = SparkSession
   .builder()
   .appName("phoenix-test")
   .master("local")
+  .config("spark.hadoopRDD.ignoreEmptySplits", "false")
   .getOrCreate()
 
 // Load data from TABLE1
@@ -62,7 +63,8 @@ import org.apache.spark.sql.SQLContext;
 public class PhoenixSparkRead {
 
 public static void main() throws Exception {
-SparkConf sparkConf = new 
SparkConf().setMaster("local").setAppName("phoenix-test");
+SparkConf sparkConf = new 
SparkConf().setMaster("local").setAppName("phoenix-test")
+.set("spark.hadoopRDD.ignoreEmptySplits", "false");
 JavaSparkContext jsc = new JavaSparkContext(sparkConf);
 SQLContext sqlContext = new SQLContext(jsc);
 
@@ -109,6 +111,7 @@ val spark = SparkSession
   .builder()
   .appName("phoenix-test")
   .master("local")
+  .config("spark.hadoopRDD.ignoreEmptySplits", "false")
   .getOrCreate()
   
 // Load INPUT_TABLE
@@ -137,7 +140,8 @@ import org.apache.spark.sql.SQLContext;
 public class PhoenixSparkWriteFromInputTable {
 
 public static void main() throws Exception {
-SparkConf sparkConf = new 
SparkConf().setMaster("local").setAppName("phoenix-test");
+SparkConf sparkConf = new 
SparkConf().setMaster("local").setAppName("phoenix-test")
+  .set("spark.hadoopRDD.ignoreEmptySplits", "false");
 JavaSparkContext jsc = new JavaSparkContext(sparkConf);
 SQLContext sqlContext = new SQLContext(jsc);
 
@@ -183,6 +187,7 @@ val spark = SparkSession
   .builder()
   .appName("phoenix-test")
   .master("local")
+  .config("spark.hadoopRDD.ignoreEmptySplits", "false")
   .getOrCreate()
   
 val dataSet = List(Row(1L, "1", 1), Row(2L, "2", 2), Row(3L, "3", 3))
@@ -223,7 +228,8 @@ import java.util.List;
 public class PhoenixSparkWriteFromRDDWithSchema {
  
 public static void main() throws Exception {
-SparkConf sparkConf = new 
SparkConf().setMaster("local").setAppName("phoenix-test");
+SparkConf sparkConf = new 
SparkConf().setMaster("local").setAppName("phoenix-test")
+.set("spark.hadoopRDD.ignoreEmptySplits", "false");
 JavaSparkContext jsc = new JavaSparkContext(sparkConf);
 SQLContext sqlContext = new SQLContext(jsc);
 SparkSession spark = sqlContext.sparkSession();
@@ -306,7 +312,8 @@ import org.apache.phoenix.spark._
 val configuration = new Configuration()
 // Can set Phoenix-specific settings, requires 'hbase.zookeeper.quorum'
 
-val sc = new SparkContext("local", "phoenix-test")
+val sparkConf = new SparkConf().set("spark.ui.showConsoleProgress", "false")
+val sc = new SparkContext("local", "phoenix-test", sparkConf)
 val sqlContext = new SQLContext(sc)
 
 // Load the columns 'ID' and 'COL1' from TABLE1 as a DataFrame
@@ -324,7 +331,8 @@ import org.apache.spark.sql.SQLContext
 import org.apache.phoenix.spark._
 import org.apache.spark.rdd.RDD
 
-val sc = new SparkContext("local", "phoenix-test")
+val sparkConf = new SparkConf().set("spark.ui.showConsoleProgress", "false")
+val sc = new SparkContext("local", "phoenix-test", sparkConf)
 
 // Load the columns 'ID' a

(phoenix-connectors) 07/07: PHOENIX-7124 Build connectors with Spark 2.4.8, Spark 3.2.4, and Hive 3.1.3

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git

commit d032bd57f0b5f7916654e635a6b8532f51484cd8
Author: Istvan Toth 
AuthorDate: Mon Nov 27 19:54:59 2023 +0100

PHOENIX-7124 Build connectors with Spark 2.4.8, Spark 3.2.4, and Hive 3.1.3
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1f01f94..47b2556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,14 +94,14 @@
 ${phoenix-surefire.argLine} 
${phoenix-surefire.jdk8.tuning.flags}
 
 
-3.1.2
+3.1.3
 ${hive3.version}
 2.7.0
 ${hive3-storage.version}
-2.4.0
+2.4.8
 2.11.12
 2.11
-3.0.3
+3.2.4
 2.12.18
 2.12
 

(phoenix) branch 5.1 updated: PHOENIX-7116 Backport "PHOENIX-6588 Update to phoenix-thirdparty 2.0.0" to branch 5.1

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 9cf4e69a8a PHOENIX-7116 Backport "PHOENIX-6588 Update to 
phoenix-thirdparty 2.0.0" to branch 5.1
9cf4e69a8a is described below

commit 9cf4e69a8a2e992679fed7b8e6d751132d5fc9fd
Author: Jain, Nihal 
AuthorDate: Mon Nov 20 19:09:26 2023 +0530

PHOENIX-7116 Backport "PHOENIX-6588 Update to phoenix-thirdparty 2.0.0" to 
branch 5.1
---
 .../main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java | 5 -
 .../src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java   | 5 -
 .../src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java   | 5 -
 .../java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java   | 5 -
 .../src/main/java/org/apache/phoenix/mapreduce/index/IndexTool.java  | 5 -
 .../java/org/apache/phoenix/mapreduce/index/IndexUpgradeTool.java| 5 -
 .../java/org/apache/phoenix/schema/stats/UpdateStatisticsTool.java   | 5 -
 .../src/main/java/org/apache/phoenix/schema/tool/SchemaTool.java | 5 -
 .../java/org/apache/phoenix/util/MergeViewIndexIdSequencesTool.java  | 5 -
 .../src/main/java/org/apache/phoenix/util/PhoenixRuntime.java| 5 -
 phoenix-pherf/src/main/java/org/apache/phoenix/pherf/Pherf.java  | 5 -
 pom.xml  | 2 +-
 12 files changed, 45 insertions(+), 12 deletions(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
index 27b416c294..b8bc14a989 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/AbstractBulkLoadTool.java
@@ -128,7 +128,10 @@ public abstract class AbstractBulkLoadTool extends 
Configured implements Tool {
 
 Options options = getOptions();
 
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
 CommandLine cmdLine = null;
 try {
 cmdLine = parser.parse(options, args);
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
index f16982269f..efa57d7e04 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/OrphanViewTool.java
@@ -199,7 +199,10 @@ public class OrphanViewTool extends Configured implements 
Tool {
 
 final Options options = getOptions();
 
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
 CommandLine cmdLine = null;
 try {
 cmdLine = parser.parse(options, args);
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
index 0f432640b0..b8d6b8a326 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/PhoenixTTLTool.java
@@ -173,7 +173,10 @@ public class PhoenixTTLTool extends Configured implements 
Tool {
 
 public CommandLine parseOptions(String[] args) {
 final Options options = getOptions();
-CommandLineParser parser = new DefaultParser(false, false);
+CommandLineParser parser = DefaultParser.builder().
+setAllowPartialMatching(false).
+setStripLeadingAndTrailingQuotes(false).
+build();
 CommandLine cmdLine = null;
 try {
 cmdLine = parser.parse(options, args);
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
index 49126400e6..27bb0c34fc 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/index/IndexScrutinyTool.java
@@ -168,7 +168,10 @@ public class IndexScrutinyTool extends Configured 
implements Tool {
 private CommandLine parseOptions(String[] args) {
 final Options options = getOptions();
 
-CommandLineParser parser = new Defaul

(phoenix) branch 5.1 updated: PHOENIX-7121 Do not exclude commons-beanutils from Omid dependencies

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 00837ccd8b PHOENIX-7121 Do not exclude commons-beanutils from Omid 
dependencies
00837ccd8b is described below

commit 00837ccd8b481fc221c93fc5da7cb89e049281bb
Author: Istvan Toth 
AuthorDate: Wed Nov 29 09:03:21 2023 +0100

PHOENIX-7121 Do not exclude commons-beanutils from Omid dependencies
---
 pom.xml | 30 ++
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 124f413e7f..e2f038881e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -853,6 +853,28 @@
 org.apache.htrace
 htrace-core4
   
+  
+
+commons-beanutils
+commons-beanutils
+  
+
+  
+  
+org.apache.hadoop
+hadoop-common
+test-jar
+${hadoop.version}
+
+  
+org.apache.htrace
+htrace-core4
+  
+  
+
+commons-beanutils
+commons-beanutils
+  
 
   
   
@@ -1226,10 +1248,6 @@
 commons-io
 commons-io
   
-  
-commons-beanutils
-commons-beanutils
-  
 
   
   
@@ -1270,10 +1288,6 @@
 omid-common
 ${omid.version}
 
-  
-commons-beanutils
-commons-beanutils
-  
   
 org.testng
 testng

(phoenix) branch master updated: PHOENIX-7121 Do not exclude commons-beanutils from Omid dependencies

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new da53e659f9 PHOENIX-7121 Do not exclude commons-beanutils from Omid 
dependencies
da53e659f9 is described below

commit da53e659f9117d3ab874fdebe5d73bf70a12967d
Author: Istvan Toth 
AuthorDate: Wed Nov 29 09:03:21 2023 +0100

PHOENIX-7121 Do not exclude commons-beanutils from Omid dependencies
---
 pom.xml | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index ff783dce53..248273a4ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -781,6 +781,11 @@
 org.slf4j
 slf4j-log4j12
   
+  
+
+commons-beanutils
+commons-beanutils
+  
 
   
   
@@ -801,6 +806,11 @@
 org.slf4j
 slf4j-log4j12
   
+  
+
+commons-beanutils
+commons-beanutils
+  
 
   
   
@@ -1229,10 +1239,6 @@
 commons-io
 commons-io
   
-  
-commons-beanutils
-commons-beanutils
-  
 
   
   
@@ -1281,10 +1287,6 @@
 omid-common
 ${omid.version}
 
-  
-commons-beanutils
-commons-beanutils
-  
   
 org.testng
 testng

(phoenix-queryserver) branch master updated: PHOENIX-7126 Update apache parent pom version in QueryServer and bump maven plugins/dependencies to latest - Bump apache parent pom version to 30 - Remove

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new 636b4bf  PHOENIX-7126 Update apache parent pom version in QueryServer 
and bump maven plugins/dependencies to latest - Bump apache parent pom version 
to 30 - Remove maven-assembly-plugin-version as it is coming from parent pom - 
Bump following plugins:  - maven-eclipse-plugin.version to 2.10  - 
maven-build-helper-plugin.version to 3.5.0  - spotbugs-maven-plugin.version to 
4.8.1.0  - spotbugs.version to 4.8.1  - maven-owasp-plugin.version to 8.4.0  - 
jacoco-maven-plugin.version to  [...]
636b4bf is described below

commit 636b4bf376f6b37642c82a2045654a4b5f129cdf
Author: Jain, Nihal 
AuthorDate: Wed Nov 29 20:20:51 2023 +0530

PHOENIX-7126 Update apache parent pom version in QueryServer and bump maven 
plugins/dependencies to latest
- Bump apache parent pom version to 30
- Remove maven-assembly-plugin-version as it is coming from parent pom
- Bump following plugins:
 - maven-eclipse-plugin.version to 2.10
 - maven-build-helper-plugin.version to 3.5.0
 - spotbugs-maven-plugin.version to 4.8.1.0
 - spotbugs.version to 4.8.1
 - maven-owasp-plugin.version to 8.4.0
 - jacoco-maven-plugin.version to 0.8.11
 - maven-sonar-plugin.version to 3.10.0.2594
- Fix scope of org.apache.phoenix:phoenix-queryserver scope to test
---
 phoenix-queryserver-it/pom.xml |  1 +
 pom.xml| 18 --
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 0dcd5c9..04103bc 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -89,6 +89,7 @@
 
   org.apache.phoenix
   phoenix-queryserver
+  test
 
 
 
diff --git a/pom.xml b/pom.xml
index 33fadfb..6e1aa17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
   org.apache
   apache
-  23
+  30
 
 
 org.apache.phoenix
@@ -95,14 +95,13 @@
 4.13.2
 
 
-3.1.1
-2.9
-
1.9.1
-4.1.3
-4.1.3
-6.5.3
-0.8.8
-3.9.1.2184
+2.10
+
3.5.0
+4.8.1.0
+4.8.1
+8.4.0
+0.8.11
+3.10.0.2594
 
 
 false
@@ -211,7 +210,6 @@
 
 org.apache.maven.plugins
 maven-assembly-plugin
-${maven-assembly-plugin.version}
 
 
 maven-dependency-plugin

(phoenix-thirdparty) branch master updated: PHOENIX-7080 Switch phoenix-thirdparty to guava-jre from guava-android

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-thirdparty.git


The following commit(s) were added to refs/heads/master by this push:
 new befb410  PHOENIX-7080 Switch phoenix-thirdparty to guava-jre from 
guava-android
befb410 is described below

commit befb410038f230fc67e90195ddbf0d290eaf07e4
Author: Jain, Nihal 
AuthorDate: Thu Oct 19 13:04:56 2023 +0530

PHOENIX-7080 Switch phoenix-thirdparty to guava-jre from guava-android

also update to the latest available 32.1.3-jre version
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c8d480d..cc643a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
 
   
 org.apache.phoenix.thirdparty
-32.1.1-android
+32.1.3-jre
 1.5.0
   
 

(phoenix) branch master updated: PHOENIX-7109 Incorrect query results when using OFFSET

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 1a2f09ced1 PHOENIX-7109 Incorrect query results when using OFFSET
1a2f09ced1 is described below

commit 1a2f09ced11206b934367852c453dc825901578d
Author: Aron Meszaros 
AuthorDate: Wed Nov 22 16:14:28 2023 +0100

PHOENIX-7109 Incorrect query results when using OFFSET
---
 .../src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
index e00a9fbeb4..61de07500b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/OffsetResultIterator.java
@@ -49,7 +49,7 @@ public class OffsetResultIterator extends 
DelegateResultIterator {
 while (rowCount < offset) {
 Tuple tuple = super.next();
 if (tuple == null) { return null; }
-if (isDummy(tuple)) {
+if (tuple.size() == 0 || isDummy(tuple)) {
 // while rowCount < offset absorb the dummy and call next on 
the underlying scanner
 continue;
 }

(phoenix-connectors) branch master updated: PHOENIX-7114 Use Phoenix 5.1.3 for building Connectiors

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 26c1aba  PHOENIX-7114 Use Phoenix 5.1.3 for building Connectiors
26c1aba is described below

commit 26c1aba65b02c893f595620601b1c263552b93d8
Author: Istvan Toth 
AuthorDate: Fri Nov 17 16:02:35 2023 +0100

PHOENIX-7114 Use Phoenix 5.1.3 for building Connectiors
---
 phoenix5-hive/pom.xml  | 11 +++
 phoenix5-spark/pom.xml | 12 
 phoenix5-spark3-it/pom.xml | 12 
 pom.xml| 16 +++-
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/phoenix5-hive/pom.xml b/phoenix5-hive/pom.xml
index dd31e80..25f90ae 100644
--- a/phoenix5-hive/pom.xml
+++ b/phoenix5-hive/pom.xml
@@ -216,6 +216,17 @@
   tests
   test
 
+
+  org.apache.omid
+  omid-tso-server-hbase2.x
+  test
+
+
+  org.apache.omid
+  omid-tso-server-hbase2.x
+  test
+  test-jar
+
 
   org.apache.hbase
   hbase-server
diff --git a/phoenix5-spark/pom.xml b/phoenix5-spark/pom.xml
index 35b1d83..7b26396 100644
--- a/phoenix5-spark/pom.xml
+++ b/phoenix5-spark/pom.xml
@@ -103,6 +103,18 @@
   tests
   test
 
+
+  org.apache.omid
+  omid-tso-server-hbase2.x
+  test
+
+
+  org.apache.omid
+  omid-tso-server-hbase2.x
+  test
+  test-jar
+
+
 
 
   junit
diff --git a/phoenix5-spark3-it/pom.xml b/phoenix5-spark3-it/pom.xml
index 3232eb5..37f9ca8 100644
--- a/phoenix5-spark3-it/pom.xml
+++ b/phoenix5-spark3-it/pom.xml
@@ -97,6 +97,17 @@
   tests
   test
 
+
+  org.apache.omid
+  omid-tso-server-hbase2.x
+  test
+
+
+  org.apache.omid
+  omid-tso-server-hbase2.x
+  test
+  test-jar
+
 
 
 
@@ -221,6 +232,7 @@
 
org.apache.hadoop:hadoop-minicluster
 
org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}
 org.apache.hbase:hbase-it
+org.apache.omid:*
   
 
   
diff --git a/pom.xml b/pom.xml
index 461c073..a415667 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,8 @@
 
   
 
-5.1.2
+5.1.3
+1.0.2
 2.0.0
 
 2.1.10
@@ -499,6 +500,19 @@
 tests
 test
   
+  
+org.apache.omid
+omid-tso-server-hbase2.x
+test
+${omid.version}
+  
+  
+org.apache.omid
+omid-tso-server-hbase2.x
+test
+   ${omid.version}
+test-jar
+  
   
 org.apache.phoenix.thirdparty
 phoenix-shaded-guava

(phoenix) branch master updated: PHOENIX-7095 Implement Statement.closeOnCompletion() and fix related close() bugs

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new b64a9736b7 PHOENIX-7095 Implement Statement.closeOnCompletion() and 
fix related close() bugs
b64a9736b7 is described below

commit b64a9736b78ae2d513669849986fad3bb5894279
Author: Istvan Toth 
AuthorDate: Thu Nov 2 09:52:07 2023 +0100

PHOENIX-7095 Implement Statement.closeOnCompletion() and fix related 
close() bugs

also set closeOnCompletion() on the statements generating metadata 
resultsets
---
 .../phoenix/end2end/ClientHashAggregateIT.java |  38 +-
 .../java/org/apache/phoenix/end2end/InListIT.java  |   7 +-
 .../phoenix/end2end/QueryDatabaseMetaDataIT.java   |  50 ++
 .../org/apache/phoenix/jdbc/PhoenixConnection.java |  45 +-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java  | 502 +++--
 .../org/apache/phoenix/jdbc/PhoenixResultSet.java  |   7 +-
 .../org/apache/phoenix/jdbc/PhoenixStatement.java  |  54 ++-
 .../apache/phoenix/jdbc/PhoenixStatementTest.java  |  38 ++
 8 files changed, 436 insertions(+), 305 deletions(-)

diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java
index b4b8ec731c..c071b7a836 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ClientHashAggregateIT.java
@@ -41,13 +41,10 @@ public class ClientHashAggregateIT extends 
ParallelStatsDisabledIT {
 public void testSalted() throws Exception { 
 
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
-   
-try {
+
+try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
 String table = createSalted(conn);
 testTable(conn, table);
-} finally {
-conn.close();
 }
 }
 
@@ -168,36 +165,39 @@ public class ClientHashAggregateIT extends 
ParallelStatsDisabledIT {
 String hashQuery = getQuery(table, true, swap, sort);
 String sortQuery = getQuery(table, false, swap, sort);
 Statement stmt = conn.createStatement();
-ResultSet hrs = stmt.executeQuery(hashQuery);
-ResultSet srs = stmt.executeQuery(sortQuery);
 
-try {
+try (ResultSet hrs = stmt.executeQuery(hashQuery);) {
 if (c1 > 0) {
 assertTrue(hrs.next());
-assertTrue(srs.next());
-assertEquals(hrs.getInt("v1"), srs.getInt("v1"));
-assertEquals(hrs.getInt("v2"), srs.getInt("v2"));
-assertEquals(hrs.getInt("c"), srs.getInt("c"));
 assertEquals(hrs.getInt("v1"), 1);
 assertEquals(hrs.getInt("v2"), 2);
 assertEquals(hrs.getInt("c"), c1);
 }
 if (c2 > 0) {
 assertTrue(hrs.next());
-assertTrue(srs.next());
-assertEquals(hrs.getInt("v1"), srs.getInt("v1"));
-assertEquals(hrs.getInt("v2"), srs.getInt("v2"));
-assertEquals(hrs.getInt("c"), srs.getInt("c"));
 assertEquals(hrs.getInt("v1"), 2);
 assertEquals(hrs.getInt("v2"), 1);
 assertEquals(hrs.getInt("c"), c2);
 }
 assertFalse(hrs.next());
+}
+
+try (ResultSet srs = stmt.executeQuery(sortQuery)) {
+if (c1 > 0) {
+assertTrue(srs.next());
+assertEquals(srs.getInt("v1"), 1);
+assertEquals(srs.getInt("v2"), 2);
+assertEquals(srs.getInt("c"), c1);
+}
+if (c2 > 0) {
+assertTrue(srs.next());
+assertEquals(srs.getInt("v1"), 2);
+assertEquals(srs.getInt("v2"), 1);
+assertEquals(srs.getInt("c"), c2);
+}
 assertFalse(srs.next());
-} finally {
-hrs.close();
-srs.close();
 }
+
 }
 
 private void dropTable(Connection conn, String table) throws Exception {
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
index 6728f6286e..d154ecdfd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/InListIT.java
@@ -792,12 +792,13

(phoenix-queryserver) branch master updated: PHOENIX-7091 Cleanup and ban log4j and related jars from phoenix-query-server

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
 new f0c2860  PHOENIX-7091 Cleanup and ban log4j and related jars from 
phoenix-query-server
f0c2860 is described below

commit f0c2860fea7fe2704f11476d457cd0d38ddd345d
Author: Jain, Nihal 
AuthorDate: Tue Oct 31 19:06:46 2023 +0530

PHOENIX-7091 Cleanup and ban log4j and related jars from 
phoenix-query-server

- Add maven-enforcer-plugin and use it to ban commons-logging and other 
logging framework related jars
- Remove all traces of log4j:log4j, org.slf4j:slf4j-log4j12 and 
commons-logging:commons-logging from dependency list
- Replace log4j.properties with log4j2.properties (copied from hbase 
project)
- Fix issue where IT logs where not getting logged in surefire reports due 
to "Failed to load class "org.slf4j.impl.StaticLoggerBinder"
 - See http://www.slf4j.org/codes.html#StaticLoggerBinder for further 
details.
- Fix log4j duplicate dependency warning in pom.xml
---
 phoenix-queryserver-it/pom.xml |  10 ++
 .../src/it/resources/log4j.properties  |  71 -
 .../src/it/resources/log4j2.properties | 137 
 pom.xml| 176 +++--
 4 files changed, 312 insertions(+), 82 deletions(-)

diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
index 36b9d5c..0dcd5c9 100644
--- a/phoenix-queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -202,5 +202,15 @@
 log4j-core
 test
 
+
+  org.apache.logging.log4j
+  log4j-slf4j-impl
+  test
+
+
+  org.apache.logging.log4j
+  log4j-1.2-api
+  test
+
   
 
diff --git a/phoenix-queryserver-it/src/it/resources/log4j.properties 
b/phoenix-queryserver-it/src/it/resources/log4j.properties
deleted file mode 100644
index 06af7bc..000
--- a/phoenix-queryserver-it/src/it/resources/log4j.properties
+++ /dev/null
@@ -1,71 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Define some default values that can be overridden by system properties
-hbase.root.logger=DEBUG,console
-hbase.log.dir=.
-hbase.log.file=hbase.log
-
-# Define the root logger to the system property "hbase.root.logger".
-log4j.rootLogger=${hbase.root.logger}
-
-# Logging Threshold
-log4j.threshhold=ALL
-
-#
-# Daily Rolling File Appender
-#
-log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.DRFA.File=${hbase.log.dir}/${hbase.log.file}
-
-# Rollver at midnight
-log4j.appender.DRFA.DatePattern=.-MM-dd
-
-# 30-day backup
-#log4j.appender.DRFA.MaxBackupIndex=30
-log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
-
-# Pattern format: Date LogLevel LoggerName LogMessage
-#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
-
-# Debugging Pattern format
-log4j.appender.DRFA.layout.ConversionPattern=%d %-5p [%t] %C{2}(%L): %m%n
-
-
-#
-# console
-# Add "console" to rootlogger above if you want to use this
-#
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d %-5p [%t] %C{2}(%L): %m%n
-
-# Custom Logging levels
-
-#log4j.logger.org.apache.hadoop.fs.FSNamesystem=DEBUG
-
-log4j.logger.org.apache.zookeeper=ERROR
-
-# Suppresses junk from minikdc
-log4j.logger.org.mortbay.log=WARN
-log4j.logger.org.apache.directory=WARN
-log4j.logger.net.sf.ehcache=WARN
-# Suppress the "no group for user" spamming
-log4j.logger.org.apache.hadoop.security.UserGroupInformation=ERROR
-log4j.logger.org.apache.hadoop.hdfs=INFO
-log4j.logger.org.apache.hadoop.metrics2=INFO
-log4j.logger.org.apache.hadoop.ipc=INFO
diff --git a/phoenix-queryserver-it/src/it/resources/log4j2.properties 
b/phoenix-queryserver-it/src/it/resources/log4j2.properties
new file mode 100644
index 000..2659468
--- /dev/null
+++ b/phoenix

(phoenix-connectors) branch master updated: PHOENIX-7104 Remove phoenix 4.x info from Connectors BUILDING.md

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new 11329d3  PHOENIX-7104 Remove phoenix 4.x info from Connectors 
BUILDING.md
11329d3 is described below

commit 11329d3597849f5199b821e8addf23703eb84c4e
Author: Istvan Toth 
AuthorDate: Fri Nov 10 10:08:13 2023 +0100

PHOENIX-7104 Remove phoenix 4.x info from Connectors BUILDING.md
---
 BUILDING.md | 26 +-
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/BUILDING.md b/BUILDING.md
index 308d3f8..b6edf29 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -24,23 +24,18 @@ Copyright ©2019 [Apache Software 
Foundation](http://www.apache.org/). All Right
 ## Building Apache Phoenix Connectors
 
 This repository will build jars for the different Phoenix connectors.
-Phoenix 4 and Phoenix 5 versions use different Hadoop and HBase versions, and 
require separate versions of the connectors.
-Phoenix 4 requires Hadoop 2.x and HBase 1.x, while Phoenix 5 requires Hadoop 
3.x and HBase 2.x
-The standard build process builds the connectors both for Phoenix 4 and 
Phoenix 5.
 
 ```
 $ mvn package
 ```
 
 ### Building against specific Phoenix version
-To build a release of Phoenix Connectors which packages a specific version of 
Phoenix, specify the `phoenix-four.version` or the `phoenix-five.version` 
system property to indicate a specific Phoenix version.
+To build a release of Phoenix Connectors which packages a specific version of 
Phoenix, specify the `phoenix.version` system property to indicate a specific 
Phoenix version.
 
-Phoenix Connectors will package the same version of Phoenix used for 
build/test. This version is controlled by the
-`phoenix-four.version` and the `phoenix-five.version` system properties.
 
-When specifying `phoenix-four.version` and the `phoenix-five.version`, also 
specify the HBase version to be used
-by the corresponding `hbase-one.version` and `hbase-two.version` system 
properties.
-Similarly you can overwrite the `hadoop-two.version` and the 
`hadoop-three.version` system properties if necessary.
+When specifying `phoenix.version`, also specify the HBase version to be used
+by the corresponding `hbase-two.version` system property.
+Similarly you can override the `hadoop-three.version` system properties if 
necessary.
 
 ```
 $ mvn package -Dphoenix-five.version=5.1.0-SNAPSHOT
@@ -51,19 +46,8 @@ $ mvn package -Dphoenix-five.version=5.1.0-SNAPSHOT
 `mvn package` will run the unit tests while building, but it will not run the 
integration test suite.
 
 The IT suite is run when executing `mvn install` or `mvn verify`. The Phoenix 
version specified
-with `phoenix-four.version` and the `phoenix-five.version` are used for 
running the integration tests.
+with `phoenix.version` is used for running the integration tests.
 
-```
-$ mvn verify -Dphoenix-four.version=4.16.0-SNAPSHOT -Dhbase-one.version=1.5.0
-```
 ```
 $ mvn install -Dphoenix-five.version=5.1.0-SNAPSHOT -Dhbase-one.version=2.1.9 
-Dhadoop-three.version=3.0.3
 ```
-
-### Skipping Phoenix 4/5 modules
-
-You can specify `-Dskip-phoenix4` or `-Dskip-phoenix5` system property to skip 
building the connectors for Phoenix 4 or Phoenix 5 altogether. It is useful to 
reduce the feedback time while working on a change for a specific Phoenix 
version or when you don't actually need the connectors for both Phoenix 4 and 5.
-
-```
-mvn clean package -DskipTests -Dskip-phoenix4
-```
\ No newline at end of file

(phoenix) branch 5.1 updated: PHOENIX-7102 phoenix-connectors doesn't compile with core HEAD

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 0757f8dae8 PHOENIX-7102 phoenix-connectors doesn't compile with core 
HEAD
0757f8dae8 is described below

commit 0757f8dae8c8db22659ec9ffa9e25b994c0474a9
Author: Istvan Toth 
AuthorDate: Tue Nov 7 18:19:27 2023 +0100

PHOENIX-7102 phoenix-connectors doesn't compile with core HEAD
---
 .../phoenix/iterate/TableResultIterator.java   | 23 ++
 1 file changed, 23 insertions(+)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
index 9ef7eb8200..9087411c4f 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
@@ -155,6 +155,29 @@ public class TableResultIterator implements ResultIterator 
{
 ScanUtil.setScanAttributesForClient(scan, table, 
plan.getContext().getConnection());
 }
 
+// Constructors without maxQueryEndTime to maintain API compatibility for 
phoenix-connectors
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, null, false, Long.MAX_VALUE);
+}
+
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper,Map caches) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, caches, false, Long.MAX_VALUE);
+}
+
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper, boolean isMapReduceContext) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, null, isMapReduceContext, Long.MAX_VALUE);
+}
+
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper,Map caches,
+boolean isMapReduceContext) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, caches, isMapReduceContext, Long.MAX_VALUE);
+}
+// End Constructors without maxQueryEndTime to maintain API compatibility 
for phoenix-connectors
+
 @Override
 public void close() throws SQLException {
 try {

(phoenix) branch master updated: PHOENIX-7102 phoenix-connectors doesn't compile with core HEAD

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 20529a62b8 PHOENIX-7102 phoenix-connectors doesn't compile with core 
HEAD
20529a62b8 is described below

commit 20529a62b8e8f6859ee246d3edc0ee568e93dacd
Author: Istvan Toth 
AuthorDate: Tue Nov 7 18:19:27 2023 +0100

PHOENIX-7102 phoenix-connectors doesn't compile with core HEAD
---
 .../phoenix/iterate/TableResultIterator.java   | 23 ++
 1 file changed, 23 insertions(+)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
index 9ef7eb8200..9087411c4f 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java
@@ -155,6 +155,29 @@ public class TableResultIterator implements ResultIterator 
{
 ScanUtil.setScanAttributesForClient(scan, table, 
plan.getContext().getConnection());
 }
 
+// Constructors without maxQueryEndTime to maintain API compatibility for 
phoenix-connectors
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, null, false, Long.MAX_VALUE);
+}
+
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper,Map caches) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, caches, false, Long.MAX_VALUE);
+}
+
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper, boolean isMapReduceContext) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, null, isMapReduceContext, Long.MAX_VALUE);
+}
+
+public TableResultIterator(MutationState mutationState, Scan scan, 
ScanMetricsHolder scanMetricsHolder,
+long renewLeaseThreshold, QueryPlan plan, ParallelScanGrouper 
scanGrouper,Map caches,
+boolean isMapReduceContext) throws SQLException {
+this(mutationState, scan, scanMetricsHolder, renewLeaseThreshold, 
plan, scanGrouper, caches, isMapReduceContext, Long.MAX_VALUE);
+}
+// End Constructors without maxQueryEndTime to maintain API compatibility 
for phoenix-connectors
+
 @Override
 public void close() throws SQLException {
 try {

(phoenix-connectors) branch master updated: PHOENIX-7103 Phoenix-connectors uses the refactored ConnectionInfo class

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-connectors.git


The following commit(s) were added to refs/heads/master by this push:
 new a465c90  PHOENIX-7103 Phoenix-connectors uses the refactored 
ConnectionInfo class
a465c90 is described below

commit a465c90f6e57af1e53650e1f1a67e5a02fca4b46
Author: Istvan Toth 
AuthorDate: Wed Nov 8 08:59:42 2023 +0100

PHOENIX-7103 Phoenix-connectors uses the refactored ConnectionInfo class
---
 .../apache/phoenix/spark/ConfigurationUtil.scala| 21 +++--
 .../apache/phoenix/spark/ConfigurationUtil.scala| 21 +++--
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git 
a/phoenix5-spark/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
 
b/phoenix5-spark/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
index 9377986..dbd7b04 100644
--- 
a/phoenix5-spark/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
+++ 
b/phoenix5-spark/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
@@ -64,12 +64,21 @@ object ConfigurationUtil extends Serializable {
   }
 
   def setZookeeperURL(conf: Configuration, zkUrl: String) = {
-val info = PhoenixEmbeddedDriver.ConnectionInfo.create(zkUrl)
-conf.set(HConstants.ZOOKEEPER_QUORUM, info.getZookeeperQuorum)
-if (info.getPort != null)
-  conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, info.getPort)
-if (info.getRootNode != null)
-  conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, info.getRootNode)
+var zk = zkUrl
+if (zk.startsWith("jdbc:phoenix:")) {
+  zk = zk.substring("jdbc:phoenix:".length)
+}
+if (zk.startsWith("jdbc:phoenix+zk:")) {
+  zk = zk.substring("jdbc:phoenix+zk:".length)
+}
+val escapedUrl = zk.replaceAll(":","=")
+val parts = escapedUrl.split(":")
+if (parts.length >= 1 && parts(0).length()>0)
+  conf.set(HConstants.ZOOKEEPER_QUORUM, parts(0).replaceAll("=", ":"))
+if (parts.length >= 2 && parts(1).length()>0)
+  conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, 
Integer.parseInt(parts(1).replaceAll("=", ":")))
+if (parts.length >= 3 && parts(2).length()>0)
+  conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, parts(2).replaceAll("=", 
":"))
   }
 
   def setTenantId(conf: Configuration, tenantId: String) = {
diff --git 
a/phoenix5-spark3/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
 
b/phoenix5-spark3/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
index 9377986..dbd7b04 100644
--- 
a/phoenix5-spark3/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
+++ 
b/phoenix5-spark3/src/main/scala/org/apache/phoenix/spark/ConfigurationUtil.scala
@@ -64,12 +64,21 @@ object ConfigurationUtil extends Serializable {
   }
 
   def setZookeeperURL(conf: Configuration, zkUrl: String) = {
-val info = PhoenixEmbeddedDriver.ConnectionInfo.create(zkUrl)
-conf.set(HConstants.ZOOKEEPER_QUORUM, info.getZookeeperQuorum)
-if (info.getPort != null)
-  conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, info.getPort)
-if (info.getRootNode != null)
-  conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, info.getRootNode)
+var zk = zkUrl
+if (zk.startsWith("jdbc:phoenix:")) {
+  zk = zk.substring("jdbc:phoenix:".length)
+}
+if (zk.startsWith("jdbc:phoenix+zk:")) {
+  zk = zk.substring("jdbc:phoenix+zk:".length)
+}
+val escapedUrl = zk.replaceAll(":","=")
+val parts = escapedUrl.split(":")
+if (parts.length >= 1 && parts(0).length()>0)
+  conf.set(HConstants.ZOOKEEPER_QUORUM, parts(0).replaceAll("=", ":"))
+if (parts.length >= 2 && parts(1).length()>0)
+  conf.setInt(HConstants.ZOOKEEPER_CLIENT_PORT, 
Integer.parseInt(parts(1).replaceAll("=", ":")))
+if (parts.length >= 3 && parts(2).length()>0)
+  conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, parts(2).replaceAll("=", 
":"))
   }
 
   def setTenantId(conf: Configuration, tenantId: String) = {

(phoenix) branch 5.1 updated: PHOENIX-7097 Allow specifying full JDBC URL string in psql/PhoenixRuntime and sqllline.py

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/5.1 by this push:
 new 1d709fd2f7 PHOENIX-7097 Allow specifying full JDBC URL string in 
psql/PhoenixRuntime and sqllline.py
1d709fd2f7 is described below

commit 1d709fd2f7b545a75690ec56387571ac5424acca
Author: Istvan Toth 
AuthorDate: Sat Nov 4 06:48:50 2023 +0100

PHOENIX-7097 Allow specifying full JDBC URL string in psql/PhoenixRuntime 
and sqllline.py
---
 bin/sqlline.py   | 9 +++--
 .../src/main/java/org/apache/phoenix/util/PhoenixRuntime.java| 7 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bin/sqlline.py b/bin/sqlline.py
index bc1cab1cfc..e454ab7fbd 100755
--- a/bin/sqlline.py
+++ b/bin/sqlline.py
@@ -50,7 +50,7 @@ phoenix_utils.setPath()
 parser = argparse.ArgumentParser(description='Launches the Apache Phoenix 
Client.')
 # Positional argument 'zookeepers' is optional. The PhoenixDriver will 
automatically populate
 # this if it's not provided by the user (so, we want to leave a default value 
of empty)
-parser.add_argument('zookeepers', nargs='?', help='The ZooKeeper quorum 
string', default='')
+parser.add_argument('zookeepers', nargs='?', help='The ZooKeeper quorum string 
or full JDBC URL', default='')
 # Positional argument 'sqlfile' is optional
 parser.add_argument('sqlfile', nargs='?', help='A file of SQL commands to 
execute', default='')
 parser.add_argument('--noconnect', help='Start without making a connection',
@@ -64,6 +64,11 @@ phoenix_utils.common_sqlline_args(parser)
 args=parser.parse_args()
 
 zookeeper = tryDecode(args.zookeepers)
+if zookeeper.startswith('jdbc:phoenix'):
+jdbc_url = zookeeper
+else:
+# We do want to use the default "jdbc:phoenix:" URL if no URL was specified
+jdbc_url = 'jdbc:phoenix:' + zookeeper
 sqlfile = tryDecode(args.sqlfile)
 
 # HBase configuration folder path (where hbase-site.xml reside) for
@@ -128,7 +133,7 @@ java_cmd = java + ' $PHOENIX_OPTS ' + \
 '" -Dlog4j.configuration=file:' + os.path.join(phoenix_utils.current_dir, 
"log4j.properties") + \
 disable_jna + \
 " sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver" + \
-(not args.noconnect and " -u jdbc:phoenix:" + 
phoenix_utils.shell_quote([zookeeper]) or "") + \
+(not args.noconnect and " -u " + phoenix_utils.shell_quote([jdbc_url]) or 
"") + \
 " -n none -p none --color=" + \
 (args.color and "true" or "false") + \
 " --fastConnect=" + (args.fastconnect and "true" or "false") + \
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index fb25078200..d824cc0031 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -306,7 +306,12 @@ public class PhoenixRuntime {
 public static void main(String [] args) {
 
 ExecutionCommand execCmd = ExecutionCommand.parseArgs(args);
-String jdbcUrl = JDBC_PROTOCOL + JDBC_PROTOCOL_SEPARATOR + 
execCmd.getConnectionString();
+String jdbcUrl;
+if (execCmd.getConnectionString().startsWith(JDBC_PROTOCOL)) {
+jdbcUrl = execCmd.getConnectionString();
+} else {
+jdbcUrl = JDBC_PROTOCOL + JDBC_PROTOCOL_SEPARATOR + 
execCmd.getConnectionString();
+}
 
 int exitStatus = 0;
 

(phoenix) branch master updated: PHOENIX-7097 Allow specifying full JDBC URL string in psql/PhoenixRuntime and sqllline.py

[stoty]

This is an automated email from the ASF dual-hosted git repository.

stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/master by this push:
 new 17fac6a4d1 PHOENIX-7097 Allow specifying full JDBC URL string in 
psql/PhoenixRuntime and sqllline.py
17fac6a4d1 is described below

commit 17fac6a4d1850150580dec9d54c9f6d59701056b
Author: Istvan Toth 
AuthorDate: Sat Nov 4 06:48:50 2023 +0100

PHOENIX-7097 Allow specifying full JDBC URL string in psql/PhoenixRuntime 
and sqllline.py
---
 bin/sqlline.py   | 9 +++--
 .../src/main/java/org/apache/phoenix/util/PhoenixRuntime.java| 7 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/bin/sqlline.py b/bin/sqlline.py
index 62f0814c9f..72b06bdab7 100755
--- a/bin/sqlline.py
+++ b/bin/sqlline.py
@@ -50,7 +50,7 @@ phoenix_utils.setPath()
 parser = argparse.ArgumentParser(description='Launches the Apache Phoenix 
Client.')
 # Positional argument 'zookeepers' is optional. The PhoenixDriver will 
automatically populate
 # this if it's not provided by the user (so, we want to leave a default value 
of empty)
-parser.add_argument('zookeepers', nargs='?', help='The ZooKeeper quorum 
string', default='')
+parser.add_argument('zookeepers', nargs='?', help='The ZooKeeper quorum string 
or full JDBC URL', default='')
 # Positional argument 'sqlfile' is optional
 parser.add_argument('sqlfile', nargs='?', help='A file of SQL commands to 
execute', default='')
 parser.add_argument('--noconnect', help='Start without making a connection',
@@ -64,6 +64,11 @@ phoenix_utils.common_sqlline_args(parser)
 args=parser.parse_args()
 
 zookeeper = tryDecode(args.zookeepers)
+if zookeeper.startswith('jdbc:phoenix'):
+jdbc_url = zookeeper
+else:
+# We do want to use the default "jdbc:phoenix:" URL if no URL was specified
+jdbc_url = 'jdbc:phoenix:' + zookeeper
 sqlfile = tryDecode(args.sqlfile)
 
 # HBase configuration folder path (where hbase-site.xml reside) for
@@ -128,7 +133,7 @@ java_cmd = java + ' $PHOENIX_OPTS ' + \
 '" -Dlog4j2.configurationFile=file:' + 
os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
 disable_jna + \
 " sqlline.SqlLine -d org.apache.phoenix.jdbc.PhoenixDriver" + \
-(not args.noconnect and " -u jdbc:phoenix:" + 
phoenix_utils.shell_quote([zookeeper]) or "") + \
+(not args.noconnect and " -u " + phoenix_utils.shell_quote([jdbc_url]) or 
"") + \
 " -n none -p none --color=" + \
 (args.color and "true" or "false") + \
 " --fastConnect=" + (args.fastconnect and "true" or "false") + \
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
index 04be259c4c..d4448a786c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
@@ -312,7 +312,12 @@ public class PhoenixRuntime {
 public static void main(String [] args) {
 
 ExecutionCommand execCmd = ExecutionCommand.parseArgs(args);
-String jdbcUrl = JDBC_PROTOCOL + JDBC_PROTOCOL_SEPARATOR + 
execCmd.getConnectionString();
+String jdbcUrl;
+if (execCmd.getConnectionString().startsWith(JDBC_PROTOCOL)) {
+jdbcUrl = execCmd.getConnectionString();
+} else {
+jdbcUrl = JDBC_PROTOCOL + JDBC_PROTOCOL_SEPARATOR + 
execCmd.getConnectionString();
+}
 
 int exitStatus = 0;