duckdb 0.6.1-dev157.0 → 0.6.1-dev162.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.1-dev157.0",
+  "version": "0.6.1-dev162.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -90635,6 +90635,8 @@ struct LogicalExtensionOperator : public LogicalOperator {
 	    : LogicalOperator(LogicalOperatorType::LOGICAL_EXTENSION_OPERATOR, move(expressions)) {
 	}
 
+	static unique_ptr<LogicalExtensionOperator> Deserialize(LogicalDeserializationState &state, FieldReader &reader);
+
 	virtual unique_ptr<PhysicalOperator> CreatePlan(ClientContext &context, PhysicalPlanGenerator &generator) = 0;
 };
 } // namespace duckdb
@@ -198288,6 +198290,7 @@ JoinSide JoinSide::GetJoinSide(const unordered_set<idx_t> &bindings, unordered_s
 
 
 
+
 namespace duckdb {
 
 const uint64_t PLAN_SERIALIZATION_VERSION = 1;
@@ -198619,7 +198622,8 @@ unique_ptr<LogicalOperator> LogicalOperator::Deserialize(Deserializer &deseriali
 		result = LogicalSimple::Deserialize(state, reader);
 		break;
 	case LogicalOperatorType::LOGICAL_EXTENSION_OPERATOR:
-		throw SerializationException("Invalid type for operator deserialization");
+		result = LogicalExtensionOperator::Deserialize(state, reader);
+		break;
 	case LogicalOperatorType::LOGICAL_INVALID:
 		/* no default here to trigger a warning if we forget to implement deserialize for a new operator */
 		throw SerializationException("Invalid type for operator deserialization");
@@ -199614,6 +199618,24 @@ vector<idx_t> LogicalExpressionGet::GetTableIndex() const {
 
 
 
+namespace duckdb {
+unique_ptr<LogicalExtensionOperator> LogicalExtensionOperator::Deserialize(LogicalDeserializationState &state,
+                                                                           FieldReader &reader) {
+	auto &config = DBConfig::GetConfig(state.gstate.context);
+
+	auto extension_name = reader.ReadRequired<std::string>();
+	for (auto &extension : config.operator_extensions) {
+		if (extension->GetName() == extension_name) {
+			return extension->Deserialize(state, reader);
+		}
+	}
+
+	throw SerializationException("No serialization method exists for extension: " + extension_name);
+}
+} // namespace duckdb
+
+
+
 
 namespace duckdb {
 
@@ -200584,7 +200606,7 @@ void Planner::CreatePlan(SQLStatement &statement) {
 		this->plan = nullptr;
 		for (auto &extension_op : config.operator_extensions) {
 			auto bound_statement =
-			    extension_op.Bind(context, *this->binder, extension_op.operator_info.get(), statement);
+			    extension_op->Bind(context, *this->binder, extension_op->operator_info.get(), statement);
 			if (bound_statement.plan != nullptr) {
 				this->names = bound_statement.names;
 				this->types = bound_statement.types;

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 "8510cce102"
-#define DUCKDB_VERSION "v0.6.1-dev157"
+#define DUCKDB_SOURCE_ID "67694989c8"
+#define DUCKDB_VERSION "v0.6.1-dev162"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -18920,6 +18920,9 @@ struct OperatorExtensionInfo {
 typedef BoundStatement (*bind_function_t)(ClientContext &context, Binder &binder, OperatorExtensionInfo *info,
                                           SQLStatement &statement);
 
+// forward declaration to avoid circular reference
+struct LogicalExtensionOperator;
+
 class OperatorExtension {
 public:
 	bind_function_t Bind;
@@ -18927,6 +18930,10 @@ public:
 	//! Additional info passed to the CreatePlan & Bind functions
 	shared_ptr<OperatorExtensionInfo> operator_info;
 
+	virtual std::string GetName() = 0;
+	virtual std::unique_ptr<LogicalExtensionOperator> Deserialize(LogicalDeserializationState &state,
+	                                                              FieldReader &reader) = 0;
+
 	DUCKDB_API virtual ~OperatorExtension() {
 	}
 };
@@ -19072,7 +19079,7 @@ public:
 	//! A reference to the (shared) default allocator (Allocator::DefaultAllocator)
 	shared_ptr<Allocator> default_allocator;
 	//! Extensions made to binder
-	vector<OperatorExtension> operator_extensions;
+	vector<std::unique_ptr<OperatorExtension>> operator_extensions;
 
 public:
 	DUCKDB_API static DBConfig &GetConfig(ClientContext &context);