Apache-Phoenix | master | HBase 2.3 | Build #491 FAILURE
master branch HBase 2.3 build #491 status FAILURE Build #491 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/491/
Apache-Phoenix | master | HBase 2.5 | Build #491 FAILURE
master branch HBase 2.5 build #491 status FAILURE Build #491 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/491/
[phoenix] branch master updated: PHOENIX-6776 Abort scans of closed connections at ScanningResultIterator (#1551)
This is an automated email from the ASF dual-hosted git repository. kadir 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 320a266a4d PHOENIX-6776 Abort scans of closed connections at ScanningResultIterator (#1551) 320a266a4d is described below commit 320a266a4d12715444967500fa6373fd53ad0762 Author: Lokesh Khurana AuthorDate: Tue Jan 24 16:28:41 2023 -0800 PHOENIX-6776 Abort scans of closed connections at ScanningResultIterator (#1551) --- .../end2end/PreMatureTimelyAbortScanIt.java| 89 ++ .../coprocessor/BaseScannerRegionObserver.java | 2 +- .../apache/phoenix/exception/SQLExceptionCode.java | 5 +- .../phoenix/iterate/BaseResultIterators.java | 3 + .../phoenix/iterate/ScanningResultIterator.java| 29 ++- .../phoenix/iterate/TableResultIterator.java | 25 -- .../iterate/TableSnapshotResultIterator.java | 10 ++- .../org/apache/phoenix/jdbc/PhoenixConnection.java | 23 +- .../phoenix/mapreduce/PhoenixRecordReader.java | 4 +- 9 files changed, 171 insertions(+), 19 deletions(-) diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/PreMatureTimelyAbortScanIt.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PreMatureTimelyAbortScanIt.java new file mode 100644 index 00..c0729707be --- /dev/null +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/PreMatureTimelyAbortScanIt.java @@ -0,0 +1,89 @@ +/* + * 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.end2end; + +import org.apache.phoenix.coprocessor.BaseScannerRegionObserver; +import org.apache.phoenix.exception.SQLExceptionCode; +import org.apache.phoenix.iterate.ScanningResultIterator; +import org.apache.phoenix.jdbc.PhoenixConnection; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; +import org.apache.phoenix.util.ReadOnlyProps; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Map; + +import static org.junit.Assert.*; +@Category(ParallelStatsDisabledTest.class) +public class PreMatureTimelyAbortScanIt extends ParallelStatsDisabledIT { +private static final Logger LOG = LoggerFactory.getLogger(PreMatureTimelyAbortScanIt.class); + +@BeforeClass +public static synchronized void doSetup() throws Exception { +Map props = Maps.newHashMapWithExpectedSize(1); +props.put(BaseScannerRegionObserver.PHOENIX_MAX_LOOKBACK_AGE_CONF_KEY, Integer.toString(60*60)); // An hour +props.put(QueryServices.USE_STATS_FOR_PARALLELIZATION, Boolean.toString(false)); +props.put(QueryServices.PHOENIX_SERVER_PAGE_SIZE_MS, Integer.toString(0)); +setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); +} + +private String getUniqueUrl() { +return url + generateUniqueName(); +} + +@Test +public void testPreMatureScannerAbortForCount() throws Exception { + +try (Connection conn = DriverManager.getConnection(getUniqueUrl())) { +conn.createStatement().execute("CREATE TABLE LONG_BUG (ID INTEGER PRIMARY KEY, AMOUNT DECIMAL) SALT_BUCKETS = 16 "); +} +try (Connection conn = DriverManager.getConnection(getUniqueUrl())) { +for (int i = 0; i<100 ; i++) { +int amount = -5 + i; +String s = "UPSERT INTO LONG_BUG (ID, AMOUNT) VALUES( " + i + ", " + amount + ")"; +conn.createStatement().execute(s); +} +conn.commit(); +} + +try { +PhoenixConnection conn = DriverManager.getConnection(getUniqueUrl()).unwrap(PhoenixConnection.class); +ScanningResultIterator.setIsScannerClosedForcefully(true); +ResultSet resultSet = conn.createStatement().executeQuery( +"SELECT COUNT(*) FROM
[phoenix-omid] branch dependabot/maven/org.testng-testng-7.7.0 created (now 6b5861df)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.testng-testng-7.7.0 in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git at 6b5861df Bump testng from 6.10 to 7.7.0 No new revisions were added by this update.
[phoenix-omid] branch master updated: Upgrade Netty to 4.1.86.Final (#125)
This is an automated email from the ASF dual-hosted git repository. rajeshbabu 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 f5cd7dc5 Upgrade Netty to 4.1.86.Final (#125) f5cd7dc5 is described below commit f5cd7dc5e64c7c403504e06696f47c52d7099234 Author: Rajeshbabu Chintaguntla AuthorDate: Wed Jan 25 03:44:36 2023 +0530 Upgrade Netty to 4.1.86.Final (#125) Co-authored-by: Rajeshbabu Chintaguntla --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 513a096c..c5bf548d 100644 --- a/pom.xml +++ b/pom.xml @@ -159,7 +159,7 @@ 6.10 1.7.36 2.18.0 -4.1.79.Final +4.1.86.Final com.google.protobuf 2.5.0
[phoenix-queryserver] branch master updated: PHOENIX-6858 Add Python 3.11 to supported languages and update docker test image for phoenixdb
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 434eae4 PHOENIX-6858 Add Python 3.11 to supported languages and update docker test image for phoenixdb 434eae4 is described below commit 434eae46b5b34febd3e475b80f78ce5d9780d393 Author: Istvan Toth AuthorDate: Mon Jan 23 10:47:41 2023 +0100 PHOENIX-6858 Add Python 3.11 to supported languages and update docker test image for phoenixdb --- python-phoenixdb/Dockerfile | 4 ++-- python-phoenixdb/setup.py | 3 ++- python-phoenixdb/tox.ini| 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/python-phoenixdb/Dockerfile b/python-phoenixdb/Dockerfile index a6aea1c..95f6b2d 100644 --- a/python-phoenixdb/Dockerfile +++ b/python-phoenixdb/Dockerfile @@ -18,8 +18,8 @@ from advian/tox-base:ubuntu as tox ### # Prebuild given versions # ### -ARG BUILD_PYTHON_VERSIONS="3.10 3.9 3.8 3.7 3.6" #Can we take this from the parent image ? -ARG EXTRA_PYTHON_VERSIONS="3.5 2.7" +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" 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/setup.py b/python-phoenixdb/setup.py index 749bc90..f689b16 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -89,7 +89,8 @@ setup( 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', -'Programming Language :: Python :: 3.10' +'Programming Language :: Python :: 3.10', +'Programming Language :: Python :: 3.11' ], install_requires=install_requires, extras_require={ diff --git a/python-phoenixdb/tox.ini b/python-phoenixdb/tox.ini index 93281bb..0589a53 100644 --- a/python-phoenixdb/tox.ini +++ b/python-phoenixdb/tox.ini @@ -14,7 +14,7 @@ # limitations under the License. [tox] -envlist = py27,py35,py36,py37,py38,py39,py310 +envlist = py27,py35,py36,py37,py38,py39,py310,py311 [testenv] passenv = PHOENIXDB_TEST_DB_URL commands =
[phoenix-queryserver] branch master updated: PHOENIX-6810 Make SSL key-store type configurable (#114)
This is an automated email from the ASF dual-hosted git repository. richardantal 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 4b22faa PHOENIX-6810 Make SSL key-store type configurable (#114) 4b22faa is described below commit 4b22faa55b5e35974951cc7f41b7e84eeba261dd Author: richardantal AuthorDate: Tue Jan 24 09:58:08 2023 +0100 PHOENIX-6810 Make SSL key-store type configurable (#114) and bump Avatica version to 1.23 --- .../java/org/apache/phoenix/queryserver/QueryServerProperties.java| 4 .../main/java/org/apache/phoenix/queryserver/server/QueryServer.java | 4 +++- pom.xml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java index 9945da4..dda88cf 100644 --- a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java +++ b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java @@ -58,6 +58,10 @@ public class QueryServerProperties { "phoenix.queryserver.remoteUserExtractor.param"; public static final String QUERY_SERVER_DISABLE_KERBEROS_LOGIN = "phoenix.queryserver.disable.kerberos.login"; +public static final String QUERY_SERVER_TLS_KEYSTORE_TYPE_KEY = +"phoenix.queryserver.tls.keystore.type"; +public static final String QUERY_SERVER_TLS_KEYSTORE_TYPE_DEFAULT = +"jks"; public static final String QUERY_SERVER_TLS_ENABLED = "phoenix.queryserver.tls.enabled"; public static final String QUERY_SERVER_TLS_KEYSTORE = diff --git a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java index 45ead51..2add30e 100644 --- a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java +++ b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java @@ -284,6 +284,8 @@ public final class QueryServer extends Configured implements Tool, Runnable { final boolean useTls = getConf().getBoolean(QueryServerProperties.QUERY_SERVER_TLS_ENABLED, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_ENABLED); if(useTls) { final String tlsKeystore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE); + final String keystoreType = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_TYPE_KEY, QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_TYPE_DEFAULT); + final String tlsKeystorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_KEYSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_KEYSTORE_PASSWORD); final String tlsTruststore = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE); final String tlsTruststorePassword = getConf().get(QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD, QueryServerOptions.DEFAULT_QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD); @@ -295,7 +297,7 @@ public final class QueryServer extends Configured implements Tool, Runnable { throw new Exception(String.format("if %s is enabled, %s must be specfified" , QueryServerProperties.QUERY_SERVER_TLS_ENABLED, QueryServerProperties.QUERY_SERVER_TLS_TRUSTSTORE)); } final File tlsTruststoreFile = new File(tlsTruststore); - builder.withTLS(tlsKeystoreFile, tlsKeystorePassword, tlsTruststoreFile, tlsTruststorePassword); + builder.withTLS(tlsKeystoreFile, tlsKeystorePassword, tlsTruststoreFile, tlsTruststorePassword, keystoreType); } } diff --git a/pom.xml b/pom.xml index b2d5ce9..740cbe3 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 1.9.0 1.7.36 1.2.19 -1.21.0 +1.23.0 3.1.0 3.0.0