Support unpartitioned tables in Kudu

trinodb · Jan 10, 2025 · cd0ac2f · cd0ac2f
1 parent bdd4503
commit cd0ac2f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/KuduTableProperties.java b/plugin/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/KuduTableProperties.java
@@ -41,6 +41,7 @@
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static io.trino.plugin.base.util.JsonUtils.parseJson;
+import static io.trino.plugin.kudu.properties.RangePartitionDefinition.EMPTY_RANGE_PARTITION;
 import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR;
 import static io.trino.spi.session.PropertyMetadata.integerProperty;
 import static io.trino.spi.session.PropertyMetadata.stringProperty;
@@ -158,6 +159,10 @@ else if (!hashColumns2.isEmpty()) {
             design.setRange(new RangePartitionDefinition(rangeColumns));
         }
 
+        if (!design.hasPartitions()) {
+            design.setRange(EMPTY_RANGE_PARTITION);
+        }
+
         return design;
     }
 
@@ -228,6 +233,11 @@ public static Map<String, Object> toMap(KuduTable table)
                 properties.put(PARTITION_BY_RANGE_COLUMNS, partitionDesign.getRange().columns());
             }
 
+            if (!partitionDesign.hasPartitions()) {
+                properties.put(PARTITION_BY_HASH_COLUMNS, ImmutableList.of());
+                properties.put(PARTITION_BY_RANGE_COLUMNS, ImmutableList.of());
+            }
+
             String partitionRangesValue = mapper.writeValueAsString(rangePartitionList);
             properties.put(RANGE_PARTITIONS, partitionRangesValue);
 

diff --git a/...in/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/RangePartitionDefinition.java b/...in/trino-kudu/src/main/java/io/trino/plugin/kudu/properties/RangePartitionDefinition.java
@@ -21,6 +21,8 @@
 
 public record RangePartitionDefinition(List<String> columns)
 {
+    public static final RangePartitionDefinition EMPTY_RANGE_PARTITION = new RangePartitionDefinition(ImmutableList.of());
+
     public RangePartitionDefinition
     {
         columns = ImmutableList.copyOf(requireNonNull(columns, "columns is null"));

diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduConnectorTest.java
@@ -94,6 +94,29 @@ public static String createKuduTableForWrites(String createTable)
                 format("WITH (partition_by_hash_columns = ARRAY['%s'], partition_by_hash_buckets = 2)", column);
     }
 
+    @Test
+    public void testUnPartitionedTable()
+    {
+        String tableName = "test_unpartitioned_table" + randomNameSuffix();
+        // success create the table without partition keys
+        assertUpdate("CREATE TABLE " + tableName + " (id int WITH (primary_key=true), val varchar)");
+
+        assertQuery("SELECT COUNT(*) FROM " + tableName, "VALUES 0");
+        assertUpdate("INSERT INTO " + tableName + " VALUES (1, 'hello'), (2, 'world')", 2);
+        assertQuery("SELECT COUNT(*) FROM " + tableName, "VALUES 2");
+
+        assertUpdate("DELETE FROM " + tableName + " WHERE id = 1", 1);
+        assertQuery("SELECT * FROM " + tableName, "VALUES (2, 'world')");
+
+        String sqlStatement = (String) computeScalar("SHOW CREATE TABLE " + tableName);
+        String tableProperties = sqlStatement.split("\\)\\s*WITH\\s*\\(")[1];
+        // empty partition keys
+        assertTableProperty(tableProperties, "partition_by_hash_columns", Pattern.quote("ARRAY[]"));
+        assertTableProperty(tableProperties, "partition_by_range_columns", Pattern.quote("ARRAY[]"));
+
+        assertUpdate("DROP TABLE " + tableName);
+    }
+
     @Test
     @Override
     public void testCreateSchema()
@@ -300,7 +323,7 @@ public void testAddNotNullColumnToEmptyTable()
     {
         // TODO: Enable this test
         assertThatThrownBy(super::testAddNotNullColumnToEmptyTable)
-                .hasMessage("Table partitioning must be specified using setRangePartitionColumns or addHashPartitions");
+                .hasMessage("must specify at least one key column");
         abort("TODO");
     }
 
@@ -750,7 +773,7 @@ public void testWrittenStats()
     public void testVarcharCastToDateInPredicate()
     {
         assertThatThrownBy(super::testVarcharCastToDateInPredicate)
-                .hasStackTraceContaining("Table partitioning must be specified using setRangePartitionColumns or addHashPartitions");
+                .hasStackTraceContaining("must specify at least one key column");
 
         abort("TODO: implement the test for Kudu");
     }