update ComplexFilterPushdown()

duckdb · Aug 21, 2024 · 8de8d0d · 8de8d0d
1 parent e0af7f6
commit 8de8d0d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/duckdb b/duckdb
diff --git a/src/functions/delta_scan.cpp b/src/functions/delta_scan.cpp
@@ -438,13 +438,15 @@ void DeltaSnapshot::InitializeFiles() {
     initialized = true;
 }
 
-unique_ptr<MultiFileList> DeltaSnapshot::ComplexFilterPushdown(ClientContext &context, const MultiFileReaderOptions &options, LogicalGet &get,
-                                               vector<unique_ptr<Expression>> &filters) {
+unique_ptr<MultiFileList> DeltaSnapshot::ComplexFilterPushdown(ClientContext &context,
+                                                               const MultiFileReaderOptions &options,
+                                                               MultiFilePushdownInfo &info,
+                                                               vector<unique_ptr<Expression>> &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<DeltaSnapshot>(context, paths[0]);

diff --git 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<LogicalType> &return_types, vector<string> &names);
     unique_ptr<MultiFileList> ComplexFilterPushdown(ClientContext &context,
-                                                            const MultiFileReaderOptions &options, LogicalGet &get,
-                                                            vector<unique_ptr<Expression>> &filters) override;
+	                                                const MultiFileReaderOptions &options,
+	                                                MultiFilePushdownInfo &info,
+	                                                vector<unique_ptr<Expression>> &filters) override;
     vector<string> GetAllFiles() override;
     FileExpandResult GetExpandResult() override;
     idx_t GetTotalFileCount() override;