switch to DuckDB main

.github/workflows/MainDistributionPipeline.yml

@@ -16,17 +16,17 @@ 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: v1.0.0
  extension_name: delta
  exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_rtools;windows_amd64;linux_arm64'
 
  duckdb-stable-deploy:
  name: Deploy extension binaries
  needs: duckdb-stable-build
- uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v0.10.3
+ uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.0.0
  secrets: inherit
  with:
  extension_name: delta
- duckdb_version: v0.10.3
+ duckdb_version: v1.0.0
  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' }}

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

README.md

@@ -12,7 +12,7 @@ Support for the [other](https://duckdb.org/docs/extensions/working_with_extensio
 work-in-progress
 
 # How to use
-**NOTE: this extension requires the latest stable version of DuckDB, v0.10.3.**
+**NOTE: this extension requires the DuckDB v0.10.3 or higher**
 
 This extension is distributed as a binary extension. To use it, simply use one of its functions from DuckDB and the extension will be autoloaded:
 ```SQL

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) {

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