(phoenix) branch PHOENIX-6978-feature updated: PHOENIX-7329 Change TTL column type to VARCHAR in syscat (#1905)
This is an automated email from the ASF dual-hosted git repository.
tkhurana pushed a commit to branch PHOENIX-6978-feature
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/PHOENIX-6978-feature by this
push:
new 967c7d0e1e PHOENIX-7329 Change TTL column type to VARCHAR in syscat
(#1905)
967c7d0e1e is described below
commit 967c7d0e1ececa2275fb8a168d81df29cfb63579
Author: tkhurana
AuthorDate: Tue Jun 18 17:28:52 2024 -0700
PHOENIX-7329 Change TTL column type to VARCHAR in syscat (#1905)
PHOENIX-7329 Changing syscat column to type VARCHAR
Co-authored-by: Tanuj Khurana
---
.../phoenix/end2end/MoveTTLDuringUpgradeIT.java| 2 +-
.../java/org/apache/phoenix/end2end/UpgradeIT.java | 15 -
.../java/org/apache/phoenix/end2end/ViewTTLIT.java | 3 ++-
.../phoenix/coprocessor/MetaDataEndpointImpl.java | 26 +-
.../org/apache/phoenix/query/QueryConstants.java | 2 +-
.../org/apache/phoenix/schema/MetaDataClient.java | 7 +++---
.../java/org/apache/phoenix/util/UpgradeUtil.java | 4 ++--
7 files changed, 35 insertions(+), 24 deletions(-)
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MoveTTLDuringUpgradeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MoveTTLDuringUpgradeIT.java
index 630a405198..95da46f9b6 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MoveTTLDuringUpgradeIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MoveTTLDuringUpgradeIT.java
@@ -79,7 +79,7 @@ public class MoveTTLDuringUpgradeIT extends
ParallelStatsDisabledIT {
int ttl = tableTTLMap.get(table);
//Check if TTL is moved to SYSCAT.
if (ttl != HConstants.FOREVER) {
-assertEquals(ttl, rs.getInt(2));
+assertEquals(ttl,
Integer.valueOf(rs.getString(2)).intValue());
} else {
assertEquals(ttl, TTL_NOT_DEFINED);
}
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index d05e53e527..868fb116ba 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -404,18 +404,21 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
String sql3 = "SELECT TTL FROM SYSTEM.CATALOG WHERE TABLE_NAME =
'" + tableName + "'";
ResultSet rs3 = conn.createStatement().executeQuery(sql3);
-rs3.next();
-assertEquals("Should have return one value for PHOENIX_TTL
column",Integer.MAX_VALUE, rs3.getInt(1));
+assertTrue(rs3.next());
+int ttl = Integer.valueOf(rs3.getString(1));
+assertEquals("Should have return one value for PHOENIX_TTL
column",Integer.MAX_VALUE, ttl);
String sql4 = "SELECT TTL FROM SYSTEM.CATALOG WHERE TABLE_NAME =
'" + tableName1 + "'";
ResultSet rs4 = conn.createStatement().executeQuery(sql4);
-rs4.next();
-assertEquals("Should have return one value for PHOENIX_TTL
column",randomIntValue, rs4.getInt(1));
+assertTrue(rs4.next());
+ttl = Integer.valueOf(rs4.getString(1));
+assertEquals("Should have return one value for PHOENIX_TTL
column",randomIntValue, ttl);
String sql5 = "SELECT TTL FROM SYSTEM.CATALOG WHERE TABLE_NAME =
'" + tableName2 + "'";
ResultSet rs5 = conn.createStatement().executeQuery(sql5);
-rs5.next();
-assertEquals("Should have return one value for PHOENIX_TTL
column",Integer.MAX_VALUE, rs5.getInt(1));
+assertTrue(rs5.next());
+ttl = Integer.valueOf(rs5.getString(1));
+assertEquals("Should have return one value for PHOENIX_TTL
column",Integer.MAX_VALUE, ttl);
}
}
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
index fee3cac9b8..98903417d8 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewTTLIT.java
@@ -205,7 +205,8 @@ public class ViewTTLIT extends ParallelStatsDisabledIT {
.format(TTL_HEADER_SQL, tenantClause, schemaName,
tableName, tableType);
stmt.execute(sql);
ResultSet rs = stmt.getResultSet();
-long actualTTLValueReturned = rs.next() ? rs.getLong(1) : 0;
+String ttlStr = rs.next() ? rs.getString(1) : null;
+long actualTTLValueReturned = ttlStr != null ?
Integer.valueOf(ttlStr): 0;
assertEquals(String.format("Expected rows do not match for schema
= %s, table = %s",
schemaName, tableName), ttlValueExpected,
Apache-Phoenix | master | HBase 2.5 | Build #688 FAILURE
master branch HBase 2.5 build #688 status FAILURE Build #688 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/688/
Apache-Phoenix | master | HBase 2.4 | Build #688 SUCCESS
master branch HBase 2.4 build #688 status SUCCESS Build #688 https://ci-hadoop.apache.org/job/Phoenix/job/Phoenix-mulitbranch/job/master/688/
(phoenix) branch master updated: PHOENIX-7172: Support HBase 2.6 (#1793)
This is an automated email from the ASF dual-hosted git repository.
richardantal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new ce17ec1daa PHOENIX-7172: Support HBase 2.6 (#1793)
ce17ec1daa is described below
commit ce17ec1daaa4f064d798ea246909d611eaf61e92
Author: richardantal
AuthorDate: Tue Jun 18 12:32:57 2024 +0200
PHOENIX-7172: Support HBase 2.6 (#1793)
---
phoenix-assembly/pom.xml | 5 +
phoenix-core-client/pom.xml| 3 +
.../phoenix/transaction/OmidTransactionTable.java | 26 -
.../regionserver/IndexHalfStoreFileReader.java | 9 +-
.../regionserver/LocalIndexStoreFileScanner.java | 9 +-
.../hbase/regionserver/wal/IndexedHLogReader.java | 10 +-
.../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++-
.../hbase/CompatIndexHalfStoreFileReader.java | 40
.../compat/hbase/CompatIndexedHLogReader.java | 31 ++
.../hbase/CompatLocalIndexStoreFileScanner.java| 33 ++
.../compat/hbase/CompatOmidTransactionTable.java | 42 ++--
.../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++-
.../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++-
.../compat/hbase/HbaseCompatCapabilities.java | 13 ++-
.../hbase/ReplicationSinkCompatEndpoint.java | 21 ++--
.../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++-
.../hbase/CompatIndexHalfStoreFileReader.java | 40
.../compat/hbase/CompatIndexedHLogReader.java | 31 ++
.../hbase/CompatLocalIndexStoreFileScanner.java| 34 +++
.../compat/hbase/CompatOmidTransactionTable.java | 42 ++--
.../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++-
.../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++-
.../compat/hbase/HbaseCompatCapabilities.java | 13 ++-
.../hbase/ReplicationSinkCompatEndpoint.java | 21 ++--
.../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++-
.../hbase/CompatIndexHalfStoreFileReader.java | 40
.../compat/hbase/CompatIndexedHLogReader.java | 32 ++
.../hbase/CompatLocalIndexStoreFileScanner.java| 33 ++
.../compat/hbase/CompatOmidTransactionTable.java | 42 ++--
.../compat/hbase/CompatPhoenixRpcScheduler.java| 13 ++-
.../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++-
.../compat/hbase/HbaseCompatCapabilities.java | 13 ++-
.../hbase/ReplicationSinkCompatEndpoint.java | 21 ++--
phoenix-hbase-compat-2.6.0/pom.xml | 113 +
.../phoenix/compat/hbase/CompatDelegateHTable.java | 13 ++-
.../hbase/CompatIndexHalfStoreFileReader.java | 42
.../compat/hbase/CompatIndexedHLogReader.java | 23 +
.../hbase/CompatLocalIndexStoreFileScanner.java| 35 +++
.../compat/hbase/CompatOmidTransactionTable.java | 78 ++
.../compat/hbase/CompatPhoenixRpcScheduler.java| 27 +++--
.../apache/phoenix/compat/hbase/CompatUtil.java| 15 ++-
.../compat/hbase/HbaseCompatCapabilities.java | 13 ++-
.../hbase/ReplicationSinkCompatEndpoint.java | 21 ++--
pom.xml| 45 +++-
44 files changed, 924 insertions(+), 228 deletions(-)
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index cf963a1b1f..0ff54a34ff 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -276,6 +276,11 @@
phoenix-hbase-compat-2.5.4
${project.version}
+
+ org.apache.phoenix
+ phoenix-hbase-compat-2.6.0
+ ${project.version}
+
diff --git a/phoenix-core-client/pom.xml b/phoenix-core-client/pom.xml
index c036d1e377..b926a0d302 100644
--- a/phoenix-core-client/pom.xml
+++ b/phoenix-core-client/pom.xml
@@ -66,6 +66,9 @@
|| ("${hbase.compat.version}".equals("2.5.4")
&& hbaseMinor == 5
&& hbasePatch >=4)
+|| ("${hbase.compat.version}".equals("2.6.0")
+ && hbaseMinor == 6
+ && hbasePatch >=0)
)
diff --git
a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
index 0e9ddb41a5..483a52b725 100644
---
a/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
+++
b/phoenix-core-client/src/main/java/org/apache/phoenix/transaction/OmidTransactionTable.java
@@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.coprocessor.Batch.Call;
import org.apache.hadoop.hbase.client.coprocessor.Batch
