Apache-Phoenix | 5.1 | HBase 2.2 | Build #193 SUCCESS

2023-01-18 Thread Apache Jenkins Server 

5.1 branch  HBase 2.2  build #193 status SUCCESS
Build #193 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/193/

Apache-Phoenix | 5.1 | HBase 2.1 | Build #193 SUCCESS

2023-01-18 Thread Apache Jenkins Server 

5.1 branch  HBase 2.1  build #193 status SUCCESS
Build #193 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/193/

Apache-Phoenix | master | HBase 2.4 | Build #490 FAILURE

2023-01-18 Thread Apache Jenkins Server 

master branch  HBase 2.4  build #490 status FAILURE
Build #490 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/490/

Apache-Phoenix | 5.1 | HBase 2.4 | Build #193 SUCCESS

2023-01-18 Thread Apache Jenkins Server 

5.1 branch  HBase 2.4  build #193 status SUCCESS
Build #193 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/193/

Apache-Phoenix | 5.1 | HBase 2.5 | Build #193 FAILURE

2023-01-18 Thread Apache Jenkins Server 

5.1 branch  HBase 2.5  build #193 status FAILURE
Build #193 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/193/

Apache-Phoenix | 5.1 | HBase 2.3 | Build #193 ABORTED

2023-01-18 Thread Apache Jenkins Server 

5.1 branch  HBase 2.3  build #193 status ABORTED
Build #193 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/5.1/193/

Apache-Phoenix | master | HBase 2.3 | Build #490 FAILURE

2023-01-18 Thread Apache Jenkins Server 

master branch  HBase 2.3  build #490 status FAILURE
Build #490 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/490/

Apache-Phoenix | master | HBase 2.5 | Build #490 FAILURE

2023-01-18 Thread Apache Jenkins Server 

master branch  HBase 2.5  build #490 status FAILURE
Build #490 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/490/

[phoenix] branch 5.1 updated: PHOENIX-6855 Upgrade from 4.7 to 5+ fails if any of the local indexes exist.

2023-01-18 Thread ssa 
This is an automated email from the ASF dual-hosted git repository.

ssa 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 335c52fc07 PHOENIX-6855 Upgrade from 4.7 to 5+ fails if any of the 
local indexes exist.
335c52fc07 is described below

commit 335c52fc07e217388a12bfa0fab5388b4cc9cef9
Author: Sergey Soldatov 
AuthorDate: Mon Jan 16 21:53:01 2023 -0800

PHOENIX-6855 Upgrade from 4.7 to 5+ fails if any of the local indexes exist.
---
 .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java  | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 99c434f924..86ed6713ee 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -374,6 +374,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 private final int maxInternalConnectionsAllowed;
 private final boolean shouldThrottleNumConnections;
 public static final byte[] MUTEX_LOCKED = 
"MUTEX_LOCKED".getBytes(StandardCharsets.UTF_8);
+private boolean localIndexUpgradeRequired;
 
 private static interface FeatureSupported {
 boolean isSupported(ConnectionQueryServices services);
@@ -3746,7 +3747,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 metaConnection = UpgradeUtil.disableViewIndexes(metaConnection);
 if 
(getProps().getBoolean(QueryServices.LOCAL_INDEX_CLIENT_UPGRADE_ATTRIB,
   QueryServicesOptions.DEFAULT_LOCAL_INDEX_CLIENT_UPGRADE)) {
-metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
+localIndexUpgradeRequired = true;
 }
 ConnectionQueryServicesImpl.this.removeTable(null,
   PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME, null,
@@ -4004,6 +4005,13 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 // snapshot entries
 metaConnection = upgradeOtherSystemTablesIfRequired(metaConnection,
 moveChildLinks, systemTableToSnapshotMap);
+
+// Once the system tables are upgraded the local index upgrade can 
be done
+if (localIndexUpgradeRequired) {
+LOGGER.info("Upgrading local indexes");
+metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
+}
+
 // Synchronize necessary properties amongst all column families of 
a base table
 // and its indexes. See PHOENIX-3955
 if (syncAllTableAndIndexProps) {

[phoenix] branch master updated: PHOENIX-6855 Upgrade from 4.7 to 5+ fails if any of the local indexes exist. (#1550)

2023-01-18 Thread ssa 
This is an automated email from the ASF dual-hosted git repository.

ssa 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 d2acf9c262 PHOENIX-6855 Upgrade from 4.7 to 5+ fails if any of the 
local indexes exist. (#1550)
d2acf9c262 is described below

commit d2acf9c2620e2caf636022fc759844d5c46cb455
Author: Sergey Soldatov 
AuthorDate: Wed Jan 18 06:43:20 2023 -0800

PHOENIX-6855 Upgrade from 4.7 to 5+ fails if any of the local indexes 
exist. (#1550)
---
 .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java  | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 84abaee0b6..4a1256f054 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -392,6 +392,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 private final boolean shouldThrottleNumConnections;
 public static final byte[] MUTEX_LOCKED = 
"MUTEX_LOCKED".getBytes(StandardCharsets.UTF_8);
 private ServerSideRPCControllerFactory serverSideRPCControllerFactory;
+private boolean localIndexUpgradeRequired;
 
 private static interface FeatureSupported {
 boolean isSupported(ConnectionQueryServices services);
@@ -3933,7 +3934,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 metaConnection = UpgradeUtil.disableViewIndexes(metaConnection);
 if 
(getProps().getBoolean(QueryServices.LOCAL_INDEX_CLIENT_UPGRADE_ATTRIB,
   QueryServicesOptions.DEFAULT_LOCAL_INDEX_CLIENT_UPGRADE)) {
-metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
+localIndexUpgradeRequired = true;
 }
 ConnectionQueryServicesImpl.this.removeTable(null,
   PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME, null,
@@ -4207,6 +4208,13 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 // snapshot entries
 metaConnection = upgradeOtherSystemTablesIfRequired(metaConnection,
 moveChildLinks, systemTableToSnapshotMap);
+
+// Once the system tables are upgraded the local index upgrade can 
be done
+if (localIndexUpgradeRequired) {
+LOGGER.info("Upgrading local indexes");
+metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
+}
+
 // Synchronize necessary properties amongst all column families of 
a base table
 // and its indexes. See PHOENIX-3955
 if (syncAllTableAndIndexProps) {