This is an automated email from the ASF dual-hosted git repository. voonhous pushed a commit to tag rfc-105-pre-cleanup in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 2d5088f3d09ec4b41a05386f9fd1e5f3ef2b7c11 Author: voon <[email protected]> AuthorDate: Tue May 26 21:56:16 2026 +0800 fix(trino): port connector tests off removed Trino 481 APIs Two SPI removals we missed on the test side: - io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT and the io.trino.hdfs HdfsEnvironment / HdfsContext pair were dropped. The only consumer was TpchHudiTablesInitializer, which used HdfsEnvironment. getConfiguration(context, path) to mint a Hadoop Configuration for table init -- a plain new Configuration() is sufficient for the test's local filesystem layout. - io.trino.filesystem.cache.DefaultCachingHostAddressProvider was deleted alongside the CachingHostAddressProvider interface we already removed from production sources. TestHudiPartitionInfoLoader and TestHudiSplitFactory still passed it to the 3-arg HudiSplitFactory constructor / 6-arg createHudiSplits factory; drop the parameter to match. --- .../plugin/hudi/partition/TestHudiPartitionInfoLoader.java | 3 +-- .../java/io/trino/plugin/hudi/split/TestHudiSplitFactory.java | 4 +--- .../trino/plugin/hudi/testing/TpchHudiTablesInitializer.java | 11 +++-------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/partition/TestHudiPartitionInfoLoader.java b/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/partition/TestHudiPartitionInfoLoader.java index 78f565dcaa2d..765777cf855d 100644 --- a/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/partition/TestHudiPartitionInfoLoader.java +++ b/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/partition/TestHudiPartitionInfoLoader.java @@ -16,7 +16,6 @@ package io.trino.plugin.hudi.partition; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; import io.trino.filesystem.Location; -import io.trino.filesystem.cache.DefaultCachingHostAddressProvider; import io.trino.metastore.Partition; import io.trino.metastore.StorageFormat; import io.trino.plugin.hive.HiveColumnHandle; @@ -167,7 +166,7 @@ public class TestHudiPartitionInfoLoader "", "101"); HudiSplitWeightProvider weightProvider = new SizeBasedSplitWeightProvider(0.05, DataSize.of(128, MEGABYTE)); - return new HudiSplitFactory(tableHandle, weightProvider, DataSize.of(128, MEGABYTE), new DefaultCachingHostAddressProvider()); + return new HudiSplitFactory(tableHandle, weightProvider, DataSize.of(128, MEGABYTE)); } private static HiveHudiPartitionInfo createTestPartition(String partitionPath) diff --git a/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/split/TestHudiSplitFactory.java b/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/split/TestHudiSplitFactory.java index 266a5397af41..01a4208e9758 100644 --- a/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/split/TestHudiSplitFactory.java +++ b/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/split/TestHudiSplitFactory.java @@ -15,7 +15,6 @@ package io.trino.plugin.hudi.split; import com.google.common.collect.ImmutableList; import io.airlift.units.DataSize; -import io.trino.filesystem.cache.DefaultCachingHostAddressProvider; import io.trino.plugin.hive.HivePartitionKey; import io.trino.plugin.hudi.HudiSplit; import io.trino.plugin.hudi.HudiTableHandle; @@ -152,8 +151,7 @@ public class TestHudiSplitFactory FileSlice fileSlice = createFileSlice(baseFileSize, logFileSize); List<HudiSplit> splits = HudiSplitFactory.createHudiSplits( - tableHandle, PARTITION_KEYS, fileSlice, COMMIT_TIME, weightProvider, targetSplitSize, - new DefaultCachingHostAddressProvider()); + tableHandle, PARTITION_KEYS, fileSlice, COMMIT_TIME, weightProvider, targetSplitSize); assertThat(splits).hasSize(expectedSplitInfo.size()); diff --git a/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java b/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java index 640980c41936..47902849e0d9 100644 --- a/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java +++ b/hudi-trino-plugin/src/test/java/io/trino/plugin/hudi/testing/TpchHudiTablesInitializer.java @@ -19,8 +19,6 @@ import io.airlift.log.Logger; import io.trino.filesystem.Location; import io.trino.filesystem.TrinoFileSystem; import io.trino.filesystem.TrinoFileSystemFactory; -import io.trino.hdfs.HdfsContext; -import io.trino.hdfs.HdfsEnvironment; import io.trino.metastore.Column; import io.trino.metastore.HiveMetastore; import io.trino.metastore.HiveMetastoreFactory; @@ -88,9 +86,7 @@ import static io.trino.metastore.HiveType.HIVE_DOUBLE; import static io.trino.metastore.HiveType.HIVE_INT; import static io.trino.metastore.HiveType.HIVE_LONG; import static io.trino.metastore.HiveType.HIVE_STRING; -import static io.trino.plugin.hive.HiveTestUtils.HDFS_ENVIRONMENT; import static io.trino.plugin.hive.TableType.EXTERNAL_TABLE; -import static io.trino.testing.TestingConnectorSession.SESSION; import static java.lang.String.format; import static java.nio.file.Files.createTempDirectory; import static java.util.Collections.unmodifiableList; @@ -110,7 +106,6 @@ public class TpchHudiTablesInitializer new Column("_hoodie_record_key", HIVE_STRING, Optional.empty(), Map.of()), new Column("_hoodie_partition_path", HIVE_STRING, Optional.empty(), Map.of()), new Column("_hoodie_file_name", HIVE_STRING, Optional.empty(), Map.of())); - private static final HdfsContext CONTEXT = new HdfsContext(SESSION); private final List<TpchTable<?>> tpchTables; @@ -154,7 +149,7 @@ public class TpchHudiTablesInitializer public void load(TpchTable<?> tpchTables, QueryRunner queryRunner, java.nio.file.Path tableDirectory) { - try (HoodieJavaWriteClient<HoodieAvroPayload> writeClient = createWriteClient(tpchTables, HDFS_ENVIRONMENT, new Path(tableDirectory.toUri()))) { + try (HoodieJavaWriteClient<HoodieAvroPayload> writeClient = createWriteClient(tpchTables, new Path(tableDirectory.toUri()))) { RecordConverter recordConverter = createRecordConverter(tpchTables); @Language("SQL") String sql = generateScanSql(TPCH_TINY, tpchTables); @@ -209,10 +204,10 @@ public class TpchHudiTablesInitializer .build(); } - private static HoodieJavaWriteClient<HoodieAvroPayload> createWriteClient(TpchTable<?> table, HdfsEnvironment hdfsEnvironment, Path tablePath) + private static HoodieJavaWriteClient<HoodieAvroPayload> createWriteClient(TpchTable<?> table, Path tablePath) { Schema schema = createAvroSchema(table); - Configuration conf = hdfsEnvironment.getConfiguration(CONTEXT, tablePath); + Configuration conf = new Configuration(); try { HoodieTableMetaClient.newTableBuilder()
