Correctly support IN filters

Author: Mytherin

src/mysql_filter_pushdown.cpp

@@ -1,5 +1,7 @@
 #include "mysql_filter_pushdown.hpp"
 #include "mysql_utils.hpp"
+#include "duckdb/planner/filter/optional_filter.hpp"
+#include "duckdb/planner/filter/in_filter.hpp"
 
 namespace duckdb {
 
@@ -77,6 +79,21 @@ string MySQLFilterPushdown::TransformFilter(string &column_name, TableFilter &fi
 		auto operator_string = TransformComparison(constant_filter.comparison_type);
 		return StringUtil::Format("%s %s %s", column_name, operator_string, constant_string);
 	}
+	case TableFilterType::OPTIONAL_FILTER: {
+		auto &optional_filter = filter.Cast<OptionalFilter>();
+		return TransformFilter(column_name, *optional_filter.child_filter);
+	}
+	case TableFilterType::IN_FILTER: {
+		auto &in_filter = filter.Cast<InFilter>();
+		string in_list;
+		for(auto &val : in_filter.values) {
+			if (!in_list.empty()) {
+				in_list += ", ";
+			}
+			in_list += TransformConstant(val);
+		}
+		return column_name + " IN (" + in_list + ")";
+		}
 	default:
 		throw InternalException("Unsupported table filter type");
 	}

src/storage/mysql_execute_query.cpp

@@ -111,7 +111,29 @@ string ExtractFilters(PhysicalOperator &child, const string &statement) {
 		if (!table_scan.table_filters) {
 			return string();
 		}
-		throw NotImplementedException("Pushed down table filters not supported currently");
+		string result;
+		for(auto &entry : table_scan.table_filters->filters) {
+			auto column_index = entry.first;
+			auto &filter = entry.second;
+			string column_name;
+			if (column_index < table_scan.names.size()) {
+				const auto col_id = table_scan.column_ids[column_index].GetPrimaryIndex();
+				if (col_id == COLUMN_IDENTIFIER_ROW_ID) {
+					column_name = "rowid";
+				} else {
+					column_name = table_scan.names[col_id];
+				}
+			}
+			BoundReferenceExpression bound_ref(std::move(column_name), LogicalTypeId::INVALID, 0);
+			auto filter_expr = filter->ToExpression(bound_ref);
+			auto filter_str = filter_expr->ToString();
+			if (result.empty()) {
+				result = std::move(filter_str);
+			} else {
+				result += " AND " + filter_str;
+			}
+		}
+		return result;
 	} else {
 		throw NotImplementedException("Unsupported operator type %s in %s statement - only simple deletes "
 		                              "(e.g. %s "

test/sql/attach_filter_pushdown.test

@@ -63,7 +63,7 @@ SELECT COUNT(*) FROM s1.text_tbl WHERE v= '🦆'
 1
 
 # blob pushdown
-statement error
+query I
 SELECT COUNT(*) FROM s1.blob_tbl WHERE bl= BLOB '\x80'
 ----
-Unsupported
+1

test/sql/attach_types.test

@@ -78,4 +78,9 @@ SELECT ANY_VALUE(${column_name})=getvariable('minimum_value') FROM s.all_types W
 ----
 true
 
+query I
+SELECT ANY_VALUE(${column_name})=getvariable('minimum_value') FROM s.all_types WHERE ${column_name} IN (getvariable('minimum_value'), getvariable('minimum_value'))
+----
+true
+
 endloop