From 8de8d0db33dceeefa7b2532c0bb1724668050808 Mon Sep 17 00:00:00 2001 From: stephaniewang Date: Wed, 21 Aug 2024 14:28:18 -0400 Subject: [PATCH] update ComplexFilterPushdown() --- duckdb | 2 +- src/functions/delta_scan.cpp | 8 +++++--- src/include/functions/delta_scan.hpp | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/duckdb b/duckdb index 7b8efd3..10ea483 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 7b8efd3d0fab38ec9dae467861a317af3f1d7f3e +Subproject commit 10ea4832d3f1850685a65369e0b19c27ec81e638 diff --git a/src/functions/delta_scan.cpp b/src/functions/delta_scan.cpp index abd400a..5c8330f 100644 --- a/src/functions/delta_scan.cpp +++ b/src/functions/delta_scan.cpp @@ -438,13 +438,15 @@ void DeltaSnapshot::InitializeFiles() { initialized = true; } -unique_ptr DeltaSnapshot::ComplexFilterPushdown(ClientContext &context, const MultiFileReaderOptions &options, LogicalGet &get, - vector> &filters) { +unique_ptr DeltaSnapshot::ComplexFilterPushdown(ClientContext &context, + const MultiFileReaderOptions &options, + MultiFilePushdownInfo &info, + vector> &filters) { FilterCombiner combiner(context); for (const auto &filter : filters) { combiner.AddFilter(filter->Copy()); } - auto filterstmp = combiner.GenerateTableScanFilters(get.column_ids); + auto filterstmp = combiner.GenerateTableScanFilters(info.column_ids); // TODO: can/should we figure out if this filtered anything? auto filtered_list = make_uniq(context, paths[0]); diff --git a/src/include/functions/delta_scan.hpp b/src/include/functions/delta_scan.hpp index b4c3c76..c5a9989 100644 --- a/src/include/functions/delta_scan.hpp +++ b/src/include/functions/delta_scan.hpp @@ -43,8 +43,9 @@ struct DeltaSnapshot : public MultiFileList { public: void Bind(vector &return_types, vector &names); unique_ptr ComplexFilterPushdown(ClientContext &context, - const MultiFileReaderOptions &options, LogicalGet &get, - vector> &filters) override; + const MultiFileReaderOptions &options, + MultiFilePushdownInfo &info, + vector> &filters) override; vector GetAllFiles() override; FileExpandResult GetExpandResult() override; idx_t GetTotalFileCount() override;