npm - duckdb - Versions diffs - 0.8.2-dev4126.0 → 0.8.2-dev4203.0 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (497) hide show

package/src/duckdb/src/include/duckdb/planner/operator/logical_filter.hpp CHANGED Viewed

@@ -25,11 +25,9 @@ public:
 public:
 	vector<ColumnBinding> GetColumnBindings() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	bool SplitPredicates() {
 		return SplitPredicates(expressions);

package/src/duckdb/src/include/duckdb/planner/operator/logical_get.hpp CHANGED Viewed

@@ -63,16 +63,14 @@ public:
 	vector<ColumnBinding> GetColumnBindings() override;
 	idx_t EstimateCardinality(ClientContext &context) override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
 	vector<idx_t> GetTableIndex() const override;
 	//! Skips the serialization check in VerifyPlan
 	bool SupportSerialization() const override {
 		return function.verify_serialization;
 	}
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 protected:
 	void ResolveTypes() override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_insert.hpp CHANGED Viewed

@@ -60,11 +60,8 @@ public:
 	vector<column_t> source_columns;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 protected:
 	vector<ColumnBinding> GetColumnBindings() override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_join.hpp CHANGED Viewed

@@ -40,8 +40,6 @@ public:
 public:
 	vector<ColumnBinding> GetColumnBindings() override;
-	void Serialize(FieldWriter &writer) const override;
-	static void Deserialize(LogicalJoin &join, LogicalDeserializationState &state, FieldReader &reader);
 protected:
 	void ResolveTypes() override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_limit.hpp CHANGED Viewed

@@ -32,11 +32,8 @@ public:
 	vector<ColumnBinding> GetColumnBindings() override;
 	idx_t EstimateCardinality(ClientContext &context) override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 protected:
 	void ResolveTypes() override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_limit_percent.hpp CHANGED Viewed

@@ -37,11 +37,8 @@ public:
 		return children[0]->GetColumnBindings();
 	}
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	idx_t EstimateCardinality(ClientContext &context) override;
 protected:

package/src/duckdb/src/include/duckdb/planner/operator/logical_materialized_cte.hpp CHANGED Viewed

@@ -36,11 +36,9 @@ public:
 	vector<ColumnBinding> GetColumnBindings() override {
 		return children[1]->GetColumnBindings();
 	}
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	vector<idx_t> GetTableIndex() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_order.hpp CHANGED Viewed

@@ -29,11 +29,8 @@ public:
 public:
 	vector<ColumnBinding> GetColumnBindings() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	string ParamsToString() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_pivot.hpp CHANGED Viewed

@@ -29,11 +29,9 @@ public:
 public:
 	vector<ColumnBinding> GetColumnBindings() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	vector<idx_t> GetTableIndex() const override;
 	string GetName() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_positional_join.hpp CHANGED Viewed

@@ -25,10 +25,7 @@ public:
 public:
 	static unique_ptr<LogicalOperator> Create(unique_ptr<LogicalOperator> left, unique_ptr<LogicalOperator> right);
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/operator/logical_pragma.hpp CHANGED Viewed

@@ -31,8 +31,6 @@ public:
 	PragmaInfo info;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
 	idx_t EstimateCardinality(ClientContext &context) override;
 	//! Skips the serialization check in VerifyPlan
 	bool SupportSerialization() const override {

package/src/duckdb/src/include/duckdb/planner/operator/logical_prepare.hpp CHANGED Viewed

@@ -33,8 +33,6 @@ public:
 	shared_ptr<PreparedStatementData> prepared;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
 	idx_t EstimateCardinality(ClientContext &context) override;
 	//! Skips the serialization check in VerifyPlan
 	bool SupportSerialization() const override {

package/src/duckdb/src/include/duckdb/planner/operator/logical_projection.hpp CHANGED Viewed

@@ -24,10 +24,8 @@ public:
 public:
 	vector<ColumnBinding> GetColumnBindings() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	vector<idx_t> GetTableIndex() const override;
 	string GetName() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_recursive_cte.hpp CHANGED Viewed

@@ -37,11 +37,9 @@ public:
 	vector<ColumnBinding> GetColumnBindings() override {
 		return GenerateColumnBindings(table_index, column_count);
 	}
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	vector<idx_t> GetTableIndex() const override;
 	string GetName() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_reset.hpp CHANGED Viewed

@@ -28,11 +28,8 @@ public:
 	SetScope scope;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	idx_t EstimateCardinality(ClientContext &context) override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_sample.hpp CHANGED Viewed

@@ -28,11 +28,8 @@ public:
 	vector<ColumnBinding> GetColumnBindings() override;
 	idx_t EstimateCardinality(ClientContext &context) override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 protected:
 	void ResolveTypes() override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_set.hpp CHANGED Viewed

@@ -29,11 +29,8 @@ public:
 	SetScope scope;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	idx_t EstimateCardinality(ClientContext &context) override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_set_operation.hpp CHANGED Viewed

@@ -38,11 +38,8 @@ public:
 		return GenerateColumnBindings(table_index, column_count);
 	}
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	vector<idx_t> GetTableIndex() const override;
 	string GetName() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_show.hpp CHANGED Viewed

@@ -27,11 +27,8 @@ public:
 	vector<string> aliases;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 protected:
 	void ResolveTypes() override {

package/src/duckdb/src/include/duckdb/planner/operator/logical_simple.hpp CHANGED Viewed

@@ -26,11 +26,8 @@ public:
 	unique_ptr<ParseInfo> info;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	idx_t EstimateCardinality(ClientContext &context) override;
 protected:

package/src/duckdb/src/include/duckdb/planner/operator/logical_top_n.hpp CHANGED Viewed

@@ -33,11 +33,9 @@ public:
 	vector<ColumnBinding> GetColumnBindings() override {
 		return children[0]->GetColumnBindings();
 	}
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	idx_t EstimateCardinality(ClientContext &context) override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_unnest.hpp CHANGED Viewed

@@ -26,10 +26,8 @@ public:
 public:
 	vector<ColumnBinding> GetColumnBindings() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	vector<idx_t> GetTableIndex() const override;
 	string GetName() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_update.hpp CHANGED Viewed

@@ -31,10 +31,8 @@ public:
 	bool update_is_del_and_insert;
 public:
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	idx_t EstimateCardinality(ClientContext &context) override;
 	string GetName() const override;

package/src/duckdb/src/include/duckdb/planner/operator/logical_window.hpp CHANGED Viewed

@@ -27,11 +27,9 @@ public:
 public:
 	vector<ColumnBinding> GetColumnBindings() override;
-	void Serialize(FieldWriter &writer) const override;
-	static unique_ptr<LogicalOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
-	void FormatSerialize(FormatSerializer &serializer) const override;
-	static unique_ptr<LogicalOperator> FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const override;
+	static unique_ptr<LogicalOperator> Deserialize(Deserializer &deserializer);
 	vector<idx_t> GetTableIndex() const override;
 	string GetName() const override;

package/src/duckdb/src/include/duckdb/planner/operator_extension.hpp CHANGED Viewed

@@ -34,9 +34,7 @@ public:
 	shared_ptr<OperatorExtensionInfo> operator_info;
 	virtual std::string GetName() = 0;
-	virtual unique_ptr<LogicalExtensionOperator> Deserialize(LogicalDeserializationState &state,
-	                                                         FieldReader &reader) = 0;
-	virtual unique_ptr<LogicalExtensionOperator> FormatDeserialize(FormatDeserializer &deserializer) = 0;
+	virtual unique_ptr<LogicalExtensionOperator> Deserialize(Deserializer &deserializer) = 0;
 	virtual ~OperatorExtension() {
 	}

package/src/duckdb/src/include/duckdb/planner/parsed_data/bound_create_table_info.hpp CHANGED Viewed

@@ -49,11 +49,6 @@ struct BoundCreateTableInfo {
 	//! Indexes created by this table <Block_ID, Offset>
 	vector<BlockPointer> indexes;
-	//! Serializes a BoundCreateTableInfo to a stand-alone binary blob
-	void Serialize(Serializer &serializer) const;
-	//! Deserializes a blob back into a BoundCreateTableInfo
-	static unique_ptr<BoundCreateTableInfo> Deserialize(Deserializer &source, PlanDeserializationState &state);
 	CreateTableInfo &Base() {
 		D_ASSERT(base);
 		return (CreateTableInfo &)*base;

package/src/duckdb/src/include/duckdb/planner/table_filter.hpp CHANGED Viewed

@@ -15,8 +15,6 @@
 namespace duckdb {
 class BaseStatistics;
-class FieldWriter;
-class FieldReader;
 enum class TableFilterType : uint8_t {
 	CONSTANT_COMPARISON = 0, // constant comparison (e.g. =C, >C, >=C, <C, <=C)
@@ -44,12 +42,8 @@ public:
 		return filter_type != other.filter_type;
 	}
-	void Serialize(Serializer &serializer) const;
-	virtual void Serialize(FieldWriter &writer) const = 0;
-	static unique_ptr<TableFilter> Deserialize(Deserializer &source);
-	virtual void FormatSerialize(FormatSerializer &serializer) const;
-	static unique_ptr<TableFilter> FormatDeserialize(FormatDeserializer &deserializer);
+	virtual void Serialize(Serializer &serializer) const;
+	static unique_ptr<TableFilter> Deserialize(Deserializer &deserializer);
 public:
 	template <class TARGET>
@@ -102,10 +96,7 @@ public:
 	}
 	void Serialize(Serializer &serializer) const;
-	static unique_ptr<TableFilterSet> Deserialize(Deserializer &source);
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static TableFilterSet FormatDeserialize(FormatDeserializer &deserializer);
+	static TableFilterSet Deserialize(Deserializer &deserializer);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/planner/tableref/bound_pivotref.hpp CHANGED Viewed

@@ -26,8 +26,8 @@ struct BoundPivotInfo {
 	//! The set of aggregate functions that is being executed
 	vector<unique_ptr<Expression>> aggregates;
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static BoundPivotInfo FormatDeserialize(FormatDeserializer &deserializer);
+	void Serialize(Serializer &serializer) const;
+	static BoundPivotInfo Deserialize(Deserializer &deserializer);
 };
 class BoundPivotRef : public BoundTableRef {

package/src/duckdb/src/include/duckdb/storage/block.hpp CHANGED Viewed

@@ -14,8 +14,8 @@
 namespace duckdb {
-class FormatSerializer;
-class FormatDeserializer;
+class Serializer;
+class Deserializer;
 class Block : public FileBuffer {
 public:
@@ -38,6 +38,9 @@ struct BlockPointer {
 	bool IsValid() const {
 		return block_id != INVALID_BLOCK;
 	}
+	void Serialize(Serializer &serializer) const;
+	static BlockPointer Deserialize(Deserializer &source);
 };
 struct MetaBlockPointer {
@@ -55,8 +58,8 @@ struct MetaBlockPointer {
 	block_id_t GetBlockId();
 	uint32_t GetBlockIndex();
-	void FormatSerialize(FormatSerializer &serializer) const;
-	static MetaBlockPointer FormatDeserialize(FormatDeserializer &source);
+	void Serialize(Serializer &serializer) const;
+	static MetaBlockPointer Deserialize(Deserializer &source);
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/storage/checkpoint/row_group_writer.hpp CHANGED Viewed

@@ -30,7 +30,7 @@ public:
 	CompressionType GetColumnCompressionType(idx_t i);
-	virtual void WriteColumnDataPointers(ColumnCheckpointState &column_checkpoint_state) = 0;
+	virtual void WriteColumnDataPointers(ColumnCheckpointState &column_checkpoint_state, Serializer &serializer) = 0;
 	virtual MetadataWriter &GetPayloadWriter() = 0;
@@ -59,7 +59,8 @@ public:
 	MetadataWriter &table_data_writer;
 public:
-	virtual void WriteColumnDataPointers(ColumnCheckpointState &column_checkpoint_state) override;
+	virtual void WriteColumnDataPointers(ColumnCheckpointState &column_checkpoint_state,
+	                                     Serializer &serializer) override;
 	virtual MetadataWriter &GetPayloadWriter() override;
 };

package/src/duckdb/src/include/duckdb/storage/checkpoint/table_data_writer.hpp CHANGED Viewed

@@ -27,11 +27,12 @@ public:
 	virtual ~TableDataWriter();
 public:
-	void WriteTableData();
+	void WriteTableData(Serializer &metadata_serializer);
 	CompressionType GetColumnCompressionType(idx_t i);
-	virtual void FinalizeTable(TableStatistics &&global_stats, DataTableInfo *info) = 0;
+	virtual void FinalizeTable(TableStatistics &&global_stats, DataTableInfo *info,
+	                           Serializer &metadata_serializer) = 0;
 	virtual unique_ptr<RowGroupWriter> GetRowGroupWriter(RowGroup &row_group) = 0;
 	virtual void AddRowGroup(RowGroupPointer &&row_group_pointer, unique_ptr<RowGroupWriter> &&writer);
@@ -45,18 +46,17 @@ protected:
 class SingleFileTableDataWriter : public TableDataWriter {
 public:
 	SingleFileTableDataWriter(SingleFileCheckpointWriter &checkpoint_manager, TableCatalogEntry &table,
-	                          MetadataWriter &table_data_writer, MetadataWriter &meta_data_writer);
+	                          MetadataWriter &table_data_writer);
 public:
-	virtual void FinalizeTable(TableStatistics &&global_stats, DataTableInfo *info) override;
+	virtual void FinalizeTable(TableStatistics &&global_stats, DataTableInfo *info,
+	                           Serializer &metadata_serializer) override;
 	virtual unique_ptr<RowGroupWriter> GetRowGroupWriter(RowGroup &row_group) override;
 private:
 	SingleFileCheckpointWriter &checkpoint_manager;
 	// Writes the actual table data
 	MetadataWriter &table_data_writer;
-	// Writes the metadata of the table
-	MetadataWriter &meta_data_writer;
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/storage/checkpoint_manager.hpp CHANGED Viewed

@@ -38,14 +38,14 @@ public:
 	virtual unique_ptr<TableDataWriter> GetTableDataWriter(TableCatalogEntry &table) = 0;
 protected:
-	virtual void WriteSchema(SchemaCatalogEntry &schema);
-	virtual void WriteTable(TableCatalogEntry &table);
-	virtual void WriteView(ViewCatalogEntry &table);
-	virtual void WriteSequence(SequenceCatalogEntry &table);
-	virtual void WriteMacro(ScalarMacroCatalogEntry &table);
-	virtual void WriteTableMacro(TableMacroCatalogEntry &table);
-	virtual void WriteIndex(IndexCatalogEntry &index_catalog);
-	virtual void WriteType(TypeCatalogEntry &type);
+	virtual void WriteSchema(SchemaCatalogEntry &schema, Serializer &serializer);
+	virtual void WriteTable(TableCatalogEntry &table, Serializer &serializer);
+	virtual void WriteView(ViewCatalogEntry &table, Serializer &serializer);
+	virtual void WriteSequence(SequenceCatalogEntry &table, Serializer &serializer);
+	virtual void WriteMacro(ScalarMacroCatalogEntry &table, Serializer &serializer);
+	virtual void WriteTableMacro(TableMacroCatalogEntry &table, Serializer &serializer);
+	virtual void WriteIndex(IndexCatalogEntry &index_catalog, Serializer &serializer);
+	virtual void WriteType(TypeCatalogEntry &type, Serializer &serializer);
 };
 class CheckpointReader {
@@ -60,16 +60,16 @@ protected:
 protected:
 	virtual void LoadCheckpoint(ClientContext &context, MetadataReader &reader);
-	virtual void ReadSchema(ClientContext &context, MetadataReader &reader);
-	virtual void ReadTable(ClientContext &context, MetadataReader &reader);
-	virtual void ReadView(ClientContext &context, MetadataReader &reader);
-	virtual void ReadSequence(ClientContext &context, MetadataReader &reader);
-	virtual void ReadMacro(ClientContext &context, MetadataReader &reader);
-	virtual void ReadTableMacro(ClientContext &context, MetadataReader &reader);
-	virtual void ReadIndex(ClientContext &context, MetadataReader &reader);
-	virtual void ReadType(ClientContext &context, MetadataReader &reader);
-	virtual void ReadTableData(ClientContext &context, MetadataReader &reader, BoundCreateTableInfo &bound_info);
+	virtual void ReadSchema(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadTable(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadView(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadSequence(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadMacro(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadTableMacro(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadIndex(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadType(ClientContext &context, Deserializer &deserializer);
+	virtual void ReadTableData(ClientContext &context, Deserializer &deserializer, BoundCreateTableInfo &bound_info);
 };
 class SingleFileCheckpointReader final : public CheckpointReader {

package/src/duckdb/src/include/duckdb/storage/data_pointer.hpp CHANGED Viewed

@@ -17,6 +17,9 @@
 namespace duckdb {
+class Serializer;
+class Deserializer;
 struct DataPointer {
 	DataPointer(BaseStatistics stats) : statistics(std::move(stats)) {
 	}
@@ -27,6 +30,9 @@ struct DataPointer {
 	CompressionType compression_type;
 	//! Type-specific statistics of the segment
 	BaseStatistics statistics;
+	void Serialize(Serializer &serializer) const;
+	static DataPointer Deserialize(Deserializer &source);
 };
 struct RowGroupPointer {

package/src/duckdb/src/include/duckdb/storage/data_table.hpp CHANGED Viewed

@@ -175,7 +175,7 @@ public:
 	void SetDistinct(column_t column_id, unique_ptr<DistinctStatistics> distinct_stats);
 	//! Checkpoint the table to the specified table data writer
-	void Checkpoint(TableDataWriter &writer);
+	void Checkpoint(TableDataWriter &writer, Serializer &metadata_serializer);
 	void CommitDropTable();
 	void CommitDropColumn(idx_t index);

package/src/duckdb/src/include/duckdb/storage/metadata/metadata_manager.hpp CHANGED Viewed

@@ -9,7 +9,6 @@
 #pragma once
 #include "duckdb/common/common.hpp"
-#include "duckdb/common/serializer.hpp"
 #include "duckdb/storage/block.hpp"
 #include "duckdb/storage/block_manager.hpp"
 #include "duckdb/common/set.hpp"
@@ -23,8 +22,8 @@ struct MetadataBlock {
 	block_id_t block_id;
 	vector<uint8_t> free_blocks;
-	void Serialize(Serializer &serializer);
-	static MetadataBlock Deserialize(Deserializer &source);
+	void Write(WriteStream &sink);
+	static MetadataBlock Read(ReadStream &source);
 	idx_t FreeBlocksToInteger();
 	void FreeBlocksFromInteger(idx_t blocks);
@@ -68,8 +67,8 @@ public:
 	idx_t BlockCount();
-	void Serialize(Serializer &serializer);
-	void Deserialize(Deserializer &source);
+	void Write(WriteStream &sink);
+	void Read(ReadStream &source);
 protected:
 	BlockManager &block_manager;