duckdb 0.8.2-dev4126.0 → 0.8.2-dev4203.0

package/src/duckdb/src/include/duckdb/parser/expression/window_expression.hpp

@@ -74,10 +74,8 @@ public:
 
 	unique_ptr<ParsedExpression> Copy() const override;
 
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<ParsedExpression> Deserialize(ExpressionType type, FieldReader &source);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParsedExpression> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<ParsedExpression> Deserialize(Deserializer &deserializer);
 
 	static ExpressionType WindowToExpressionType(string &fun_name);
 

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_info.hpp

@@ -62,12 +62,9 @@ public:
 public:
 	virtual CatalogType GetCatalogType() const = 0;
 	virtual unique_ptr<AlterInfo> Copy() const = 0;
-	void Serialize(Serializer &serializer) const;
-	virtual void Serialize(FieldWriter &writer) const = 0;
-	static unique_ptr<AlterInfo> Deserialize(Deserializer &source);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 
 	virtual string GetColumnName() const {
 		return "";

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_scalar_function_info.hpp

@@ -27,8 +27,6 @@ struct AlterScalarFunctionInfo : public AlterInfo {
 
 public:
 	CatalogType GetCatalogType() const override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader);
 };
 
 //===--------------------------------------------------------------------===//

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_table_function_info.hpp

@@ -27,8 +27,6 @@ struct AlterTableFunctionInfo : public AlterInfo {
 
 public:
 	CatalogType GetCatalogType() const override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader);
 };
 
 //===--------------------------------------------------------------------===//

package/src/duckdb/src/include/duckdb/parser/parsed_data/alter_table_info.hpp

@@ -35,7 +35,6 @@ struct ChangeOwnershipInfo : public AlterInfo {
 public:
 	CatalogType GetCatalogType() const override;
 	unique_ptr<AlterInfo> Copy() const override;
-	void Serialize(FieldWriter &writer) const override;
 };
 
 //===--------------------------------------------------------------------===//
@@ -62,12 +61,9 @@ struct AlterTableInfo : public AlterInfo {
 
 public:
 	CatalogType GetCatalogType() const override;
-	void Serialize(FieldWriter &writer) const override;
-	virtual void SerializeAlterTable(FieldWriter &writer) const = 0;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterInfo> Deserialize(Deserializer &deserializer);
 
 protected:
 	AlterTableInfo(AlterTableType type);
@@ -87,11 +83,9 @@ struct RenameColumnInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	RenameColumnInfo();
@@ -109,11 +103,9 @@ struct RenameTableInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	RenameTableInfo();
@@ -133,11 +125,9 @@ struct AddColumnInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	explicit AddColumnInfo(ColumnDefinition new_column);
@@ -159,10 +149,8 @@ struct RemoveColumnInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 	string GetColumnName() const override {
 		return removed_column;
 	}
@@ -188,10 +176,8 @@ struct ChangeColumnTypeInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 	string GetColumnName() const override {
 		return column_name;
 	};
@@ -214,10 +200,8 @@ struct SetDefaultInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	SetDefaultInfo();
@@ -240,10 +224,8 @@ struct AlterForeignKeyInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	AlterForeignKeyInfo();
@@ -261,10 +243,8 @@ struct SetNotNullInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	SetNotNullInfo();
@@ -282,10 +262,8 @@ struct DropNotNullInfo : public AlterTableInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterTable(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterTableInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterTableInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	DropNotNullInfo();
@@ -304,11 +282,8 @@ struct AlterViewInfo : public AlterInfo {
 
 public:
 	CatalogType GetCatalogType() const override;
-	void Serialize(FieldWriter &writer) const override;
-	virtual void SerializeAlterView(FieldWriter &writer) const = 0;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterInfo> Deserialize(Deserializer &deserializer);
 
 protected:
 	AlterViewInfo(AlterViewType type);
@@ -326,10 +301,8 @@ struct RenameViewInfo : public AlterViewInfo {
 
 public:
 	unique_ptr<AlterInfo> Copy() const override;
-	void SerializeAlterView(FieldWriter &writer) const override;
-	static unique_ptr<AlterInfo> Deserialize(FieldReader &reader, AlterEntryData data);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<AlterViewInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<AlterViewInfo> Deserialize(Deserializer &deserializer);
 
 private:
 	RenameViewInfo();

package/src/duckdb/src/include/duckdb/parser/parsed_data/attach_info.hpp

@@ -33,11 +33,8 @@ public:
 public:
 	unique_ptr<AttachInfo> Copy() const;
 
-	void Serialize(Serializer &serializer) const;
+	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/copy_info.hpp

@@ -55,8 +55,8 @@ public:
 		return result;
 	}
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_collation_info.hpp

@@ -28,9 +28,6 @@ struct CreateCollationInfo : public CreateInfo {
 	//! speeds up processing.
 	bool not_required_for_equality;
 
-protected:
-	void SerializeInternal(Serializer &) const override;
-
 public:
 	unique_ptr<CreateInfo> Copy() const override;
 };

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_copy_function_info.hpp

@@ -21,9 +21,6 @@ struct CreateCopyFunctionInfo : public CreateInfo {
 	//! The table function
 	CopyFunction function;
 
-protected:
-	void SerializeInternal(Serializer &) const override;
-
 public:
 	unique_ptr<CreateInfo> Copy() const override;
 };

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_function_info.hpp

@@ -28,11 +28,6 @@ struct CreateFunctionInfo : public CreateInfo {
 	vector<string> parameter_names;
 	//! The example (if any)
 	string example;
-
-protected:
-	void SerializeInternal(Serializer &serializer) const override {
-		serializer.WriteString(name);
-	}
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_index_info.hpp

@@ -45,16 +45,11 @@ struct CreateIndexInfo : public CreateInfo {
 	//! Options values (WITH ...)
 	case_insensitive_map_t<Value> options;
 
-protected:
-	void SerializeInternal(Serializer &serializer) const override;
-
 public:
 	DUCKDB_API unique_ptr<CreateInfo> Copy() const override;
 
-	static unique_ptr<CreateIndexInfo> Deserialize(Deserializer &deserializer);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_info.hpp

@@ -9,9 +9,7 @@
 #pragma once
 
 #include "duckdb/common/enums/catalog_type.hpp"
-#include "duckdb/common/field_writer.hpp"
 #include "duckdb/parser/parsed_data/parse_info.hpp"
-#include "duckdb/planner/plan_serialization.hpp"
 
 namespace duckdb {
 struct AlterInfo;
@@ -54,19 +52,9 @@ public:
 	//! The SQL string of the CREATE statement
 	string sql;
 
-protected:
-	virtual void SerializeInternal(Serializer &) const = 0;
-
-	void DeserializeBase(Deserializer &deserializer);
-
 public:
-	void Serialize(Serializer &serializer) const;
-
+	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
-	static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer, PlanDeserializationState &state);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
 
 	virtual unique_ptr<CreateInfo> Copy() const = 0;
 

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_macro_info.hpp

@@ -14,7 +14,6 @@
 namespace duckdb {
 
 struct CreateMacroInfo : public CreateFunctionInfo {
-	CreateMacroInfo();
 	CreateMacroInfo(CatalogType type);
 
 	unique_ptr<MacroFunction> function;
@@ -22,13 +21,8 @@ struct CreateMacroInfo : public CreateFunctionInfo {
 public:
 	unique_ptr<CreateInfo> Copy() const override;
 
-	DUCKDB_API static unique_ptr<CreateMacroInfo> Deserialize(Deserializer &deserializer);
-
-	DUCKDB_API void FormatSerialize(FormatSerializer &serializer) const override;
-	DUCKDB_API static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
-
-protected:
-	void SerializeInternal(Serializer &) const override;
+	DUCKDB_API void Serialize(Serializer &serializer) const override;
+	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_schema_info.hpp

@@ -23,18 +23,8 @@ public:
 		return std::move(result);
 	}
 
-	static unique_ptr<CreateSchemaInfo> Deserialize(Deserializer &deserializer) {
-		auto result = make_uniq<CreateSchemaInfo>();
-		result->DeserializeBase(deserializer);
-		return result;
-	}
-
-	DUCKDB_API void FormatSerialize(FormatSerializer &serializer) const override;
-	DUCKDB_API static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
-
-protected:
-	void SerializeInternal(Serializer &) const override {
-	}
+	DUCKDB_API void Serialize(Serializer &serializer) const override;
+	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_sequence_info.hpp

@@ -50,13 +50,8 @@ public:
 	unique_ptr<CreateInfo> Copy() const override;
 
 public:
-	DUCKDB_API static unique_ptr<CreateSequenceInfo> Deserialize(Deserializer &deserializer);
-
-	DUCKDB_API void FormatSerialize(FormatSerializer &serializer) const override;
-	DUCKDB_API static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
-
-protected:
-	void SerializeInternal(Serializer &) const override;
+	DUCKDB_API void Serialize(Serializer &serializer) const override;
+	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_table_info.hpp

@@ -33,16 +33,11 @@ struct CreateTableInfo : public CreateInfo {
 	//! CREATE TABLE from QUERY
 	unique_ptr<SelectStatement> query;
 
-protected:
-	void SerializeInternal(Serializer &serializer) const override;
-
 public:
-	DUCKDB_API static unique_ptr<CreateTableInfo> Deserialize(Deserializer &deserializer);
-
 	DUCKDB_API unique_ptr<CreateInfo> Copy() const override;
 
-	DUCKDB_API void FormatSerialize(FormatSerializer &serializer) const override;
-	DUCKDB_API static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	DUCKDB_API void Serialize(Serializer &serializer) const override;
+	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_type_info.hpp

@@ -29,13 +29,8 @@ struct CreateTypeInfo : public CreateInfo {
 public:
 	unique_ptr<CreateInfo> Copy() const override;
 
-	DUCKDB_API static unique_ptr<CreateTypeInfo> Deserialize(Deserializer &deserializer);
-
-	DUCKDB_API void FormatSerialize(FormatSerializer &serializer) const override;
-	DUCKDB_API static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
-
-protected:
-	void SerializeInternal(Serializer &) const override;
+	DUCKDB_API void Serialize(Serializer &serializer) const override;
+	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/create_view_info.hpp

@@ -31,18 +31,13 @@ struct CreateViewInfo : public CreateInfo {
 public:
 	unique_ptr<CreateInfo> Copy() const override;
 
-	static unique_ptr<CreateViewInfo> Deserialize(Deserializer &deserializer);
-
 	//! Gets a bound CreateViewInfo object from a SELECT statement and a view name, schema name, etc
 	DUCKDB_API static unique_ptr<CreateViewInfo> FromSelect(ClientContext &context, unique_ptr<CreateViewInfo> info);
 	//! Gets a bound CreateViewInfo object from a CREATE VIEW statement
 	DUCKDB_API static unique_ptr<CreateViewInfo> FromCreateView(ClientContext &context, const string &sql);
 
-	DUCKDB_API void FormatSerialize(FormatSerializer &serializer) const override;
-	DUCKDB_API static unique_ptr<CreateInfo> FormatDeserialize(FormatDeserializer &deserializer);
-
-protected:
-	void SerializeInternal(Serializer &serializer) const override;
+	DUCKDB_API void Serialize(Serializer &serializer) const override;
+	DUCKDB_API static unique_ptr<CreateInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/detach_info.hpp

@@ -27,10 +27,8 @@ public:
 
 public:
 	unique_ptr<DetachInfo> Copy() const;
-	void Serialize(Serializer &serializer) const;
-	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/drop_info.hpp

@@ -9,8 +9,8 @@
 #pragma once
 
 #include "duckdb/common/enums/catalog_type.hpp"
-#include "duckdb/common/field_writer.hpp"
 #include "duckdb/parser/parsed_data/parse_info.hpp"
+#include "duckdb/common/enums/on_entry_not_found.hpp"
 
 namespace duckdb {
 
@@ -40,11 +40,8 @@ public:
 public:
 	unique_ptr<DropInfo> Copy() const;
 
-	void Serialize(Serializer &serializer) const;
+	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/load_info.hpp

@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "duckdb/common/field_writer.hpp"
 #include "duckdb/parser/parsed_data/parse_info.hpp"
 
 namespace duckdb {
@@ -36,26 +35,8 @@ public:
 		return result;
 	}
 
-	void Serialize(Serializer &serializer) const {
-		FieldWriter writer(serializer);
-		writer.WriteString(filename);
-		writer.WriteString(repository);
-		writer.WriteField<LoadType>(load_type);
-		writer.Finalize();
-	}
-
-	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer) {
-		FieldReader reader(deserializer);
-		auto load_info = make_uniq<LoadInfo>();
-		load_info->filename = reader.ReadRequired<string>();
-		load_info->repository = reader.ReadRequired<string>();
-		load_info->load_type = reader.ReadRequired<LoadType>();
-		reader.Finalize();
-		return std::move(load_info);
-	}
-
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/parse_info.hpp

@@ -48,8 +48,8 @@ public:
 		return reinterpret_cast<const TARGET &>(*this);
 	}
 
-	virtual void FormatSerialize(FormatSerializer &serializer) const;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	virtual void Serialize(Serializer &serializer) const;
+	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/pragma_info.hpp

@@ -41,8 +41,8 @@ public:
 		return result;
 	}
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/sample_options.hpp

@@ -27,11 +27,9 @@ struct SampleOptions {
 	int64_t seed = -1;
 
 	unique_ptr<SampleOptions> Copy();
-	void Serialize(Serializer &serializer);
-	static unique_ptr<SampleOptions> Deserialize(Deserializer &source);
 	static bool Equals(SampleOptions *a, SampleOptions *b);
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static unique_ptr<SampleOptions> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const;
+	static unique_ptr<SampleOptions> Deserialize(Deserializer &deserializer);
 };
 
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/parser/parsed_data/transaction_info.hpp

@@ -25,12 +25,9 @@ public:
 	TransactionType type;
 
 public:
-	void Serialize(Serializer &serializer) const;
+	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
 
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
-
 private:
 	TransactionInfo();
 };

package/src/duckdb/src/include/duckdb/parser/parsed_data/vacuum_info.hpp

@@ -15,8 +15,8 @@
 #include "duckdb/common/optional_ptr.hpp"
 
 namespace duckdb {
-class FormatSerializer;
-class FormatDeserializer;
+class Serializer;
+class Deserializer;
 
 struct VacuumOptions {
 	VacuumOptions() : vacuum(false), analyze(false) {
@@ -25,8 +25,8 @@ struct VacuumOptions {
 	bool vacuum;
 	bool analyze;
 
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static VacuumOptions FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const;
+	static VacuumOptions Deserialize(Deserializer &deserializer);
 };
 
 struct VacuumInfo : public ParseInfo {
@@ -48,10 +48,8 @@ public:
 public:
 	unique_ptr<VacuumInfo> Copy();
 
-	void Serialize(Serializer &serializer) const;
+	void Serialize(Serializer &serializer) const override;
 	static unique_ptr<ParseInfo> Deserialize(Deserializer &deserializer);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<ParseInfo> FormatDeserialize(FormatDeserializer &deserializer);
 };
 
 } // namespace duckdb

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

@@ -15,12 +15,8 @@
 #include "duckdb/parser/expression_util.hpp"
 
 namespace duckdb {
-class Serializer;
 class Deserializer;
-class FieldWriter;
-class FieldReader;
-class FormatDeserializer;
-class FormatSerializer;
+class Serializer;
 
 //!  The ParsedExpression class is a base class that can represent any expression
 //!  part of a SQL statement.
@@ -53,17 +49,8 @@ public:
 	//! Create a copy of this expression
 	virtual unique_ptr<ParsedExpression> Copy() const = 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<ParsedExpression> Deserialize(Deserializer &source);
-
-	virtual void FormatSerialize(FormatSerializer &serializer) const;
-	static unique_ptr<ParsedExpression> FormatDeserialize(FormatDeserializer &deserializer);
+	virtual void Serialize(Serializer &serializer) const;
+	static unique_ptr<ParsedExpression> Deserialize(Deserializer &deserializer);
 
 	static bool Equals(const unique_ptr<ParsedExpression> &left, const unique_ptr<ParsedExpression> &right);
 	static bool ListEquals(const vector<unique_ptr<ParsedExpression>> &left,