prep for 10.4

duckdb · May 31, 2024 · 099ffa8 · 099ffa8
1 parent 90f9557
commit 099ffa8
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 973 deletions.
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -16,7 +16,7 @@ jobs:
     name: Build extension binaries
     uses: ./.github/workflows/_extension_distribution.yml # Overridden due to rust dependency during build
     with:
-      duckdb_version: v0.10.3
+      duckdb_version: 1f98600c2cf8722a6d2f2d805bb4af5e701319fc
       extension_name: delta
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64;linux_arm64'
 
@@ -27,6 +27,6 @@ jobs:
     secrets: inherit
     with:
       extension_name: delta
-      duckdb_version: v0.10.3
+      duckdb_version: 1f98600c2cf8722a6d2f2d805bb4af5e701319fc
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64;linux_arm64'
       deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,13 +11,7 @@ project(${TARGET_NAME})
 
 include_directories(src/include)
 
-# Need a few extra headers from duckdb for parquet reading
-include_directories(duckdb/extension/parquet/include)
-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/delta_utils.cpp

diff --git a/duckdb b/duckdb
diff --git a/src/delta_extension.cpp b/src/delta_extension.cpp
@@ -7,8 +7,6 @@
 #include "duckdb/common/exception.hpp"
 #include "duckdb/main/extension_util.hpp"
 
-#include "parquet_reader.hpp"
-
 namespace duckdb {
 
 static void LoadInternal(DatabaseInstance &instance) {

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"
@@ -577,10 +576,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