Add test table and a test with metadata enabled

Author: codope

Diff for: plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiSessionProperties.java

@@ -41,8 +41,8 @@
 public class HudiSessionProperties
         implements SessionPropertiesProvider
 {
+    static final String METADATA_TABLE_ENABLED = "metadata_enabled";
     private static final String COLUMNS_TO_HIDE = "columns_to_hide";
-    private static final String METADATA_TABLE_ENABLED = "metadata_enabled";
     private static final String USE_PARQUET_COLUMN_NAMES = "use_parquet_column_names";
     private static final String PARQUET_SMALL_FILE_THRESHOLD = "parquet_small_file_threshold";
     private static final String PARQUET_VECTORIZED_DECODING_ENABLED = "parquet_vectorized_decoding_enabled";

Diff for: plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/TestHudiSmokeTest.java

@@ -28,6 +28,7 @@
 
 import static io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer.TestingTable.HUDI_COW_PT_TBL;
 import static io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer.TestingTable.HUDI_NON_PART_COW;
+import static io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer.TestingTable.HUDI_STOCK_TICKS_MOR;
 import static io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer.TestingTable.STOCK_TICKS_COW;
 import static io.trino.plugin.hudi.testing.ResourceHudiTablesInitializer.TestingTable.STOCK_TICKS_MOR;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -134,12 +135,25 @@ public void testMetaColumns()
                 "VALUES ('719c3273-2805-4124-b1ac-e980dada85bf-0_0-27-1215_20220906063435640.parquet'), ('4a3fcb9b-65eb-4f6e-acf9-7b0764bb4dd1-0_0-70-2444_20220906063456550.parquet')");
     }
 
+    @Test
+    public void testReadPartitionedMORTableWithMetadata()
+    {
+        getQueryRunner().execute(getSession(), "SET SESSION hudi.metadata_enabled=true");
+        assertQuery("SELECT symbol, max(ts) FROM " + HUDI_STOCK_TICKS_MOR + " GROUP BY symbol HAVING symbol = 'GOOG'",
+                "SELECT * FROM VALUES ('GOOG', '2018-08-31 10:59:00')");
+
+        assertQuery("SELECT date, count(1) FROM " + HUDI_STOCK_TICKS_MOR + " GROUP BY date",
+                "SELECT * FROM VALUES ('2018-08-31', '99')");
+    }
+
     @Test
     public void testPathColumn()
             throws Exception
     {
         String path = (String) computeScalar("SELECT \"$path\" FROM " + HUDI_COW_PT_TBL + " WHERE id = 1");
         assertThat(toInputFile(path).exists()).isTrue();
+        path = (String) computeScalar("SELECT \"$path\" FROM " + HUDI_STOCK_TICKS_MOR + " WHERE volume = 6794");
+        assertThat(toInputFile(path).exists()).isTrue();
     }
 
     @Test

Diff for: plugin/trino-hudi/src/test/java/io/trino/plugin/hudi/testing/ResourceHudiTablesInitializer.java

@@ -167,6 +167,7 @@ public enum TestingTable
         HUDI_COW_PT_TBL(multiPartitionRegularColumns(), multiPartitionColumns(), multiPartitions()),
         STOCK_TICKS_COW(stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
         STOCK_TICKS_MOR(stockTicksRegularColumns(), stockTicksPartitionColumns(), stockTicksPartitions()),
+        HUDI_STOCK_TICKS_MOR(metadataStockTicksRegularColumns(), metadataStockTicksPartitionColumns(), metadataStockTicksPartitions()),
         /**/;
 
         private static final List<Column> HUDI_META_COLUMNS = ImmutableList.of(
@@ -176,6 +177,32 @@ public enum TestingTable
                 new Column("_hoodie_partition_path", HIVE_STRING, Optional.empty(), Map.of()),
                 new Column("_hoodie_file_name", HIVE_STRING, Optional.empty(), Map.of()));
 
+        private static List<Column> metadataStockTicksRegularColumns()
+        {
+            return ImmutableList.of(
+                    column("volume", HIVE_LONG),
+                    column("ts", HIVE_STRING),
+                    column("symbol", HIVE_STRING),
+                    column("year", HIVE_INT),
+                    column("month", HIVE_STRING),
+                    column("high", HIVE_DOUBLE),
+                    column("low", HIVE_DOUBLE),
+                    column("key", HIVE_STRING),
+                    column("close", HIVE_DOUBLE),
+                    column("open", HIVE_DOUBLE),
+                    column("day", HIVE_STRING));
+        }
+
+        private static List<Column> metadataStockTicksPartitionColumns()
+        {
+            return ImmutableList.of(column("date", HIVE_STRING));
+        }
+
+        private static Map<String, String> metadataStockTicksPartitions()
+        {
+            return ImmutableMap.of("date=2018-08-31", "2018/08/31");
+        }
+
         private final List<Column> regularColumns;
         private final List<Column> partitionColumns;
         private final Map<String, String> partitions;

Diff for: plugin/trino-hudi/src/test/resources/hudi-testing-data/hudi_stock_ticks_mor/.hoodie/.hoodie.properties.crc

@@ -0,0 +1,29 @@
+#Updated at 2025-01-06T01:29:42.850Z
+#Sun Jan 05 17:29:42 PST 2025
+hoodie.table.timeline.timezone=LOCAL
+hoodie.table.version=8
+hoodie.database.name=
+hoodie.table.initial.version=8
+hoodie.datasource.write.hive_style_partitioning=false
+hoodie.table.metadata.partitions.inflight=
+hoodie.table.checksum=1806126834
+hoodie.table.keygenerator.type=SIMPLE
+hoodie.partition.metafile.use.base.format=false
+hoodie.archivelog.folder=history
+hoodie.table.cdc.enabled=false
+hoodie.table.name=hudi_stock_ticks_mor
+hoodie.record.merge.strategy.id=eeb8d96f-b1e4-49fd-bbf8-28ac514178e5
+hoodie.timeline.history.path=history
+hoodie.compaction.payload.class=org.apache.hudi.common.model.DefaultHoodieRecordPayload
+hoodie.populate.meta.fields=true
+hoodie.table.type=MERGE_ON_READ
+hoodie.datasource.write.partitionpath.urlencode=false
+hoodie.table.base.file.format=PARQUET
+hoodie.datasource.write.drop.partition.columns=false
+hoodie.table.metadata.partitions=files
+hoodie.timeline.layout.version=2
+hoodie.table.multiple.base.file.formats.enable=false
+hoodie.record.merge.mode=EVENT_TIME_ORDERING
+hoodie.table.recordkey.fields=key
+hoodie.table.partition.fields=date
+hoodie.timeline.path=timeline

Diff for: plugin/trino-hudi/src/test/resources/hudi-testing-data/hudi_stock_ticks_mor/.hoodie/hoodie.properties

@@ -0,0 +1,19 @@
+#Properties saved on 2025-01-06T01:29:41.549Z
+#Sun Jan 05 17:29:41 PST 2025
+hoodie.table.initial.version=8
+hoodie.datasource.write.drop.partition.columns=false
+hoodie.table.type=MERGE_ON_READ
+hoodie.archivelog.folder=history
+hoodie.populate.meta.fields=false
+hoodie.compaction.payload.class=org.apache.hudi.metadata.HoodieMetadataPayload
+hoodie.timeline.path=timeline
+hoodie.timeline.layout.version=2
+hoodie.table.version=8
+hoodie.record.merge.strategy.id=00000000-0000-0000-0000-000000000000
+hoodie.record.merge.mode=CUSTOM
+hoodie.table.base.file.format=HFILE
+hoodie.table.recordkey.fields=key
+hoodie.table.keygenerator.type=HOODIE_TABLE_METADATA
+hoodie.table.name=hudi_stock_ticks_mor_metadata
+hoodie.timeline.history.path=history
+hoodie.table.checksum=100423886

Diff for: plugin/trino-hudi/src/test/resources/hudi-testing-data/hudi_stock_ticks_mor/.hoodie/metadata/.hoodie/.hoodie.properties.crc

@@ -0,0 +1,4 @@
+#partition metadata
+#Sun Jan 05 17:29:42 PST 2025
+commitTime=00000000000000000
+partitionDepth=1

Diff for: plugin/trino-hudi/src/test/resources/hudi-testing-data/hudi_stock_ticks_mor/.hoodie/metadata/.hoodie/hoodie.properties

@@ -0,0 +1,4 @@
+#partition metadata
+#Sun Jan 05 17:29:43 PST 2025
+commitTime=20250105172941176
+partitionDepth=3