Fix main

Author: evertlammerts

src/duckdb_py/arrow/arrow_array_stream.cpp

@@ -43,7 +43,7 @@ py::object PythonTableArrowArrayStreamFactory::ProduceScanner(py::object &arrow_
 	auto &filter_to_col = parameters.projected_columns.filter_to_col;
 	py::list projection_list = py::cast(column_list);
 
-	bool has_filter = filters && !filters->filters.empty();
+	bool has_filter = filters && filters->HasFilters();
 	py::dict kwargs;
 	if (!column_list.empty()) {
 		kwargs["columns"] = projection_list;
@@ -74,7 +74,7 @@ unique_ptr<ArrowArrayStreamWrapper> PythonTableArrowArrayStreamFactory::Produce(
 		bool filters_pushed = false;
 
 		// Translate DuckDB filters to Polars expressions and push into the lazy plan
-		if (filters && !filters->filters.empty()) {
+		if (filters && filters->HasFilters()) {
 			try {
 				auto filter_expr = PolarsFilterPushdown::TransformFilter(
 				    *filters, parameters.projected_columns.projection_map, parameters.projected_columns.filter_to_col,

src/duckdb_py/arrow/polars_filter_pushdown.cpp

@@ -12,7 +12,7 @@
 
 namespace duckdb {
 
-static py::object TransformFilterRecursive(TableFilter &filter, py::object col_expr,
+static py::object TransformFilterRecursive(const TableFilter &filter, py::object col_expr,
                                            const ClientProperties &client_properties) {
 	auto &import_cache = *DuckDBPyConnection::ImportCache();
 
@@ -137,15 +137,14 @@ py::object PolarsFilterPushdown::TransformFilter(const TableFilterSet &filter_co
                                                  const unordered_map<idx_t, idx_t> &filter_to_col,
                                                  const ClientProperties &client_properties) {
 	auto &import_cache = *DuckDBPyConnection::ImportCache();
-	auto &filters_map = filter_collection.filters;
 
 	py::object expression = py::none();
-	for (auto &it : filters_map) {
-		auto column_idx = it.first;
+	for (auto &entry : filter_collection) {
+		auto column_idx = entry.ColumnIndex();
 		auto &column_name = columns[column_idx];
 		auto col_expr = import_cache.polars.col()(column_name);
 
-		auto child_expression = TransformFilterRecursive(*it.second, col_expr, client_properties);
+		auto child_expression = TransformFilterRecursive(entry.Filter(), col_expr, client_properties);
 		if (child_expression.is(py::none())) {
 			continue;
 		}

src/duckdb_py/arrow/pyarrow_filter_pushdown.cpp

@@ -309,11 +309,10 @@ py::object PyArrowFilterPushdown::TransformFilter(TableFilterSet &filter_collect
                                                   unordered_map<idx_t, string> &columns,
                                                   unordered_map<idx_t, idx_t> filter_to_col,
                                                   const ClientProperties &config, const ArrowTableSchema &arrow_table) {
-	auto &filters_map = filter_collection.filters;
 
 	py::object expression = py::none();
-	for (auto &it : filters_map) {
-		auto column_idx = it.first;
+	for (auto &entry : filter_collection) {
+		auto column_idx = entry.ColumnIndex();
 		auto &column_name = columns[column_idx];
 
 		vector<string> column_ref;
@@ -322,7 +321,8 @@ py::object PyArrowFilterPushdown::TransformFilter(TableFilterSet &filter_collect
 		D_ASSERT(columns.find(column_idx) != columns.end());
 
 		auto &arrow_type = arrow_table.GetColumns().at(filter_to_col.at(column_idx));
-		py::object child_expression = TransformFilterRecursive(*it.second, column_ref, config.time_zone, *arrow_type);
+		py::object child_expression =
+		    TransformFilterRecursive(entry.Filter(), column_ref, config.time_zone, *arrow_type);
 		if (child_expression.is(py::none())) {
 			continue;
 		} else if (expression.is(py::none())) {

src/duckdb_py/include/duckdb_python/arrow/polars_filter_pushdown.hpp

@@ -8,8 +8,7 @@
 
 #pragma once
 
-#include "duckdb/common/unordered_map.hpp"
-#include "duckdb/planner/table_filter.hpp"
+#include "duckdb/planner/table_filter_set.hpp"
 #include "duckdb/main/client_properties.hpp"
 #include "duckdb_python/pybind11/pybind_wrapper.hpp"
 

src/duckdb_py/include/duckdb_python/arrow/pyarrow_filter_pushdown.hpp

@@ -8,10 +8,8 @@
 
 #pragma once
 
-#include "duckdb/common/arrow/arrow_wrapper.hpp"
 #include "duckdb/function/table/arrow/arrow_duck_schema.hpp"
-#include "duckdb/common/unordered_map.hpp"
-#include "duckdb/planner/table_filter.hpp"
+#include "duckdb/planner/table_filter_set.hpp"
 #include "duckdb/main/client_properties.hpp"
 #include "duckdb_python/pybind11/pybind_wrapper.hpp"