chore: Update vendored sources to duckdb/duckdb@a5e12fe

Merge pull request duckdb/duckdb#12681 from jeewonhh/jeewon/serializer-customdata
duckdb · Jun 26, 2024 · bdf579d · bdf579d
1 parent d8e767e
commit bdf579d
Show file tree

Hide file tree

Showing 6 changed files with 275 additions and 219 deletions.
diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp
@@ -1,5 +1,5 @@
 #ifndef DUCKDB_PATCH_VERSION
-#define DUCKDB_PATCH_VERSION "1-dev1916"
+#define DUCKDB_PATCH_VERSION "1-dev1922"
 #endif
 #ifndef DUCKDB_MINOR_VERSION
 #define DUCKDB_MINOR_VERSION 0
@@ -8,10 +8,10 @@
 #define DUCKDB_MAJOR_VERSION 1
 #endif
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "v1.0.1-dev1916"
+#define DUCKDB_VERSION "v1.0.1-dev1922"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "1c9b593eba"
+#define DUCKDB_SOURCE_ID "a5e12fee05"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

diff --git a/src/duckdb/src/include/duckdb/common/serializer/binary_serializer.hpp b/src/duckdb/src/include/duckdb/common/serializer/binary_serializer.hpp
@@ -8,10 +8,11 @@
 
 #pragma once
 
-#include "duckdb/common/serializer/serializer.hpp"
-#include "duckdb/common/serializer/write_stream.hpp"
 #include "duckdb/common/pair.hpp"
 #include "duckdb/common/serializer/encoding_util.hpp"
+#include "duckdb/common/serializer/serialization_data.hpp"
+#include "duckdb/common/serializer/serializer.hpp"
+#include "duckdb/common/serializer/write_stream.hpp"
 
 namespace duckdb {
 
@@ -110,6 +111,9 @@ class BinarySerializer : public Serializer {
 private:
 	vector<DebugState> debug_stack;
 	WriteStream &stream;
+
+protected:
+	duckdb::SerializationData data;
 };
 
 } // namespace duckdb
diff --git a/src/duckdb/src/include/duckdb/common/serializer/deserialization_data.hpp b/src/duckdb/src/include/duckdb/common/serializer/deserialization_data.hpp
diff --git a/src/duckdb/src/include/duckdb/common/serializer/deserializer.hpp b/src/duckdb/src/include/duckdb/common/serializer/deserializer.hpp
@@ -9,20 +9,20 @@
 #pragma once
 
 #include "duckdb/common/enum_util.hpp"
+#include "duckdb/common/serializer/serialization_data.hpp"
 #include "duckdb/common/serializer/serialization_traits.hpp"
-#include "duckdb/common/serializer/deserialization_data.hpp"
 #include "duckdb/common/types/string_type.hpp"
+#include "duckdb/common/uhugeint.hpp"
 #include "duckdb/common/unordered_map.hpp"
 #include "duckdb/common/unordered_set.hpp"
-#include "duckdb/common/uhugeint.hpp"
 #include "duckdb/execution/operator/csv_scanner/csv_reader_options.hpp"
 
 namespace duckdb {
 
 class Deserializer {
 protected:
 	bool deserialize_enum_from_string = false;
-	DeserializationData data;
+	SerializationData data;
 
 public:
 	virtual ~Deserializer() {
@@ -165,6 +165,14 @@ class Deserializer {
 		return data.Unset<T>();
 	}
 
+	SerializationData &GetSerializationData() {
+		return data;
+	}
+
+	void SetSerializationData(const SerializationData &other) {
+		data = other;
+	}
+
 	template <class FUNC>
 	void ReadList(const field_id_t field_id, const char *tag, FUNC func) {
 		OnPropertyBegin(field_id, tag);