This is an automated email from the ASF dual-hosted git repository.
vjasani 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 5b3280a3f5 PHOENIX-7715 Bump phoenix version after 5.3 release (#2303)
5b3280a3f5 is described below
commit 5b3280a3f580360bdc1f99467a8814bf917c166b
Author: richardantal <[email protected]>
AuthorDate: Fri Nov 21 19:49:26 2025 +0100
PHOENIX-7715 Bump phoenix version after 5.3 release (#2303)
---
phoenix-assembly/pom.xml | 2 +-
.../phoenix-client-embedded/pom.xml | 2 +-
phoenix-client-parent/phoenix-client-lite/pom.xml | 2 +-
phoenix-client-parent/pom.xml | 2 +-
phoenix-core-client/pom.xml | 2 +-
.../coprocessorclient/MetaDataProtocol.java | 6 +++--
.../phoenix/query/ConnectionQueryServicesImpl.java | 29 ++++++++++------------
phoenix-core-server/pom.xml | 2 +-
phoenix-core/pom.xml | 2 +-
phoenix-hbase-compat-2.5.0/pom.xml | 2 +-
phoenix-hbase-compat-2.5.4/pom.xml | 2 +-
phoenix-hbase-compat-2.6.0/pom.xml | 2 +-
phoenix-mapreduce-byo-shaded-hbase/pom.xml | 2 +-
phoenix-pherf/pom.xml | 2 +-
phoenix-server/pom.xml | 2 +-
phoenix-tracing-webapp/pom.xml | 2 +-
pom.xml | 2 +-
17 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index 078173fe62..d7a669e287 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-assembly</artifactId>
<packaging>pom</packaging>
diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml
b/phoenix-client-parent/phoenix-client-embedded/pom.xml
index b61287a6b9..f7a674e534 100644
--- a/phoenix-client-parent/phoenix-client-embedded/pom.xml
+++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-parent</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-client-embedded-${hbase.suffix}</artifactId>
diff --git a/phoenix-client-parent/phoenix-client-lite/pom.xml
b/phoenix-client-parent/phoenix-client-lite/pom.xml
index 25cd5f2a00..e915fbef01 100644
--- a/phoenix-client-parent/phoenix-client-lite/pom.xml
+++ b/phoenix-client-parent/phoenix-client-lite/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-parent</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-client-lite-${hbase.suffix}</artifactId>
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 574fbac0b0..47b62405c3 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-client-parent</artifactId>
<packaging>pom</packaging>
diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
index 07769c9f68..e67be38cb0 100644
--- a/phoenix-core-client/pom.xml
+++ b/phoenix-core-client/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-core-client</artifactId>
<name>Phoenix Core Client</name>
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 cc7120f71d..b523a44de0 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 8e867842bc..cd141e1182 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
@@ -28,7 +28,7 @@ import static
org.apache.phoenix.coprocessorclient.BaseScannerRegionObserverCons
import static
org.apache.phoenix.coprocessorclient.MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP;
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;
@@ -4753,24 +4753,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());
/**
@@ -4778,19 +4778,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);
diff --git a/phoenix-core-server/pom.xml b/phoenix-core-server/pom.xml
index 45611f7750..e3abcb3558 100644
--- a/phoenix-core-server/pom.xml
+++ b/phoenix-core-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-core-server</artifactId>
<name>Phoenix Core Server</name>
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 0570a64a8d..99d45dc6b9 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-core</artifactId>
<name>Phoenix Core</name>
diff --git a/phoenix-hbase-compat-2.5.0/pom.xml
b/phoenix-hbase-compat-2.5.0/pom.xml
index bdc3d92b15..e9696aeca9 100644
--- a/phoenix-hbase-compat-2.5.0/pom.xml
+++ b/phoenix-hbase-compat-2.5.0/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-hbase-compat-2.5.0</artifactId>
diff --git a/phoenix-hbase-compat-2.5.4/pom.xml
b/phoenix-hbase-compat-2.5.4/pom.xml
index 3b8291567b..39e05b450a 100644
--- a/phoenix-hbase-compat-2.5.4/pom.xml
+++ b/phoenix-hbase-compat-2.5.4/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-hbase-compat-2.5.4</artifactId>
diff --git a/phoenix-hbase-compat-2.6.0/pom.xml
b/phoenix-hbase-compat-2.6.0/pom.xml
index 7df076a527..cde486f723 100644
--- a/phoenix-hbase-compat-2.6.0/pom.xml
+++ b/phoenix-hbase-compat-2.6.0/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-hbase-compat-2.6.0</artifactId>
diff --git a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
index 00ae674c06..477cd06345 100644
--- a/phoenix-mapreduce-byo-shaded-hbase/pom.xml
+++ b/phoenix-mapreduce-byo-shaded-hbase/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-mapreduce-byo-shaded-hbase-${hbase.suffix}</artifactId>
<packaging>jar</packaging>
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index a2fff7b36f..513d45c883 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-pherf</artifactId>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 3307e8671b..05e068f108 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-server-${hbase.suffix}</artifactId>
<packaging>jar</packaging>
diff --git a/phoenix-tracing-webapp/pom.xml b/phoenix-tracing-webapp/pom.xml
index 3dd2cecadc..bb45e192c9 100755
--- a/phoenix-tracing-webapp/pom.xml
+++ b/phoenix-tracing-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-tracing-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
index f7a553bd3e..293a1e53ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
</parent>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
+ <version>5.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Phoenix</name>
<description>A SQL layer over HBase</description>
