Refactor HudiPageSourceProvider#createPageSource

Moved creation of ParquetReaderOptions to the caller to ensure that the same options are used consistently
hashhar · May 25, 2023 · 4b17fcf · 4b17fcf
1 parent 677e45c
commit 4b17fcf
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSourceProvider.java b/plugin/trino-hudi/src/main/java/io/trino/plugin/hudi/HudiPageSourceProvider.java
@@ -162,7 +162,15 @@ public ConnectorPageSource createPageSource(
                 .collect(Collectors.toList());
         TrinoFileSystem fileSystem = fileSystemFactory.create(session);
         TrinoInputFile inputFile = fileSystem.newInputFile(Location.of(path), split.getFileSize());
-        ConnectorPageSource dataPageSource = createPageSource(session, regularColumns, split, inputFile, dataSourceStats, options, timeZone);
+        ConnectorPageSource dataPageSource = createPageSource(
+                session,
+                regularColumns,
+                split,
+                inputFile,
+                dataSourceStats,
+                options.withBatchColumnReaders(isParquetOptimizedReaderEnabled(session))
+                        .withBatchNestedColumnReaders(isParquetOptimizedNestedReaderEnabled(session)),
+                timeZone);
 
         return new HudiPageSource(
                 toPartitionName(split.getPartitionKeys()),
@@ -238,8 +246,7 @@ && predicateMatches(parquetPredicate, block, dataSource, descriptorsByPath, parq
                     finalDataSource,
                     timeZone,
                     newSimpleAggregatedMemoryContext(),
-                    options.withBatchColumnReaders(isParquetOptimizedReaderEnabled(session))
-                            .withBatchNestedColumnReaders(isParquetOptimizedNestedReaderEnabled(session)),
+                    options,
                     exception -> handleException(dataSourceId, exception),
                     Optional.of(parquetPredicate),
                     columnIndexes.build(),