PHOENIX-7715 Bump phoenix version after 5.3 release #2303

richardantal · 2025-10-15T12:57:46Z

No description provided.

stoty

+1 LGTM

virajjasani · 2025-10-15T15:27:36Z

We will need some other changes too e.g. updating MetaDataClient version to reflect 5.4?

virajjasani · 2025-10-15T15:58:09Z

I had the changes in my local but could not push them due to some conflicts

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/coprocessorclient/MetaDataProtocol.java b/phoenix-core-client/src/main/java/org/apache/phoenix/coprocessorclient/MetaDataProtocol.java
index cc7120f71..b523a44de 100644
--- a/phoenix-core-client/src/main/java/org/apache/phoenix/coprocessorclient/MetaDataProtocol.java
+++ b/phoenix-core-client/src/main/java/org/apache/phoenix/coprocessorclient/MetaDataProtocol.java
@@ -56,7 +56,7 @@ import org.apache.phoenix.thirdparty.com.google.common.collect.Lists;
  */
 public abstract class MetaDataProtocol extends MetaDataService {
   public static final int PHOENIX_MAJOR_VERSION = 5;
-  public static final int PHOENIX_MINOR_VERSION = 3;
+  public static final int PHOENIX_MINOR_VERSION = 4;
 
   public static final int PHOENIX_PATCH_NUMBER = 0;
   public static final int PHOENIX_VERSION =
@@ -92,9 +92,10 @@ public abstract class MetaDataProtocol extends MetaDataService {
   public static final long MIN_SYSTEM_TABLE_TIMESTAMP_5_1_0 = MIN_SYSTEM_TABLE_TIMESTAMP_4_16_0;
   public static final long MIN_SYSTEM_TABLE_TIMESTAMP_5_2_0 = MIN_TABLE_TIMESTAMP + 38;
   public static final long MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 = MIN_TABLE_TIMESTAMP + 42;
+  public static final long MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 = MIN_TABLE_TIMESTAMP + 43;
   // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the MIN_SYSTEM_TABLE_TIMESTAMP_*
   // constants
-  public static final long MIN_SYSTEM_TABLE_TIMESTAMP = MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0;
+  public static final long MIN_SYSTEM_TABLE_TIMESTAMP = MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0;
 
   // Version below which we should disallow usage of mutable secondary indexing.
   public static final int MUTABLE_SI_VERSION_THRESHOLD = VersionUtil.encodeVersion("0", "94", "10");
@@ -151,6 +152,7 @@ public abstract class MetaDataProtocol extends MetaDataService {
     TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_5_1_0, "5.1.x");
     TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_5_2_0, "5.2.x");
     TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0, "5.3.x");
+    TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0, "5.4.x");
   }
 
   public static final String CURRENT_CLIENT_VERSION =
diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 5d46b5409..29d641790 100644
--- a/phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ b/phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -29,6 +29,7 @@ import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.MIN_SYSTEM_T
 import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_15_0;
 import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_16_0;
 import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0;
+import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0;
 import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.PHOENIX_MAJOR_VERSION;
 import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.PHOENIX_MINOR_VERSION;
 import static org.apache.phoenix.coprocessorclient.MetaDataProtocol.PHOENIX_PATCH_NUMBER;
@@ -4740,24 +4741,24 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices
         }
       }
     }
-    if (currentServerSideTableTimeStamp < MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0) {
+    if (currentServerSideTableTimeStamp < MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0) {
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 8,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 9,
         PhoenixDatabaseMetaData.PHYSICAL_TABLE_NAME + " " + PVarchar.INSTANCE.getSqlTypeName());
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 7,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 8,
         PhoenixDatabaseMetaData.SCHEMA_VERSION + " " + PVarchar.INSTANCE.getSqlTypeName());
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 6,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 7,
         PhoenixDatabaseMetaData.EXTERNAL_SCHEMA_ID + " " + PVarchar.INSTANCE.getSqlTypeName());
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 5,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 6,
         PhoenixDatabaseMetaData.STREAMING_TOPIC_NAME + " " + PVarchar.INSTANCE.getSqlTypeName());
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 4,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 5,
         PhoenixDatabaseMetaData.INDEX_WHERE + " " + PVarchar.INSTANCE.getSqlTypeName());
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 3,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 4,
         PhoenixDatabaseMetaData.CDC_INCLUDE_TABLE + " " + PVarchar.INSTANCE.getSqlTypeName());
 
       /**
@@ -4765,19 +4766,16 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices
        * PHOENIX_TTL Column. See PHOENIX-7023
        */
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 2,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 3,
         PhoenixDatabaseMetaData.TTL + " " + PVarchar.INSTANCE.getSqlTypeName());
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 1,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 2,
         PhoenixDatabaseMetaData.ROW_KEY_MATCHER + " " + PVarbinary.INSTANCE.getSqlTypeName());
       metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 1,
         PhoenixDatabaseMetaData.IS_STRICT_TTL + " " + PBoolean.INSTANCE.getSqlTypeName());
-      // Values in PHOENIX_TTL column will not be used for further release as PHOENIX_TTL column is
-      // being deprecated
-      // and will be removed in later release. To copy copyDataFromPhoenixTTLtoTTL(metaConnection)
-      // can be used but
-      // as that feature was not fully built we are not moving old value to new column
+      // Add any 5.4.0 specific upgrade logic here if needed in the future
+      // Currently no new schema changes required for 5.4.0
 
       // move TTL values stored in descriptor to SYSCAT TTL column.
       moveTTLFromHBaseLevelTTLToPhoenixLevelTTL(metaConnection);

stoty

You're right, I forgot about the protocol version bump.

virajjasani · 2025-10-16T03:50:52Z

@richardantal feel free to try above patch, it should work I think. I could not push because of other issue with pom, it was bit messed up in local.

richardantal · 2025-10-16T07:10:29Z

I've added your patch to this change.
Thanks @virajjasani

stoty · 2025-10-16T07:14:56Z

phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java

+    if (currentServerSideTableTimeStamp < MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0) {
      metaConnection = addColumnsIfNotExists(metaConnection, PhoenixDatabaseMetaData.SYSTEM_CATALOG,
-        MIN_SYSTEM_TABLE_TIMESTAMP_5_3_0 - 8,
+        MIN_SYSTEM_TABLE_TIMESTAMP_5_4_0 - 9,


Unrelated, but this is super fragile, we should use the actual verion constants.

Yes, I agree

Opened https://issues.apache.org/jira/browse/PHOENIX-7723 to track this

stoty

+1 LGTM

virajjasani · 2025-10-17T01:21:42Z

Triggered new build, to make sure the backward compat test failure in previous build was env issue https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-PreCommit-GitHub-PR/job/PR-2303/3/

virajjasani · 2025-10-17T01:22:21Z

Also, we need one more round of mvn spotless:apply

virajjasani

+1

virajjasani · 2025-10-30T22:51:58Z

Good to go?

richardantal requested review from stoty and virajjasani October 15, 2025 12:57

stoty approved these changes Oct 15, 2025

View reviewed changes

stoty requested changes Oct 16, 2025

View reviewed changes

richardantal force-pushed the PHOENIX-7715 branch from bcb8b6e to 4d53313 Compare October 16, 2025 07:09

stoty reviewed Oct 16, 2025

View reviewed changes

stoty approved these changes Oct 16, 2025

View reviewed changes

PHOENIX-7715 Bump phoenix version after 5.3 release

cf6e5ed

richardantal force-pushed the PHOENIX-7715 branch from 4d53313 to cf6e5ed Compare October 17, 2025 08:28

virajjasani approved these changes Oct 30, 2025

View reviewed changes

PHOENIX-7715 Bump phoenix version after 5.3 release #2303

Are you sure you want to change the base?

PHOENIX-7715 Bump phoenix version after 5.3 release #2303

Conversation

richardantal commented Oct 15, 2025

Uh oh!

stoty left a comment

Choose a reason for hiding this comment

Uh oh!

virajjasani commented Oct 15, 2025

Uh oh!

virajjasani commented Oct 15, 2025

Uh oh!

stoty left a comment

Choose a reason for hiding this comment

Uh oh!

virajjasani commented Oct 16, 2025

Uh oh!

richardantal commented Oct 16, 2025

Uh oh!

stoty Oct 16, 2025

Choose a reason for hiding this comment

Uh oh!

virajjasani Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

stoty Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

stoty left a comment

Choose a reason for hiding this comment

Uh oh!

virajjasani commented Oct 17, 2025

Uh oh!

virajjasani commented Oct 17, 2025

Uh oh!

virajjasani left a comment

Choose a reason for hiding this comment

Uh oh!

virajjasani commented Oct 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants