remove parquet override

samansmink · May 29, 2024 · 870b32e · 870b32e
1 parent b0acfc0
commit 870b32e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 963 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,7 +17,6 @@ include_directories(duckdb/third_party/parquet)
 include_directories(duckdb/third_party/thrift)
 
 set(EXTENSION_SOURCES
-        src/inlined_parquet/parquet_extension.cpp
         src/delta_extension.cpp
         src/delta_functions.cpp
         src/functions/delta_scan.cpp)

diff --git a/src/functions/delta_scan.cpp b/src/functions/delta_scan.cpp
@@ -1,6 +1,5 @@
 #include "duckdb/function/table_function.hpp"
 
-#include "parquet_override.hpp"
 #include "delta_functions.hpp"
 #include "functions/delta_scan.hpp"
 #include "duckdb/optimizer/filter_combiner.hpp"
@@ -595,10 +594,8 @@ TableFunctionSet DeltaFunctions::GetDeltaScanFunction(DatabaseInstance &instance
     // The delta_scan function is constructed by grabbing the parquet scan from the Catalog, then injecting the
     // DeltaMultiFileReader into it to create a Delta-based multi file read
 
-    // FIXME revert when all required changes are applied upstream
-//    auto &parquet_scan = ExtensionUtil::GetTableFunction(instance, "parquet_scan");
-//    auto parquet_scan_copy = parquet_scan.functions;
-    auto parquet_scan_copy = ParquetOverrideFunction::GetFunctionSet();
+    auto &parquet_scan = ExtensionUtil::GetTableFunction(instance, "parquet_scan");
+    auto parquet_scan_copy = parquet_scan.functions;
 
     for (auto &function : parquet_scan_copy.functions) {
         // Register the MultiFileReader as the driver for reads

diff --git a/src/include/parquet_override.hpp b/src/include/parquet_override.hpp
diff --git a/src/inlined_parquet/README.md b/src/inlined_parquet/README.md