duckdb 0.8.2-dev4142.0 → 0.8.2-dev4314.0

package/src/duckdb/src/include/duckdb/parser/tableref/pivotref.hpp

@@ -22,12 +22,10 @@ struct PivotColumnEntry {
 	string alias;
 
 	bool Equals(const PivotColumnEntry &other) const;
-	void Serialize(Serializer &serializer) const;
 	PivotColumnEntry Copy() const;
-	static PivotColumnEntry Deserialize(Deserializer &source);
 
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static PivotColumnEntry FormatDeserialize(FormatDeserializer &source);
+	void Serialize(Serializer &serializer) const;
+	static PivotColumnEntry Deserialize(Deserializer &source);
 };
 
 struct PivotValueElement {
@@ -49,12 +47,10 @@ struct PivotColumn {
 
 	string ToString() const;
 	bool Equals(const PivotColumn &other) const;
-	void Serialize(Serializer &serializer) const;
 	PivotColumn Copy() const;
-	static PivotColumn Deserialize(Deserializer &source);
 
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static PivotColumn FormatDeserialize(FormatDeserializer &source);
+	void Serialize(Serializer &serializer) const;
+	static PivotColumn Deserialize(Deserializer &source);
 };
 
 //! Represents a PIVOT or UNPIVOT expression
@@ -93,12 +89,8 @@ public:
 
 	unique_ptr<TableRef> Copy() override;
 
-	//! Serializes a blob into a PivotRef
-	void Serialize(FieldWriter &serializer) const override;
 	//! Deserializes a blob back into a PivotRef
-	static unique_ptr<TableRef> Deserialize(FieldReader &source);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableRef> FormatDeserialize(FormatDeserializer &source);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableRef> Deserialize(Deserializer &source);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/tableref/subqueryref.hpp

@@ -34,12 +34,8 @@ public:
 
 	unique_ptr<TableRef> Copy() override;
 
-	//! Serializes a blob into a SubqueryRef
-	void Serialize(FieldWriter &serializer) const override;
 	//! Deserializes a blob back into a SubqueryRef
-	static unique_ptr<TableRef> Deserialize(FieldReader &source);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableRef> FormatDeserialize(FormatDeserializer &source);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableRef> Deserialize(Deserializer &source);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/tableref/table_function_ref.hpp

@@ -39,12 +39,8 @@ public:
 
 	unique_ptr<TableRef> Copy() override;
 
-	//! Serializes a blob into a BaseTableRef
-	void Serialize(FieldWriter &serializer) const override;
 	//! Deserializes a blob back into a BaseTableRef
-	static unique_ptr<TableRef> Deserialize(FieldReader &source);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableRef> FormatDeserialize(FormatDeserializer &source);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableRef> Deserialize(Deserializer &source);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/tableref.hpp

@@ -13,8 +13,6 @@
 #include "duckdb/parser/parsed_data/sample_options.hpp"
 
 namespace duckdb {
-class Deserializer;
-class Serializer;
 
 //! Represents a generic expression that returns a table.
 class TableRef {
@@ -46,17 +44,11 @@ public:
 
 	virtual unique_ptr<TableRef> Copy() = 0;
 
-	//! Serializes a TableRef to a stand-alone binary blob
-	DUCKDB_API void Serialize(Serializer &serializer) const;
-	//! Serializes a TableRef to a stand-alone binary blob
-	DUCKDB_API virtual void Serialize(FieldWriter &writer) const = 0;
-	//! Deserializes a blob back into a TableRef
-	DUCKDB_API static unique_ptr<TableRef> Deserialize(Deserializer &source);
 	//! Copy the properties of this table ref to the target
 	void CopyProperties(TableRef &target) const;
 
-	virtual void FormatSerialize(FormatSerializer &serializer) const;
-	static unique_ptr<TableRef> FormatDeserialize(FormatDeserializer &deserializer);
+	virtual void Serialize(Serializer &serializer) const;
+	static unique_ptr<TableRef> Deserialize(Deserializer &deserializer);
 
 public:
 	template <class TARGET>

package/src/duckdb/src/include/duckdb/parser/transformer.hpp

@@ -24,6 +24,7 @@
 #include "nodes/primnodes.hpp"
 #include "pg_definitions.hpp"
 #include "duckdb/parser/expression/parameter_expression.hpp"
+#include "duckdb/common/enums/on_entry_not_found.hpp"
 
 namespace duckdb {
 

package/src/duckdb/src/include/duckdb/planner/bound_constraint.hpp

@@ -10,7 +10,6 @@
 
 #include "duckdb/common/common.hpp"
 #include "duckdb/parser/constraint.hpp"
-#include "duckdb/common/serializer.hpp"
 #include "duckdb/common/exception.hpp"
 
 namespace duckdb {

package/src/duckdb/src/include/duckdb/planner/bound_result_modifier.hpp

@@ -62,10 +62,7 @@ public:
 	string ToString() const;
 
 	void Serialize(Serializer &serializer) const;
-	static BoundOrderByNode Deserialize(Deserializer &source, PlanDeserializationState &state);
-
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static BoundOrderByNode FormatDeserialize(FormatDeserializer &deserializer);
+	static BoundOrderByNode Deserialize(Deserializer &deserializer);
 };
 
 class BoundLimitModifier : public BoundResultModifier {
@@ -100,10 +97,7 @@ public:
 	static bool Equals(const unique_ptr<BoundOrderModifier> &left, const unique_ptr<BoundOrderModifier> &right);
 
 	void Serialize(Serializer &serializer) const;
-	static unique_ptr<BoundOrderModifier> Deserialize(Deserializer &source, PlanDeserializationState &state);
-
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static unique_ptr<BoundOrderModifier> FormatDeserialize(FormatDeserializer &deserializer);
+	static unique_ptr<BoundOrderModifier> Deserialize(Deserializer &deserializer);
 };
 
 enum class DistinctType : uint8_t { DISTINCT = 0, DISTINCT_ON = 1 };

package/src/duckdb/src/include/duckdb/planner/column_binding.hpp

@@ -14,8 +14,8 @@
 #include <functional>
 
 namespace duckdb {
-class FormatSerializer;
-class FormatDeserializer;
+class Serializer;
+class Deserializer;
 
 struct ColumnBinding {
 	idx_t table_index;
@@ -39,8 +39,8 @@ struct ColumnBinding {
 		return !(*this == rhs);
 	}
 
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static ColumnBinding FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const;
+	static ColumnBinding Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_aggregate_expression.hpp

@@ -55,10 +55,8 @@ public:
 	hash_t Hash() const override;
 	bool Equals(const BaseExpression &other) const override;
 	unique_ptr<Expression> Copy() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_between_expression.hpp

@@ -32,11 +32,9 @@ public:
 	bool Equals(const BaseExpression &other) const override;
 
 	unique_ptr<Expression> Copy() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 
 public:
 	ExpressionType LowerComparisonType() {

package/src/duckdb/src/include/duckdb/planner/expression/bound_case_expression.hpp

@@ -17,10 +17,7 @@ struct BoundCaseCheck {
 	unique_ptr<Expression> then_expr;
 
 	void Serialize(Serializer &serializer) const;
-	static BoundCaseCheck Deserialize(Deserializer &source, PlanDeserializationState &state);
-
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static BoundCaseCheck FormatDeserialize(FormatDeserializer &deserializer);
+	static BoundCaseCheck Deserialize(Deserializer &deserializer);
 };
 
 class BoundCaseExpression : public Expression {
@@ -42,10 +39,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_cast_expression.hpp

@@ -50,11 +50,8 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 
 private:
 	BoundCastExpression(ClientContext &context, unique_ptr<Expression> child, LogicalType target_type);

package/src/duckdb/src/include/duckdb/planner/expression/bound_columnref_expression.hpp

@@ -13,9 +13,6 @@
 
 namespace duckdb {
 
-class FieldReader;
-class FieldWriter;
-
 //! A BoundColumnRef expression represents a ColumnRef expression that was bound to an actual table and column index. It
 //! is not yet executable, however. The ColumnBindingResolver transforms the BoundColumnRefExpressions into
 //! BoundExpressions, which refer to indexes into the physical chunks that pass through the executor.
@@ -49,10 +46,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_comparison_expression.hpp

@@ -28,11 +28,9 @@ public:
 	bool Equals(const BaseExpression &other) const override;
 
 	unique_ptr<Expression> Copy() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 
 public:
 	static LogicalType BindComparison(LogicalType left_type, LogicalType right_type);

package/src/duckdb/src/include/duckdb/planner/expression/bound_conjunction_expression.hpp

@@ -31,10 +31,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_constant_expression.hpp

@@ -30,10 +30,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_default_expression.hpp

@@ -37,10 +37,7 @@ public:
 		return make_uniq<BoundDefaultExpression>(return_type);
 	}
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_function_expression.hpp

@@ -44,11 +44,8 @@ public:
 	unique_ptr<Expression> Copy() override;
 	void Verify() const override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_lambda_expression.hpp

@@ -32,9 +32,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_lambdaref_expression.hpp

@@ -13,9 +13,6 @@
 
 namespace duckdb {
 
-class FieldReader;
-class FieldWriter;
-
 //! A BoundLambdaRef expression represents a LambdaRef expression that was bound to an lambda parameter
 //! in the lambda bindings vector. When capturing lambdas the BoundLambdaRef becomes a
 //! BoundReferenceExpresssion, indexing the corresponding lambda parameter in the lambda bindings vector,
@@ -51,10 +48,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_operator_expression.hpp

@@ -28,10 +28,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_parameter_data.hpp

@@ -10,7 +10,6 @@
 
 #include "duckdb/common/types/value.hpp"
 #include "duckdb/planner/bound_parameter_map.hpp"
-#include "duckdb/common/field_writer.hpp"
 #include "duckdb/common/case_insensitive_map.hpp"
 
 namespace duckdb {
@@ -37,24 +36,8 @@ public:
 		return value;
 	}
 
-	void Serialize(Serializer &serializer) const {
-		FieldWriter writer(serializer);
-		value.Serialize(writer.GetSerializer());
-		writer.WriteSerializable(return_type);
-		writer.Finalize();
-	}
-
-	static shared_ptr<BoundParameterData> Deserialize(Deserializer &source) {
-		FieldReader reader(source);
-		auto value = Value::Deserialize(reader.GetSource());
-		auto result = make_shared<BoundParameterData>(std::move(value));
-		result->return_type = reader.ReadRequiredSerializable<LogicalType, LogicalType>();
-		reader.Finalize();
-		return result;
-	}
-
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static shared_ptr<BoundParameterData> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const;
+	static shared_ptr<BoundParameterData> Deserialize(Deserializer &deserializer);
 };
 
 struct BoundParameterMap {

package/src/duckdb/src/include/duckdb/planner/expression/bound_parameter_expression.hpp

@@ -40,11 +40,8 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 
 private:
 	BoundParameterExpression(bound_parameter_map_t &global_parameter_set, string identifier, LogicalType return_type,

package/src/duckdb/src/include/duckdb/planner/expression/bound_reference_expression.hpp

@@ -39,10 +39,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_subquery_expression.hpp

@@ -60,8 +60,5 @@ public:
 	unique_ptr<Expression> Copy() override;
 
 	bool PropagatesNullValues() const override;
-
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_unnest_expression.hpp

@@ -31,10 +31,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression/bound_window_expression.hpp

@@ -65,10 +65,7 @@ public:
 
 	unique_ptr<Expression> Copy() override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<Expression> Deserialize(ExpressionDeserializationState &state, FieldReader &reader);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/expression.hpp

@@ -10,12 +10,9 @@
 
 #include "duckdb/parser/base_expression.hpp"
 #include "duckdb/common/types.hpp"
-#include "duckdb/planner/plan_serialization.hpp"
 
 namespace duckdb {
 class BaseStatistics;
-class FieldWriter;
-class FieldReader;
 class ClientContext;
 
 //!  The Expression class represents a bound Expression with a return type
@@ -55,17 +52,8 @@ public:
 	//! Create a copy of this expression
 	virtual unique_ptr<Expression> Copy() = 0;
 
-	//! Serializes an Expression to a stand-alone binary blob
-	void Serialize(Serializer &serializer) const;
-	//! Serializes an Expression to a stand-alone binary blob
-	virtual void Serialize(FieldWriter &writer) const = 0;
-
-	//! Deserializes a blob back into an Expression [CAN THROW:
-	//! SerializationException]
-	static unique_ptr<Expression> Deserialize(Deserializer &source, PlanDeserializationState &state);
-
-	virtual void FormatSerialize(FormatSerializer &serializer) const;
-	static unique_ptr<Expression> FormatDeserialize(FormatDeserializer &deserializer);
+	virtual void Serialize(Serializer &serializer) const;
+	static unique_ptr<Expression> Deserialize(Deserializer &deserializer);
 
 protected:
 	//! Copy base Expression properties from another expression to this one,

package/src/duckdb/src/include/duckdb/planner/filter/conjunction_filter.hpp

@@ -43,10 +43,8 @@ public:
 	FilterPropagateResult CheckStatistics(BaseStatistics &stats) override;
 	string ToString(const string &column_name) override;
 	bool Equals(const TableFilter &other) const override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<TableFilter> Deserialize(FieldReader &source);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableFilter> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableFilter> Deserialize(Deserializer &deserializer);
 };
 
 class ConjunctionAndFilter : public ConjunctionFilter {
@@ -60,10 +58,8 @@ public:
 	FilterPropagateResult CheckStatistics(BaseStatistics &stats) override;
 	string ToString(const string &column_name) override;
 	bool Equals(const TableFilter &other) const override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<TableFilter> Deserialize(FieldReader &source);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableFilter> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableFilter> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/filter/constant_filter.hpp

@@ -30,10 +30,8 @@ public:
 	FilterPropagateResult CheckStatistics(BaseStatistics &stats) override;
 	string ToString(const string &column_name) override;
 	bool Equals(const TableFilter &other) const override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<TableFilter> Deserialize(FieldReader &source);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableFilter> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableFilter> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/filter/null_filter.hpp

@@ -22,10 +22,8 @@ public:
 public:
 	FilterPropagateResult CheckStatistics(BaseStatistics &stats) override;
 	string ToString(const string &column_name) override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<TableFilter> Deserialize(FieldReader &source);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableFilter> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableFilter> Deserialize(Deserializer &deserializer);
 };
 
 class IsNotNullFilter : public TableFilter {
@@ -38,10 +36,8 @@ public:
 public:
 	FilterPropagateResult CheckStatistics(BaseStatistics &stats) override;
 	string ToString(const string &column_name) override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<TableFilter> Deserialize(FieldReader &source);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<TableFilter> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<TableFilter> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/joinside.hpp

@@ -24,13 +24,8 @@ public:
 	static unique_ptr<Expression> CreateExpression(JoinCondition cond);
 	static unique_ptr<Expression> CreateExpression(vector<JoinCondition> conditions);
 
-	//! Serializes a JoinCondition to a stand-alone binary blob
 	void Serialize(Serializer &serializer) const;
-	//! Deserializes a blob back into a JoinCondition
-	static JoinCondition Deserialize(Deserializer &source, PlanDeserializationState &state);
-
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static JoinCondition FormatDeserialize(FormatDeserializer &deserializer);
+	static JoinCondition Deserialize(Deserializer &deserializer);
 
 public:
 	unique_ptr<Expression> left;