rebase

apache · Mar 12, 2025 · b1b3490 · b1b3490
1 parent aad64cf
commit b1b3490
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/FileReader.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/FileReader.cpp
@@ -284,6 +284,14 @@ std::unique_ptr<NormalFileReader> createNormalFileReader(
         return input_format;
     };
 
+    if (file->getFileInfo().has_iceberg())
+        return iceberg::IcebergReader::create(file, to_read_header_, output_header_, createInputFormat);
+
+    auto input_format = createInputFormat(to_read_header_);
+
+    if (!input_format)
+        return nullptr;
+
     if (file->getFileInfo().other_const_metadata_columns_size())
     {
         String row_index_ids_encoded;
@@ -299,11 +307,7 @@ std::unique_ptr<NormalFileReader> createNormalFileReader(
             return delta::DeltaReader::create(file, to_read_header_, output_header_, input_format, row_index_ids_encoded, row_index_filter_type);
     }
 
-    if (file->getFileInfo().has_iceberg())
-        return iceberg::IcebergReader::create(file, to_read_header_, output_header_, createInputFormat);
-
-    auto input_format = createInputFormat(to_read_header_);
-    return input_format == nullptr ? nullptr : std::make_unique<NormalFileReader>(file, to_read_header_, output_header_, input_format);
+    return std::make_unique<NormalFileReader>(file, to_read_header_, output_header_, input_format);
 }
 }
 std::unique_ptr<BaseReader> BaseReader::create(

diff --git a/cpp-ch/local-engine/Storages/SubstraitSource/ParquetFormatFile.cpp b/cpp-ch/local-engine/Storages/SubstraitSource/ParquetFormatFile.cpp
@@ -18,8 +18,6 @@
 
 #if USE_PARQUET
 
-#include <memory>
-
 #include <Core/Settings.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <Formats/FormatFactory.h>
@@ -30,7 +28,6 @@
 #include <Processors/Formats/Impl/ParquetBlockInputFormat.h>
 #include <Storages/Parquet/VectorizedParquetRecordReader.h>
 #include <Storages/Parquet/VirtualColumnRowIndexReader.h>
-#include <Common/Exception.h>
 #include <Storages/SubstraitSource/Delta/DeltaParquetMeta.h>
 
 namespace DB