duckdb 0.4.1-dev2127.0 → 0.4.1-dev2142.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.4.1-dev2127.0",
+  "version": "0.4.1-dev2142.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -15357,6 +15357,7 @@ namespace duckdb {
 //===--------------------------------------------------------------------===//
 FieldWriter::FieldWriter(Serializer &serializer_p)
     : serializer(serializer_p), buffer(make_unique<BufferedSerializer>()), field_count(0), finalized(false) {
+	buffer->SetVersion(serializer.GetVersion());
 }
 
 FieldWriter::~FieldWriter() {
@@ -15396,6 +15397,7 @@ void FieldWriter::Finalize() {
 // Field Deserializer
 //===--------------------------------------------------------------------===//
 FieldDeserializer::FieldDeserializer(Deserializer &root) : root(root), remaining_data(idx_t(-1)) {
+	SetVersion(root.GetVersion());
 }
 
 void FieldDeserializer::ReadData(data_ptr_t buffer, idx_t read_size) {
@@ -34956,6 +34958,7 @@ BufferedDeserializer::BufferedDeserializer(data_ptr_t ptr, idx_t data_size) : pt
 
 BufferedDeserializer::BufferedDeserializer(BufferedSerializer &serializer)
     : BufferedDeserializer(serializer.data, serializer.maximum_size) {
+	SetVersion(serializer.GetVersion());
 }
 
 void BufferedDeserializer::ReadData(data_ptr_t buffer, idx_t read_size) {
@@ -184442,6 +184445,8 @@ JoinSide JoinSide::GetJoinSide(const unordered_set<idx_t> &bindings, unordered_s
 
 namespace duckdb {
 
+const uint64_t PLAN_SERIALIZATION_VERSION = 1;
+
 LogicalOperator::LogicalOperator(LogicalOperatorType type) : type(type) {
 }
 

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "b51257ea6"
-#define DUCKDB_VERSION "v0.4.1-dev2127"
+#define DUCKDB_SOURCE_ID "4053be069"
+#define DUCKDB_VERSION "v0.4.1-dev2142"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -1670,10 +1670,26 @@ namespace duckdb {
 
 //! The Serialize class is a base class that can be used to serializing objects into a binary buffer
 class Serializer {
+private:
+	uint64_t version = 0L;
+
 public:
 	virtual ~Serializer() {
 	}
 
+	//! Sets the version of the serialization that writers are expected to use
+	//! The version is mostly the most recent one, unless modifying old data or streaming to
+	//! an older version
+	void SetVersion(uint64_t v) {
+		D_ASSERT(this->version == 0); // version can only be set once
+		this->version = v;
+	}
+
+	//! Returns the version of serialization that writers are expected to use
+	uint64_t GetVersion() {
+		return version;
+	}
+
 	virtual void WriteData(const_data_ptr_t buffer, idx_t write_size) = 0;
 
 	template <class T>
@@ -1725,10 +1741,26 @@ public:
 //! The Deserializer class assists in deserializing a binary blob back into an
 //! object
 class Deserializer {
+private:
+	uint64_t version = 0L;
+
 public:
 	virtual ~Deserializer() {
 	}
 
+	//! Sets the version of the serialization that readers are expected to use
+	//! The version is mostly the most recent one, unless reading old data or streaming from
+	//! an older version
+	void SetVersion(uint64_t v) {
+		D_ASSERT(this->version == 0); // version can only be set once
+		this->version = v;
+	}
+
+	//! Returns the version of serialization that readers are expected to use
+	uint64_t GetVersion() {
+		return version;
+	}
+
 	//! Reads [read_size] bytes into the buffer
 	virtual void ReadData(data_ptr_t buffer, idx_t read_size) = 0;
 
@@ -9124,6 +9156,10 @@ namespace duckdb {
 class FieldWriter;
 class FieldReader;
 
+//! The current version of the plan serialization format. Exposed via by @Serializer & @Deserializer
+//! to be used by various Operator to know what format to read and write.
+extern const uint64_t PLAN_SERIALIZATION_VERSION;
+
 //! LogicalOperator is the base class of the logical operators present in the
 //! logical query tree
 class LogicalOperator {