From 7b97ab73d69124a6bb9541a28af504a75660a6d0 Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Mon, 15 Jul 2024 16:22:04 +0200 Subject: [PATCH 1/3] PHOENIX-7361 Build PQS with Phoenix 5.2.0 --- pom.xml | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 235 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 51f24bd..b8ef38e 100644 --- a/pom.xml +++ b/pom.xml @@ -69,19 +69,21 @@ ${project.basedir} ${project.build.directory} - 5.1.3 + 5.2.0 - 2.4.15 - 3.1.4 - phoenix-client-embedded-hbase-2.4 + 2.5.8-hadoop3 + 3.2.4 + phoenix-client-embedded-hbase-2.5 - 3.5.8 - 2.12.0 + 3.8.4 + + 5.6.0 2.10.1 9.4.53.v20231009 + 4.1.108.Final 2.11.0 3.2.2 1.9.0 @@ -92,6 +94,7 @@ 2.20.0 + 6.10 1.8.5 4.13.2 @@ -556,6 +559,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -571,6 +582,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -599,6 +618,16 @@ org.eclipse.jetty jetty-http ${jetty.version} + + + + io.netty + netty-bom + ${netty-bom.version} + import + pom org.apache.zookeeper @@ -609,10 +638,34 @@ org.slf4j slf4j-log4j12 - - log4j - log4j - + + log4j + log4j + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + @@ -655,6 +708,20 @@ org.apache.curator curator-test ${curator.version} + + + com.google.guava + guava + + + org.apache.zookeeper + zookeeper + + + org.junit.jupiter + junit-jupiter-api + + @@ -819,6 +886,14 @@ commons-logging commons-logging + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -836,6 +911,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -857,6 +940,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -881,6 +972,14 @@ org.slf4j slf4j-log4j12 + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -897,6 +996,14 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -913,6 +1020,106 @@ log4j log4j + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + + + + org.apache.hadoop + hadoop-yarn-server-resourcemanager + ${hadoop.version} + test + + + commons-logging + commons-logging + + + log4j + log4j + + + ch.qos.reload4j + reload4j + + + + + org.apache.hadoop + hadoop-mapreduce-client-shuffle + ${hadoop.version} + test + + + commons-logging + commons-logging + + + log4j + log4j + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + + + + org.apache.hadoop + hadoop-mapreduce-client-app + ${hadoop.version} + test + + + commons-logging + commons-logging + + + log4j + log4j + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + + + + org.apache.hadoop + hadoop-mapreduce-client-hs + ${hadoop.version} + test + + + commons-logging + commons-logging + + + log4j + log4j + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + @@ -920,6 +1127,16 @@ hadoop-hdfs-client ${hadoop.version} test + + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + + org.apache.hadoop @@ -983,6 +1200,14 @@ org.slf4j slf4j-log4j12 + + ch.qos.reload4j + reload4j + + + org.slf4j + slf4j-reload4j + From 06ec421bdf08c98630e6c7f44e0fa8914690ec9c Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Tue, 16 Jul 2024 10:04:39 +0200 Subject: [PATCH 2/3] update github actions --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9efe855..6e47035 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -28,4 +28,4 @@ jobs: with: java-version: 1.8 - name: Build with Maven - run: mvn -B clean install -Pshade-javax-servlet + run: mvn -B clean verify From b06aeb1f01b8e01b64867dab161ee8ab8919714b Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Wed, 17 Jul 2024 14:51:44 +0200 Subject: [PATCH 3/3] update python-phoenixdb README --- python-phoenixdb/README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python-phoenixdb/README.rst b/python-phoenixdb/README.rst index 1d70a6e..510f348 100644 --- a/python-phoenixdb/README.rst +++ b/python-phoenixdb/README.rst @@ -76,22 +76,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 -Pshade-javax-servlet -am -pl phoenix-queryserver-it -Dtest=foo \ + mvn clean verify -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 -Pshade-javax-servlet -am -pl phoenix-queryserver-it -Dtest=foo \ + mvn clean verify -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. -Note: Depending on the Phoenix version used for building, you may or may not need the -`-Pshade-javax-servlet` option. See BUILDING.md in the repository root for more information. +Note: If you build with Phoenix 5.1, you need to add the `-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::