[phoenix] branch 5.1 updated: PHOENIX-6543 de-flake AuditLoggingIT
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 71619f0 PHOENIX-6543 de-flake AuditLoggingIT
71619f0 is described below
commit 71619f05c1af6cec4ef5ca2e73c2e64511d54e17
Author: Istvan Toth
AuthorDate: Tue Sep 14 10:56:37 2021 +0200
PHOENIX-6543 de-flake AuditLoggingIT
---
.../org/apache/phoenix/end2end/AuditLoggingIT.java | 171 -
1 file changed, 101 insertions(+), 70 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
index 6489663..56a6f98 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
@@ -49,6 +49,7 @@ public class AuditLoggingIT extends ParallelStatsDisabledIT {
stmt.executeQuery(selectQuery);
conn.commit();
+Thread.sleep(4000);
ResultSet rs = stmt.executeQuery(getLogsQuery);
assertFalse(rs.next());
} finally {
@@ -65,27 +66,37 @@ public class AuditLoggingIT extends ParallelStatsDisabledIT
{
String getLogsQuery = "select * from SYSTEM.LOG WHERE
TABLE_NAME='TEST2' order by start_time";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(QueryServices.LOG_LEVEL, LogLevel.TRACE.name());
-Connection conn = DriverManager.getConnection(getUrl(), props);
-conn.setAutoCommit(true);
-try {
-conn.createStatement().execute(createqQery);
-conn.createStatement().execute(upsertQuery);
-ResultSet rs = conn.createStatement().executeQuery(selectQuery);
+try (Connection conn = DriverManager.getConnection(getUrl(), props);
+Statement stmt = conn.createStatement();
+){
+conn.setAutoCommit(true);
+stmt.execute(createqQery);
+stmt.execute(upsertQuery);
+ResultSet rs = stmt.executeQuery(selectQuery);
assertTrue(rs.next());
assertFalse(rs.next());
rs.close();
-ResultSet rs2 = conn.createStatement().executeQuery(getLogsQuery);
-assertTrue(rs2.next());
-assertEquals(rs2.getString(7), selectQuery);
-assertFalse(rs2.next());
-} finally {
-conn.close();
+int retryCount=10;
+while (true) {
+try {
+ResultSet rs2 = stmt.executeQuery(getLogsQuery);
+assertTrue(rs2.next());
+assertEquals(rs2.getString(7), selectQuery);
+assertFalse(rs2.next());
+break;
+} catch (AssertionError e) {
+if(retryCount-- <= 0) {
+throw e;
+}
+Thread.sleep(4000);
+}
+}
}
}
@Test
-public void testLoggingDMLAandDDL() throws Exception {
+public void testLoggingDMLAndDDL() throws Exception {
String createqQery = "create table test3 (mykey integer not null
primary key," +
" mycolumn varchar)";
String upsertQuery = "upsert into test3 values (1,'Hello')";
@@ -93,32 +104,41 @@ public class AuditLoggingIT extends
ParallelStatsDisabledIT {
String getLogsQuery = "select * from SYSTEM.LOG WHERE
TABLE_NAME='TEST3' order by start_time";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(QueryServices.AUDIT_LOG_LEVEL, LogLevel.INFO.name());
-Connection conn = DriverManager.getConnection(getUrl(), props);
-conn.setAutoCommit(true);
-try {
-conn.createStatement().execute(createqQery);
-conn.createStatement().execute(upsertQuery);
+try (Connection conn = DriverManager.getConnection(getUrl(), props);
+Statement stmt = conn.createStatement();
+){
+conn.setAutoCommit(true);
+
+stmt.execute(createqQery);
+stmt.execute(upsertQuery);
ResultSet rs = conn.createStatement().executeQuery(selectQuery);
assertTrue(rs.next());
assertFalse(rs.next());
rs.close();
-Thread.sleep(4000);
-ResultSet rs2 = conn.createStatement().executeQuery(getLogsQuery);
-assertTrue(rs2.next());
-assertEquals(rs2.getString(7), createqQery);
-assertTrue(rs2.next());
-assertEquals(rs2.getString(7), upsertQuery);
-
-assertFalse(rs2.next());
-} finally {
-conn.close();
+
[phoenix] branch master updated: PHOENIX-6543 de-flake AuditLoggingIT
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 01e7047 PHOENIX-6543 de-flake AuditLoggingIT
01e7047 is described below
commit 01e70474e4fdd2da157013bfa4fb90cef2e3adfd
Author: Istvan Toth
AuthorDate: Tue Sep 14 10:56:37 2021 +0200
PHOENIX-6543 de-flake AuditLoggingIT
---
.../org/apache/phoenix/end2end/AuditLoggingIT.java | 171 -
1 file changed, 101 insertions(+), 70 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
index 6489663..56a6f98 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AuditLoggingIT.java
@@ -49,6 +49,7 @@ public class AuditLoggingIT extends ParallelStatsDisabledIT {
stmt.executeQuery(selectQuery);
conn.commit();
+Thread.sleep(4000);
ResultSet rs = stmt.executeQuery(getLogsQuery);
assertFalse(rs.next());
} finally {
@@ -65,27 +66,37 @@ public class AuditLoggingIT extends ParallelStatsDisabledIT
{
String getLogsQuery = "select * from SYSTEM.LOG WHERE
TABLE_NAME='TEST2' order by start_time";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(QueryServices.LOG_LEVEL, LogLevel.TRACE.name());
-Connection conn = DriverManager.getConnection(getUrl(), props);
-conn.setAutoCommit(true);
-try {
-conn.createStatement().execute(createqQery);
-conn.createStatement().execute(upsertQuery);
-ResultSet rs = conn.createStatement().executeQuery(selectQuery);
+try (Connection conn = DriverManager.getConnection(getUrl(), props);
+Statement stmt = conn.createStatement();
+){
+conn.setAutoCommit(true);
+stmt.execute(createqQery);
+stmt.execute(upsertQuery);
+ResultSet rs = stmt.executeQuery(selectQuery);
assertTrue(rs.next());
assertFalse(rs.next());
rs.close();
-ResultSet rs2 = conn.createStatement().executeQuery(getLogsQuery);
-assertTrue(rs2.next());
-assertEquals(rs2.getString(7), selectQuery);
-assertFalse(rs2.next());
-} finally {
-conn.close();
+int retryCount=10;
+while (true) {
+try {
+ResultSet rs2 = stmt.executeQuery(getLogsQuery);
+assertTrue(rs2.next());
+assertEquals(rs2.getString(7), selectQuery);
+assertFalse(rs2.next());
+break;
+} catch (AssertionError e) {
+if(retryCount-- <= 0) {
+throw e;
+}
+Thread.sleep(4000);
+}
+}
}
}
@Test
-public void testLoggingDMLAandDDL() throws Exception {
+public void testLoggingDMLAndDDL() throws Exception {
String createqQery = "create table test3 (mykey integer not null
primary key," +
" mycolumn varchar)";
String upsertQuery = "upsert into test3 values (1,'Hello')";
@@ -93,32 +104,41 @@ public class AuditLoggingIT extends
ParallelStatsDisabledIT {
String getLogsQuery = "select * from SYSTEM.LOG WHERE
TABLE_NAME='TEST3' order by start_time";
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
props.setProperty(QueryServices.AUDIT_LOG_LEVEL, LogLevel.INFO.name());
-Connection conn = DriverManager.getConnection(getUrl(), props);
-conn.setAutoCommit(true);
-try {
-conn.createStatement().execute(createqQery);
-conn.createStatement().execute(upsertQuery);
+try (Connection conn = DriverManager.getConnection(getUrl(), props);
+Statement stmt = conn.createStatement();
+){
+conn.setAutoCommit(true);
+
+stmt.execute(createqQery);
+stmt.execute(upsertQuery);
ResultSet rs = conn.createStatement().executeQuery(selectQuery);
assertTrue(rs.next());
assertFalse(rs.next());
rs.close();
-Thread.sleep(4000);
-ResultSet rs2 = conn.createStatement().executeQuery(getLogsQuery);
-assertTrue(rs2.next());
-assertEquals(rs2.getString(7), createqQery);
-assertTrue(rs2.next());
-assertEquals(rs2.getString(7), upsertQuery);
-
-assertFalse(rs2.next());
-} finally {
-conn.close();
+
[phoenix] branch 4.x updated: PHOENIX-6540 Drop Hbase 1.3 support from 4.x branch (addendum: remove 1.3 profile from Jenkinsfile for post-commit job)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 5bb1376 PHOENIX-6540 Drop Hbase 1.3 support from 4.x branch
(addendum: remove 1.3 profile from Jenkinsfile for post-commit job)
5bb1376 is described below
commit 5bb1376f03b571a7c144f9bfcf97e52dd579c163
Author: Istvan Toth
AuthorDate: Tue Sep 14 09:14:44 2021 +0200
PHOENIX-6540 Drop Hbase 1.3 support from 4.x branch (addendum: remove 1.3
profile from Jenkinsfile for post-commit job)
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 817643d..2f2d6cb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
axes {
axis {
name 'HBASE_PROFILE'
-values '1.3', '1.4', '1.6'
+values '1.4', '1.6'
}
}
[phoenix] branch 4.16 updated: PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new a3a34f5 PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
a3a34f5 is described below
commit a3a34f52da5c9c60f1c9912f4143495dcdc38ec3
Author: Istvan Toth
AuthorDate: Mon Sep 13 16:40:37 2021 +0200
PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
---
.../hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
index de26fe2..1a2a128 100644
---
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
+++
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
@@ -29,7 +29,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -107,13 +106,13 @@ public class WALRecoveryRegionPostOpenIT extends BaseTest
{
serverProps.put(HConstants.HBASE_RPC_TIMEOUT_KEY, "1");
serverProps.put(IndexWriterUtils.INDEX_WRITER_RPC_PAUSE, "5000");
serverProps.put("data.tx.snapshot.dir", "/tmp");
-serverProps.put("hbase.balancer.period",
String.valueOf(Integer.MAX_VALUE));
serverProps.put(QueryServices.INDEX_FAILURE_HANDLING_REBUILD_ATTRIB,
Boolean.FALSE.toString());
Map clientProps = Maps.newHashMapWithExpectedSize(2);
clientProps.put(QueryServices.TRANSACTIONS_ENABLED,
Boolean.FALSE.toString());
clientProps.put(QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
Boolean.FALSE.toString());
NUM_SLAVES_BASE = 2;
setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
new ReadOnlyProps(clientProps.entrySet().iterator()));
+getUtility().getHBaseCluster().getMaster().balanceSwitch(false);
}
public static class IndexTableFailingRegionObserver extends
SimpleRegionObserver {
[phoenix] branch 4.x updated: PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new a2bfe93 PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
a2bfe93 is described below
commit a2bfe93765ebd4d78d38052b6781fbb67814bced
Author: Istvan Toth
AuthorDate: Mon Sep 13 16:40:37 2021 +0200
PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
---
.../hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
index de26fe2..1a2a128 100644
---
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
+++
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
@@ -29,7 +29,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -107,13 +106,13 @@ public class WALRecoveryRegionPostOpenIT extends BaseTest
{
serverProps.put(HConstants.HBASE_RPC_TIMEOUT_KEY, "1");
serverProps.put(IndexWriterUtils.INDEX_WRITER_RPC_PAUSE, "5000");
serverProps.put("data.tx.snapshot.dir", "/tmp");
-serverProps.put("hbase.balancer.period",
String.valueOf(Integer.MAX_VALUE));
serverProps.put(QueryServices.INDEX_FAILURE_HANDLING_REBUILD_ATTRIB,
Boolean.FALSE.toString());
Map clientProps = Maps.newHashMapWithExpectedSize(2);
clientProps.put(QueryServices.TRANSACTIONS_ENABLED,
Boolean.FALSE.toString());
clientProps.put(QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
Boolean.FALSE.toString());
NUM_SLAVES_BASE = 2;
setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
new ReadOnlyProps(clientProps.entrySet().iterator()));
+getUtility().getHBaseCluster().getMaster().balanceSwitch(false);
}
public static class IndexTableFailingRegionObserver extends
SimpleRegionObserver {
[phoenix] branch 5.1 updated: PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
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 618d06e PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
618d06e is described below
commit 618d06e5b5fb81b792075f51fa52d922bb99598e
Author: Istvan Toth
AuthorDate: Mon Sep 13 16:40:37 2021 +0200
PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
---
.../hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
index 36b277c..5e9aaf2 100644
---
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
+++
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
@@ -29,7 +29,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -57,7 +56,6 @@ import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;
-import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.Indexer;
@@ -68,6 +66,8 @@ import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Multimap;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
@@ -76,9 +76,6 @@ import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-import org.apache.phoenix.thirdparty.com.google.common.collect.Multimap;
-
@Category(NeedsOwnMiniClusterTest.class)
public class WALRecoveryRegionPostOpenIT extends BaseTest {
@@ -109,13 +106,13 @@ public class WALRecoveryRegionPostOpenIT extends BaseTest
{
serverProps.put(HConstants.HBASE_RPC_TIMEOUT_KEY, "1");
serverProps.put(IndexWriterUtils.INDEX_WRITER_RPC_PAUSE, "5000");
serverProps.put("data.tx.snapshot.dir", "/tmp");
-serverProps.put("hbase.balancer.period",
String.valueOf(Integer.MAX_VALUE));
serverProps.put(QueryServices.INDEX_FAILURE_HANDLING_REBUILD_ATTRIB,
Boolean.FALSE.toString());
Map clientProps = Maps.newHashMapWithExpectedSize(2);
clientProps.put(QueryServices.TRANSACTIONS_ENABLED,
Boolean.FALSE.toString());
clientProps.put(QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
Boolean.FALSE.toString());
NUM_SLAVES_BASE = 2;
setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
new ReadOnlyProps(clientProps.entrySet().iterator()));
+getUtility().getHBaseCluster().getMaster().balanceSwitch(false);
}
public static class IndexTableFailingRegionObserver extends
SimpleRegionObserver {
[phoenix] branch master updated: PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
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 e84232b PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
e84232b is described below
commit e84232bda68bf3afd639265f3ddcd68d5798a6ae
Author: Istvan Toth
AuthorDate: Mon Sep 13 16:40:37 2021 +0200
PHOENIX-6542 WALRecoveryRegionPostOpenIT is flakey
---
.../hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
index 36b277c..5e9aaf2 100644
---
a/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
+++
b/phoenix-core/src/it/java/org/apache/hadoop/hbase/regionserver/wal/WALRecoveryRegionPostOpenIT.java
@@ -29,7 +29,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -57,7 +56,6 @@ import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.MiniBatchOperationInProgress;
-import org.apache.hadoop.hbase.regionserver.Region;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
import org.apache.phoenix.hbase.index.Indexer;
@@ -68,6 +66,8 @@ import
org.apache.phoenix.hbase.index.write.recovery.StoreFailuresInCachePolicy;
import org.apache.phoenix.query.BaseTest;
import org.apache.phoenix.query.QueryConstants;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.thirdparty.com.google.common.collect.Multimap;
import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
@@ -76,9 +76,6 @@ import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
-import org.apache.phoenix.thirdparty.com.google.common.collect.Multimap;
-
@Category(NeedsOwnMiniClusterTest.class)
public class WALRecoveryRegionPostOpenIT extends BaseTest {
@@ -109,13 +106,13 @@ public class WALRecoveryRegionPostOpenIT extends BaseTest
{
serverProps.put(HConstants.HBASE_RPC_TIMEOUT_KEY, "1");
serverProps.put(IndexWriterUtils.INDEX_WRITER_RPC_PAUSE, "5000");
serverProps.put("data.tx.snapshot.dir", "/tmp");
-serverProps.put("hbase.balancer.period",
String.valueOf(Integer.MAX_VALUE));
serverProps.put(QueryServices.INDEX_FAILURE_HANDLING_REBUILD_ATTRIB,
Boolean.FALSE.toString());
Map clientProps = Maps.newHashMapWithExpectedSize(2);
clientProps.put(QueryServices.TRANSACTIONS_ENABLED,
Boolean.FALSE.toString());
clientProps.put(QueryServices.INDEX_REGION_OBSERVER_ENABLED_ATTRIB,
Boolean.FALSE.toString());
NUM_SLAVES_BASE = 2;
setUpTestDriver(new ReadOnlyProps(serverProps.entrySet().iterator()),
new ReadOnlyProps(clientProps.entrySet().iterator()));
+getUtility().getHBaseCluster().getMaster().balanceSwitch(false);
}
public static class IndexTableFailingRegionObserver extends
SimpleRegionObserver {
[phoenix] branch 4.x updated: PHOENIX-6540 Drop Hbase 1.3 support from 4.x branch
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new cc32ab0 PHOENIX-6540 Drop Hbase 1.3 support from 4.x branch
cc32ab0 is described below
commit cc32ab0e63e21a01834064d2a9492609ad95a0c4
Author: Istvan Toth
AuthorDate: Thu Sep 9 18:56:11 2021 +0200
PHOENIX-6540 Drop Hbase 1.3 support from 4.x branch
Revert "PHOENIX-5721 Unify 4.x branches (add HBase 1.3)"
This reverts commit a0cff1744bb76a6fc1b79a3aa43859418adb8850.
Fix conflicts with newer code from revert
---
phoenix-core/pom.xml | 15 --
.../ipc/controller/ClientRpcControllerFactory.java | 19 ++-
.../hbase/ipc/controller/IndexRpcController.java | 8 +-
...InterRegionServerIndexRpcControllerFactory.java | 21 ++-
...erRegionServerMetadataRpcControllerFactory.java | 19 ++-
.../ipc/controller/MetadataRpcController.java | 8 +-
.../regionserver/IndexHalfStoreFileReader.java | 22 +--
.../regionserver/LocalIndexStoreFileScanner.java | 4 +-
.../DelegateRegionCoprocessorEnvironment.java | 9 +-
.../phoenix/coprocessor/PagedRegionScanner.java| 3 +-
.../org/apache/phoenix/execute/DelegateHTable.java | 26 ++-
.../apache/phoenix/index/GlobalIndexChecker.java | 18 +--
.../phoenix/iterate/ScanningResultIterator.java| 6 +-
.../apache/phoenix/iterate/SnapshotScanner.java| 8 +-
.../phoenix/monitoring/GlobalClientMetrics.java| 44 -
.../monitoring/GlobalClientMetricsRegistry.java| 49 --
.../monitoring/GlobalMetricRegistriesAdapter.java | 22 +--
.../phoenix/schema/stats/UpdateStatisticsTool.java | 14 +-
.../phoenix/transaction/OmidTransactionTable.java | 8 +-
.../coprocessor/TaskMetaDataEndpointTest.java | 9 +-
.../java/org/apache/phoenix/query/BaseTest.java| 21 +--
phoenix-hbase-compat-1.3.0/pom.xml | 95 ---
.../hbase/regionserver/CompatStoreFileScanner.java | 33
.../phoenix/compat/hbase/CompatDelegateHTable.java | 28
...CompatDelegateRegionCoprocessorEnvironment.java | 27
.../compat/hbase/CompatDelegateRegionObserver.java | 29
.../hbase/CompatDelegatingHBaseRpcController.java | 57 ---
.../compat/hbase/CompatHBaseRpcController.java | 39 -
.../compat/hbase/CompatObserverContext.java| 32
...CompatPhoenixMetaDataControllerEnvironment.java | 36 -
.../compat/hbase/CompatPhoenixRpcScheduler.java| 24 ---
.../hbase/CompatRegionCoprocessorEnvironment.java | 23 ---
.../compat/hbase/CompatRpcControllerFactory.java | 48 --
.../compat/hbase/CompatScanningResultIterator.java | 21 ---
.../apache/phoenix/compat/hbase/CompatUtil.java| 54 ---
.../compat/hbase/HbaseCompatCapabilities.java | 28
.../coprocessor/CompatIndexRegionObserver.java | 49 --
.../CompatGlobalClientMetricsRegistry.java | 40 -
.../hbase/regionserver/CompatStoreFileScanner.java | 33
.../phoenix/compat/hbase/CompatDelegateHTable.java | 48 --
...CompatDelegateRegionCoprocessorEnvironment.java | 32
.../hbase/CompatDelegatingHBaseRpcController.java | 30
.../compat/hbase/CompatHBaseRpcController.java | 23 ---
.../compat/hbase/CompatHBaseRpcControllerImpl.java | 41 -
.../hbase/CompatRegionCoprocessorEnvironment.java | 29
.../compat/hbase/CompatRpcControllerFactory.java | 48 --
.../apache/phoenix/compat/hbase/CompatUtil.java| 12 --
.../CompatGlobalClientMetricsRegistry.java | 62
.../hbase/regionserver/CompatStoreFileScanner.java | 33
.../phoenix/compat/hbase/CompatDelegateHTable.java | 48 --
...CompatDelegateRegionCoprocessorEnvironment.java | 32
.../hbase/CompatDelegatingHBaseRpcController.java | 30
.../compat/hbase/CompatHBaseRpcController.java | 23 ---
.../compat/hbase/CompatHBaseRpcControllerImpl.java | 41 -
.../hbase/CompatRegionCoprocessorEnvironment.java | 29
.../compat/hbase/CompatRpcControllerFactory.java | 48 --
.../apache/phoenix/compat/hbase/CompatUtil.java| 12 --
.../CompatGlobalClientMetricsRegistry.java | 62
.../monitoring/GlobalMetricRegistriesAdapter.java | 177 -
pom.xml| 39 +
60 files changed, 163 insertions(+), 1785 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 7fdc7a8..bb048eb 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -524,21 +524,6 @@
- phoenix-hbase-compat-1.3.0
-
-
- hbase.profile
- 1.3
-
-
-
-1.3
-1.3.0
-${hbase-1.3.runtime.version}
-1.3
-
-
-
phoenix-hbase-co
[phoenix] branch 4.16 updated: PHOENIX-6538 4.x builds broken for HBase 1.3 profile
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 7ade0b6 PHOENIX-6538 4.x builds broken for HBase 1.3 profile
7ade0b6 is described below
commit 7ade0b6db2c9a3ee4c2b0e5846a0f73f446216aa
Author: Istvan Toth
AuthorDate: Thu Sep 9 09:39:06 2021 +0200
PHOENIX-6538 4.x builds broken for HBase 1.3 profile
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0b575b6..7199e46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,7 +615,7 @@
org.apache.phoenix
-phoenix-server-hbase-2.1
+phoenix-server-hbase-1.3
${project.version}
[phoenix] branch 4.x updated: PHOENIX-6538 4.x builds broken for HBase 1.3 profile
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 82cfcf0 PHOENIX-6538 4.x builds broken for HBase 1.3 profile
82cfcf0 is described below
commit 82cfcf0e022bd26ef8086f316e1c950f9d3a1151
Author: Istvan Toth
AuthorDate: Thu Sep 9 09:39:06 2021 +0200
PHOENIX-6538 4.x builds broken for HBase 1.3 profile
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1913b2c..68dca81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -616,7 +616,7 @@
org.apache.phoenix
-phoenix-server-hbase-2.1
+phoenix-server-hbase-1.3
${project.version}
svn commit: r1893163 [1/2] - in /phoenix/site: publish/ publish/language/ source/src/site/markdown/
Author: stoty Date: Thu Sep 9 05:55:04 2021 New Revision: 1893163 URL: http://svn.apache.org/viewvc?rev=1893163=rev Log: PHOENIX-6535 Update obsolete information on website also replace absolute links with relative ones in wiki links Modified: phoenix/site/publish/Phoenix-in-15-minutes-or-less.html phoenix/site/publish/building.html phoenix/site/publish/contributing.html phoenix/site/publish/develop.html phoenix/site/publish/faq.html phoenix/site/publish/index.html phoenix/site/publish/installation.html phoenix/site/publish/issues.html phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/multi-tenancy.html phoenix/site/publish/namspace_mapping.html phoenix/site/publish/news.html phoenix/site/publish/performance.html phoenix/site/publish/phoenix_spark.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/secondary_indexing.html phoenix/site/publish/sequences.html phoenix/site/publish/server.html phoenix/site/publish/tuning_guide.html phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md phoenix/site/source/src/site/markdown/building.md phoenix/site/source/src/site/markdown/contributing.md phoenix/site/source/src/site/markdown/develop.md phoenix/site/source/src/site/markdown/faq.md phoenix/site/source/src/site/markdown/index.md phoenix/site/source/src/site/markdown/installation.md phoenix/site/source/src/site/markdown/issues.md phoenix/site/source/src/site/markdown/multi-tenancy.md phoenix/site/source/src/site/markdown/namspace_mapping.md phoenix/site/source/src/site/markdown/news.md phoenix/site/source/src/site/markdown/performance.md phoenix/site/source/src/site/markdown/phoenix_spark.md phoenix/site/source/src/site/markdown/python.md phoenix/site/source/src/site/markdown/recent.md phoenix/site/source/src/site/markdown/release.md phoenix/site/source/src/site/markdown/release_notes.md phoenix/site/source/src/site/markdown/resources.md phoenix/site/source/src/site/markdown/roadmap.md phoenix/site/source/src/site/markdown/secondary_indexing.md phoenix/site/source/src/site/markdown/sequences.md phoenix/site/source/src/site/markdown/server.md phoenix/site/source/src/site/markdown/tuning_guide.md 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=1893163=1893162=1893163=diff == --- phoenix/site/publish/Phoenix-in-15-minutes-or-less.html (original) +++ phoenix/site/publish/Phoenix-in-15-minutes-or-less.html Thu Sep 9 05:55:04 2021 @@ -1,7 +1,7 @@ @@ -178,9 +178,6 @@ bringing the computation to the data by pushing the predicates in your where clause to a server-side filter executing aggregate queries through server-side hooks (called co-processors) - -In addition to these items, weâve got some interesting enhancements in the works to further optimize performance: - secondary indexes to improve performance for queries on non row key columns stats gathering to improve parallelization and guide choices between optimizations skip scan filter to optimize IN, LIKE, and OR queries @@ -195,13 +192,13 @@ But how can SQL support my favorite HBase technique of x,y,z Didnât make it to the last HBase Meetup did you? SQL is just a way of expressing what you want to get not how you want to get it. Check out my http://files.meetup.com/1350427/IntelPhoenixHBaseMeetup.ppt;>presentation for various existing and to-be-done Phoenix features to support your favorite HBase trick. Have ideas of your own? Weâd love to hear about them: file an issue for us and/or join our mailing list. Blah, blah, blah - I just want to get started! Ok, great! Just follow our install instructions: - download and expand our installation tar - copy the phoenix server jar that is compatible with your HBase installation into the lib directory of every region server - restart the region servers - add the phoenix client jar to the classpath of your HBase client - download and setup SQuirrel as your SQL client so you can issue adhoc SQL against your HBase cluster + download and expand our installation binary tar corresponding to your HBase version + copy the phoenix server jar into the lib directory of every region server and master + restart HBase + add the phoenix client jar to the classpath of your JDBC client or application + We have detailed instructions for setting up SQuirreL SQL as your SQL client -I donâ
svn commit: r1893163 [2/2] - in /phoenix/site: publish/ publish/language/ source/src/site/markdown/
Modified: phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md?rev=1893163=1893162=1893163=diff == --- phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md (original) +++ phoenix/site/source/src/site/markdown/Phoenix-in-15-minutes-or-less.md Thu Sep 9 05:55:04 2021 @@ -12,9 +12,6 @@ Actually, no. Phoenix achieves as good o * bringing the computation to the data by * pushing the predicates in your where clause to a server-side filter * executing aggregate queries through server-side hooks (called co-processors) - -In addition to these items, we've got some interesting enhancements in the works to further optimize performance: - * secondary indexes to improve performance for queries on non row key columns * stats gathering to improve parallelization and guide choices between optimizations * skip scan filter to optimize IN, LIKE, and OR queries @@ -33,14 +30,14 @@ Didn't make it to the last HBase Meetup *Blah, blah, blah - I just want to get started!* Ok, great! Just follow our [install instructions](installation.html): -* [download](download.html) and expand our installation tar -* copy the phoenix server jar that is compatible with your HBase installation into the lib directory of every region server -* restart the region servers -* add the phoenix client jar to the classpath of your HBase client -* download and [setup SQuirrel](installation.html#SQL_Client) as your SQL client so you can issue adhoc SQL against your HBase cluster +* [download](download.html) and expand our installation binary tar corresponding to your HBase version +* copy the phoenix server jar into the lib directory of every region server and master +* restart HBase +* add the phoenix client jar to the classpath of your JDBC client or application + * We have detailed instructions for [setting up SQuirreL SQL](installation.html#SQL_Client) as your SQL client *I don't want to download and setup anything else!* -Ok, fair enough - you can create your own SQL scripts and execute them using our command line tool instead. Let's walk through an example now. Begin by navigating to the `bin/` directory of your Phoenix install location. +Ok, fair enough - you can create your own SQL scripts and execute them using our command line tools instead. Let's walk through an example now. Begin by navigating to the `bin/` directory of your Phoenix install location. * First, let's create a `us_population.sql` file, containing a table definition: @@ -66,19 +63,25 @@ TX,Dallas,1213825 CA,San Jose,912332 ``` -* And finally, let's create a `us_population_queries.sql` file containing a query we'd like to run on that data. +* Execute the following command from a command terminal to create and populate the table ``` -SELECT state as "State",count(city) as "City Count",sum(population) as "Population Sum" -FROM us_population -GROUP BY state -ORDER BY sum(population) DESC; +./psql.py us_population.sql us_population.csv +``` + +* Start the interactive sql client + +``` +./sqlline.py ``` -* Execute the following command from a command terminal +and issue a query ``` -./psql.py us_population.sql us_population.csv us_population_queries.sql +SELECT state as "State",count(city) as "City Count",sum(population) as "Population Sum" +FROM us_population +GROUP BY state +ORDER BY sum(population) DESC; ``` Congratulations! You've just created your first Phoenix table, inserted data into it, and executed an aggregate query with just a few lines of code in 15 minutes or less! Modified: phoenix/site/source/src/site/markdown/building.md URL: http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/building.md?rev=1893163=1893162=1893163=diff == --- phoenix/site/source/src/site/markdown/building.md (original) +++ phoenix/site/source/src/site/markdown/building.md Thu Sep 9 05:55:04 2021 @@ -1,68 +1,40 @@ -# Building Phoenix Project +# Building the Main Phoenix Project -Phoenix is a fully mavenized project. Download [source](source.html) and build simply by doing: - -``` -$ mvn package -``` -builds, runs fast unit tests and package Phoenix and put the resulting jars (phoenix-[version].jar and phoenix-[version]-client.jar) in the generated phoenix-core/target/ and phoenix-assembly/target/ directories respectively. +Phoenix consists of several subprojects. +The core of the project is the `phoenix` project, which depends on the `phoenix-thirdparty`, `phoenix-omid` and `phoenix-tephra` projects. -To build, but skip running the fast unit tests, you can do: +`phoenix-queryserver` and `phoenix-connectors` are optional packages that depend on the `phoenix` project. -``` - $ mvn package -DskipTests -``` +Check out
[phoenix] branch 4.16 updated: PHOENIX-6534 Upgrades from pre 4.10 versions are broken
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 2ad8dbb PHOENIX-6534 Upgrades from pre 4.10 versions are broken
2ad8dbb is described below
commit 2ad8dbb44fc15ca4cfeb10f85f504844073ed862
Author: Istvan Toth
AuthorDate: Tue Sep 7 18:24:21 2021 +0200
PHOENIX-6534 Upgrades from pre 4.10 versions are broken
---
.../java/org/apache/phoenix/schema/MetaDataClient.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index f78deb3..e785d58 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -957,12 +957,15 @@ public class MetaDataClient {
} else {
colUpsert.setString(18, column.getExpressionStr());
}
-if (column.getColumnQualifierBytes() == null) {
-colUpsert.setNull(19, Types.VARBINARY);
-} else {
-colUpsert.setBytes(19, column.getColumnQualifierBytes());
+//Do not try to set extra columns when using
ALTER_SYSCATALOG_TABLE_UPGRADE
+if (colUpsert.getParameterMetaData().getParameterCount() > 18) {
+if (column.getColumnQualifierBytes() == null) {
+colUpsert.setNull(19, Types.VARBINARY);
+} else {
+colUpsert.setBytes(19, column.getColumnQualifierBytes());
+}
+colUpsert.setBoolean(20, column.isRowTimestamp());
}
-colUpsert.setBoolean(20, column.isRowTimestamp());
colUpsert.execute();
}
@@ -3902,7 +3905,10 @@ public class MetaDataClient {
Map changedCqCounters = new
HashMap<>(numCols);
if (numCols > 0 ) {
StatementContext context = new StatementContext(new
PhoenixStatement(connection), resolver);
-String addColumnSqlToUse = INSERT_COLUMN_CREATE_TABLE;
+String addColumnSqlToUse = connection.isRunningUpgrade()
+&&
tableName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE)
+&&
schemaName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA) ?
ALTER_SYSCATALOG_TABLE_UPGRADE
+: INSERT_COLUMN_CREATE_TABLE;
try (PreparedStatement colUpsert =
connection.prepareStatement(addColumnSqlToUse)) {
short nextKeySeq = SchemaUtil.getMaxKeySeq(table);
for ( ColumnDef colDef : columnDefs) {
[phoenix] branch 4.x updated: PHOENIX-6534 Upgrades from pre 4.10 versions are broken
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new b8af202 PHOENIX-6534 Upgrades from pre 4.10 versions are broken
b8af202 is described below
commit b8af2020c9c050f218b7a1879a3c785cb905eb3b
Author: Istvan Toth
AuthorDate: Tue Sep 7 18:24:21 2021 +0200
PHOENIX-6534 Upgrades from pre 4.10 versions are broken
---
.../java/org/apache/phoenix/schema/MetaDataClient.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 732fb58..38bcbcd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -964,12 +964,15 @@ public class MetaDataClient {
} else {
colUpsert.setString(18, column.getExpressionStr());
}
-if (column.getColumnQualifierBytes() == null) {
-colUpsert.setNull(19, Types.VARBINARY);
-} else {
-colUpsert.setBytes(19, column.getColumnQualifierBytes());
+//Do not try to set extra columns when using
ALTER_SYSCATALOG_TABLE_UPGRADE
+if (colUpsert.getParameterMetaData().getParameterCount() > 18) {
+if (column.getColumnQualifierBytes() == null) {
+colUpsert.setNull(19, Types.VARBINARY);
+} else {
+colUpsert.setBytes(19, column.getColumnQualifierBytes());
+}
+colUpsert.setBoolean(20, column.isRowTimestamp());
}
-colUpsert.setBoolean(20, column.isRowTimestamp());
colUpsert.execute();
}
@@ -3947,7 +3950,10 @@ public class MetaDataClient {
Map changedCqCounters = new
HashMap<>(numCols);
if (numCols > 0 ) {
StatementContext context = new StatementContext(new
PhoenixStatement(connection), resolver);
-String addColumnSqlToUse = INSERT_COLUMN_CREATE_TABLE;
+String addColumnSqlToUse = connection.isRunningUpgrade()
+&&
tableName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE)
+&&
schemaName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA) ?
ALTER_SYSCATALOG_TABLE_UPGRADE
+: INSERT_COLUMN_CREATE_TABLE;
try (PreparedStatement colUpsert =
connection.prepareStatement(addColumnSqlToUse)) {
short nextKeySeq = SchemaUtil.getMaxKeySeq(table);
for ( ColumnDef colDef : columnDefs) {
[phoenix] branch 5.1 updated: PHOENIX-6534 Upgrades from pre 4.10 versions are broken
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 35d6de3 PHOENIX-6534 Upgrades from pre 4.10 versions are broken
35d6de3 is described below
commit 35d6de3ebfaa43d9d0256928980401557038ee83
Author: Istvan Toth
AuthorDate: Tue Sep 7 18:24:21 2021 +0200
PHOENIX-6534 Upgrades from pre 4.10 versions are broken
---
.../java/org/apache/phoenix/schema/MetaDataClient.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 27d5d5f..a64c340 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -957,12 +957,15 @@ public class MetaDataClient {
} else {
colUpsert.setString(18, column.getExpressionStr());
}
-if (column.getColumnQualifierBytes() == null) {
-colUpsert.setNull(19, Types.VARBINARY);
-} else {
-colUpsert.setBytes(19, column.getColumnQualifierBytes());
+//Do not try to set extra columns when using
ALTER_SYSCATALOG_TABLE_UPGRADE
+if (colUpsert.getParameterMetaData().getParameterCount() > 18) {
+if (column.getColumnQualifierBytes() == null) {
+colUpsert.setNull(19, Types.VARBINARY);
+} else {
+colUpsert.setBytes(19, column.getColumnQualifierBytes());
+}
+colUpsert.setBoolean(20, column.isRowTimestamp());
}
-colUpsert.setBoolean(20, column.isRowTimestamp());
colUpsert.execute();
}
@@ -3890,7 +3893,10 @@ public class MetaDataClient {
Map changedCqCounters = new
HashMap<>(numCols);
if (numCols > 0 ) {
StatementContext context = new StatementContext(new
PhoenixStatement(connection), resolver);
-String addColumnSqlToUse = INSERT_COLUMN_CREATE_TABLE;
+String addColumnSqlToUse = connection.isRunningUpgrade()
+&&
tableName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE)
+&&
schemaName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA) ?
ALTER_SYSCATALOG_TABLE_UPGRADE
+: INSERT_COLUMN_CREATE_TABLE;
try (PreparedStatement colUpsert =
connection.prepareStatement(addColumnSqlToUse)) {
short nextKeySeq = SchemaUtil.getMaxKeySeq(table);
for ( ColumnDef colDef : columnDefs) {
[phoenix] branch master updated: PHOENIX-6534 Upgrades from pre 4.10 versions are broken
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 19b2260 PHOENIX-6534 Upgrades from pre 4.10 versions are broken
19b2260 is described below
commit 19b22604e08567e49a22f781f736c6e1fca05bb3
Author: Istvan Toth
AuthorDate: Tue Sep 7 18:24:21 2021 +0200
PHOENIX-6534 Upgrades from pre 4.10 versions are broken
---
.../java/org/apache/phoenix/schema/MetaDataClient.java | 18 --
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 85f99da..c85e220 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -964,12 +964,15 @@ public class MetaDataClient {
} else {
colUpsert.setString(18, column.getExpressionStr());
}
-if (column.getColumnQualifierBytes() == null) {
-colUpsert.setNull(19, Types.VARBINARY);
-} else {
-colUpsert.setBytes(19, column.getColumnQualifierBytes());
+//Do not try to set extra columns when using
ALTER_SYSCATALOG_TABLE_UPGRADE
+if (colUpsert.getParameterMetaData().getParameterCount() > 18) {
+if (column.getColumnQualifierBytes() == null) {
+colUpsert.setNull(19, Types.VARBINARY);
+} else {
+colUpsert.setBytes(19, column.getColumnQualifierBytes());
+}
+colUpsert.setBoolean(20, column.isRowTimestamp());
}
-colUpsert.setBoolean(20, column.isRowTimestamp());
colUpsert.execute();
}
@@ -3940,7 +3943,10 @@ public class MetaDataClient {
Map changedCqCounters = new
HashMap<>(numCols);
if (numCols > 0 ) {
StatementContext context = new StatementContext(new
PhoenixStatement(connection), resolver);
-String addColumnSqlToUse = INSERT_COLUMN_CREATE_TABLE;
+String addColumnSqlToUse = connection.isRunningUpgrade()
+&&
tableName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE)
+&&
schemaName.equals(PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA) ?
ALTER_SYSCATALOG_TABLE_UPGRADE
+: INSERT_COLUMN_CREATE_TABLE;
try (PreparedStatement colUpsert =
connection.prepareStatement(addColumnSqlToUse)) {
short nextKeySeq = SchemaUtil.getMaxKeySeq(table);
for ( ColumnDef colDef : columnDefs) {
svn commit: r1892639 - in /phoenix/site: publish/download.html source/src/site/markdown/download.md
Author: stoty
Date: Fri Aug 27 13:12:56 2021
New Revision: 1892639
URL: http://svn.apache.org/viewvc?rev=1892639=rev
Log:
add download links for python-phoenixdb 1.1.0 release
Modified:
phoenix/site/publish/download.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=1892639=1892638=1892639=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Fri Aug 27 13:12:56 2021
@@ -257,8 +257,8 @@ addRelease('4.14.0-cdh5.14.2','09/jun/20
addRelease('4.14.0-cdh5.13.2','09/jun/2018');
addRelease('4.14.0-cdh5.12.2','09/jun/2018');
addRelease('4.14.0-cdh5.11.2','09/jun/2018');
-addPhoenixdbRelease('1.0.0','18/sep/2020');
addPhoenixdbRelease('1.0.1','22/may/2021');
+addPhoenixdbRelease('1.1.0','27/aug/2021');
addPhoenixThirdpartyRelease('1.0.0','26/oct/2020');
addPhoenixThirdpartyRelease('1.1.0','01/feb/2021');
addPhoenixOmidRelease('1.0.2','23/nov/2020');
Modified: phoenix/site/source/src/site/markdown/download.md
URL:
http://svn.apache.org/viewvc/phoenix/site/source/src/site/markdown/download.md?rev=1892639=1892638=1892639=diff
==
--- phoenix/site/source/src/site/markdown/download.md (original)
+++ phoenix/site/source/src/site/markdown/download.md Fri Aug 27 13:12:56 2021
@@ -82,8 +82,8 @@ addRelease('4.14.0-cdh5.14.2','09/jun/20
addRelease('4.14.0-cdh5.13.2','09/jun/2018');
addRelease('4.14.0-cdh5.12.2','09/jun/2018');
addRelease('4.14.0-cdh5.11.2','09/jun/2018');
-addPhoenixdbRelease('1.0.0','18/sep/2020');
addPhoenixdbRelease('1.0.1','22/may/2021');
+addPhoenixdbRelease('1.1.0','27/aug/2021');
addPhoenixThirdpartyRelease('1.0.0','26/oct/2020');
addPhoenixThirdpartyRelease('1.1.0','01/feb/2021');
addPhoenixOmidRelease('1.0.2','23/nov/2020');
svn commit: r49653 - in /release/phoenix: python-phoenixdb-1.1.0.rc0/ python-phoenixdb-1.1.0/
Author: stoty Date: Fri Aug 27 12:59:25 2021 New Revision: 49653 Log: fix python-phoenixdb 1.1.0 release directory name Added: release/phoenix/python-phoenixdb-1.1.0/ - copied from r49652, release/phoenix/python-phoenixdb-1.1.0.rc0/ Removed: release/phoenix/python-phoenixdb-1.1.0.rc0/
[phoenix-queryserver] branch master updated: Bump phoenixdb version to 1.1.1.dev0 after release
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 b35a818 Bump phoenixdb version to 1.1.1.dev0 after release b35a818 is described below commit b35a818a251afb809cfb0bab107eca99a3703cdb Author: Istvan Toth AuthorDate: Fri Aug 27 14:46:31 2021 +0200 Bump phoenixdb version to 1.1.1.dev0 after release --- python-phoenixdb/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py index 4cdb682..c47b53a 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -59,7 +59,7 @@ else: 'Sphinx;python_version>="3.6"', ], -version = "1.1.0" +version = "1.1.1.dev0" setup( name="phoenixdb",
[phoenix-queryserver] annotated tag python-phoenixdb-1.1.0 updated (48ca4b2 -> b9d2449)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag python-phoenixdb-1.1.0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. *** WARNING: tag python-phoenixdb-1.1.0 was modified! *** from 48ca4b2 (commit) to b9d2449 (tag) tagging 48ca4b22b0f2793d54d7ae0ab4e6f8b5751301b4 (commit) replaces 6.0.0 by Istvan Toth on Fri Aug 27 14:44:11 2021 +0200 - Log - python-phoenixdb-1.1.0 release --- No new revisions were added by this update. Summary of changes:
svn commit: r49652 - /dev/phoenix/python-phoenixdb-1.1.0.rc0/ /release/phoenix/python-phoenixdb-1.1.0.rc0/
Author: stoty Date: Fri Aug 27 12:34:15 2021 New Revision: 49652 Log: Release Python-phoenixdb 1.1.0 Added: release/phoenix/python-phoenixdb-1.1.0.rc0/ - copied from r49651, dev/phoenix/python-phoenixdb-1.1.0.rc0/ Removed: dev/phoenix/python-phoenixdb-1.1.0.rc0/
[phoenix-queryserver] branch master updated: PHOENIX-6531 Document Phoenixdb release process
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 6ceaea8 PHOENIX-6531 Document Phoenixdb release process
6ceaea8 is described below
commit 6ceaea83884ac91d9269126d2df6aa0ae8a9881f
Author: Istvan Toth
AuthorDate: Thu Aug 19 08:48:20 2021 +0200
PHOENIX-6531 Document Phoenixdb release process
also remove sha256 signature generation
---
python-phoenixdb/RELEASING.rst | 70 ++---
python-phoenixdb/dev-support/make_rc.sh | 2 -
2 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/python-phoenixdb/RELEASING.rst b/python-phoenixdb/RELEASING.rst
index d996cfe..8571018 100644
--- a/python-phoenixdb/RELEASING.rst
+++ b/python-phoenixdb/RELEASING.rst
@@ -1,12 +1,72 @@
Releasing a new version
===
-Change the version number ``setup.py`` and ``NEWS.rst``.
+Refer to the Phoenix release docs https://phoenix.apache.org/release.html for
additinal information
-Commit the changes and tag the repository::
+Pre-requisites
+--
-git tag -s vX.Y
+You need to be a Phoenix PMC to be able to upload the RC and final releases to
dist.apache.org
-Upload the package to PyPI::
+Make sure your gpg is set up, and that the default key is your code signing
key.
+See http://www.apache.org/dev/release-signing.html
-python setup.py clean sdist upload
+Make sure that your git remote ``origin`` points to either the main gitbox or
the main github
+phoenix-queryserver repo.
+
+Make sure that you have a PyPI account, and that you can publish to the
+https://pypi.org/project/phoenixdb/ project. If not, then reach out to one of
the maintainers listed there for permission.
+
+For instructions on the PyPi registration and publishing process, see
+https://kynan.github.io/blog/2020/05/23/how-to-upload-your-package-to-the-python-package-index-pypi-test-server
+
+Prepare the RC
+--
+
+#. Make sure the dockerized tests described in README.rst run successfully
+
+#. Discuss release plans on dev@phoenix.a.o
+
+#. Open a ticket like https://issues.apache.org/jira/browse/PHOENIX-6529
+
+#. Change the version number in ``setup.py`` and ``NEWS.rst``.
+
+#. Add the changes since the last release to ``NEWS.rst``
+
+#. Make a PR form the changes get it reviewed, and commit it
+
+#. Run the dev_support/make_rc.sh script, and choose the option to tag the
release::
+
+cd python-phoenixdb
+./dev/support/make_rc.sh
+
+#. The distribution will be generated under the python-phoenixdb/release
directory. Upload the directory to
https://dist.apache.org/repos/dist/dev/phoenix/ with SVN::
+
+cd workdir
+svn co https://dist.apache.org/repos/dist/dev/phoenix --depth empty
+cd phoenix
+cp -r /python-phoenixdb/release/ .
+svn add
+svn commit
+
+Voting
+--
+
+#. Follow the Voting section in https://phoenix.apache.org/release.html
+
+You can use
http://mail-archives.us.apache.org/mod_mbox/phoenix-dev/202108.mbox/%3CCAJ0%2BiOs2P8EQq_GEGwb%2BVyWur_HyvUGRgVvrD55Xh249QNUcNQ%40mail.gmail.com%3E
+as an email template.
+
+Publishing
+--
+
+#. If the vote passes, upload the package to PyPI (using the instructions
linked above)
+
+#. Bump the package version to ...dev0 in ``setup.py``,
and commit the change
+
+#. Follow the steps from the ``Release`` section in
https://phoenix.apache.org/release.html , but skip the following steps:
+* maven release
+* new branch creation
+* mvn version set
+
+Congratulations!
\ No newline at end of file
diff --git a/python-phoenixdb/dev-support/make_rc.sh
b/python-phoenixdb/dev-support/make_rc.sh
index 2efc562..c1ece74 100755
--- a/python-phoenixdb/dev-support/make_rc.sh
+++ b/python-phoenixdb/dev-support/make_rc.sh
@@ -70,12 +70,10 @@ function_sign() {
if [[ "$OSTYPE" == "darwin"* ]]; then
gpg --armor --output $phoenix_tar.asc --detach-sig $phoenix_tar;
openssl dgst -sha512 $phoenix_tar > $phoenix_tar.sha512;
-openssl dgst -sha256 $phoenix_tar >> $phoenix_tar.sha256;
# all other OS
else
gpg --armor --output $phoenix_tar.asc --detach-sig $phoenix_tar;
sha512sum -b $phoenix_tar > $phoenix_tar.sha512;
-sha256sum -b $phoenix_tar >> $phoenix_tar.sha256;
fi
}
svn commit: r49558 - in /dev/phoenix/python-phoenixdb-1.1.0.rc0: ./ src/ src/python-phoenixdb-1.1.0-src.tar.gz src/python-phoenixdb-1.1.0-src.tar.gz.asc src/python-phoenixdb-1.1.0-src.tar.gz.sha256 sr
Author: stoty Date: Wed Aug 18 16:26:56 2021 New Revision: 49558 Log: Add python-phoenixdb-1.1.0.rc0 Added: dev/phoenix/python-phoenixdb-1.1.0.rc0/ dev/phoenix/python-phoenixdb-1.1.0.rc0/src/ dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz (with props) dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.asc dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha256 dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha512 Added: dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz == Binary file - no diff available. Propchange: dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.asc == --- dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.asc (added) +++ dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.asc Wed Aug 18 16:26:56 2021 @@ -0,0 +1,11 @@ +-BEGIN PGP SIGNATURE- + +iQEzBAABCgAdFiEEglIDpwQFvIOuz199lzUcG3lEM8cFAmEdL+kACgkQlzUcG3lE +M8dR6Qf/dOSOTC9EdHeMte4xb1h5CveIu0bRYvUXcIJG504xnhT2WfHXc74Qz41G +zsSm+YebdvjniB+MnNKHt3x0e4UFx8Tdypj5weVXWaxLkf1J+7fTUCsKFJrbSP1J +EIiFzSnFxRu4nXQqpgqJcn3tCG1bKGe1KuFjA4Fi9d96Y7X2XVzB/kJwHeGhYE/Z +28g2BEdq7doGfBbjZOXDDAM6u2kg7I+RMJ0IMpkAwWBPtpMvc8VkkxGAuG3R0278 +OaUaEufptjqwnW55wVO/oe1Boq0HzB0LzgEcg7Rn9Ox0CN8z7mCNHU+EgaT1Bc0H +DKOC5ZbWpZJJOR7aTQO6/ckJPFdUeg== +=/Ral +-END PGP SIGNATURE- Added: dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha256 == --- dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha256 (added) +++ dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha256 Wed Aug 18 16:26:56 2021 @@ -0,0 +1 @@ +SHA256(python-phoenixdb-1.1.0-src.tar.gz)= 2e6034e921d4b90e7edfdaa45725e2ca96d340a9eca979af12eadc016a5157ac Added: dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha512 == --- dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha512 (added) +++ dev/phoenix/python-phoenixdb-1.1.0.rc0/src/python-phoenixdb-1.1.0-src.tar.gz.sha512 Wed Aug 18 16:26:56 2021 @@ -0,0 +1 @@ +SHA512(python-phoenixdb-1.1.0-src.tar.gz)= f0a7fda96eec6b5511fb45d9f18ffb68479a974717e03eefc8cdd5be1289a7c1dcfbea47fdf23d308bd548c1f2b96f4220a9c27c68ea316c724d481d55a220a8
[phoenix-queryserver] annotated tag python-phoenixdb-1.1.0.rc0 updated (48ca4b2 -> 083154c)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag python-phoenixdb-1.1.0.rc0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. *** WARNING: tag python-phoenixdb-1.1.0.rc0 was modified! *** from 48ca4b2 (commit) to 083154c (tag) tagging 48ca4b22b0f2793d54d7ae0ab4e6f8b5751301b4 (commit) replaces 6.0.0 by Istvan Toth on Wed Aug 18 18:07:30 2021 +0200 - Log - python-phoenixdb-1.1.0.rc0 --- No new revisions were added by this update. Summary of changes:
[phoenix-queryserver] branch master updated: PHOENIX-6529 Release python-phoenixdb 1.1.0
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 48ca4b2 PHOENIX-6529 Release python-phoenixdb 1.1.0
48ca4b2 is described below
commit 48ca4b22b0f2793d54d7ae0ab4e6f8b5751301b4
Author: Istvan Toth
AuthorDate: Wed Aug 18 12:31:48 2021 +0200
PHOENIX-6529 Release python-phoenixdb 1.1.0
also split too long lines
---
python-phoenixdb/NEWS.rst | 8
python-phoenixdb/phoenixdb/cursor.py| 4 +++-
python-phoenixdb/phoenixdb/tests/test_db.py | 9 ++---
python-phoenixdb/setup.py | 2 +-
4 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst
index 22fa1ce..5d9dfc8 100644
--- a/python-phoenixdb/NEWS.rst
+++ b/python-phoenixdb/NEWS.rst
@@ -1,6 +1,14 @@
Changelog
=
+Version 1.1.0
+-
+
+- Implemented get_primary_keys() and get_index_info() methods in meta object
(PHOENIX-6410)
+- Fixed broken SqlAlchemy get_pk_constraint() method to use
meta.get_primary_keys() (PHOENIX-6410)
+- Implemented SqlAlchemy get_indexes() method to expose meta.get_index_info()
(PHOENIX-6410)
+- Fixed empty array column handling in result set (PHOENIX-6484)
+
Version 1.0.1
-
diff --git a/python-phoenixdb/phoenixdb/cursor.py
b/python-phoenixdb/phoenixdb/cursor.py
index 0f1ace2..f4e84d4 100644
--- a/python-phoenixdb/phoenixdb/cursor.py
+++ b/python-phoenixdb/phoenixdb/cursor.py
@@ -175,7 +175,9 @@ class Cursor(object):
def _transform_parameters(self, parameters):
if len(parameters) != len(self._parameter_data_types):
-raise ProgrammingError('Number of placeholders (?) must match
number of parameters. Number of placeholders: {0}. Number of parameters:
{1}'.format(len(self._parameter_data_types), len(parameters)))
+raise ProgrammingError('Number of placeholders (?) must match
number of parameters.'
+ ' Number of placeholders: {0}. Number of
parameters: {1}'
+ .format(len(self._parameter_data_types),
len(parameters)))
typed_parameters = []
for value, data_type in zip(parameters, self._parameter_data_types):
field_name, rep, mutate_to, cast_from, is_array = data_type
diff --git a/python-phoenixdb/phoenixdb/tests/test_db.py
b/python-phoenixdb/phoenixdb/tests/test_db.py
index 3056a6b..6b94ba8 100644
--- a/python-phoenixdb/phoenixdb/tests/test_db.py
+++ b/python-phoenixdb/phoenixdb/tests/test_db.py
@@ -296,10 +296,13 @@ class PhoenixDatabaseTest(DatabaseTestCase):
])
with self.assertRaises(ProgrammingError) as cm:
cursor.execute("UPSERT INTO phoenixdb_test_param_number VALUES
(?, ?)", (123, 'John Doe', 'admin'))
-self.assertEqual("Number of placeholders (?) must match number of
parameters. Number of placeholders: 2. Number of parameters: 3",
cm.exception.message)
+self.assertEqual("Number of placeholders (?) must match number of
parameters."
+ " Number of placeholders: 2. Number of
parameters: 3", cm.exception.message)
with self.assertRaises(ProgrammingError) as cm:
cursor.execute("UPSERT INTO phoenixdb_test_param_number VALUES
(?, ?, ?)", (123, 'John Doe', 'admin', 'asd'))
-self.assertEqual("Number of placeholders (?) must match number of
parameters. Number of placeholders: 3. Number of parameters: 4",
cm.exception.message)
+self.assertEqual("Number of placeholders (?) must match number of
parameters."
+ " Number of placeholders: 3. Number of
parameters: 4", cm.exception.message)
with self.assertRaises(ProgrammingError) as cm:
cursor.execute("UPSERT INTO phoenixdb_test_param_number VALUES
(?, ?, ?)", (123, 'John Doe'))
-self.assertEqual("Number of placeholders (?) must match number of
parameters. Number of placeholders: 3. Number of parameters: 2",
cm.exception.message)
+self.assertEqual("Number of placeholders (?) must match number of
parameters."
+ " Number of placeholders: 3. Number of
parameters: 2", cm.exception.message)
diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py
index 6ac0f47..4cdb682 100644
--- a/python-phoenixdb/setup.py
+++ b/python-phoenixdb/setup.py
@@ -59,7 +59,7 @@ else:
'Sphinx;python_version>="3.6"',
],
-version = "1.1.0.dev0"
+version = "1.1.0"
setup(
name="phoenixdb",
svn commit: r1892036 - in /phoenix/site: publish/language/datatypes.html publish/language/functions.html publish/language/index.html publish/server.html source/src/site/markdown/server.md
Author: stoty Date: Fri Aug 6 09:42:16 2021 New Revision: 1892036 URL: http://svn.apache.org/viewvc?rev=1892036=rev Log: Update PQS docs for 6.0.0 Modified: phoenix/site/publish/language/datatypes.html phoenix/site/publish/language/functions.html phoenix/site/publish/language/index.html phoenix/site/publish/server.html phoenix/site/source/src/site/markdown/server.md Modified: phoenix/site/publish/language/datatypes.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1892036=1892035=1892036=diff == --- phoenix/site/publish/language/datatypes.html (original) +++ phoenix/site/publish/language/datatypes.html Fri Aug 6 09:42:16 2021 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/functions.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1892036=1892035=1892036=diff == --- phoenix/site/publish/language/functions.html (original) +++ phoenix/site/publish/language/functions.html Fri Aug 6 09:42:16 2021 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/language/index.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1892036=1892035=1892036=diff == --- phoenix/site/publish/language/index.html (original) +++ phoenix/site/publish/language/index.html Fri Aug 6 09:42:16 2021 @@ -1,7 +1,7 @@ Modified: phoenix/site/publish/server.html URL: http://svn.apache.org/viewvc/phoenix/site/publish/server.html?rev=1892036=1892035=1892036=diff == --- phoenix/site/publish/server.html (original) +++ phoenix/site/publish/server.html Fri Aug 6 09:42:16 2021 @@ -1,7 +1,7 @@ @@ -169,22 +169,33 @@ Phoenix Query Server -The Phoenix Query Server provides an alternative means for interaction with Phoenix and HBase. Soon this will enable access from environments other than the JVM. +The Phoenix Query Server provides an alternative means for interaction with Phoenix and HBase. Overview - Phoenix 4.4 introduces a stand-alone server that exposes Phoenix to âthinâ clients. It is based on the https://calcite.apache.org/avatica;>Avatica component of https://calcite.apache.org;>Apache Calcite. The query server is comprised of a Java server that manages Phoenix Connections on the clientsâ behalf. The client implementation is currently a JDBC driver with minimal dependencies. Two transport mechanisms are current supported: JSON and Protocol Buffers (available as of Phoenix 4.7 as the default). Thereâs also a sqlline script that uses the thin client. - Avatica is still relatively early in its life-cycle. With the introduction of the Protobuf transport, Avatica is moving towards backwards compatibility with the provided thin JDBC driver. There are no such backwards compatibility guarantees for the JSON API. + Phoenix 4.4 introduces a stand-alone server that exposes Phoenix to âthinâ clients. It is based on the https://calcite.apache.org/avatica;>Avatica component of https://calcite.apache.org;>Apache Calcite. The query server is comprised of a Java server that manages Phoenix Connections on the clientsâ behalf. + With the introduction of the Protobuf transport, Avatica is moving towards backwards compatibility with the provided thin JDBC driver. There are no such backwards compatibility guarantees for the JSON API. To repeat, there is no guarantee of backwards compatibility with the JSON transport; however, compatibility with the Protobuf transport is stabilizing (although, not tested thoroughly enough to be stated as âguaranteedâ). + + Clients + The primary client implementation is currently a JDBC driver with minimal dependencies. The default and primary transport mechanism since Phoenix 4.7 is Protobuf, the older JSON mechanism can still be enabled. The distribution includes the sqlline-thin.py CLI client that uses the JDBC thin client. + The Phoenix project also maintains the Python driver https://phoenix.apache.org/python.html;>phoenixdb. + The Avatica https://calcite.apache.org/avatica/docs/go_client_reference.html;>Go client can also be used. + Proprietary ODBC drivers are also available for Windows and Linux. + Installation - In the 4.x and 5.0 releases the query server and its JDBC client are part of the standard Phoenix distribution. They require no additional dependencies. - After the 5.0 release, the query server has been unbundled into the phoenix-queryserver repository, and its version number has been reset to 1.0. At the time of writing there is no released version of the standalone query server. + In the 4.4-4.14 and 5.0 releases the query server a
[phoenix] branch 5.1 updated: PHOENIX-6526 Bump default HBase version on 2.3 profile to 2.3.6
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 10a4b7e PHOENIX-6526 Bump default HBase version on 2.3 profile to 2.3.6 10a4b7e is described below commit 10a4b7e5f8c4562053ea368737b8d3a39fec0b4d Author: luoc AuthorDate: Thu Aug 5 15:03:16 2021 +0800 PHOENIX-6526 Bump default HBase version on 2.3 profile to 2.3.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ec915e..5767d76 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 2.1.10 2.2.6 -2.3.5 +2.3.6 2.4.0 2.4.4
[phoenix] branch master updated: PHOENIX-6526 Bump default HBase version on 2.3 profile to 2.3.6
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 c4d297d PHOENIX-6526 Bump default HBase version on 2.3 profile to 2.3.6 c4d297d is described below commit c4d297d9c57a6ffaa27498e59ca6c294fda779fe Author: luoc AuthorDate: Thu Aug 5 15:03:16 2021 +0800 PHOENIX-6526 Bump default HBase version on 2.3 profile to 2.3.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e1a0006..f92950c 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ 2.1.10 2.2.6 -2.3.5 +2.3.6 2.4.0 2.4.4
[phoenix-connectors] branch master updated: PHOENIX-6524 Hive Connector returns emtpy AND expression when all children are pushed down
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 349a2b2 PHOENIX-6524 Hive Connector returns emtpy AND expression when
all children are pushed down
349a2b2 is described below
commit 349a2b2d7d5c4be78e99f7a94e20d47b22b68e6d
Author: Istvan Toth
AuthorDate: Wed Aug 4 10:43:06 2021 +0200
PHOENIX-6524 Hive Connector returns emtpy AND expression when all children
are pushed down
also fix incorrect phoenix.hbase.table.name property in some tests
---
.../apache/phoenix/hive/HivePhoenixStoreIT.java| 54 +++---
.../hive/ql/index/IndexPredicateAnalyzer.java | 5 ++
2 files changed, 52 insertions(+), 7 deletions(-)
diff --git
a/phoenix-hive-base/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
b/phoenix-hive-base/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
index bdd10e5..461ab99 100644
---
a/phoenix-hive-base/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
+++
b/phoenix-hive-base/src/it/java/org/apache/phoenix/hive/HivePhoenixStoreIT.java
@@ -139,7 +139,7 @@ public abstract class HivePhoenixStoreIT extends
BaseHivePhoenixStoreIT {
"DOUBLE,fl FLOAT, us INT)" + HiveTestUtil.CRLF +
" STORED BY
\"org.apache.phoenix.hive.PhoenixStorageHandler\"" + HiveTestUtil
.CRLF + " TBLPROPERTIES(" + HiveTestUtil.CRLF +
-" 'phoenix.hbase.table.name'='phoenix_datatype'," +
HiveTestUtil.CRLF +
+" 'phoenix.table.name'='phoenix_datatype'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.znode.parent'='/hbase'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.quorum'='localhost'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.client.port'='" +
@@ -185,7 +185,7 @@ public abstract class HivePhoenixStoreIT extends
BaseHivePhoenixStoreIT {
" STORED BY
\"org.apache.phoenix.hive.PhoenixStorageHandler\"" + HiveTestUtil
.CRLF +
" TBLPROPERTIES(" + HiveTestUtil.CRLF +
-" 'phoenix.hbase.table.name'='phoenix_MultiKey'," +
HiveTestUtil.CRLF +
+" 'phoenix.table.name'='phoenix_MultiKey'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.znode.parent'='/hbase'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.quorum'='localhost'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.client.port'='" +
@@ -233,7 +233,7 @@ public abstract class HivePhoenixStoreIT extends
BaseHivePhoenixStoreIT {
" STORED BY
\"org.apache.phoenix.hive.PhoenixStorageHandler\"" + HiveTestUtil
.CRLF +
" TBLPROPERTIES(" + HiveTestUtil.CRLF +
-" 'phoenix.hbase.table.name'='joinTable1'," +
HiveTestUtil.CRLF +
+" 'phoenix.table.name'='joinTable1'," + HiveTestUtil.CRLF +
" 'phoenix.zookeeper.znode.parent'='/hbase'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.quorum'='localhost'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.client.port'='" +
@@ -244,7 +244,7 @@ public abstract class HivePhoenixStoreIT extends
BaseHivePhoenixStoreIT {
" STORED BY
\"org.apache.phoenix.hive.PhoenixStorageHandler\"" + HiveTestUtil
.CRLF +
" TBLPROPERTIES(" + HiveTestUtil.CRLF +
-" 'phoenix.hbase.table.name'='joinTable2'," +
HiveTestUtil.CRLF +
+" 'phoenix.table.name'='joinTable2'," + HiveTestUtil.CRLF +
" 'phoenix.zookeeper.znode.parent'='/hbase'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.quorum'='localhost'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.client.port'='" +
@@ -283,7 +283,7 @@ public abstract class HivePhoenixStoreIT extends
BaseHivePhoenixStoreIT {
" STORED BY
\"org.apache.phoenix.hive.PhoenixStorageHandler\"" + HiveTestUtil
.CRLF +
" TBLPROPERTIES(" + HiveTestUtil.CRLF +
-" 'phoenix.hbase.table.name'='joinTable3'," +
HiveTestUtil.CRLF +
+" 'phoenix.table.name'='joinTable3'," + HiveTestUtil.CRLF +
" 'phoenix.zookeeper.znode.parent'='/hbase'," +
HiveTestUtil.CRLF +
" 'phoenix.zookeeper.quorum'='localhost'," +
[phoenix-connectors] branch master updated: PHOENIX-6525 Use the defined version properties for building phoenix-connectors-phoenixX-compat modules
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 53d0d18 PHOENIX-6525 Use the defined version properties for building
phoenix-connectors-phoenixX-compat modules
53d0d18 is described below
commit 53d0d18971b4dc00bb7cc5f65c68cd9b340d8601
Author: Istvan Toth
AuthorDate: Wed Aug 4 14:34:11 2021 +0200
PHOENIX-6525 Use the defined version properties for building
phoenix-connectors-phoenixX-compat modules
---
phoenix-connectors-phoenix4-compat/pom.xml | 4 ++--
phoenix-connectors-phoenix5-compat/pom.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/phoenix-connectors-phoenix4-compat/pom.xml
b/phoenix-connectors-phoenix4-compat/pom.xml
index c5e3443..da71a15 100644
--- a/phoenix-connectors-phoenix4-compat/pom.xml
+++ b/phoenix-connectors-phoenix4-compat/pom.xml
@@ -33,8 +33,8 @@
Compatibility util for Phoenix 4
-4.15.0-HBase-1.4
-1.4.0
+${phoenix-four.version}
+${hbase-one.version}
diff --git a/phoenix-connectors-phoenix5-compat/pom.xml
b/phoenix-connectors-phoenix5-compat/pom.xml
index 781338a..e63a4f5 100644
--- a/phoenix-connectors-phoenix5-compat/pom.xml
+++ b/phoenix-connectors-phoenix5-compat/pom.xml
@@ -33,8 +33,8 @@
Compatibility util for Phoenix 5
-5.1.0-SNAPSHOT
-2.1.9
+${phoenix-five.version}
+${hbase-two.version}
svn commit: r1891971 - in /phoenix/site: publish/download.html publish/js/download.js publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdo
Author: stoty
Date: Tue Aug 3 08:05:05 2021
New Revision: 1891971
URL: http://svn.apache.org/viewvc?rev=1891971=rev
Log:
Add PQS 6.0.0 release download link
Modified:
phoenix/site/publish/download.html
phoenix/site/publish/js/download.js
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
phoenix/site/source/src/site/resources/js/download.js
Modified: phoenix/site/publish/download.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/download.html?rev=1891971=1891970=1891971=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Tue Aug 3 08:05:05 2021
@@ -1,7 +1,7 @@
@@ -170,7 +170,7 @@
Phoenix Downloads
The below table lists mirrored release artifacts and their associated
hashes and signatures available ONLY at apache.org. The keys used to sign
releases can be found in our published https://www.apache.org/dist/phoenix/KEYS;>KEYS file. See our
installation instructions here, our release
notes here, and a list of fixes and new
features https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12334393projectId=12315120;>here.
Follow https://www.apache.org/dyn/closer.cgi#verify;>Verify the Integrity of the
Files for how to verify your mirrored downloads.
-Current release 4.16.1 can run on Apache HBase 1.3, 1.4, 1.5 and 1.6.
Current release 5.1.1 can run on Apache HBase 2.1, 2.2, 2.3 and 2.4 CDH HBase
5.11, 5.12, 5.13 and 5.14 is supported by 4.14.0.Apache HBase 2.0 is
supported by 5.0.0.
+Current release 4.16.1 can run on Apache HBase 1.3, 1.4, 1.5 and 1.6.
Current release 5.1.2 can run on Apache HBase 2.1, 2.2, 2.3 and 2.4 CDH HBase
5.11, 5.12, 5.13 and 5.14 is supported by 4.14.0.Apache HBase 2.0 is
supported by 5.0.0.
Please follow the appropriate link depending on your HBase version.
@@ -216,6 +216,17 @@
+
+
+
+ Phoenix Query Server Version
+ Release Date
+ Download
+
+
+
+
+
@@ -253,6 +264,7 @@ addPhoenixThirdpartyRelease('1.1.0','01/
addPhoenixOmidRelease('1.0.2','23/nov/2020');
addPhoenixTephraRelease('0.16.0','04/dec/2020');
addPhoenixTephraRelease('0.16.1','13/may/2021');
+addPhoenixQueryServerRelease('6.0.0','03/aug/2021');
//]]>
Modified: phoenix/site/publish/js/download.js
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/js/download.js?rev=1891971=1891970=1891971=diff
==
--- phoenix/site/publish/js/download.js (original)
+++ phoenix/site/publish/js/download.js Tue Aug 3 08:05:05 2021
@@ -14,13 +14,11 @@ function addRelease(version, date) {
'' + date + '' +
'' +
'bin ' +
- // 'sha256 ' +
'' +
'[ sha512' +
' | asc ]' +
'' +
'src ' +
- // 'sha256 ' +
'' +
'[ sha512' +
' | asc ]' +
@@ -118,3 +116,24 @@ function addPhoenixTephraRelease(version
'';
document.getElementById('phoenix-tephra-releases').appendChild(tr);
}
+
+function addPhoenixQueryServerRelease(version, date) {
+var tr = document.createElement('tr');
+var parcelsHtml = version.includes('-cdh') ? parcelFolderHtml(version) : ''
+tr.innerHTML =
+'' + version + '' +
+'' + date + '' +
+'' +
+ 'bin ' +
+ '' +
+ '[ sha512' +
+ ' | asc ]' +
+'' +
+ 'src ' +
+ '' +
+ '[ sha512' +
+ ' | asc ]' +
+'' + parcelsHtml +
+'';
+document.getElementById('phoenix-queryserver-releases').appendChild(tr);
+}
Modified: phoenix/site/publish/language/datatypes.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1891971=1891970=1891971=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Tue Aug 3 08:05:05 2021
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1891971=1891970=1891971=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Tue Aug 3 08:05:05 2021
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1891971=1891970=1891971=diff
==
--- phoenix/site/publish/language/index.html (original)
+++
[phoenix-queryserver] branch master updated: bump version to 6.0.1-SNAPSHOT
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 19e05cc bump version to 6.0.1-SNAPSHOT 19e05cc is described below commit 19e05cc2a53ada094e1b94b9f1697865ffcff0db Author: Istvan Toth AuthorDate: Tue Aug 3 07:33:28 2021 +0200 bump version to 6.0.1-SNAPSHOT --- phoenix-queryserver-assembly/pom.xml | 2 +- phoenix-queryserver-client/pom.xml| 2 +- phoenix-queryserver-it/pom.xml| 2 +- phoenix-queryserver-load-balancer/pom.xml | 2 +- phoenix-queryserver-orchestrator/pom.xml | 2 +- phoenix-queryserver/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phoenix-queryserver-assembly/pom.xml b/phoenix-queryserver-assembly/pom.xml index 4391b83..5386dd0 100644 --- a/phoenix-queryserver-assembly/pom.xml +++ b/phoenix-queryserver-assembly/pom.xml @@ -25,7 +25,7 @@ org.apache.phoenix phoenix-queryserver-parent -6.0.0 +6.0.1-SNAPSHOT phoenix-queryserver-assembly diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index e9de2fb..d501977 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -29,7 +29,7 @@ org.apache.phoenix phoenix-queryserver-parent -6.0.0 +6.0.1-SNAPSHOT phoenix-queryserver-client diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml index 4d53649..1930ee5 100644 --- a/phoenix-queryserver-it/pom.xml +++ b/phoenix-queryserver-it/pom.xml @@ -28,7 +28,7 @@ org.apache.phoenix phoenix-queryserver-parent -6.0.0 +6.0.1-SNAPSHOT phoenix-queryserver-it diff --git a/phoenix-queryserver-load-balancer/pom.xml b/phoenix-queryserver-load-balancer/pom.xml index 52b12d9..44e6ebe 100644 --- a/phoenix-queryserver-load-balancer/pom.xml +++ b/phoenix-queryserver-load-balancer/pom.xml @@ -27,7 +27,7 @@ org.apache.phoenix phoenix-queryserver-parent -6.0.0 +6.0.1-SNAPSHOT phoenix-queryserver-load-balancer Phoenix Query Server Load Balancer diff --git a/phoenix-queryserver-orchestrator/pom.xml b/phoenix-queryserver-orchestrator/pom.xml index 4ad455f..a383550 100644 --- a/phoenix-queryserver-orchestrator/pom.xml +++ b/phoenix-queryserver-orchestrator/pom.xml @@ -28,7 +28,7 @@ phoenix-queryserver-parent org.apache.phoenix -6.0.0 +6.0.1-SNAPSHOT phoenix-queryserver-orchestrator diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index 1ca7807..2fe5455 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -28,7 +28,7 @@ org.apache.phoenix phoenix-queryserver-parent -6.0.0 +6.0.1-SNAPSHOT phoenix-queryserver diff --git a/pom.xml b/pom.xml index b577741..7a9d2a4 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ org.apache.phoenix phoenix-queryserver-parent -6.0.0 +6.0.1-SNAPSHOT pom Phoenix Query Server Maven Parent Project
[phoenix-queryserver] annotated tag 6.0.0 updated (7088fc6 -> 1c0c85c)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to annotated tag 6.0.0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. *** WARNING: tag 6.0.0 was modified! *** from 7088fc6 (commit) to 1c0c85c (tag) tagging 7088fc687b2c315ddd1c3bba8f1555e890d8c384 (commit) replaces python-phoenixdb-1.0.1 by Istvan Toth on Tue Aug 3 07:28:44 2021 +0200 - Log - Phoenix Query Server 6.0.0 release --- No new revisions were added by this update. Summary of changes:
svn commit: r49140 - /dev/phoenix/phoenix-queryserver-6.0.0RC5/ /release/phoenix/phoenix-queryserver-6.0.0/
Author: stoty Date: Tue Aug 3 05:27:34 2021 New Revision: 49140 Log: releasing PQS 6.0.0RC5 as final Added: release/phoenix/phoenix-queryserver-6.0.0/ - copied from r49139, dev/phoenix/phoenix-queryserver-6.0.0RC5/ Removed: dev/phoenix/phoenix-queryserver-6.0.0RC5/
svn commit: r48853 - /dev/phoenix/phoenix-queryserver-6.0.0RC5/
Author: stoty Date: Fri Jul 16 16:01:24 2021 New Revision: 48853 Log: Apache phoenix-queryserver 6.0.0RC5 Added: dev/phoenix/phoenix-queryserver-6.0.0RC5/ dev/phoenix/phoenix-queryserver-6.0.0RC5/CHANGES.md dev/phoenix/phoenix-queryserver-6.0.0RC5/RELEASENOTES.md dev/phoenix/phoenix-queryserver-6.0.0RC5/phoenix-queryserver-6.0.0-bin.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC5/phoenix-queryserver-6.0.0-bin.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC5/phoenix-queryserver-6.0.0-bin.tar.gz.sha512 dev/phoenix/phoenix-queryserver-6.0.0RC5/phoenix-queryserver-6.0.0-src.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC5/phoenix-queryserver-6.0.0-src.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC5/phoenix-queryserver-6.0.0-src.tar.gz.sha512 Added: dev/phoenix/phoenix-queryserver-6.0.0RC5/CHANGES.md == --- dev/phoenix/phoenix-queryserver-6.0.0RC5/CHANGES.md (added) +++ dev/phoenix/phoenix-queryserver-6.0.0RC5/CHANGES.md Fri Jul 16 16:01:24 2021 @@ -0,0 +1,132 @@ + + +# PHOENIX Changelog + +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-16) + + + +### IMPORTANT ISSUES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5446](https://issues.apache.org/jira/browse/PHOENIX-5446) | Support Protobuf shaded clients (thin + thick) | Major | . | + + +### NEW FEATURES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5938](https://issues.apache.org/jira/browse/PHOENIX-5938) | Support impersonation in the python driver | Major | python, queryserver | +| [PHOENIX-5880](https://issues.apache.org/jira/browse/PHOENIX-5880) | Add SQLAchemy support to python driver | Major | python, queryserver | +| [PHOENIX-5642](https://issues.apache.org/jira/browse/PHOENIX-5642) | Add HTTPS support to Phoenix Query Server and thin client | Major | queryserver | + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-6508](https://issues.apache.org/jira/browse/PHOENIX-6508) | add -bin suffix to queryserver binary assembly name | Trivial | queryserver | +| [PHOENIX-6488](https://issues.apache.org/jira/browse/PHOENIX-6488) | Bump Avatica version to 1.18.0 in queryserver | Major | queryserver | +| [PHOENIX-6473](https://issues.apache.org/jira/browse/PHOENIX-6473) | Add Hadoop JMXServlet as /jmx endpoint | Major | queryserver | +| [PHOENIX-6398](https://issues.apache.org/jira/browse/PHOENIX-6398) | Returns uniform SQL dialect in calcite for the PQS | Major | queryserver | +| [PHOENIX-5869](https://issues.apache.org/jira/browse/PHOENIX-5869) | Use symlinks to reduce size of phoenix queryserver assembly | Major | queryserver | +| [PHOENIX-5829](https://issues.apache.org/jira/browse/PHOENIX-5829) | Make it possible to build/test queryserver against all supported versions | Major | queryserver | +| [PHOENIX-6006](https://issues.apache.org/jira/browse/PHOENIX-6006) | Bump queryserver version to 6.0 | Major | queryserver | +| [PHOENIX-5999](https://issues.apache.org/jira/browse/PHOENIX-5999) | Have executemany leverage ExecuteBatchRequest | Major | python | +| [PHOENIX-6007](https://issues.apache.org/jira/browse/PHOENIX-6007) | PhoenixDB error handling improvements | Major | queryserver | +| [PHOENIX-5778](https://issues.apache.org/jira/browse/PHOENIX-5778) | Remove the dependency of KeyStoreTestUtil | Major | queryserver | +| [PHOENIX-5964](https://issues.apache.org/jira/browse/PHOENIX-5964) | Rename queryserver subprojects | Major | queryserver | +| [PHOENIX-5907](https://issues.apache.org/jira/browse/PHOENIX-5907) | Remove unused part from phoenix\_utils.py | Major | queryserver | +| [PHOENIX-5904](https://issues.apache.org/jira/browse/PHOENIX-5904) | Add log if the configed kerberos principal login failed | Minor | queryserver | +| [PHOENIX-5826](https://issues.apache.org/jira/browse/PHOENIX-5826) | Remove guava from queryserver | Major | queryserver | +| [PHOENIX-5844](https://issues.apache.org/jira/browse/PHOENIX-5844) | Feature parity for the python client | Major | python | +| [PHOENIX-5827](https://issues.apache.org/jira/browse/PHOENIX-5827) | Let PQS act as a maven repo | Major | queryserver | +| [PHOENIX-4112](https://issues.apache.org/jira/browse/PHOENIX-4112) | Allow JDBC url-based Kerberos credentials via sqlline-thin.py | Major | queryserver | +| [PHOENIX-5814](https://issues.apache.org/jira/browse/PHOENIX-5814) | disable trimStackTrace | Major | connectors, core, omid, queryserver, tephra | +| [PHOENIX-5777](https://issues.apache.org/jira/browse/PHOENIX-5777) | Unify the queryserver config keys to use QueryServerProperties | Major | queryserver | +| [PHOENIX-5702](https://issues.apache.org/jira/browse/PHOENIX-5702) | Add https support to sqlline-thin script | Major | queryserver
[phoenix-queryserver] branch master updated (b8202d2 -> 7088fc6)
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 b8202d2 PHOENIX-6512 Fix PQS Apache RAT check problems addendum add 7088fc6 Preparing phoenix-queryserver release 6.0.0RC5; tagging and updates to CHANGES.md and RELEASENOTES.md No new revisions were added by this update. Summary of changes: CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix-queryserver] tag 6.0.0RC5 created (now 7088fc6)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 6.0.0RC5 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. at 7088fc6 (commit) This tag includes the following new commits: new 7088fc6 Preparing phoenix-queryserver release 6.0.0RC5; tagging and updates to CHANGES.md and RELEASENOTES.md The 1 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.
[phoenix-queryserver] 01/01: Preparing phoenix-queryserver release 6.0.0RC5; tagging and updates to CHANGES.md and RELEASENOTES.md
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to tag 6.0.0RC5 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git commit 7088fc687b2c315ddd1c3bba8f1555e890d8c384 Author: Istvan Toth AuthorDate: Fri Jul 16 15:50:18 2021 + Preparing phoenix-queryserver release 6.0.0RC5; tagging and updates to CHANGES.md and RELEASENOTES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a72608a..34d742c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,7 +18,7 @@ --> # PHOENIX Changelog -## Release queryserver-6.0.0 - Unreleased (as of 2021-07-13) +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-16)
svn commit: r48844 - /dev/phoenix/phoenix-queryserver-6.0.0RC4/
Author: stoty Date: Thu Jul 15 16:43:18 2021 New Revision: 48844 Log: Apache phoenix-queryserver 6.0.0RC4 Added: dev/phoenix/phoenix-queryserver-6.0.0RC4/ dev/phoenix/phoenix-queryserver-6.0.0RC4/CHANGES.md dev/phoenix/phoenix-queryserver-6.0.0RC4/RELEASENOTES.md dev/phoenix/phoenix-queryserver-6.0.0RC4/phoenix-queryserver-6.0.0-bin.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC4/phoenix-queryserver-6.0.0-bin.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC4/phoenix-queryserver-6.0.0-bin.tar.gz.sha512 dev/phoenix/phoenix-queryserver-6.0.0RC4/phoenix-queryserver-6.0.0-src.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC4/phoenix-queryserver-6.0.0-src.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC4/phoenix-queryserver-6.0.0-src.tar.gz.sha512 Added: dev/phoenix/phoenix-queryserver-6.0.0RC4/CHANGES.md == --- dev/phoenix/phoenix-queryserver-6.0.0RC4/CHANGES.md (added) +++ dev/phoenix/phoenix-queryserver-6.0.0RC4/CHANGES.md Thu Jul 15 16:43:18 2021 @@ -0,0 +1,132 @@ + + +# PHOENIX Changelog + +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-15) + + + +### IMPORTANT ISSUES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5446](https://issues.apache.org/jira/browse/PHOENIX-5446) | Support Protobuf shaded clients (thin + thick) | Major | . | + + +### NEW FEATURES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5938](https://issues.apache.org/jira/browse/PHOENIX-5938) | Support impersonation in the python driver | Major | python, queryserver | +| [PHOENIX-5880](https://issues.apache.org/jira/browse/PHOENIX-5880) | Add SQLAchemy support to python driver | Major | python, queryserver | +| [PHOENIX-5642](https://issues.apache.org/jira/browse/PHOENIX-5642) | Add HTTPS support to Phoenix Query Server and thin client | Major | queryserver | + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-6508](https://issues.apache.org/jira/browse/PHOENIX-6508) | add -bin suffix to queryserver binary assembly name | Trivial | queryserver | +| [PHOENIX-6488](https://issues.apache.org/jira/browse/PHOENIX-6488) | Bump Avatica version to 1.18.0 in queryserver | Major | queryserver | +| [PHOENIX-6473](https://issues.apache.org/jira/browse/PHOENIX-6473) | Add Hadoop JMXServlet as /jmx endpoint | Major | queryserver | +| [PHOENIX-6398](https://issues.apache.org/jira/browse/PHOENIX-6398) | Returns uniform SQL dialect in calcite for the PQS | Major | queryserver | +| [PHOENIX-5869](https://issues.apache.org/jira/browse/PHOENIX-5869) | Use symlinks to reduce size of phoenix queryserver assembly | Major | queryserver | +| [PHOENIX-5829](https://issues.apache.org/jira/browse/PHOENIX-5829) | Make it possible to build/test queryserver against all supported versions | Major | queryserver | +| [PHOENIX-6006](https://issues.apache.org/jira/browse/PHOENIX-6006) | Bump queryserver version to 6.0 | Major | queryserver | +| [PHOENIX-5999](https://issues.apache.org/jira/browse/PHOENIX-5999) | Have executemany leverage ExecuteBatchRequest | Major | python | +| [PHOENIX-6007](https://issues.apache.org/jira/browse/PHOENIX-6007) | PhoenixDB error handling improvements | Major | queryserver | +| [PHOENIX-5778](https://issues.apache.org/jira/browse/PHOENIX-5778) | Remove the dependency of KeyStoreTestUtil | Major | queryserver | +| [PHOENIX-5964](https://issues.apache.org/jira/browse/PHOENIX-5964) | Rename queryserver subprojects | Major | queryserver | +| [PHOENIX-5907](https://issues.apache.org/jira/browse/PHOENIX-5907) | Remove unused part from phoenix\_utils.py | Major | queryserver | +| [PHOENIX-5904](https://issues.apache.org/jira/browse/PHOENIX-5904) | Add log if the configed kerberos principal login failed | Minor | queryserver | +| [PHOENIX-5826](https://issues.apache.org/jira/browse/PHOENIX-5826) | Remove guava from queryserver | Major | queryserver | +| [PHOENIX-5844](https://issues.apache.org/jira/browse/PHOENIX-5844) | Feature parity for the python client | Major | python | +| [PHOENIX-5827](https://issues.apache.org/jira/browse/PHOENIX-5827) | Let PQS act as a maven repo | Major | queryserver | +| [PHOENIX-4112](https://issues.apache.org/jira/browse/PHOENIX-4112) | Allow JDBC url-based Kerberos credentials via sqlline-thin.py | Major | queryserver | +| [PHOENIX-5814](https://issues.apache.org/jira/browse/PHOENIX-5814) | disable trimStackTrace | Major | connectors, core, omid, queryserver, tephra | +| [PHOENIX-5777](https://issues.apache.org/jira/browse/PHOENIX-5777) | Unify the queryserver config keys to use QueryServerProperties | Major | queryserver | +| [PHOENIX-5702](https://issues.apache.org/jira/browse/PHOENIX-5702) | Add https support to sqlline-thin script | Major | queryserver
[phoenix-queryserver] branch master updated (dd3d77c -> a0ac2cf)
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 dd3d77c Preparing phoenix-queryserver release 6.0.0RC3; tagging and updates to CHANGES.md and RELEASENOTES.md add a0ac2cf Preparing phoenix-queryserver release 6.0.0RC4; tagging and updates to CHANGES.md and RELEASENOTES.md No new revisions were added by this update. Summary of changes: CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix-queryserver] 01/01: Preparing phoenix-queryserver release 6.0.0RC4; tagging and updates to CHANGES.md and RELEASENOTES.md
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to tag 6.0.0RC4 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git commit a0ac2cff0bb6902ff984d50e51028403a598263b Author: Istvan Toth AuthorDate: Thu Jul 15 16:31:31 2021 + Preparing phoenix-queryserver release 6.0.0RC4; tagging and updates to CHANGES.md and RELEASENOTES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a72608a..a0a6d38 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,7 +18,7 @@ --> # PHOENIX Changelog -## Release queryserver-6.0.0 - Unreleased (as of 2021-07-13) +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-15)
[phoenix-queryserver] tag 6.0.0RC4 created (now a0ac2cf)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 6.0.0RC4 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. at a0ac2cf (commit) This tag includes the following new commits: new a0ac2cf Preparing phoenix-queryserver release 6.0.0RC4; tagging and updates to CHANGES.md and RELEASENOTES.md The 1 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.
[phoenix] branch 4.16 updated: PHOENIX-6510 Double-Checked Locking field must be volatile
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 089a784 PHOENIX-6510 Double-Checked Locking field must be volatile
089a784 is described below
commit 089a7840006c49fd1d9c01ceb2661475f9481e70
Author: Wei-Chiu Chuang
AuthorDate: Sat Jul 3 00:45:21 2021 +0800
PHOENIX-6510 Double-Checked Locking field must be volatile
added volatile keyword to the variable to be doubly checked.
Do not use double check pattern in PhoenixConnection.
---
.../org/apache/phoenix/jdbc/PhoenixConnection.java | 29 +-
.../org/apache/phoenix/log/TableLogWriter.java | 2 +-
.../java/org/apache/phoenix/schema/PNameImpl.java | 2 +-
3 files changed, 8 insertions(+), 25 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index ddc1dd3..cccf4be 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -175,8 +175,8 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
private Double logSamplingRate;
private String sourceOfOperation;
-private final Object queueCreationLock = new Object(); // lock for the
lazy init path of childConnections structure
-private ConcurrentLinkedQueue childConnections = null;
+private final ConcurrentLinkedQueue childConnections =
+new ConcurrentLinkedQueue<>();
//For now just the copy constructor paths will have this as true as I
don't want to change the
//public interfaces.
@@ -463,18 +463,10 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
}
/**
- * This method, and *only* this method is thread safe
+ * Add connection to the internal childConnections queue
* @param connection
*/
public void addChildConnection(PhoenixConnection connection) {
-//double check for performance
-if(childConnections == null) {
-synchronized (queueCreationLock) {
-if (childConnections == null) {
-childConnections = new ConcurrentLinkedQueue<>();
-}
-}
-}
childConnections.add(connection);
}
@@ -484,9 +476,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
* @param connection
*/
public void removeChildConnection(PhoenixConnection connection) {
-if (childConnections != null) {
-childConnections.remove(connection);
-}
+childConnections.remove(connection);
}
/**
@@ -496,10 +486,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
*/
@VisibleForTesting
public int getChildConnectionsCount() {
-if (childConnections != null) {
-return childConnections.size();
-}
-return 0;
+return childConnections.size();
}
public Sampler getSampler() {
@@ -716,11 +703,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
traceScope.close();
}
closeStatements();
-synchronized (queueCreationLock) {
-if (childConnections != null) {
-SQLCloseables.closeAllQuietly(childConnections);
-}
-}
+SQLCloseables.closeAllQuietly(childConnections);
} finally {
services.removeConnection(this);
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
index fbc6b2d..ee0d494 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
@@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableMap;
*/
public class TableLogWriter implements LogWriter {
private static final Logger LOGGER =
LoggerFactory.getLogger(LogWriter.class);
-private Connection connection;
+private volatile Connection connection;
private boolean isClosed;
private PreparedStatement upsertStatement;
private Configuration config;
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
index dd1f6ec..bccf7bf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
@@ -33,7 +33,7 @@ public class PNameImp
[phoenix] branch 4.x updated: PHOENIX-6510 Double-Checked Locking field must be volatile
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new f37524d PHOENIX-6510 Double-Checked Locking field must be volatile
f37524d is described below
commit f37524d77fbf1d1e3ca7e05bd6f7f3a2410a5070
Author: Wei-Chiu Chuang
AuthorDate: Sat Jul 3 00:45:21 2021 +0800
PHOENIX-6510 Double-Checked Locking field must be volatile
added volatile keyword to the variable to be doubly checked.
Do not use double check pattern in PhoenixConnection.
---
.../org/apache/phoenix/jdbc/PhoenixConnection.java | 29 +-
.../org/apache/phoenix/log/TableLogWriter.java | 2 +-
.../java/org/apache/phoenix/schema/PNameImpl.java | 2 +-
3 files changed, 8 insertions(+), 25 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index 7ec162f..e1b2270 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -177,8 +177,8 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
private Double logSamplingRate;
private String sourceOfOperation;
-private final Object queueCreationLock = new Object(); // lock for the
lazy init path of childConnections structure
-private ConcurrentLinkedQueue childConnections = null;
+private final ConcurrentLinkedQueue childConnections =
+new ConcurrentLinkedQueue<>();
//For now just the copy constructor paths will have this as true as I
don't want to change the
//public interfaces.
@@ -467,18 +467,10 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
}
/**
- * This method, and *only* this method is thread safe
+ * Add connection to the internal childConnections queue
* @param connection
*/
public void addChildConnection(PhoenixConnection connection) {
-//double check for performance
-if(childConnections == null) {
-synchronized (queueCreationLock) {
-if (childConnections == null) {
-childConnections = new ConcurrentLinkedQueue<>();
-}
-}
-}
childConnections.add(connection);
}
@@ -488,9 +480,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
* @param connection
*/
public void removeChildConnection(PhoenixConnection connection) {
-if (childConnections != null) {
-childConnections.remove(connection);
-}
+childConnections.remove(connection);
}
/**
@@ -500,10 +490,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
*/
@VisibleForTesting
public int getChildConnectionsCount() {
-if (childConnections != null) {
-return childConnections.size();
-}
-return 0;
+return childConnections.size();
}
public Sampler getSampler() {
@@ -721,11 +708,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
traceScope.close();
}
closeStatements();
-synchronized (queueCreationLock) {
-if (childConnections != null) {
-SQLCloseables.closeAllQuietly(childConnections);
-}
-}
+SQLCloseables.closeAllQuietly(childConnections);
} finally {
services.removeConnection(this);
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
index f325666..5512c4e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
@@ -41,7 +41,7 @@ import com.google.common.collect.ImmutableMap;
*/
public class TableLogWriter implements LogWriter {
private static final Logger LOGGER =
LoggerFactory.getLogger(LogWriter.class);
-private Connection connection;
+private volatile Connection connection;
private boolean isClosed;
private PreparedStatement upsertStatement;
private Configuration config;
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
index dd1f6ec..bccf7bf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
@@ -33,7 +33,7 @@ public class PNameImp
[phoenix] branch 5.1 updated: PHOENIX-6510 Double-Checked Locking field must be volatile
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 c5dfb0f PHOENIX-6510 Double-Checked Locking field must be volatile
c5dfb0f is described below
commit c5dfb0f6a26b02459d0e6201597b354a380ed668
Author: Wei-Chiu Chuang
AuthorDate: Sat Jul 3 00:45:21 2021 +0800
PHOENIX-6510 Double-Checked Locking field must be volatile
added volatile keyword to the variable to be doubly checked.
Do not use double check pattern in PhoenixConnection.
---
.../org/apache/phoenix/jdbc/PhoenixConnection.java | 29 +-
.../org/apache/phoenix/log/TableLogWriter.java | 2 +-
.../java/org/apache/phoenix/schema/PNameImpl.java | 2 +-
3 files changed, 8 insertions(+), 25 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index 74aefbe..b4b3d7a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -176,8 +176,8 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
private Double logSamplingRate;
private String sourceOfOperation;
-private Object queueCreationLock = new Object(); // lock for the lazy init
path of childConnections structure
-private ConcurrentLinkedQueue childConnections = null;
+private final ConcurrentLinkedQueue childConnections =
+new ConcurrentLinkedQueue<>();
//For now just the copy constructor paths will have this as true as I
don't want to change the
//public interfaces.
@@ -466,18 +466,10 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
}
/**
- * This method, and *only* this method is thread safe
+ * Add connection to the internal childConnections queue
* @param connection
*/
public void addChildConnection(PhoenixConnection connection) {
-//double check for performance
-if(childConnections == null) {
-synchronized (queueCreationLock) {
-if (childConnections == null) {
-childConnections = new ConcurrentLinkedQueue<>();
-}
-}
-}
childConnections.add(connection);
}
@@ -487,9 +479,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
* @param connection
*/
public void removeChildConnection(PhoenixConnection connection) {
-if (childConnections != null) {
-childConnections.remove(connection);
-}
+childConnections.remove(connection);
}
/**
@@ -499,10 +489,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
*/
@VisibleForTesting
public int getChildConnectionsCount() {
-if (childConnections != null) {
-return childConnections.size();
-}
-return 0;
+return childConnections.size();
}
public Sampler getSampler() {
@@ -719,11 +706,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
traceScope.close();
}
closeStatements();
-synchronized (queueCreationLock) {
-if (childConnections != null) {
-SQLCloseables.closeAllQuietly(childConnections);
-}
-}
+SQLCloseables.closeAllQuietly(childConnections);
} finally {
services.removeConnection(this);
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
index 966bed4..dc610b5 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
@@ -41,7 +41,7 @@ import
org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
*/
public class TableLogWriter implements LogWriter {
private static final Logger LOGGER =
LoggerFactory.getLogger(LogWriter.class);
-private Connection connection;
+private volatile Connection connection;
private boolean isClosed;
private PreparedStatement upsertStatement;
private Configuration config;
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
index dd1f6ec..bccf7bf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
@@ -33,7 +33
[phoenix] branch master updated: PHOENIX-6510 Double-Checked Locking field must be volatile
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 00d9031 PHOENIX-6510 Double-Checked Locking field must be volatile
00d9031 is described below
commit 00d90317d8e7e1586eb1e30ff9643ccf0b20b469
Author: Wei-Chiu Chuang
AuthorDate: Sat Jul 3 00:45:21 2021 +0800
PHOENIX-6510 Double-Checked Locking field must be volatile
added volatile keyword to the variable to be doubly checked.
Do not use double check pattern in PhoenixConnection.
---
.../org/apache/phoenix/jdbc/PhoenixConnection.java | 29 +-
.../org/apache/phoenix/log/TableLogWriter.java | 2 +-
.../java/org/apache/phoenix/schema/PNameImpl.java | 2 +-
3 files changed, 8 insertions(+), 25 deletions(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
index da70442..105f45b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java
@@ -177,8 +177,8 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
private Double logSamplingRate;
private String sourceOfOperation;
-private Object queueCreationLock = new Object(); // lock for the lazy init
path of childConnections structure
-private ConcurrentLinkedQueue childConnections = null;
+private final ConcurrentLinkedQueue childConnections =
+new ConcurrentLinkedQueue<>();
//For now just the copy constructor paths will have this as true as I
don't want to change the
//public interfaces.
@@ -467,18 +467,10 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
}
/**
- * This method, and *only* this method is thread safe
+ * Add connection to the internal childConnections queue
* @param connection
*/
public void addChildConnection(PhoenixConnection connection) {
-//double check for performance
-if(childConnections == null) {
-synchronized (queueCreationLock) {
-if (childConnections == null) {
-childConnections = new ConcurrentLinkedQueue<>();
-}
-}
-}
childConnections.add(connection);
}
@@ -488,9 +480,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
* @param connection
*/
public void removeChildConnection(PhoenixConnection connection) {
-if (childConnections != null) {
-childConnections.remove(connection);
-}
+childConnections.remove(connection);
}
/**
@@ -500,10 +490,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
*/
@VisibleForTesting
public int getChildConnectionsCount() {
-if (childConnections != null) {
-return childConnections.size();
-}
-return 0;
+return childConnections.size();
}
public Sampler getSampler() {
@@ -721,11 +708,7 @@ public class PhoenixConnection implements Connection,
MetaDataMutated, SQLClosea
traceScope.close();
}
closeStatements();
-synchronized (queueCreationLock) {
-if (childConnections != null) {
-SQLCloseables.closeAllQuietly(childConnections);
-}
-}
+SQLCloseables.closeAllQuietly(childConnections);
} finally {
services.removeConnection(this);
}
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
index 966bed4..dc610b5 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/log/TableLogWriter.java
@@ -41,7 +41,7 @@ import
org.apache.phoenix.thirdparty.com.google.common.collect.ImmutableMap;
*/
public class TableLogWriter implements LogWriter {
private static final Logger LOGGER =
LoggerFactory.getLogger(LogWriter.class);
-private Connection connection;
+private volatile Connection connection;
private boolean isClosed;
private PreparedStatement upsertStatement;
private Configuration config;
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
index dd1f6ec..bccf7bf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PNameImpl.java
@@
[phoenix] branch 4.16 updated: PHOENIX-6514 Exception should be thrown
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 9f5587e PHOENIX-6514 Exception should be thrown
9f5587e is described below
commit 9f5587e2d386a243b980dbe17cf513231907c500
Author: Wei-Chiu Chuang
AuthorDate: Wed Jul 14 11:17:43 2021 +0800
PHOENIX-6514 Exception should be thrown
Change-Id: I626eb3878a29e1467835c48f8f446edc72ed04c8
---
.../java/org/apache/phoenix/coprocessor/PhoenixAccessController.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
index 4ca9ff2..e668137 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
@@ -281,7 +281,7 @@ public class PhoenixAccessController extends
BaseMetaDataEndpointObserver {
AccessControlClient.grant(conn, TableName.valueOf(table),
toUser , null, null,
actions);
} catch (Throwable e) {
-new DoNotRetryIOException(e);
+throw new DoNotRetryIOException(e);
}
return null;
}
[phoenix] branch 4.x updated: PHOENIX-6514 Exception should be thrown
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 19017c6 PHOENIX-6514 Exception should be thrown
19017c6 is described below
commit 19017c686e9aedbc0515d2467600eb094dec625b
Author: Wei-Chiu Chuang
AuthorDate: Wed Jul 14 11:17:43 2021 +0800
PHOENIX-6514 Exception should be thrown
Change-Id: I626eb3878a29e1467835c48f8f446edc72ed04c8
---
.../java/org/apache/phoenix/coprocessor/PhoenixAccessController.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
index 4ca9ff2..e668137 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
@@ -281,7 +281,7 @@ public class PhoenixAccessController extends
BaseMetaDataEndpointObserver {
AccessControlClient.grant(conn, TableName.valueOf(table),
toUser , null, null,
actions);
} catch (Throwable e) {
-new DoNotRetryIOException(e);
+throw new DoNotRetryIOException(e);
}
return null;
}
[phoenix] branch 5.1 updated: PHOENIX-6514 Exception should be thrown
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 0810be3 PHOENIX-6514 Exception should be thrown
0810be3 is described below
commit 0810be324da31ae20c377be7c336a3efb1fef3f2
Author: Wei-Chiu Chuang
AuthorDate: Wed Jul 14 11:17:43 2021 +0800
PHOENIX-6514 Exception should be thrown
Change-Id: I626eb3878a29e1467835c48f8f446edc72ed04c8
---
.../java/org/apache/phoenix/coprocessor/PhoenixAccessController.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
index 18787ec..e15ac43 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
@@ -285,7 +285,7 @@ public class PhoenixAccessController extends
BaseMetaDataEndpointObserver {
AccessControlClient.grant(conn, TableName.valueOf(table),
toUser , null, null,
actions);
} catch (Throwable e) {
-new DoNotRetryIOException(e);
+throw new DoNotRetryIOException(e);
}
return null;
}
[phoenix] branch master updated: PHOENIX-6514 Exception should be thrown
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 9c9dd0b PHOENIX-6514 Exception should be thrown
9c9dd0b is described below
commit 9c9dd0b4358b07bbcd35ae7d04fe2e9c121fedeb
Author: Wei-Chiu Chuang
AuthorDate: Wed Jul 14 11:17:43 2021 +0800
PHOENIX-6514 Exception should be thrown
Change-Id: I626eb3878a29e1467835c48f8f446edc72ed04c8
---
.../java/org/apache/phoenix/coprocessor/PhoenixAccessController.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
index 18787ec..e15ac43 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/PhoenixAccessController.java
@@ -285,7 +285,7 @@ public class PhoenixAccessController extends
BaseMetaDataEndpointObserver {
AccessControlClient.grant(conn, TableName.valueOf(table),
toUser , null, null,
actions);
} catch (Throwable e) {
-new DoNotRetryIOException(e);
+throw new DoNotRetryIOException(e);
}
return null;
}
svn commit: r48809 - /dev/phoenix/phoenix-queryserver-6.0.0RC3/
Author: stoty Date: Tue Jul 13 18:01:13 2021 New Revision: 48809 Log: Apache phoenix-queryserver 6.0.0RC3 Added: dev/phoenix/phoenix-queryserver-6.0.0RC3/ dev/phoenix/phoenix-queryserver-6.0.0RC3/CHANGES.md dev/phoenix/phoenix-queryserver-6.0.0RC3/RELEASENOTES.md dev/phoenix/phoenix-queryserver-6.0.0RC3/phoenix-queryserver-6.0.0-bin.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC3/phoenix-queryserver-6.0.0-bin.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC3/phoenix-queryserver-6.0.0-bin.tar.gz.sha512 dev/phoenix/phoenix-queryserver-6.0.0RC3/phoenix-queryserver-6.0.0-src.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC3/phoenix-queryserver-6.0.0-src.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC3/phoenix-queryserver-6.0.0-src.tar.gz.sha512 Added: dev/phoenix/phoenix-queryserver-6.0.0RC3/CHANGES.md == --- dev/phoenix/phoenix-queryserver-6.0.0RC3/CHANGES.md (added) +++ dev/phoenix/phoenix-queryserver-6.0.0RC3/CHANGES.md Tue Jul 13 18:01:13 2021 @@ -0,0 +1,132 @@ + + +# PHOENIX Changelog + +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-13) + + + +### IMPORTANT ISSUES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5446](https://issues.apache.org/jira/browse/PHOENIX-5446) | Support Protobuf shaded clients (thin + thick) | Major | . | + + +### NEW FEATURES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5938](https://issues.apache.org/jira/browse/PHOENIX-5938) | Support impersonation in the python driver | Major | python, queryserver | +| [PHOENIX-5880](https://issues.apache.org/jira/browse/PHOENIX-5880) | Add SQLAchemy support to python driver | Major | python, queryserver | +| [PHOENIX-5642](https://issues.apache.org/jira/browse/PHOENIX-5642) | Add HTTPS support to Phoenix Query Server and thin client | Major | queryserver | + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-6508](https://issues.apache.org/jira/browse/PHOENIX-6508) | add -bin suffix to queryserver binary assembly name | Trivial | queryserver | +| [PHOENIX-6488](https://issues.apache.org/jira/browse/PHOENIX-6488) | Bump Avatica version to 1.18.0 in queryserver | Major | queryserver | +| [PHOENIX-6473](https://issues.apache.org/jira/browse/PHOENIX-6473) | Add Hadoop JMXServlet as /jmx endpoint | Major | queryserver | +| [PHOENIX-6398](https://issues.apache.org/jira/browse/PHOENIX-6398) | Returns uniform SQL dialect in calcite for the PQS | Major | queryserver | +| [PHOENIX-5869](https://issues.apache.org/jira/browse/PHOENIX-5869) | Use symlinks to reduce size of phoenix queryserver assembly | Major | queryserver | +| [PHOENIX-5829](https://issues.apache.org/jira/browse/PHOENIX-5829) | Make it possible to build/test queryserver against all supported versions | Major | queryserver | +| [PHOENIX-6006](https://issues.apache.org/jira/browse/PHOENIX-6006) | Bump queryserver version to 6.0 | Major | queryserver | +| [PHOENIX-5999](https://issues.apache.org/jira/browse/PHOENIX-5999) | Have executemany leverage ExecuteBatchRequest | Major | python | +| [PHOENIX-6007](https://issues.apache.org/jira/browse/PHOENIX-6007) | PhoenixDB error handling improvements | Major | queryserver | +| [PHOENIX-5778](https://issues.apache.org/jira/browse/PHOENIX-5778) | Remove the dependency of KeyStoreTestUtil | Major | queryserver | +| [PHOENIX-5964](https://issues.apache.org/jira/browse/PHOENIX-5964) | Rename queryserver subprojects | Major | queryserver | +| [PHOENIX-5907](https://issues.apache.org/jira/browse/PHOENIX-5907) | Remove unused part from phoenix\_utils.py | Major | queryserver | +| [PHOENIX-5904](https://issues.apache.org/jira/browse/PHOENIX-5904) | Add log if the configed kerberos principal login failed | Minor | queryserver | +| [PHOENIX-5826](https://issues.apache.org/jira/browse/PHOENIX-5826) | Remove guava from queryserver | Major | queryserver | +| [PHOENIX-5844](https://issues.apache.org/jira/browse/PHOENIX-5844) | Feature parity for the python client | Major | python | +| [PHOENIX-5827](https://issues.apache.org/jira/browse/PHOENIX-5827) | Let PQS act as a maven repo | Major | queryserver | +| [PHOENIX-4112](https://issues.apache.org/jira/browse/PHOENIX-4112) | Allow JDBC url-based Kerberos credentials via sqlline-thin.py | Major | queryserver | +| [PHOENIX-5814](https://issues.apache.org/jira/browse/PHOENIX-5814) | disable trimStackTrace | Major | connectors, core, omid, queryserver, tephra | +| [PHOENIX-5777](https://issues.apache.org/jira/browse/PHOENIX-5777) | Unify the queryserver config keys to use QueryServerProperties | Major | queryserver | +| [PHOENIX-5702](https://issues.apache.org/jira/browse/PHOENIX-5702) | Add https support to sqlline-thin script | Major | queryserver
[phoenix-queryserver] branch master updated (0a5b2a2 -> dd3d77c)
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 0a5b2a2 PHOENIX-6512 Fix PQS Apache RAT check problems add dd3d77c Preparing phoenix-queryserver release 6.0.0RC3; tagging and updates to CHANGES.md and RELEASENOTES.md No new revisions were added by this update. Summary of changes: CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[phoenix-queryserver] 01/01: Preparing phoenix-queryserver release 6.0.0RC3; tagging and updates to CHANGES.md and RELEASENOTES.md
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to tag 6.0.0RC3 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git commit dd3d77c50279b419b8ac18884a740c22cdcac748 Author: Istvan Toth AuthorDate: Tue Jul 13 17:54:41 2021 + Preparing phoenix-queryserver release 6.0.0RC3; tagging and updates to CHANGES.md and RELEASENOTES.md --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c341b6f..a72608a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,7 +18,7 @@ --> # PHOENIX Changelog -## Release queryserver-6.0.0 - Unreleased (as of 2021-07-09) +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-13) @@ -71,6 +71,7 @@ | JIRA | Summary | Priority | Component | |: |: | :--- |: | +| [PHOENIX-6512](https://issues.apache.org/jira/browse/PHOENIX-6512) | Fix PQS Apache RAT check problems | Major | queryserver | | [PHOENIX-6407](https://issues.apache.org/jira/browse/PHOENIX-6407) | phoenixdb for Python silently ignores placeholders \< placeholder arguments | Minor | python | | [PHOENIX-6461](https://issues.apache.org/jira/browse/PHOENIX-6461) | sqlline-thin does not include slf4j logging backend | Major | queryserver | | [PHOENIX-6324](https://issues.apache.org/jira/browse/PHOENIX-6324) | Queryserver IT suite incompatible with phoenix 5.1+ / 4.16+ shading | Major | queryserver |
[phoenix-queryserver] tag 6.0.0RC3 created (now dd3d77c)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 6.0.0RC3 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. at dd3d77c (commit) This tag includes the following new commits: new dd3d77c Preparing phoenix-queryserver release 6.0.0RC3; tagging and updates to CHANGES.md and RELEASENOTES.md The 1 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.
[phoenix-queryserver] branch master updated (af43c65 -> 0a5b2a2)
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 af43c65 Preparing phoenix-queryserver release 6.0.0RC2; tagging and updates to CHANGES.md and RELEASENOTES.md add 0a5b2a2 PHOENIX-6512 Fix PQS Apache RAT check problems No new revisions were added by this update. Summary of changes: .github/workflows/maven.yml | 15 +++ pom.xml | 7 +++ python-phoenixdb/dev-support/run-source-ratcheck.sh | 19 +++ 3 files changed, 41 insertions(+)
[phoenix-omid] branch master updated (b6c6165 -> 1bc41de)
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 b6c6165 OMID-210 Use org.openlabtesting.protobuf:protoc:2.5.0 on Linux ARM64 add 1bc41de OMID-211 HBase Shims leak testing dependencies as compile dependencies. No new revisions were added by this update. Summary of changes: hbase-shims/pom.xml | 1 + 1 file changed, 1 insertion(+)
svn commit: r48742 - /dev/phoenix/phoenix-queryserver-6.0.0RC2/
Author: stoty Date: Fri Jul 9 06:46:29 2021 New Revision: 48742 Log: Apache phoenix-queryserver 6.0.0RC2 Added: dev/phoenix/phoenix-queryserver-6.0.0RC2/ dev/phoenix/phoenix-queryserver-6.0.0RC2/CHANGES.md dev/phoenix/phoenix-queryserver-6.0.0RC2/RELEASENOTES.md dev/phoenix/phoenix-queryserver-6.0.0RC2/phoenix-queryserver-6.0.0-bin.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC2/phoenix-queryserver-6.0.0-bin.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC2/phoenix-queryserver-6.0.0-bin.tar.gz.sha512 dev/phoenix/phoenix-queryserver-6.0.0RC2/phoenix-queryserver-6.0.0-src.tar.gz (with props) dev/phoenix/phoenix-queryserver-6.0.0RC2/phoenix-queryserver-6.0.0-src.tar.gz.asc dev/phoenix/phoenix-queryserver-6.0.0RC2/phoenix-queryserver-6.0.0-src.tar.gz.sha512 Added: dev/phoenix/phoenix-queryserver-6.0.0RC2/CHANGES.md == --- dev/phoenix/phoenix-queryserver-6.0.0RC2/CHANGES.md (added) +++ dev/phoenix/phoenix-queryserver-6.0.0RC2/CHANGES.md Fri Jul 9 06:46:29 2021 @@ -0,0 +1,131 @@ + + +# PHOENIX Changelog + +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-09) + + + +### IMPORTANT ISSUES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5446](https://issues.apache.org/jira/browse/PHOENIX-5446) | Support Protobuf shaded clients (thin + thick) | Major | . | + + +### NEW FEATURES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5938](https://issues.apache.org/jira/browse/PHOENIX-5938) | Support impersonation in the python driver | Major | python, queryserver | +| [PHOENIX-5880](https://issues.apache.org/jira/browse/PHOENIX-5880) | Add SQLAchemy support to python driver | Major | python, queryserver | +| [PHOENIX-5642](https://issues.apache.org/jira/browse/PHOENIX-5642) | Add HTTPS support to Phoenix Query Server and thin client | Major | queryserver | + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-6508](https://issues.apache.org/jira/browse/PHOENIX-6508) | add -bin suffix to queryserver binary assembly name | Trivial | queryserver | +| [PHOENIX-6488](https://issues.apache.org/jira/browse/PHOENIX-6488) | Bump Avatica version to 1.18.0 in queryserver | Major | queryserver | +| [PHOENIX-6473](https://issues.apache.org/jira/browse/PHOENIX-6473) | Add Hadoop JMXServlet as /jmx endpoint | Major | queryserver | +| [PHOENIX-6398](https://issues.apache.org/jira/browse/PHOENIX-6398) | Returns uniform SQL dialect in calcite for the PQS | Major | queryserver | +| [PHOENIX-5869](https://issues.apache.org/jira/browse/PHOENIX-5869) | Use symlinks to reduce size of phoenix queryserver assembly | Major | queryserver | +| [PHOENIX-5829](https://issues.apache.org/jira/browse/PHOENIX-5829) | Make it possible to build/test queryserver against all supported versions | Major | queryserver | +| [PHOENIX-6006](https://issues.apache.org/jira/browse/PHOENIX-6006) | Bump queryserver version to 6.0 | Major | queryserver | +| [PHOENIX-5999](https://issues.apache.org/jira/browse/PHOENIX-5999) | Have executemany leverage ExecuteBatchRequest | Major | python | +| [PHOENIX-6007](https://issues.apache.org/jira/browse/PHOENIX-6007) | PhoenixDB error handling improvements | Major | queryserver | +| [PHOENIX-5778](https://issues.apache.org/jira/browse/PHOENIX-5778) | Remove the dependency of KeyStoreTestUtil | Major | queryserver | +| [PHOENIX-5964](https://issues.apache.org/jira/browse/PHOENIX-5964) | Rename queryserver subprojects | Major | queryserver | +| [PHOENIX-5907](https://issues.apache.org/jira/browse/PHOENIX-5907) | Remove unused part from phoenix\_utils.py | Major | queryserver | +| [PHOENIX-5904](https://issues.apache.org/jira/browse/PHOENIX-5904) | Add log if the configed kerberos principal login failed | Minor | queryserver | +| [PHOENIX-5826](https://issues.apache.org/jira/browse/PHOENIX-5826) | Remove guava from queryserver | Major | queryserver | +| [PHOENIX-5844](https://issues.apache.org/jira/browse/PHOENIX-5844) | Feature parity for the python client | Major | python | +| [PHOENIX-5827](https://issues.apache.org/jira/browse/PHOENIX-5827) | Let PQS act as a maven repo | Major | queryserver | +| [PHOENIX-4112](https://issues.apache.org/jira/browse/PHOENIX-4112) | Allow JDBC url-based Kerberos credentials via sqlline-thin.py | Major | queryserver | +| [PHOENIX-5814](https://issues.apache.org/jira/browse/PHOENIX-5814) | disable trimStackTrace | Major | connectors, core, omid, queryserver, tephra | +| [PHOENIX-5777](https://issues.apache.org/jira/browse/PHOENIX-5777) | Unify the queryserver config keys to use QueryServerProperties | Major | queryserver | +| [PHOENIX-5702](https://issues.apache.org/jira/browse/PHOENIX-5702) | Add https support to sqlline-thin script | Major | queryserver
[phoenix-queryserver] branch master updated (ac5c5d3 -> af43c65)
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 ac5c5d3 Preparing phoenix-queryserver release 6.0.0RC1; tagging and updates to CHANGES.md and RELEASENOTES.md add af43c65 Preparing phoenix-queryserver release 6.0.0RC2; tagging and updates to CHANGES.md and RELEASENOTES.md No new revisions were added by this update. Summary of changes: CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[phoenix-queryserver] 01/01: Preparing phoenix-queryserver release 6.0.0RC2; tagging and updates to CHANGES.md and RELEASENOTES.md
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to tag 6.0.0RC2 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git commit af43c65ed0477eeada058df1399b293dfefb007d Author: Istvan Toth AuthorDate: Fri Jul 9 06:39:40 2021 + Preparing phoenix-queryserver release 6.0.0RC2; tagging and updates to CHANGES.md and RELEASENOTES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a3db276..c341b6f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,7 +18,7 @@ --> # PHOENIX Changelog -## Release queryserver-6.0.0 - Unreleased (as of 2021-07-08) +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-09)
[phoenix-queryserver] tag 6.0.0RC2 created (now af43c65)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 6.0.0RC2 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. at af43c65 (commit) This tag includes the following new commits: new af43c65 Preparing phoenix-queryserver release 6.0.0RC2; tagging and updates to CHANGES.md and RELEASENOTES.md The 1 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.
[phoenix-queryserver] branch master updated (d63b792 -> ac5c5d3)
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 d63b792 Preparing phoenix-queryserver release 6.0.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md add ac5c5d3 Preparing phoenix-queryserver release 6.0.0RC1; tagging and updates to CHANGES.md and RELEASENOTES.md No new revisions were added by this update. Summary of changes: CHANGES.md | 1 + 1 file changed, 1 insertion(+)
[phoenix-queryserver] tag 6.0.0RC1 created (now ac5c5d3)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 6.0.0RC1 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. at ac5c5d3 (commit) This tag includes the following new commits: new ac5c5d3 Preparing phoenix-queryserver release 6.0.0RC1; tagging and updates to CHANGES.md and RELEASENOTES.md The 1 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.
[phoenix-queryserver] 01/01: Preparing phoenix-queryserver release 6.0.0RC1; tagging and updates to CHANGES.md and RELEASENOTES.md
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to tag 6.0.0RC1 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git commit ac5c5d3ed84f2b6157983268a6af2516e5ec1811 Author: Istvan Toth AuthorDate: Thu Jul 8 17:39:07 2021 + Preparing phoenix-queryserver release 6.0.0RC1; tagging and updates to CHANGES.md and RELEASENOTES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 0bc3519..a3db276 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -128,3 +128,4 @@ | [PHOENIX-5680](https://issues.apache.org/jira/browse/PHOENIX-5680) | remove psql.py from phoenix-queryserver | Minor | queryserver | +
[phoenix-queryserver] branch master updated (1e3e5fb -> d63b792)
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 1e3e5fb PHOENIX-6508 add -bin suffix to queryserver binary assembly name add d63b792 Preparing phoenix-queryserver release 6.0.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md No new revisions were added by this update. Summary of changes: CHANGES.md| 130 ++ RELEASENOTES.md | 58 + phoenix-queryserver-assembly/pom.xml | 2 +- phoenix-queryserver-client/pom.xml| 2 +- phoenix-queryserver-it/pom.xml| 2 +- phoenix-queryserver-load-balancer/pom.xml | 2 +- phoenix-queryserver-orchestrator/pom.xml | 2 +- phoenix-queryserver/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 195 insertions(+), 7 deletions(-) create mode 100644 CHANGES.md create mode 100644 RELEASENOTES.md
[phoenix-queryserver] 01/01: Preparing phoenix-queryserver release 6.0.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md
This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to tag 6.0.0RC0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git commit d63b79289a5d7a287d95ed8443223be9c977842e Author: Istvan Toth AuthorDate: Thu Jul 8 16:59:40 2021 + Preparing phoenix-queryserver release 6.0.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md --- CHANGES.md| 130 ++ RELEASENOTES.md | 58 + phoenix-queryserver-assembly/pom.xml | 2 +- phoenix-queryserver-client/pom.xml| 2 +- phoenix-queryserver-it/pom.xml| 2 +- phoenix-queryserver-load-balancer/pom.xml | 2 +- phoenix-queryserver-orchestrator/pom.xml | 2 +- phoenix-queryserver/pom.xml | 2 +- pom.xml | 2 +- 9 files changed, 195 insertions(+), 7 deletions(-) diff --git a/CHANGES.md b/CHANGES.md new file mode 100644 index 000..0bc3519 --- /dev/null +++ b/CHANGES.md @@ -0,0 +1,130 @@ + + +# PHOENIX Changelog + +## Release queryserver-6.0.0 - Unreleased (as of 2021-07-08) + + + +### IMPORTANT ISSUES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5446](https://issues.apache.org/jira/browse/PHOENIX-5446) | Support Protobuf shaded clients (thin + thick) | Major | . | + + +### NEW FEATURES: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-5938](https://issues.apache.org/jira/browse/PHOENIX-5938) | Support impersonation in the python driver | Major | python, queryserver | +| [PHOENIX-5880](https://issues.apache.org/jira/browse/PHOENIX-5880) | Add SQLAchemy support to python driver | Major | python, queryserver | +| [PHOENIX-5642](https://issues.apache.org/jira/browse/PHOENIX-5642) | Add HTTPS support to Phoenix Query Server and thin client | Major | queryserver | + + +### IMPROVEMENTS: + +| JIRA | Summary | Priority | Component | +|: |: | :--- |: | +| [PHOENIX-6508](https://issues.apache.org/jira/browse/PHOENIX-6508) | add -bin suffix to queryserver binary assembly name | Trivial | queryserver | +| [PHOENIX-6488](https://issues.apache.org/jira/browse/PHOENIX-6488) | Bump Avatica version to 1.18.0 in queryserver | Major | queryserver | +| [PHOENIX-6473](https://issues.apache.org/jira/browse/PHOENIX-6473) | Add Hadoop JMXServlet as /jmx endpoint | Major | queryserver | +| [PHOENIX-6398](https://issues.apache.org/jira/browse/PHOENIX-6398) | Returns uniform SQL dialect in calcite for the PQS | Major | queryserver | +| [PHOENIX-5869](https://issues.apache.org/jira/browse/PHOENIX-5869) | Use symlinks to reduce size of phoenix queryserver assembly | Major | queryserver | +| [PHOENIX-5829](https://issues.apache.org/jira/browse/PHOENIX-5829) | Make it possible to build/test queryserver against all supported versions | Major | queryserver | +| [PHOENIX-6006](https://issues.apache.org/jira/browse/PHOENIX-6006) | Bump queryserver version to 6.0 | Major | queryserver | +| [PHOENIX-5999](https://issues.apache.org/jira/browse/PHOENIX-5999) | Have executemany leverage ExecuteBatchRequest | Major | python | +| [PHOENIX-6007](https://issues.apache.org/jira/browse/PHOENIX-6007) | PhoenixDB error handling improvements | Major | queryserver | +| [PHOENIX-5778](https://issues.apache.org/jira/browse/PHOENIX-5778) | Remove the dependency of KeyStoreTestUtil | Major | queryserver | +| [PHOENIX-5964](https://issues.apache.org/jira/browse/PHOENIX-5964) | Rename queryserver subprojects | Major | queryserver | +| [PHOENIX-5907](https://issues.apache.org/jira/browse/PHOENIX-5907) | Remove unused part from phoenix\_utils.py | Major | queryserver | +| [PHOENIX-5904](https://issues.apache.org/jira/browse/PHOENIX-5904) | Add log if the configed kerberos principal login failed | Minor | queryserver | +| [PHOENIX-5826](https://issues.apache.org/jira/browse/PHOENIX-5826) | Remove guava from queryserver | Major | queryserver | +| [PHOENIX-5844](https://issues.apache.org/jira/browse/PHOENIX-5844) | Feature parity for the python client | Major | python | +| [PHOENIX-5827](https://issues.apache.org/jira/browse/PHOENIX-5827) | Let PQS act as a maven repo | Major | queryserver | +| [PHOENIX-4112](https://issues.apache.org/jira/browse/PHOENIX-4112) | Allow JDBC url-based Kerberos credentials via sqlline-thin.py | Major | queryserver | +| [PHOENIX-5814](https://issues.apache.org/jira/browse/PHOENIX-5814) | disable trimStackTrace | Major | connectors, core, omid, queryserver, tephra | +| [PHOENIX-5777](https://issues.apache.org/jira/browse/PHOENIX-5777) | Unify the queryserver config keys to use QueryServerProperties | Major | queryserver | +| [PHOENIX-5702](https://issues.apache.org/jira/browse/PHOENIX-5702) | Add https support to sqlline-thin script | Major | queryserver | +| [PHOENIX-5454](https://issues.apache.org
[phoenix-queryserver] tag 6.0.0RC0 created (now d63b792)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to tag 6.0.0RC0 in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git. at d63b792 (commit) This tag includes the following new commits: new d63b792 Preparing phoenix-queryserver release 6.0.0RC0; tagging and updates to CHANGES.md and RELEASENOTES.md The 1 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.
[phoenix-queryserver] branch master updated: PHOENIX-6508 add -bin suffix to queryserver binary assembly name
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 1e3e5fb PHOENIX-6508 add -bin suffix to queryserver binary assembly
name
1e3e5fb is described below
commit 1e3e5fb07a2ae8790186f5c4d2148b33d537fc73
Author: Istvan Toth
AuthorDate: Thu Jul 8 17:00:03 2021 +0200
PHOENIX-6508 add -bin suffix to queryserver binary assembly name
---
phoenix-queryserver-assembly/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/phoenix-queryserver-assembly/pom.xml
b/phoenix-queryserver-assembly/pom.xml
index db727d7..dccc71c 100644
--- a/phoenix-queryserver-assembly/pom.xml
+++ b/phoenix-queryserver-assembly/pom.xml
@@ -68,7 +68,7 @@
src/assembly/cluster.xml
-
phoenix-queryserver-${project.version}
+
phoenix-queryserver-${project.version}-bin
posix
false
[phoenix] branch 4.16 updated: PHOENIX-6493 MetaData schemaPattern handling errors
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 9caa23c PHOENIX-6493 MetaData schemaPattern handling errors
9caa23c is described below
commit 9caa23c88b7ffd9a70c7bbd9729456d5052af3f2
Author: Istvan Toth
AuthorDate: Wed Jun 16 10:51:44 2021 +0200
PHOENIX-6493 MetaData schemaPattern handling errors
---
.../it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java | 6 ++
.../main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java | 6 --
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 226a2cc..51a9b5f 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -369,6 +369,12 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(rs.getString(2), null);
assertFalse(rs.next());
+rs = dbmd.getSchemas(null, "");
+assertTrue(rs.next());
+assertEquals(rs.getString(1), null);
+assertEquals(rs.getString(2), null);
+assertFalse(rs.next());
+
rs = dbmd.getSchemas(null, null);
assertTrue(rs.next());
assertEquals(null, rs.getString("TABLE_SCHEM"));
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
index c78af6b..57370d3 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
@@ -1327,8 +1327,10 @@ public class PhoenixDatabaseMetaData implements
DatabaseMetaData {
" where " + COLUMN_NAME + " is null");
addTenantIdFilter(buf, catalog, parameterValues);
if (schemaPattern != null) {
-buf.append(" and " + TABLE_SCHEM + " like ?");
-parameterValues.add(schemaPattern);
+buf.append(" and " + TABLE_SCHEM + (schemaPattern.length() == 0 ?
" is null" : " like ?"));
+if(schemaPattern.length() > 0) {
+parameterValues.add(schemaPattern);
+}
}
if (SchemaUtil.isNamespaceMappingEnabled(null,
connection.getQueryServices().getProps())) {
buf.append(" and " + TABLE_NAME + " = '" +
MetaDataClient.EMPTY_TABLE + "'");
[phoenix] branch 4.x updated: PHOENIX-6493 MetaData schemaPattern handling errors
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new dd9b8af PHOENIX-6493 MetaData schemaPattern handling errors
dd9b8af is described below
commit dd9b8af2b5f612c1f26d3f4af699117c45c2d82b
Author: Istvan Toth
AuthorDate: Wed Jun 16 10:51:44 2021 +0200
PHOENIX-6493 MetaData schemaPattern handling errors
---
.../it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java | 6 ++
phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java | 6 --
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 0fe0bed..cacdba6 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -426,6 +426,12 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(rs.getString(2), null);
assertFalse(rs.next());
+rs = dbmd.getSchemas(null, "");
+assertTrue(rs.next());
+assertEquals(rs.getString(1), null);
+assertEquals(rs.getString(2), null);
+assertFalse(rs.next());
+
rs = dbmd.getSchemas(null, null);
assertTrue(rs.next());
assertEquals(null, rs.getString("TABLE_SCHEM"));
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index 4acf10a..749b601 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -545,8 +545,10 @@ public final class QueryUtil {
" where " + COLUMN_NAME + " is null");
addTenantIdFilter(connection, buf, catalog, parameterValues);
if (schemaPattern != null) {
-buf.append(" and " + TABLE_SCHEM + " like ?");
-parameterValues.add(schemaPattern);
+buf.append(" and " + TABLE_SCHEM + (schemaPattern.length() == 0 ?
" is null" : " like ?"));
+if(schemaPattern.length() > 0) {
+parameterValues.add(schemaPattern);
+}
}
if (SchemaUtil.isNamespaceMappingEnabled(null,
connection.getQueryServices().getProps())) {
buf.append(" and " + TABLE_NAME + " = '" +
MetaDataClient.EMPTY_TABLE + "'");
[phoenix] branch 5.1 updated: PHOENIX-6493 MetaData schemaPattern handling errors
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 1f4b265 PHOENIX-6493 MetaData schemaPattern handling errors
1f4b265 is described below
commit 1f4b2651eae0f60871bb6074bc187283d2191ee5
Author: Istvan Toth
AuthorDate: Wed Jun 16 10:51:44 2021 +0200
PHOENIX-6493 MetaData schemaPattern handling errors
---
.../it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java | 6 ++
phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java | 6 --
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index f1ff66e..5ec4e09 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -430,6 +430,12 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(rs.getString(2), null);
assertFalse(rs.next());
+rs = dbmd.getSchemas(null, "");
+assertTrue(rs.next());
+assertEquals(rs.getString(1), null);
+assertEquals(rs.getString(2), null);
+assertFalse(rs.next());
+
rs = dbmd.getSchemas(null, null);
assertTrue(rs.next());
assertEquals(null, rs.getString("TABLE_SCHEM"));
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index 2702142..b6b76fb 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -545,8 +545,10 @@ public final class QueryUtil {
" where " + COLUMN_NAME + " is null");
addTenantIdFilter(connection, buf, catalog, parameterValues);
if (schemaPattern != null) {
-buf.append(" and " + TABLE_SCHEM + " like ?");
-parameterValues.add(schemaPattern);
+buf.append(" and " + TABLE_SCHEM + (schemaPattern.length() == 0 ?
" is null" : " like ?"));
+if(schemaPattern.length() > 0) {
+parameterValues.add(schemaPattern);
+}
}
if (SchemaUtil.isNamespaceMappingEnabled(null,
connection.getQueryServices().getProps())) {
buf.append(" and " + TABLE_NAME + " = '" +
MetaDataClient.EMPTY_TABLE + "'");
[phoenix] branch master updated: PHOENIX-6493 MetaData schemaPattern handling errors
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 fcdf5bc PHOENIX-6493 MetaData schemaPattern handling errors
fcdf5bc is described below
commit fcdf5bc3dcf1079df7ed4f8497b28d72764cf046
Author: Istvan Toth
AuthorDate: Wed Jun 16 10:51:44 2021 +0200
PHOENIX-6493 MetaData schemaPattern handling errors
---
.../it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java | 6 ++
phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java | 6 --
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index f1ff66e..5ec4e09 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -430,6 +430,12 @@ public class QueryDatabaseMetaDataIT extends
ParallelStatsDisabledIT {
assertEquals(rs.getString(2), null);
assertFalse(rs.next());
+rs = dbmd.getSchemas(null, "");
+assertTrue(rs.next());
+assertEquals(rs.getString(1), null);
+assertEquals(rs.getString(2), null);
+assertFalse(rs.next());
+
rs = dbmd.getSchemas(null, null);
assertTrue(rs.next());
assertEquals(null, rs.getString("TABLE_SCHEM"));
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index 2702142..b6b76fb 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -545,8 +545,10 @@ public final class QueryUtil {
" where " + COLUMN_NAME + " is null");
addTenantIdFilter(connection, buf, catalog, parameterValues);
if (schemaPattern != null) {
-buf.append(" and " + TABLE_SCHEM + " like ?");
-parameterValues.add(schemaPattern);
+buf.append(" and " + TABLE_SCHEM + (schemaPattern.length() == 0 ?
" is null" : " like ?"));
+if(schemaPattern.length() > 0) {
+parameterValues.add(schemaPattern);
+}
}
if (SchemaUtil.isNamespaceMappingEnabled(null,
connection.getQueryServices().getProps())) {
buf.append(" and " + TABLE_NAME + " = '" +
MetaDataClient.EMPTY_TABLE + "'");
[phoenix] branch 5.1 updated: PHOENIX-6495 Include phoenix-tools jar in assembly
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 9cba040 PHOENIX-6495 Include phoenix-tools jar in assembly
9cba040 is described below
commit 9cba0401d7f380ee6eacd16765f6206ebc8f3a9a
Author: Istvan Toth
AuthorDate: Fri Jun 18 10:29:58 2021 +0200
PHOENIX-6495 Include phoenix-tools jar in assembly
also restore/add versionsless symlinks
---
phoenix-assembly/pom.xml | 65 ++
.../src/build/components/all-common-jars.xml | 12
2 files changed, 77 insertions(+)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index f293ae5..a9cb434 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -63,6 +63,27 @@
+embedded client without version
+compile
+
+ exec
+
+
+ ln
+
${project.basedir}/../phoenix-client-parent/phoenix-client-embedded/target
+
+-fnsv
+
+
phoenix-client-embedded-${hbase.suffix}-${project.version}.jar
+
+
+
+ phoenix-client-embedded-${hbase.suffix}.jar
+
+
+
+
+
server without version
compile
@@ -83,6 +104,46 @@
+
+pherf without version
+compile
+
+ exec
+
+
+ ln
+
${project.basedir}/../phoenix-pherf/target
+
+-fnsv
+
+ phoenix-pherf-${project.version}.jar
+
+
+ phoenix-pherf.jar
+
+
+
+
+
+tools without version
+compile
+
+ exec
+
+
+ ln
+
${project.basedir}/../phoenix-tools/target
+
+-fnsv
+
+ phoenix-tools-${project.version}.jar
+
+
+ phoenix-tools.jar
+
+
+
+
@@ -144,6 +205,10 @@
org.apache.phoenix
phoenix-tracing-webapp
+
+ org.apache.phoenix
+ phoenix-tools
+
com.fasterxml.woodstox
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index d75915a..4afb7e6 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -28,6 +28,7 @@
/
phoenix-client-${hbase.suffix}-${project.version}.jar
+phoenix-client-${hbase.suffix}.jar
@@ -35,6 +36,7 @@
/
phoenix-client-embedded-${hbase.suffix}-${project.version}.jar
+phoenix-client-embedded-${hbase.suffix}.jar
@@ -42,6 +44,7 @@
/
phoenix-server-${hbase.suffix}-${project.version}.jar
+phoenix-server-${hbase.suffix}.jar
@@ -49,6 +52,15 @@
/
phoenix-pherf-${project.version}.jar
+phoenix-pherf.jar
+
+
+
+ ${project.basedir}/../phoenix-tools/target
+ /
+
+phoenix-tools-${project.version}.jar
+phoenix-tools.jar
[phoenix] branch master updated: PHOENIX-6495 Include phoenix-tools jar in assembly
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 d71ad47 PHOENIX-6495 Include phoenix-tools jar in assembly
d71ad47 is described below
commit d71ad470430d8f283e387629c49936c17a7e04da
Author: Istvan Toth
AuthorDate: Fri Jun 18 10:29:58 2021 +0200
PHOENIX-6495 Include phoenix-tools jar in assembly
also restore/add versionsless symlinks
---
phoenix-assembly/pom.xml | 65 ++
.../src/build/components/all-common-jars.xml | 12
2 files changed, 77 insertions(+)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 3a9e5d7..6b4deff 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -63,6 +63,27 @@
+embedded client without version
+compile
+
+ exec
+
+
+ ln
+
${project.basedir}/../phoenix-client-parent/phoenix-client-embedded/target
+
+-fnsv
+
+
phoenix-client-embedded-${hbase.suffix}-${project.version}.jar
+
+
+
+ phoenix-client-embedded-${hbase.suffix}.jar
+
+
+
+
+
server without version
compile
@@ -83,6 +104,46 @@
+
+pherf without version
+compile
+
+ exec
+
+
+ ln
+
${project.basedir}/../phoenix-pherf/target
+
+-fnsv
+
+ phoenix-pherf-${project.version}.jar
+
+
+ phoenix-pherf.jar
+
+
+
+
+
+tools without version
+compile
+
+ exec
+
+
+ ln
+
${project.basedir}/../phoenix-tools/target
+
+-fnsv
+
+ phoenix-tools-${project.version}.jar
+
+
+ phoenix-tools.jar
+
+
+
+
@@ -144,6 +205,10 @@
org.apache.phoenix
phoenix-tracing-webapp
+
+ org.apache.phoenix
+ phoenix-tools
+
com.fasterxml.woodstox
diff --git a/phoenix-assembly/src/build/components/all-common-jars.xml
b/phoenix-assembly/src/build/components/all-common-jars.xml
index d75915a..4afb7e6 100644
--- a/phoenix-assembly/src/build/components/all-common-jars.xml
+++ b/phoenix-assembly/src/build/components/all-common-jars.xml
@@ -28,6 +28,7 @@
/
phoenix-client-${hbase.suffix}-${project.version}.jar
+phoenix-client-${hbase.suffix}.jar
@@ -35,6 +36,7 @@
/
phoenix-client-embedded-${hbase.suffix}-${project.version}.jar
+phoenix-client-embedded-${hbase.suffix}.jar
@@ -42,6 +44,7 @@
/
phoenix-server-${hbase.suffix}-${project.version}.jar
+phoenix-server-${hbase.suffix}.jar
@@ -49,6 +52,15 @@
/
phoenix-pherf-${project.version}.jar
+phoenix-pherf.jar
+
+
+
+ ${project.basedir}/../phoenix-tools/target
+ /
+
+phoenix-tools-${project.version}.jar
+phoenix-tools.jar
[phoenix] branch 4.16 updated: PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 3fd7916 PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
3fd7916 is described below
commit 3fd7916022a352e6f82daf91c99b77656770b6e6
Author: Istvan Toth
AuthorDate: Fri Jun 18 15:33:24 2021 +0200
PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
---
dev/phoenix-personality.sh | 2 +-
pom.xml| 13 +
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 692981e..ae5806f 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -140,7 +140,7 @@ function personality_modules
# Running with threads>1 seems to trigger some problem in the build, but
since we
# spend 80+% of the time in phoenix-core, it wouldn't help much anyway
- extra="--threads=1 -DPhoenixPatchProcess -Dskip.embedded"
+ extra="--threads=1 -DPhoenixPatchProcess"
if [[ "${PATCH_BRANCH}" = 4* ]]; then
extra="${extra} -Dhttps.protocols=TLSv1.2"
fi
diff --git a/pom.xml b/pom.xml
index 37bbfc6..2f23f95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
phoenix-pherf
phoenix-client-parent
phoenix-client-parent/phoenix-client
-
+phoenix-client-parent/phoenix-client-embedded
phoenix-server
phoenix-assembly
phoenix-tools
@@ -1338,17 +1338,6 @@
- embedded
-
-
-!skip.embedded
-
-
-
-phoenix-client-parent/phoenix-client-embedded
-
-
-
spotbugs-site
[phoenix] branch 5.1 updated: PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded
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 df260bc PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
df260bc is described below
commit df260bca7e5e2ababba4ad7e17dd5320d774a4dd
Author: Istvan Toth
AuthorDate: Fri Jun 18 15:33:24 2021 +0200
PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
---
dev/phoenix-personality.sh | 2 +-
pom.xml| 13 +
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 618f69b..09eb696 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -140,7 +140,7 @@ function personality_modules
# Running with threads>1 seems to trigger some problem in the build, but
since we
# spend 80+% of the time in phoenix-core, it wouldn't help much anyway
- extra="--threads=1 -DPhoenixPatchProcess -Dskip.embedded"
+ extra="--threads=1 -DPhoenixPatchProcess"
if [[ "${PATCH_BRANCH}" = 4* ]]; then
extra="${extra} -Dhttps.protocols=TLSv1.2"
fi
diff --git a/pom.xml b/pom.xml
index 55c3ff1..553ea85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
phoenix-pherf
phoenix-client-parent
phoenix-client-parent/phoenix-client
-
+phoenix-client-parent/phoenix-client-embedded
phoenix-server
phoenix-assembly
phoenix-tools
@@ -1755,17 +1755,6 @@
- embedded
-
-
-!skip.embedded
-
-
-
-phoenix-client-parent/phoenix-client-embedded
-
-
-
spotbugs-site
[phoenix] branch 4.x updated: PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 494afff PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
494afff is described below
commit 494afffc2ea4ea2c3cfdf7ca6175bf4dd66e2447
Author: Istvan Toth
AuthorDate: Fri Jun 18 15:33:24 2021 +0200
PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
---
dev/phoenix-personality.sh | 2 +-
pom.xml| 13 +
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 692981e..ae5806f 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -140,7 +140,7 @@ function personality_modules
# Running with threads>1 seems to trigger some problem in the build, but
since we
# spend 80+% of the time in phoenix-core, it wouldn't help much anyway
- extra="--threads=1 -DPhoenixPatchProcess -Dskip.embedded"
+ extra="--threads=1 -DPhoenixPatchProcess"
if [[ "${PATCH_BRANCH}" = 4* ]]; then
extra="${extra} -Dhttps.protocols=TLSv1.2"
fi
diff --git a/pom.xml b/pom.xml
index 3d06e58..06975e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
phoenix-pherf
phoenix-client-parent
phoenix-client-parent/phoenix-client
-
+phoenix-client-parent/phoenix-client-embedded
phoenix-server
phoenix-assembly
phoenix-tracing-webapp
@@ -1330,17 +1330,6 @@
- embedded
-
-
-!skip.embedded
-
-
-
-phoenix-client-parent/phoenix-client-embedded
-
-
-
spotbugs-site
[phoenix] branch master updated: PHOENIX-6497 Remove embedded profile and always build phoenix-client-embedded
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 f9070c3 PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
f9070c3 is described below
commit f9070c34649cd060acb829207ed104ef6915ab5b
Author: Istvan Toth
AuthorDate: Fri Jun 18 15:33:24 2021 +0200
PHOENIX-6497 Remove embedded profile and always build
phoenix-client-embedded
---
dev/phoenix-personality.sh | 2 +-
dev/phoenix-vote.sh| 4 ++--
pom.xml| 13 +
3 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/dev/phoenix-personality.sh b/dev/phoenix-personality.sh
index 618f69b..09eb696 100755
--- a/dev/phoenix-personality.sh
+++ b/dev/phoenix-personality.sh
@@ -140,7 +140,7 @@ function personality_modules
# Running with threads>1 seems to trigger some problem in the build, but
since we
# spend 80+% of the time in phoenix-core, it wouldn't help much anyway
- extra="--threads=1 -DPhoenixPatchProcess -Dskip.embedded"
+ extra="--threads=1 -DPhoenixPatchProcess"
if [[ "${PATCH_BRANCH}" = 4* ]]; then
extra="${extra} -Dhttps.protocols=TLSv1.2"
fi
diff --git a/dev/phoenix-vote.sh b/dev/phoenix-vote.sh
index c17fa81..8a45eaa 100755
--- a/dev/phoenix-vote.sh
+++ b/dev/phoenix-vote.sh
@@ -148,7 +148,7 @@ function build_from_source() {
function run_tests() {
rm -f "${OUTPUT_PATH_PREFIX}"_run_tests
-(mvn clean package "${MVN_PROPERTIES[@]}" && mvn verify
"${MVN_PROPERTIES[@]}" -Dskip.embedded) 2>&1 | tee
"${OUTPUT_PATH_PREFIX}"_run_tests && UNIT_TEST_PASSED=1
+(mvn clean package "${MVN_PROPERTIES[@]}" && mvn verify
"${MVN_PROPERTIES[@]}") 2>&1 | tee "${OUTPUT_PATH_PREFIX}"_run_tests &&
UNIT_TEST_PASSED=1
}
function execute() {
@@ -164,7 +164,7 @@ function print_when_exit() {
* Built from source (${JAVA_VERSION}): $( ((BUILD_FROM_SOURCE_PASSED))
&& echo "ok" || echo "failed" )
- mvn clean install ${MVN_PROPERTIES[@]} -DskipTests
* Unit tests pass (${JAVA_VERSION}): $( ((UNIT_TEST_PASSED)) && echo
"ok" || echo "failed" )
- - mvn clean package ${MVN_PROPERTIES[@]} && mvn verify
${MVN_PROPERTIES[@]} -Dskip.embedded
+ - mvn clean package ${MVN_PROPERTIES[@]} && mvn verify
${MVN_PROPERTIES[@]}
__EOF
if ((CHECKSUM_PASSED)) && ((SIGNATURE_PASSED)) && ((RAT_CHECK_PASSED)) &&
((BUILD_FROM_SOURCE_PASSED)) && ((UNIT_TEST_PASSED)) ; then
exit 0
diff --git a/pom.xml b/pom.xml
index 396c9b3..7f36b5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
phoenix-pherf
phoenix-client-parent
phoenix-client-parent/phoenix-client
-
+phoenix-client-parent/phoenix-client-embedded
phoenix-server
phoenix-assembly
phoenix-tools
@@ -1755,17 +1755,6 @@
- embedded
-
-
-!skip.embedded
-
-
-
-phoenix-client-parent/phoenix-client-embedded
-
-
-
spotbugs-site
[phoenix] branch 4.16 updated: PHOENIX-6271: Effective DDL generated by SchemaExtractionTool should maintain the order of PK and other columns (#1212)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new d4ea7d3 PHOENIX-6271: Effective DDL generated by SchemaExtractionTool
should maintain the order of PK and other columns (#1212)
d4ea7d3 is described below
commit d4ea7d3832485b6f7cfa26508e8e72b25e9eb0de
Author: Swaroopa Kadam
AuthorDate: Thu Apr 29 11:05:38 2021 -0700
PHOENIX-6271: Effective DDL generated by SchemaExtractionTool should
maintain the order of PK and other columns (#1212)
Co-authored-by: Swaroopa Kadam
---
.../java/org/apache/phoenix/util/SchemaUtil.java | 13 +-
.../phoenix/schema/SchemaExtractionToolIT.java | 159 +++--
.../phoenix/schema/SchemaExtractionProcessor.java | 68 +
3 files changed, 194 insertions(+), 46 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
index 014ea24..49961f4 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
@@ -47,6 +47,7 @@ import java.util.TreeSet;
import javax.annotation.Nullable;
+import com.google.common.base.Strings;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HColumnDescriptor;
@@ -1271,15 +1272,21 @@ public class SchemaUtil {
pTableName = "\""+pTableName+"\"";
}
if(tableNameNeedsQuotes || schemaNameNeedsQuotes) {
-pTableFullName = pSchemaName + "." + pTableName;
+if (!Strings.isNullOrEmpty(pSchemaName)) {
+return String.format("%s.%s", pSchemaName, pTableName);
+} else {
+return pTableName;
+}
}
-
return pTableFullName;
}
private static boolean isQuotesNeeded(String name) {
// first char numeric or non-underscore
-if(!Character.isAlphabetic(name.charAt(0)) && name.charAt(0)!='_') {
+if (Strings.isNullOrEmpty(name)) {
+return false;
+}
+if (!Character.isAlphabetic(name.charAt(0)) && name.charAt(0)!='_') {
return true;
}
// for all other chars
diff --git
a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
b/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
index 4f9b11b..34b09db 100644
---
a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
+++
b/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
@@ -31,7 +31,9 @@ import org.junit.Test;
import java.sql.Connection;
import java.sql.DriverManager;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.ArrayList;
@@ -154,18 +156,46 @@ public class SchemaExtractionToolIT extends
ParallelStatsEnabledIT {
+ "id3 VARCHAR NOT NULL CONSTRAINT PKVIEW PRIMARY KEY (id2,
id3 DESC)) "
+ "AS SELECT * FROM "+pTableFullName;
String createView1 = "CREATE VIEW "+childviewName + " AS SELECT * FROM
"+viewFullName;
-String createIndexStatement = "CREATE INDEX "+indexName + " ON
"+childviewName+"(id1) INCLUDE (v1)";
+String createIndexStatement = "CREATE INDEX "+indexName + " ON
"+childviewName+"(id2, id1) INCLUDE (v1)";
List queries = new ArrayList(){};
queries.add(createTableStmt);
queries.add(createView);
queries.add(createView1);
queries.add(createIndexStatement);
+String expected = "CREATE INDEX %s ON " +childviewName +"(ID2, ID1, K,
ID3 DESC) INCLUDE (V1)";
String result = runSchemaExtractionTool(schemaName, indexName, null,
queries);
-Assert.assertEquals(createIndexStatement.toUpperCase(),
result.toUpperCase());
+Assert.assertEquals(String.format(expected, indexName).toUpperCase(),
result.toUpperCase());
+queries.clear();
+String newIndex =indexName+"_NEW";
+queries.add(String.format(expected, newIndex));
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+executeCreateStatements(conn, queries);
+}
+compareOrdinalPositions(indexName, newIndex);
+}
+
+private void compareOrdinalPositions(String table, String newTable) throws
SQLException {
+String ordinalQuery = "SELECT COLUMN_NAME, "
+
[phoenix] branch 5.1 updated: PHOENIX-6271: Effective DDL generated by SchemaExtractionTool should maintain the order of PK and other columns (#1218)
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 8b99826 PHOENIX-6271: Effective DDL generated by SchemaExtractionTool
should maintain the order of PK and other columns (#1218)
8b99826 is described below
commit 8b9982668f084d7fea63ada5db2989fc87a4a926
Author: Swaroopa Kadam
AuthorDate: Tue May 4 12:59:24 2021 -0700
PHOENIX-6271: Effective DDL generated by SchemaExtractionTool should
maintain the order of PK and other columns (#1218)
---
.../java/org/apache/phoenix/util/SchemaUtil.java | 13 +-
phoenix-tools/pom.xml | 4 -
.../phoenix/schema/SchemaExtractionToolIT.java | 159 +++--
.../phoenix/schema/SchemaExtractionProcessor.java | 61
4 files changed, 192 insertions(+), 45 deletions(-)
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
index fd35bea..dd4b6c3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/SchemaUtil.java
@@ -98,6 +98,7 @@ import
org.apache.phoenix.thirdparty.com.google.common.base.Preconditions;
import org.apache.phoenix.thirdparty.com.google.common.collect.Iterables;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
+import org.apache.phoenix.thirdparty.com.google.common.base.Strings;
/**
*
@@ -1253,15 +1254,21 @@ public class SchemaUtil {
pTableName = "\""+pTableName+"\"";
}
if(tableNameNeedsQuotes || schemaNameNeedsQuotes) {
-pTableFullName = pSchemaName + "." + pTableName;
+if (!Strings.isNullOrEmpty(pSchemaName)) {
+return String.format("%s.%s", pSchemaName, pTableName);
+} else {
+return pTableName;
+}
}
-
return pTableFullName;
}
private static boolean isQuotesNeeded(String name) {
// first char numeric or non-underscore
-if(!Character.isAlphabetic(name.charAt(0)) && name.charAt(0)!='_') {
+if (Strings.isNullOrEmpty(name)) {
+return false;
+}
+if (!Character.isAlphabetic(name.charAt(0)) && name.charAt(0)!='_') {
return true;
}
// for all other chars
diff --git a/phoenix-tools/pom.xml b/phoenix-tools/pom.xml
index f102e9d..eaaa2eb 100644
--- a/phoenix-tools/pom.xml
+++ b/phoenix-tools/pom.xml
@@ -48,10 +48,6 @@
hadoop-common
- org.apache.phoenix.thirdparty
- phoenix-shaded-guava
-
-
org.apache.commons
commons-lang3
diff --git
a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
b/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
index 4f9b11b..34b09db 100644
---
a/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
+++
b/phoenix-tools/src/it/java/org/apache/phoenix/schema/SchemaExtractionToolIT.java
@@ -31,7 +31,9 @@ import org.junit.Test;
import java.sql.Connection;
import java.sql.DriverManager;
+import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.ArrayList;
@@ -154,18 +156,46 @@ public class SchemaExtractionToolIT extends
ParallelStatsEnabledIT {
+ "id3 VARCHAR NOT NULL CONSTRAINT PKVIEW PRIMARY KEY (id2,
id3 DESC)) "
+ "AS SELECT * FROM "+pTableFullName;
String createView1 = "CREATE VIEW "+childviewName + " AS SELECT * FROM
"+viewFullName;
-String createIndexStatement = "CREATE INDEX "+indexName + " ON
"+childviewName+"(id1) INCLUDE (v1)";
+String createIndexStatement = "CREATE INDEX "+indexName + " ON
"+childviewName+"(id2, id1) INCLUDE (v1)";
List queries = new ArrayList(){};
queries.add(createTableStmt);
queries.add(createView);
queries.add(createView1);
queries.add(createIndexStatement);
+String expected = "CREATE INDEX %s ON " +childviewName +"(ID2, ID1, K,
ID3 DESC) INCLUDE (V1)";
String result = runSchemaExtractionTool(schemaName, indexName, null,
queries);
-Assert.assertEquals(createIndexStatement.toUpperCase(),
result.toUpperCase());
+Assert.assertEquals(String.format(expected, indexName).toUpperCase(),
result.toUpperCase());
+queries.clear();
+Strin
[phoenix-queryserver] branch master updated: PHOENIX-6489 Adopt PQS ITs to use Phoenix 5.1
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 dccc013 PHOENIX-6489 Adopt PQS ITs to use Phoenix 5.1 dccc013 is described below commit dccc013ecef80cb5328b535952c7ec411523af65 Author: Istvan Toth AuthorDate: Tue Jun 8 08:49:19 2021 +0200 PHOENIX-6489 Adopt PQS ITs to use Phoenix 5.1 --- BUILDING.md| 27 +++ phoenix-queryserver-it/pom.xml | 88 ++ .../phoenix/end2end/QueryServerBasicsIT.java | 36 + .../phoenix/end2end/ServerCustomizersIT.java | 8 +- .../tool/ParameterizedPhoenixCanaryToolIT.java | 8 +- pom.xml| 15 +++- 6 files changed, 60 insertions(+), 122 deletions(-) diff --git a/BUILDING.md b/BUILDING.md index 74c0a9e..c6eeb2a 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -27,7 +27,7 @@ This repository will build a tarball which is capable of running the Phoenix Que By default, this tarball does not contain a Phoenix client jar as it is meant to be agnostic of Phoenix version (one PQS release can be used against any Phoenix version). Today, PQS builds against -the Phoenix 4.15.0-HBase-1.4 release. +the Phoenix 5.1.1 release with HBase 2.4.2. Note that the resulting Query Server binaries are not tied to any Phoenix, Hbase or Hadoop versions, and will work with all recent Phoenix versions. @@ -40,33 +40,24 @@ $ mvn clean package To build a release of PQS which packages a specific version of Phoenix, specify the `package-phoenix-client` system property and specify the `phoenix.version` system property to indicate a specific Phoenix version, as well as -the `phoenix.client.artifactid` to choose the phoenix-client HBase variant for 4.16+ / 5.1+. +the `phoenix.client.artifactid` to choose the phoenix-client HBase variant. ``` -$ mvn clean package -Dpackage.phoenix.client -Dphoenix.version=5.1.0-SNAPSHOT -Dphoenix.client.artifactid=phoenix-client-hbase-2.4 +$ mvn clean package -Dpackage.phoenix.client -Dphoenix.version=5.1.1 -Dphoenix.client.artifactid=phoenix-client-hbase-2.4 -pl '!phoenix-queryserver-it' +``` +``` +$ mvn clean package -Dpackage.phoenix.client -Dphoenix.version=4.15.0-HBase-1.4 -Dphoenix.client.artifactid=phoenix-client -pl '!phoenix-queryserver-it' ``` ### Running integration tests `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 client artifact specified -with `phoenix.version` and `phoenix.client.artifactid` is used for running the integration tests. - -When specifying `phoenix.version` and `phoenix.client.artifactid`, also specify the HBase version to -be used for integration testing by activating the corresponding `hbase` profile. - -When using a Phoenix 5.1+ version, activate the `hbase-2.x` profile in addition to the -profile for the minor 2.x version. +The integration tests will run with the default Phoenix and HBase version. +Running the integration tests with non-default Phoenix and HBase versions is not supported. -**NOTE** that the integration tests cannot be currently run with Phoenix 4.16+ or 5.1+, so the -examples below will fail. See https://issues.apache.org/jira/browse/PHOENIX-6324 - -``` -$ mvn clean verify -Dpackage.phoenix.client -Dphoenix.version=4.16.0-SNAPSHOT -Dphoenix.client.artifactid=phoenix-client-hbase-1.3 -Phbase-1.3 -``` ``` -$ mvn clean install -Dpackage.phoenix.client -Dphoenix.version=5.1.0-SNAPSHOT -Dphoenix.client.artifactid=phoenix-client-hbase-2.1 -Phbase-2.1 -Phbase-2.x +$ mvn clean verify ``` ### Running project reports diff --git a/phoenix-queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml index 92f683c..9f1cd62 100644 --- a/phoenix-queryserver-it/pom.xml +++ b/phoenix-queryserver-it/pom.xml @@ -151,6 +151,12 @@ org.apache.hbase + hbase-asyncfs + test-jar + test + + + org.apache.hbase hbase-testing-util test @@ -187,86 +193,4 @@ test - - - - hbase-2.x - -2.1.10 -3.0.3 - - - - org.eclipse.jetty - jetty-server - test - - - org.eclipse.jetty - jetty-security - test - - - org.eclipse.jetty - jetty-util - test - - - - - - hbase-1.3 - -1.3.5 - - - - hbase-1.4 - -1.4.10 - - - - hbase-1.5 - -1.5.0 - - - - hbase-1.6 - -1.6.0 -2.8.5 - - - - hbase-2.1 - -2.1.10
[phoenix-queryserver] branch master updated: PHOENIX-6488 Bump Avatica version to 1.18.0 in queryserver
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 3f90d4d PHOENIX-6488 Bump Avatica version to 1.18.0 in queryserver 3f90d4d is described below commit 3f90d4d56d7dca052ec0c52bd867e8beded38a84 Author: Istvan Toth AuthorDate: Mon Jun 7 13:41:19 2021 +0200 PHOENIX-6488 Bump Avatica version to 1.18.0 in queryserver also update jetty to 9.4.31.v20200723 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5210728..4c93d80 100644 --- a/pom.xml +++ b/pom.xml @@ -80,12 +80,12 @@ 2.12.0 2.2.4 -9.4.15.v20190215 +9.4.31.v20200723 2.5 3.2.2 1.9.0 1.7.30 -1.16.0 +1.18.0 3.1.0 3.0.0
svn commit: r48171 - /dev/phoenix/phoenix-5.1.2RC0/ /release/phoenix/phoenix-5.1.2/
Author: stoty Date: Mon Jun 7 11:24:22 2021 New Revision: 48171 Log: Publish Phoenix 5.1.2 Added: release/phoenix/phoenix-5.1.2/ - copied from r48170, dev/phoenix/phoenix-5.1.2RC0/ Removed: dev/phoenix/phoenix-5.1.2RC0/
[phoenix-queryserver] branch master updated: PHOENIX-6473 Add Hadoop JMXServlet as /jmx endpoint
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 8d8ad15 PHOENIX-6473 Add Hadoop JMXServlet as /jmx endpoint
8d8ad15 is described below
commit 8d8ad152569f4d8825a23b20069b9052608aa9d6
Author: Andor Molnar
AuthorDate: Wed Apr 7 17:54:10 2021 +0200
PHOENIX-6473 Add Hadoop JMXServlet as /jmx endpoint
---
phoenix-queryserver/pom.xml| 8 +--
.../phoenix/queryserver/QueryServerOptions.java| 1 +
.../phoenix/queryserver/QueryServerProperties.java | 2 +
.../server/ServerCustomizersFactory.java | 5 ++
.../JMXJsonEndpointServerCustomizer.java | 62 ++
.../queryserver/server/ServerCustomizersTest.java | 2 +-
pom.xml| 5 ++
7 files changed, 80 insertions(+), 5 deletions(-)
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index fd81154..d44f5ac 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -130,10 +130,6 @@
- org.eclipse.jetty
-
${shaded.package}.org.eclipse.jetty
-
-
javax.servlet
${shaded.package}.javax.servlet
@@ -211,6 +207,10 @@
jetty-security
+ org.eclipse.jetty
+ jetty-servlet
+
+
org.slf4j
slf4j-api
diff --git
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
index 4c7db87..95f11b3 100644
---
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
+++
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
@@ -37,6 +37,7 @@ public class QueryServerOptions {
public static final boolean DEFAULT_QUERY_SERVER_CUSTOM_AUTH_ENABLED =
false;
public static final String DEFAULT_QUERY_SERVER_REMOTEUSEREXTRACTOR_PARAM
= "doAs";
public static final boolean DEFAULT_QUERY_SERVER_DISABLE_KERBEROS_LOGIN =
false;
+public static final boolean DEFAULT_QUERY_SERVER_JMXJSONENDPOINT_DISABLED
= false;
public static final boolean DEFAULT_QUERY_SERVER_TLS_ENABLED = false;
//We default to empty *store password
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 35a6dec..9945da4 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
@@ -68,6 +68,8 @@ public class QueryServerProperties {
"phoenix.queryserver.tls.truststore";
public static final String QUERY_SERVER_TLS_TRUSTSTORE_PASSWORD =
"phoenix.queryserver.tls.truststore.password";
+public static final String QUERY_SERVER_JMX_JSON_ENDPOINT_DISABLED =
+"phoenix.queryserver.jmxjsonendpoint.disabled";
// keys for load balancer
public static final String PHOENIX_QUERY_SERVER_LOADBALANCER_ENABLED =
diff --git
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
index 346d3e4..7f4105d 100644
---
a/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
+++
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
@@ -28,6 +28,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.phoenix.queryserver.QueryServerOptions;
import org.apache.phoenix.queryserver.QueryServerProperties;
import
org.apache.phoenix.queryserver.server.customizers.HostedClientJarsServerCustomizer;
+import
org.apache.phoenix.queryserver.server.customizers.JMXJsonEndpointServerCustomizer;
import org.eclipse.jetty.server.Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -71,6 +72,10 @@ public interface ServerCustomizersFactory {
LOG.warn("Empty value provided for {}, ignoring",
QueryServerProperties.CLIENT_JARS_REPO_ATTRIB);
}
}
+if
(!conf.getBoolean(QueryServerProperties.QUERY_SERVER_JMX_JSON_ENDPOINT_DISABLED,
+
QueryServerOptions.DEFAULT_QUERY_SERVER_JMXJSONENDPOINT_DISABLED)) {
+customizers.add(new JMXJsonEndpointServerCustomizer());
+}
[phoenix] branch 4.16 updated: PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan start key with multiple key range queries(Rajeshbabu)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 9f2bff3 PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while
preparing scan start key with multiple key range queries(Rajeshbabu)
9f2bff3 is described below
commit 9f2bff310d4772622dd343a4084b4777388f6918
Author: Rajeshbabu Chintaguntla
AuthorDate: Tue May 4 13:48:53 2021 +0530
PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan
start key with multiple key range queries(Rajeshbabu)
---
.../java/org/apache/phoenix/end2end/InListIT.java | 35 ++
.../java/org/apache/phoenix/util/ScanUtil.java | 4 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
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 d2fc9c7..1c1f2da 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
@@ -46,8 +46,10 @@ import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.TypeMismatchException;
import org.apache.phoenix.schema.types.PDataType;
import org.apache.phoenix.schema.types.PInteger;
+import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.SchemaUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -1657,4 +1659,37 @@ public class InListIT extends ParallelStatsDisabledIT {
.startsWith(ExplainTable.POINT_LOOKUP_ON_STRING));
}
}
+
+@Test
+public void testInListExpressionWithVariableLengthColumnsRanges() throws
Exception {
+Properties props = new Properties();
+final String schemaName = generateUniqueName();
+final String tableName = generateUniqueName();
+final String dataTableFullName = SchemaUtil.getTableName(schemaName,
tableName);
+String ddl =
+"CREATE TABLE " + dataTableFullName + " (a VARCHAR(22) NOT
NULL," +
+"b CHAR(6) NOT NULL," +
+"c VARCHAR(12) NOT NULL,d VARCHAR(200) NOT NULL, " +
+"CONSTRAINT PK_TEST_KO PRIMARY KEY (a,b,c,d)) ";
+long startTS = EnvironmentEdgeManager.currentTimeMillis();
+try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+conn.createStatement().execute(ddl);
+conn.commit();
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','B1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','B1','foo')");
+conn.commit();
+String query = "SELECT count(*) FROM "+dataTableFullName+
+" WHERE (a, b) IN (('1234567890', '202001'), (
'1234567892', '202002'))" +
+" AND c IN ('A1')";
+ResultSet r = conn.createStatement().executeQuery(query);
+r.next();
+assertEquals(2, r.getInt(1));
+}
+}
}
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
index d0b50bc..98caf91 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
@@ -362,10 +362,12 @@ public class ScanUtil {
}
int[] position = new int[slots.size()];
int maxLength = 0;
+int slotEndingFieldPos = -1;
for (int i = 0; i < position.length; i++) {
position[i] = bound == Bound.LOWER ? 0 : slots.get(i).size()-1;
KeyRange range = slots.get(i).get(position[i]);
-Field field = schema.getField(i + slotSpan[i]);
+slotEndingFieldPos = slotEndingFieldPos + slotSpan[i] + 1;
+Field field = schema.getField(slotEndingFieldPos);
int keyLength = range.getRange(bound).length;
if (!field.getDataType().isFixedWidth()) {
keyLength++;
[phoenix] branch 4.x updated: PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan start key with multiple key range queries(Rajeshbabu)
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new 09903e0 PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while
preparing scan start key with multiple key range queries(Rajeshbabu)
09903e0 is described below
commit 09903e0c07b7849f399cb96c06cfbabcb537cf09
Author: Rajeshbabu Chintaguntla
AuthorDate: Tue May 4 13:48:53 2021 +0530
PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan
start key with multiple key range queries(Rajeshbabu)
---
.../java/org/apache/phoenix/end2end/InListIT.java | 35 ++
.../java/org/apache/phoenix/util/ScanUtil.java | 4 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
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 d2fc9c7..1c1f2da 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
@@ -46,8 +46,10 @@ import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.TypeMismatchException;
import org.apache.phoenix.schema.types.PDataType;
import org.apache.phoenix.schema.types.PInteger;
+import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.SchemaUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -1657,4 +1659,37 @@ public class InListIT extends ParallelStatsDisabledIT {
.startsWith(ExplainTable.POINT_LOOKUP_ON_STRING));
}
}
+
+@Test
+public void testInListExpressionWithVariableLengthColumnsRanges() throws
Exception {
+Properties props = new Properties();
+final String schemaName = generateUniqueName();
+final String tableName = generateUniqueName();
+final String dataTableFullName = SchemaUtil.getTableName(schemaName,
tableName);
+String ddl =
+"CREATE TABLE " + dataTableFullName + " (a VARCHAR(22) NOT
NULL," +
+"b CHAR(6) NOT NULL," +
+"c VARCHAR(12) NOT NULL,d VARCHAR(200) NOT NULL, " +
+"CONSTRAINT PK_TEST_KO PRIMARY KEY (a,b,c,d)) ";
+long startTS = EnvironmentEdgeManager.currentTimeMillis();
+try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+conn.createStatement().execute(ddl);
+conn.commit();
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','B1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','B1','foo')");
+conn.commit();
+String query = "SELECT count(*) FROM "+dataTableFullName+
+" WHERE (a, b) IN (('1234567890', '202001'), (
'1234567892', '202002'))" +
+" AND c IN ('A1')";
+ResultSet r = conn.createStatement().executeQuery(query);
+r.next();
+assertEquals(2, r.getInt(1));
+}
+}
}
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
index 532b940..cdc7594 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
@@ -362,10 +362,12 @@ public class ScanUtil {
}
int[] position = new int[slots.size()];
int maxLength = 0;
+int slotEndingFieldPos = -1;
for (int i = 0; i < position.length; i++) {
position[i] = bound == Bound.LOWER ? 0 : slots.get(i).size()-1;
KeyRange range = slots.get(i).get(position[i]);
-Field field = schema.getField(i + slotSpan[i]);
+slotEndingFieldPos = slotEndingFieldPos + slotSpan[i] + 1;
+Field field = schema.getField(slotEndingFieldPos);
int keyLength = range.getRange(bound).length;
if (!field.getDataType().isFixedWidth()) {
keyLength++;
[phoenix-queryserver] branch master updated: PHOENIX-6484 Python phoenixdb throws error on empty resultsets with array types
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 5ccb85e PHOENIX-6484 Python phoenixdb throws error on empty
resultsets with array types
5ccb85e is described below
commit 5ccb85e712bddfe2a067d987adc14d8c913c6bc4
Author: Istvan Toth
AuthorDate: Mon May 31 07:38:46 2021 +0200
PHOENIX-6484 Python phoenixdb throws error on empty resultsets with array
types
---
python-phoenixdb/phoenixdb/tests/test_types.py | 2 ++
python-phoenixdb/phoenixdb/types.py| 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/python-phoenixdb/phoenixdb/tests/test_types.py
b/python-phoenixdb/phoenixdb/tests/test_types.py
index 19c730d..5d6cf8d 100644
--- a/python-phoenixdb/phoenixdb/tests/test_types.py
+++ b/python-phoenixdb/phoenixdb/tests/test_types.py
@@ -350,6 +350,8 @@ class TypesTest(DatabaseTestCase):
def test_array(self):
self.createTable("phoenixdb_test_tbl1", "CREATE TABLE {table} (id
integer primary key, val integer[])")
with self.conn.cursor() as cursor:
+cursor.execute("SELECT id, val FROM phoenixdb_test_tbl1 ORDER BY
id")
+self.assertEqual(cursor.fetchall(), [])
cursor.execute("UPSERT INTO phoenixdb_test_tbl1 VALUES (1,
ARRAY[1, 2])")
cursor.execute("UPSERT INTO phoenixdb_test_tbl1 VALUES (2, ?)",
[[2, 3]])
cursor.execute("UPSERT INTO phoenixdb_test_tbl1 VALUES (3, ?)",
[[4]])
diff --git a/python-phoenixdb/phoenixdb/types.py
b/python-phoenixdb/phoenixdb/types.py
index e446eca..21421b5 100644
--- a/python-phoenixdb/phoenixdb/types.py
+++ b/python-phoenixdb/phoenixdb/types.py
@@ -221,10 +221,11 @@ JDBC_TO_REP = dict([
(-16, common_pb2.STRING), # LONGNVARCHAR
(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
# These are defined by JDBC, but cannot be mapped
# NULL
# OTHER
-# JAVA_OBJECT
# DISTINCT
# STRUCT
# ARRAY 2003 - We are handling this as a special case
[phoenix] branch 5.1 updated: PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan start key with multiple key range queries(Rajeshbabu)
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 caef4f0 PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while
preparing scan start key with multiple key range queries(Rajeshbabu)
caef4f0 is described below
commit caef4f01c6f3c886b9a2e5fc2f928a9ade2a021b
Author: Rajeshbabu Chintaguntla
AuthorDate: Tue May 4 13:48:53 2021 +0530
PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan
start key with multiple key range queries(Rajeshbabu)
---
.../java/org/apache/phoenix/end2end/InListIT.java | 35 ++
.../java/org/apache/phoenix/util/ScanUtil.java | 4 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
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 f3ef892..4f19da2 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
@@ -46,8 +46,10 @@ import org.apache.phoenix.schema.types.PInteger;
import org.apache.phoenix.thirdparty.com.google.common.base.Function;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.SchemaUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -1673,4 +1675,37 @@ public class InListIT extends ParallelStatsDisabledIT {
.startsWith(ExplainTable.POINT_LOOKUP_ON_STRING));
}
}
+
+@Test
+public void testInListExpressionWithVariableLengthColumnsRanges() throws
Exception {
+Properties props = new Properties();
+final String schemaName = generateUniqueName();
+final String tableName = generateUniqueName();
+final String dataTableFullName = SchemaUtil.getTableName(schemaName,
tableName);
+String ddl =
+"CREATE TABLE " + dataTableFullName + " (a VARCHAR(22) NOT
NULL," +
+"b CHAR(6) NOT NULL," +
+"c VARCHAR(12) NOT NULL,d VARCHAR(200) NOT NULL, " +
+"CONSTRAINT PK_TEST_KO PRIMARY KEY (a,b,c,d)) ";
+long startTS = EnvironmentEdgeManager.currentTimeMillis();
+try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+conn.createStatement().execute(ddl);
+conn.commit();
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','B1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','B1','foo')");
+conn.commit();
+String query = "SELECT count(*) FROM "+dataTableFullName+
+" WHERE (a, b) IN (('1234567890', '202001'), (
'1234567892', '202002'))" +
+" AND c IN ('A1')";
+ResultSet r = conn.createStatement().executeQuery(query);
+r.next();
+assertEquals(2, r.getInt(1));
+}
+}
}
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
index 907a21e..3c84afb 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
@@ -363,10 +363,12 @@ public class ScanUtil {
}
int[] position = new int[slots.size()];
int maxLength = 0;
+int slotEndingFieldPos = -1;
for (int i = 0; i < position.length; i++) {
position[i] = bound == Bound.LOWER ? 0 : slots.get(i).size()-1;
KeyRange range = slots.get(i).get(position[i]);
-Field field = schema.getField(i + slotSpan[i]);
+slotEndingFieldPos = slotEndingFieldPos + slotSpan[i] + 1;
+Field field = schema.getField(slotEndingFieldPos);
int keyLength = range.getRange(bound).length;
if (!field.getDataType().isFixedWidth()) {
keyLength++;
[phoenix] branch master updated: PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan start key with multiple key range queries(Rajeshbabu)
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 5e5850f PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while
preparing scan start key with multiple key range queries(Rajeshbabu)
5e5850f is described below
commit 5e5850fd4eeecb05a28db699b3df15f758f4e8a0
Author: Rajeshbabu Chintaguntla
AuthorDate: Tue May 4 13:48:53 2021 +0530
PHOENIX-6453 Possible ArrayIndexOutOfBoundsException while preparing scan
start key with multiple key range queries(Rajeshbabu)
---
.../java/org/apache/phoenix/end2end/InListIT.java | 35 ++
.../java/org/apache/phoenix/util/ScanUtil.java | 4 ++-
2 files changed, 38 insertions(+), 1 deletion(-)
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 f3ef892..4f19da2 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
@@ -46,8 +46,10 @@ import org.apache.phoenix.schema.types.PInteger;
import org.apache.phoenix.thirdparty.com.google.common.base.Function;
import org.apache.phoenix.thirdparty.com.google.common.base.Joiner;
import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
+import org.apache.phoenix.util.EnvironmentEdgeManager;
import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
+import org.apache.phoenix.util.SchemaUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -1673,4 +1675,37 @@ public class InListIT extends ParallelStatsDisabledIT {
.startsWith(ExplainTable.POINT_LOOKUP_ON_STRING));
}
}
+
+@Test
+public void testInListExpressionWithVariableLengthColumnsRanges() throws
Exception {
+Properties props = new Properties();
+final String schemaName = generateUniqueName();
+final String tableName = generateUniqueName();
+final String dataTableFullName = SchemaUtil.getTableName(schemaName,
tableName);
+String ddl =
+"CREATE TABLE " + dataTableFullName + " (a VARCHAR(22) NOT
NULL," +
+"b CHAR(6) NOT NULL," +
+"c VARCHAR(12) NOT NULL,d VARCHAR(200) NOT NULL, " +
+"CONSTRAINT PK_TEST_KO PRIMARY KEY (a,b,c,d)) ";
+long startTS = EnvironmentEdgeManager.currentTimeMillis();
+try (Connection conn = DriverManager.getConnection(getUrl(), props)) {
+conn.createStatement().execute(ddl);
+conn.commit();
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','A1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567892','202002','B1','foo')");
+conn.createStatement().execute("upsert into "+ dataTableFullName+
+" values('1234567890','202001','B1','foo')");
+conn.commit();
+String query = "SELECT count(*) FROM "+dataTableFullName+
+" WHERE (a, b) IN (('1234567890', '202001'), (
'1234567892', '202002'))" +
+" AND c IN ('A1')";
+ResultSet r = conn.createStatement().executeQuery(query);
+r.next();
+assertEquals(2, r.getInt(1));
+}
+}
}
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
index 907a21e..3c84afb 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ScanUtil.java
@@ -363,10 +363,12 @@ public class ScanUtil {
}
int[] position = new int[slots.size()];
int maxLength = 0;
+int slotEndingFieldPos = -1;
for (int i = 0; i < position.length; i++) {
position[i] = bound == Bound.LOWER ? 0 : slots.get(i).size()-1;
KeyRange range = slots.get(i).get(position[i]);
-Field field = schema.getField(i + slotSpan[i]);
+slotEndingFieldPos = slotEndingFieldPos + slotSpan[i] + 1;
+Field field = schema.getField(slotEndingFieldPos);
int keyLength = range.getRange(bound).length;
if (!field.getDataType().isFixedWidth()) {
keyLength++;
[phoenix] branch 4.16 updated: PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux ARM64
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new 3d243ea PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when
building on Linux ARM64
3d243ea is described below
commit 3d243ead6b82c395c1c3e0b612562c7c0108006a
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed May 19 14:15:04 2021 +0300
PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux
ARM64
Stock Protobuf-Java adds aarch64 protoc binary in 3.5.0.
To be able to build on Linux ARM64 with Protobuf 2.x we should use
https://github.com/theopenlab/protobuf
---
phoenix-core/pom.xml | 3 +--
pom.xml | 19 ++-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index a9b7bba..08700d9 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -196,8 +196,7 @@
compile
-
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
-
+
${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier}
${basedir}/src/main/protobuf/
false
true
diff --git a/pom.xml b/pom.xml
index 8672df9..4def52c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,9 +107,12 @@
1.2.17
3.3.6
1.6.4
-2.5.0
2.1
2.5
+
+com.google.protobuf
+2.5.0
+2.5.0
1.0
1.5.0
13.0.1
@@ -1345,6 +1348,20 @@
+
+ linux-aarch64
+
+
+ linux
+ aarch64
+
+
+
+
+org.openlabtesting.protobuf
+2.5.0.2
+
+
[phoenix] 02/02: Remove duplicate entry of commons-io dependency
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 commit 421ecb209909d8d31a893205f710edc0bb531c33 Author: Martin Tzvetanov Grigorov AuthorDate: Wed May 26 11:09:11 2021 +0300 Remove duplicate entry of commons-io dependency --- phoenix-pherf/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 37b9572..f5a4aba 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -130,10 +130,6 @@ phoenix-shaded-commons-cli - commons-io - commons-io - - org.apache.commons commons-csv
[phoenix] branch 5.1 updated (c582e88 -> 421ecb2)
This is an automated email from the ASF dual-hosted git repository. stoty pushed a change to branch 5.1 in repository https://gitbox.apache.org/repos/asf/phoenix.git. from c582e88 PHOENIX-6437: Parent-Child Delete marker should get replicated via SystemCatalogWalEntryFilter (#1222) new 4e88918 PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux ARM64 new 421ecb2 Remove duplicate entry of commons-io dependency The 2 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: phoenix-core/pom.xml | 2 +- phoenix-pherf/pom.xml | 4 pom.xml | 17 + 3 files changed, 18 insertions(+), 5 deletions(-)
[phoenix] 01/02: PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux ARM64
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
commit 4e88918de8e458cebeb707cb24b82b64b07fa543
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed May 19 14:15:04 2021 +0300
PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux
ARM64
Stock Protobuf-Java adds aarch64 protoc binary in 3.5.0.
To be able to build on Linux ARM64 with Protobuf 2.x we should use
https://github.com/theopenlab/protobuf
---
phoenix-core/pom.xml | 2 +-
pom.xml | 17 +
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 848d7d1..2475565 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -211,7 +211,7 @@
compile
-
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
+
${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier}
${basedir}/src/main/protobuf/
false
true
diff --git a/pom.xml b/pom.xml
index 602ba82..b011eac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,10 @@
1.2.17
3.3.6
1.7.25
+
+com.google.protobuf
2.5.0
+2.5.0
2.5
3.8
1.0
@@ -1757,6 +1760,20 @@
+
+ linux-aarch64
+
+
+ linux
+ aarch64
+
+
+
+
+org.openlabtesting.protobuf
+2.5.0.2
+
+
[phoenix] branch master updated: Remove duplicate entry of commons-io dependency
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 852adb1 Remove duplicate entry of commons-io dependency 852adb1 is described below commit 852adb132895ae887defe5832ef8e12705e1aee5 Author: Martin Tzvetanov Grigorov AuthorDate: Wed May 26 11:09:11 2021 +0300 Remove duplicate entry of commons-io dependency --- phoenix-pherf/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index bf56d56..53b7cf2 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -134,10 +134,6 @@ phoenix-shaded-commons-cli - commons-io - commons-io - - org.apache.commons commons-csv
[phoenix-omid] branch master updated: OMID-210 Use org.openlabtesting.protobuf:protoc:2.5.0 on Linux ARM64
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 b6c6165 OMID-210 Use org.openlabtesting.protobuf:protoc:2.5.0 on
Linux ARM64
b6c6165 is described below
commit b6c6165e88699d46e2ff7a3b2192321fa2b4ddd6
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed May 26 17:08:02 2021 +0300
OMID-210 Use org.openlabtesting.protobuf:protoc:2.5.0 on Linux ARM64
---
common/pom.xml | 4 ++--
pom.xml| 20 ++--
tso-server/pom.xml | 2 +-
3 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/common/pom.xml b/common/pom.xml
index e827729..25f19d3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -49,7 +49,7 @@
com.google.protobuf
protobuf-java
-${protobuf.version}
+${protobuf-java.version}
compile
@@ -108,7 +108,7 @@
compile
-
com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
+
${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier}
diff --git a/pom.xml b/pom.xml
index bcd26cf..de3d8c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,10 @@
1.7.7
1.2.17
4.1.60.Final
-2.5.0
+
+com.google.protobuf
+2.5.0
+2.5.0
0.6.1
1.6.2
4.13
@@ -647,7 +650,20 @@
-
+
+linux-aarch64
+
+
+linux
+aarch64
+
+
+
+
+org.openlabtesting.protobuf
+2.5.0.2
+
+
diff --git a/tso-server/pom.xml b/tso-server/pom.xml
index e2e0253..cd81c95 100644
--- a/tso-server/pom.xml
+++ b/tso-server/pom.xml
@@ -117,7 +117,7 @@
com.google.protobuf
protobuf-java
-${protobuf.version}
+${protobuf-java.version}
org.apache.curator
[phoenix] branch 4.x updated: PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux ARM64
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new ba8fc17 PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when
building on Linux ARM64
ba8fc17 is described below
commit ba8fc174f654120559848318253ef989973843e9
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed May 19 14:15:04 2021 +0300
PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux
ARM64
Stock Protobuf-Java adds aarch64 protoc binary in 3.5.0.
To be able to build on Linux ARM64 with Protobuf 2.x we should use
https://github.com/theopenlab/protobuf
---
phoenix-core/pom.xml | 3 +--
pom.xml | 19 ++-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 62085c7..143be81 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -196,8 +196,7 @@
compile
-
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
-
+
${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier}
${basedir}/src/main/protobuf/
false
true
diff --git a/pom.xml b/pom.xml
index 62eba61..408954c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,9 +107,12 @@
1.2.17
3.3.6
1.6.4
-2.5.0
2.1
2.5
+
+com.google.protobuf
+2.5.0
+2.5.0
1.0
1.5.0
13.0.1
@@ -1343,6 +1346,20 @@
+
+ linux-aarch64
+
+
+ linux
+ aarch64
+
+
+
+
+org.openlabtesting.protobuf
+2.5.0.2
+
+
[phoenix] branch master updated: PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux ARM64
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 63cbb11 PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when
building on Linux ARM64
63cbb11 is described below
commit 63cbb111b27bb3611e930949ebda5e06c47b0c68
Author: Martin Tzvetanov Grigorov
AuthorDate: Wed May 19 14:15:04 2021 +0300
PHOENIX-6475 Use org.openlabtesting.protobuf:protoc when building on Linux
ARM64
Stock Protobuf-Java adds aarch64 protoc binary in 3.5.0.
To be able to build on Linux ARM64 with Protobuf 2.x we should use
https://github.com/theopenlab/protobuf
---
phoenix-core/pom.xml | 2 +-
pom.xml | 17 +
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index f9bf1c1..70caaee 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -211,7 +211,7 @@
compile
-
com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}
+
${protobuf.group}:protoc:${protoc.version}:exe:${os.detected.classifier}
${basedir}/src/main/protobuf/
false
true
diff --git a/pom.xml b/pom.xml
index 605062a..5af1d53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,10 @@
1.2.17
3.3.6
1.7.25
+
+com.google.protobuf
2.5.0
+2.5.0
2.5
3.8
1.0
@@ -1757,6 +1760,20 @@
+
+ linux-aarch64
+
+
+ linux
+ aarch64
+
+
+
+
+org.openlabtesting.protobuf
+2.5.0.2
+
+
[phoenix-queryserver] branch master updated: set python-phoenixdb version to 1.1.0.dev0 after release
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 6e0e853 set python-phoenixdb version to 1.1.0.dev0 after release 6e0e853 is described below commit 6e0e85353bc632e64a646ff37d53a57402a8ca34 Author: Istvan Toth AuthorDate: Tue May 25 10:19:24 2021 +0200 set python-phoenixdb version to 1.1.0.dev0 after release --- python-phoenixdb/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py index df0be7b..6ac0f47 100644 --- a/python-phoenixdb/setup.py +++ b/python-phoenixdb/setup.py @@ -59,7 +59,7 @@ else: 'Sphinx;python_version>="3.6"', ], -version = "1.0.1" +version = "1.1.0.dev0" setup( name="phoenixdb",
[phoenix-omid] branch master updated (702d1c2 -> 83ad1ac)
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 702d1c2 OMID-208 Pass additional options to omid.sh add 83ad1ac OMID-209 Migrate to commons-lang3 No new revisions were added by this update. Summary of changes: examples/pom.xml | 6 ++ examples/src/main/java/org/apache/omid/examples/BasicExample.java | 2 +- .../main/java/org/apache/omid/examples/ConfigurationExample.java | 2 +- .../src/main/java/org/apache/omid/examples/ParallelExecution.java | 2 +- .../java/org/apache/omid/examples/SnapshotIsolationExample.java| 2 +- hbase-common/pom.xml | 6 ++ .../java/org/apache/omid/committable/hbase/RegionSplitter.java | 2 +- pom.xml| 7 +++ 8 files changed, 24 insertions(+), 5 deletions(-)
svn commit: r1890096 - in /phoenix/site: publish/download.html publish/language/datatypes.html publish/language/functions.html publish/language/index.html source/src/site/markdown/download.md
Author: stoty
Date: Sat May 22 10:01:38 2021
New Revision: 1890096
URL: http://svn.apache.org/viewvc?rev=1890096=rev
Log:
phoenixdb 1.0.1 download links
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=1890096=1890095=1890096=diff
==
--- phoenix/site/publish/download.html (original)
+++ phoenix/site/publish/download.html Sat May 22 10:01:38 2021
@@ -1,7 +1,7 @@
@@ -245,6 +245,7 @@ addRelease('4.14.0-cdh5.13.2','09/jun/20
addRelease('4.14.0-cdh5.12.2','09/jun/2018');
addRelease('4.14.0-cdh5.11.2','09/jun/2018');
addPhoenixdbRelease('1.0.0','18/sep/2020');
+addPhoenixdbRelease('1.0.1','22/may/2021');
addPhoenixThirdpartyRelease('1.0.0','26/oct/2020');
addPhoenixThirdpartyRelease('1.1.0','01/feb/2021');
addPhoenixOmidRelease('1.0.2','23/nov/2020');
Modified: phoenix/site/publish/language/datatypes.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/datatypes.html?rev=1890096=1890095=1890096=diff
==
--- phoenix/site/publish/language/datatypes.html (original)
+++ phoenix/site/publish/language/datatypes.html Sat May 22 10:01:38 2021
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/functions.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/functions.html?rev=1890096=1890095=1890096=diff
==
--- phoenix/site/publish/language/functions.html (original)
+++ phoenix/site/publish/language/functions.html Sat May 22 10:01:38 2021
@@ -1,7 +1,7 @@
Modified: phoenix/site/publish/language/index.html
URL:
http://svn.apache.org/viewvc/phoenix/site/publish/language/index.html?rev=1890096=1890095=1890096=diff
==
--- phoenix/site/publish/language/index.html (original)
+++ phoenix/site/publish/language/index.html Sat May 22 10:01:38 2021
@@ -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=1890096=1890095=1890096=diff
==
--- phoenix/site/source/src/site/markdown/download.md (original)
+++ phoenix/site/source/src/site/markdown/download.md Sat May 22 10:01:38 2021
@@ -73,6 +73,7 @@ addRelease('4.14.0-cdh5.13.2','09/jun/20
addRelease('4.14.0-cdh5.12.2','09/jun/2018');
addRelease('4.14.0-cdh5.11.2','09/jun/2018');
addPhoenixdbRelease('1.0.0','18/sep/2020');
+addPhoenixdbRelease('1.0.1','22/may/2021');
addPhoenixThirdpartyRelease('1.0.0','26/oct/2020');
addPhoenixThirdpartyRelease('1.1.0','01/feb/2021');
addPhoenixOmidRelease('1.0.2','23/nov/2020');
svn commit: r47861 - /dev/phoenix/python-phoenixdb-1.0.1.rc0/ /release/phoenix/python-phoenixdb-1.0.1/
Author: stoty Date: Sat May 22 09:56:11 2021 New Revision: 47861 Log: release python-phoenixdb 1.0.1 Added: release/phoenix/python-phoenixdb-1.0.1/ - copied from r47860, dev/phoenix/python-phoenixdb-1.0.1.rc0/ Removed: dev/phoenix/python-phoenixdb-1.0.1.rc0/
