diff --git a/lib/trino-phoenix5-patched/pom.xml b/lib/trino-phoenix5-patched/pom.xml index 72485db28cfc..b0197464138b 100644 --- a/lib/trino-phoenix5-patched/pom.xml +++ b/lib/trino-phoenix5-patched/pom.xml @@ -22,7 +22,7 @@ org.apache.phoenix phoenix-client-embedded-hbase-2.2 - 5.1.2 + 5.1.3 diff --git a/plugin/trino-phoenix5/pom.xml b/plugin/trino-phoenix5/pom.xml index a383be998660..5a86cfb6eb41 100644 --- a/plugin/trino-phoenix5/pom.xml +++ b/plugin/trino-phoenix5/pom.xml @@ -133,6 +133,16 @@ + + + + ch.qos.reload4j + reload4j + 1.2.25 + runtime + + com.fasterxml.jackson.core jackson-databind @@ -415,7 +425,7 @@ org.apache.phoenix phoenix-client-embedded-hbase-2.2 - 5.1.2 + 5.1.3 provided true diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java index 91e4fc5152c2..521829dbc3e9 100644 --- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java +++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixConnectorTest.java @@ -347,6 +347,7 @@ public void testShowCreateTable() " comment varchar(79)\n" + ")\n" + "WITH (\n" + + " bloomfilter = 'ROW',\n" + " data_block_encoding = 'FAST_DIFF',\n" + " rowkeys = 'ROWKEY',\n" + " salt_buckets = 10\n" + @@ -617,6 +618,7 @@ public void testCreateTableWithProperties() " d varchar(10)\n" + ")\n" + "WITH (\n" + + " bloomfilter = 'ROW',\n" + " data_block_encoding = 'FAST_DIFF',\n" + " rowkeys = 'A,B,C',\n" + " salt_buckets = 10\n" + diff --git a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java index 69f2dd906bda..a61f8e260073 100644 --- a/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java +++ b/plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java @@ -386,8 +386,8 @@ public void testBinary() { // Not testing max length (2147483647) because it leads to 'Requested array size exceeds VM limit' SqlDataTypeTest.create() - .addRoundTrip("binary(1)", "NULL", VARBINARY, "X'00'") // NULL stored as zeros - .addRoundTrip("binary(10)", "DECODE('', 'HEX')", VARBINARY, "X'00000000000000000000'") // empty stored as zeros + .addRoundTrip("binary(1)", "NULL", VARBINARY, "CAST(NULL AS VARBINARY)") + .addRoundTrip("binary(10)", "DECODE('', 'HEX')", VARBINARY, "CAST(NULL AS VARBINARY)") .addRoundTrip("binary(5)", "DECODE('68656C6C6F', 'HEX')", VARBINARY, "to_utf8('hello')") .addRoundTrip("binary(26)", "DECODE('5069C4996B6E6120C582C4856B61207720E69DB1E4BAACE983BD', 'HEX')", VARBINARY, "to_utf8('Piękna łąka w 東京都')") .addRoundTrip("binary(16)", "DECODE('4261672066756C6C206F6620F09F92B0', 'HEX')", VARBINARY, "to_utf8('Bag full of 💰')") @@ -395,12 +395,6 @@ public void testBinary() .addRoundTrip("binary(6)", "DECODE('000000000000', 'HEX')", VARBINARY, "X'000000000000'") .addRoundTrip("integer primary key", "1", INTEGER, "1") .execute(getQueryRunner(), phoenixCreateAndInsert("tpch.test_binary")); - - // Verify 'IS NULL' doesn't get rows where the value is X'00...' padded in Phoenix - try (TestTable table = new TestTable(new PhoenixSqlExecutor(phoenixServer.getJdbcUrl()), "tpch.test_binary", "(null_binary binary(1), empty_binary binary(10), pk integer primary key)", ImmutableList.of("NULL, DECODE('', 'HEX'), 1"))) { - assertQueryReturnsEmptyResult(format("SELECT * FROM %s WHERE null_binary IS NULL", table.getName())); - assertQueryReturnsEmptyResult(format("SELECT * FROM %s WHERE empty_binary IS NULL", table.getName())); - } } @Test