duckdb 0.6.2-dev971.0 → 0.7.1-dev2.0

package/src/duckdb/third_party/libpg_query/src_backend_parser_scan.cpp

@@ -482,7 +482,7 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	int yy_buf_size;
+	yy_size_t yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
@@ -2615,7 +2615,7 @@ YY_RULE_SETUP
 						if (keyword_text[yyleng - 1] == '\0') {
 							yyless(yyleng - 1);
 						}
-						yylval->keyword = keyword->name;
+						yylval->keyword = keyword_text;
 						return keyword->value;
 					}
 

package/src/duckdb/third_party/mbedtls/library/bignum.cpp

@@ -1392,7 +1392,7 @@ void mpi_mul_hlp( size_t i,
                   mbedtls_mpi_uint *d,
                   mbedtls_mpi_uint b )
 {
-    mbedtls_mpi_uint c = 0, t = 0;
+    mbedtls_mpi_uint c = 0;
 
 #if defined(MULADDC_HUIT)
     for( ; i >= 8; i -= 8 )
@@ -1443,8 +1443,6 @@ void mpi_mul_hlp( size_t i,
     }
 #endif /* MULADDC_HUIT */
 
-    t++;
-
     while( c != 0 )
     {
         *d += c; c = ( *d < c ); d++;

package/src/duckdb/third_party/thrift/thrift/TApplicationException.h

@@ -100,9 +100,6 @@ public:
     }
   }
 
-  uint32_t read(protocol::TProtocol* iprot);
-  uint32_t write(protocol::TProtocol* oprot) const;
-
 protected:
   /**
    * Error code

package/src/duckdb/third_party/zstd/decompress/huf_decompress.cpp

@@ -834,10 +834,10 @@ HUF_decompress4X2_usingDTable_internal_body(
             HUF_DECODE_SYMBOLX2_0(op3, &bitD3);
             HUF_DECODE_SYMBOLX2_0(op4, &bitD4);
             endSignal = (U32)LIKELY(
-                        (BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished)
-                      & (BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished)
-                      & (BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished)
-                      & (BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished));
+			    (U32)(BIT_reloadDStreamFast(&bitD1) == BIT_DStream_unfinished)
+                      & (U32)(BIT_reloadDStreamFast(&bitD2) == BIT_DStream_unfinished)
+                      & (U32)(BIT_reloadDStreamFast(&bitD3) == BIT_DStream_unfinished)
+                      & (U32)(BIT_reloadDStreamFast(&bitD4) == BIT_DStream_unfinished));
 #endif
         }
 

package/src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp

@@ -348,17 +348,17 @@
 
 #include "extension/icu/third_party/icu/i18n/wintzimpl.cpp"
 
-#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"
+#include "extension/icu/third_party/icu/i18n/double-conversion-strtod.cpp"
 
-#include "extension/icu/third_party/icu/i18n/double-conversion-bignum-dtoa.cpp"
+#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"
 
-#include "extension/icu/third_party/icu/i18n/double-conversion-bignum.cpp"
+#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"
 
 #include "extension/icu/third_party/icu/i18n/double-conversion-fast-dtoa.cpp"
 
-#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"
+#include "extension/icu/third_party/icu/i18n/double-conversion-bignum-dtoa.cpp"
 
-#include "extension/icu/third_party/icu/i18n/double-conversion-strtod.cpp"
+#include "extension/icu/third_party/icu/i18n/double-conversion-bignum.cpp"
 
-#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"
+#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"
 

package/src/duckdb/ub_extension_json_json_functions.cpp

@@ -1,9 +1,13 @@
+#include "extension/json/json_functions/copy_json.cpp"
+
 #include "extension/json/json_functions/json_array_length.cpp"
 
 #include "extension/json/json_functions/json_contains.cpp"
 
 #include "extension/json/json_functions/json_extract.cpp"
 
+#include "extension/json/json_functions/json_keys.cpp"
+
 #include "extension/json/json_functions/json_merge_patch.cpp"
 
 #include "extension/json/json_functions/json_structure.cpp"
@@ -16,3 +20,7 @@
 
 #include "extension/json/json_functions/json_valid.cpp"
 
+#include "extension/json/json_functions/read_json.cpp"
+
+#include "extension/json/json_functions/read_json_objects.cpp"
+

package/src/duckdb/ub_src_catalog.cpp

@@ -8,7 +8,11 @@
 
 #include "src/catalog/catalog_transaction.cpp"
 
+#include "src/catalog/duck_catalog.cpp"
+
 #include "src/catalog/dependency_list.cpp"
 
 #include "src/catalog/dependency_manager.cpp"
 
+#include "src/catalog/similar_catalog_entry.cpp"
+

package/src/duckdb/ub_src_catalog_catalog_entry.cpp

@@ -1,5 +1,11 @@
 #include "src/catalog/catalog_entry/copy_function_catalog_entry.cpp"
 
+#include "src/catalog/catalog_entry/duck_index_entry.cpp"
+
+#include "src/catalog/catalog_entry/duck_schema_entry.cpp"
+
+#include "src/catalog/catalog_entry/duck_table_entry.cpp"
+
 #include "src/catalog/catalog_entry/type_catalog_entry.cpp"
 
 #include "src/catalog/catalog_entry/index_catalog_entry.cpp"

package/src/duckdb/ub_src_common.cpp

@@ -2,6 +2,8 @@
 
 #include "src/common/assert.cpp"
 
+#include "src/common/bind_helpers.cpp"
+
 #include "src/common/box_renderer.cpp"
 
 #include "src/common/compressed_file_system.cpp"

package/src/duckdb/ub_src_common_types.cpp

@@ -1,5 +1,7 @@
 #include "src/common/types/batched_data_collection.cpp"
 
+#include "src/common/types/bit.cpp"
+
 #include "src/common/types/blob.cpp"
 
 #include "src/common/types/cast_helpers.cpp"
@@ -14,6 +16,10 @@
 
 #include "src/common/types/column_data_consumer.cpp"
 
+#include "src/common/types/conflict_manager.cpp"
+
+#include "src/common/types/conflict_info.cpp"
+
 #include "src/common/types/data_chunk.cpp"
 
 #include "src/common/types/date.cpp"

package/src/duckdb/ub_src_execution_operator_join.cpp

@@ -22,5 +22,7 @@
 
 #include "src/execution/operator/join/physical_piecewise_merge_join.cpp"
 
+#include "src/execution/operator/join/physical_positional_join.cpp"
+
 #include "src/execution/operator/join/physical_range_join.cpp"
 

package/src/duckdb/ub_src_execution_operator_scan.cpp

@@ -6,5 +6,7 @@
 
 #include "src/execution/operator/scan/physical_expression_scan.cpp"
 
+#include "src/execution/operator/scan/physical_positional_scan.cpp"
+
 #include "src/execution/operator/scan/physical_table_scan.cpp"
 

package/src/duckdb/ub_src_execution_physical_plan.cpp

@@ -46,6 +46,8 @@
 
 #include "src/execution/physical_plan/plan_order.cpp"
 
+#include "src/execution/physical_plan/plan_positional_join.cpp"
+
 #include "src/execution/physical_plan/plan_pragma.cpp"
 
 #include "src/execution/physical_plan/plan_prepare.cpp"

package/src/duckdb/ub_src_function_cast.cpp

@@ -1,5 +1,7 @@
 #include "src/function/cast/blob_cast.cpp"
 
+#include "src/function/cast/bit_cast.cpp"
+
 #include "src/function/cast/cast_function_set.cpp"
 
 #include "src/function/cast/decimal_cast.cpp"

package/src/duckdb/ub_src_function_scalar_date.cpp

@@ -16,5 +16,7 @@
 
 #include "src/function/scalar/date/strftime.cpp"
 
+#include "src/function/scalar/date/time_bucket.cpp"
+
 #include "src/function/scalar/date/to_interval.cpp"
 

package/src/duckdb/ub_src_function_scalar_string.cpp

@@ -1,5 +1,7 @@
 #include "src/function/scalar/string/ascii.cpp"
 
+#include "src/function/scalar/string/bar.cpp"
+
 #include "src/function/scalar/string/chr.cpp"
 
 #include "src/function/scalar/string/reverse.cpp"

package/src/duckdb/ub_src_function_table_system.cpp

@@ -2,6 +2,8 @@
 
 #include "src/function/table/system/duckdb_constraints.cpp"
 
+#include "src/function/table/system/duckdb_databases.cpp"
+
 #include "src/function/table/system/duckdb_dependencies.cpp"
 
 #include "src/function/table/system/duckdb_extensions.cpp"
@@ -26,8 +28,6 @@
 
 #include "src/function/table/system/pragma_collations.cpp"
 
-#include "src/function/table/system/pragma_database_list.cpp"
-
 #include "src/function/table/system/pragma_database_size.cpp"
 
 #include "src/function/table/system/pragma_storage_info.cpp"

package/src/duckdb/ub_src_main.cpp

@@ -34,8 +34,6 @@
 
 #include "src/main/relation.cpp"
 
-#include "src/main/extension_prefix_opener.cpp"
-
 #include "src/main/query_profiler.cpp"
 
 #include "src/main/query_result.cpp"

package/src/duckdb/ub_src_main_relation.cpp

@@ -30,6 +30,8 @@
 
 #include "src/main/relation/read_csv_relation.cpp"
 
+#include "src/main/relation/read_json_relation.cpp"
+
 #include "src/main/relation/setop_relation.cpp"
 
 #include "src/main/relation/subquery_relation.cpp"
@@ -42,5 +44,7 @@
 
 #include "src/main/relation/view_relation.cpp"
 
+#include "src/main/relation/write_parquet_relation.cpp"
+
 #include "src/main/relation/write_csv_relation.cpp"
 

package/src/duckdb/ub_src_optimizer.cpp

@@ -4,6 +4,8 @@
 
 #include "src/optimizer/deliminator.cpp"
 
+#include "src/optimizer/unnest_rewriter.cpp"
+
 #include "src/optimizer/column_lifetime_analyzer.cpp"
 
 #include "src/optimizer/expression_heuristics.cpp"

package/src/duckdb/ub_src_parser_tableref.cpp

@@ -1,7 +1,5 @@
 #include "src/parser/tableref/basetableref.cpp"
 
-#include "src/parser/tableref/crossproductref.cpp"
-
 #include "src/parser/tableref/emptytableref.cpp"
 
 #include "src/parser/tableref/expressionlistref.cpp"

package/src/duckdb/ub_src_parser_transform_statement.cpp

@@ -22,6 +22,8 @@
 
 #include "src/parser/transform/statement/transform_create_type.cpp"
 
+#include "src/parser/transform/statement/transform_create_database.cpp"
+
 #include "src/parser/transform/statement/transform_delete.cpp"
 
 #include "src/parser/transform/statement/transform_explain.cpp"
@@ -56,6 +58,8 @@
 
 #include "src/parser/transform/statement/transform_update.cpp"
 
+#include "src/parser/transform/statement/transform_upsert.cpp"
+
 #include "src/parser/transform/statement/transform_use.cpp"
 
 #include "src/parser/transform/statement/transform_create_sequence.cpp"

package/src/duckdb/ub_src_planner_binder_tableref.cpp

@@ -1,7 +1,5 @@
 #include "src/planner/binder/tableref/bind_basetableref.cpp"
 
-#include "src/planner/binder/tableref/bind_crossproductref.cpp"
-
 #include "src/planner/binder/tableref/bind_emptytableref.cpp"
 
 #include "src/planner/binder/tableref/bind_expressionlistref.cpp"
@@ -16,8 +14,6 @@
 
 #include "src/planner/binder/tableref/plan_basetableref.cpp"
 
-#include "src/planner/binder/tableref/plan_crossproductref.cpp"
-
 #include "src/planner/binder/tableref/plan_dummytableref.cpp"
 
 #include "src/planner/binder/tableref/plan_expressionlistref.cpp"

package/src/duckdb/ub_src_planner_expression.cpp

@@ -22,6 +22,8 @@
 
 #include "src/planner/expression/bound_lambda_expression.cpp"
 
+#include "src/planner/expression/bound_lambdaref_expression.cpp"
+
 #include "src/planner/expression/bound_operator_expression.cpp"
 
 #include "src/planner/expression/bound_parameter_expression.cpp"

package/src/duckdb/ub_src_planner_operator.cpp

@@ -54,6 +54,8 @@
 
 #include "src/planner/operator/logical_order.cpp"
 
+#include "src/planner/operator/logical_positional_join.cpp"
+
 #include "src/planner/operator/logical_pragma.cpp"
 
 #include "src/planner/operator/logical_prepare.cpp"
@@ -76,6 +78,8 @@
 
 #include "src/planner/operator/logical_top_n.cpp"
 
+#include "src/planner/operator/logical_unconditional_join.cpp"
+
 #include "src/planner/operator/logical_unnest.cpp"
 
 #include "src/planner/operator/logical_update.cpp"

package/src/duckdb/ub_src_storage.cpp

@@ -12,6 +12,8 @@
 
 #include "src/storage/local_storage.cpp"
 
+#include "src/storage/magic_bytes.cpp"
+
 #include "src/storage/meta_block_reader.cpp"
 
 #include "src/storage/meta_block_writer.cpp"

package/src/duckdb/ub_src_transaction.cpp

@@ -1,3 +1,7 @@
+#include "src/transaction/duck_transaction_manager.cpp"
+
+#include "src/transaction/duck_transaction.cpp"
+
 #include "src/transaction/meta_transaction.cpp"
 
 #include "src/transaction/undo_buffer.cpp"

package/src/duckdb_node.hpp

@@ -56,6 +56,11 @@ struct Task {
 
 class Connection;
 
+struct JSRSArgs;
+void DuckDBNodeRSLauncher(Napi::Env env, Napi::Function jsrs, std::nullptr_t *, JSRSArgs *data);
+
+typedef Napi::TypedThreadSafeFunction<std::nullptr_t, JSRSArgs, DuckDBNodeRSLauncher> duckdb_node_rs_function_t;
+
 class Database : public Napi::ObjectWrap<Database> {
 public:
 	explicit Database(const Napi::CallbackInfo &info);
@@ -83,6 +88,7 @@ public:
 	Napi::Value Parallelize(const Napi::CallbackInfo &info);
 	Napi::Value Interrupt(const Napi::CallbackInfo &info);
 	Napi::Value Close(const Napi::CallbackInfo &info);
+	Napi::Value RegisterReplacementScan(const Napi::CallbackInfo &info);
 
 public:
 	constexpr static int DUCKDB_NODEJS_ERROR = -1;
@@ -97,6 +103,7 @@ private:
 	static Napi::FunctionReference constructor;
 	Napi::Env env;
 	int64_t bytes_allocated = 0;
+	int replacement_scan_count = 0;
 };
 
 struct JSArgs;
@@ -199,6 +206,7 @@ public:
 		auto obj = T::constructor.New(args);
 		return Napi::ObjectWrap<T>::Unwrap(obj);
 	}
+	static duckdb::Value BindParameter(const Napi::Value source);
 };
 
 Napi::Array EncodeDataChunk(Napi::Env env, duckdb::DataChunk &chunk, bool with_types, bool with_data);

package/src/statement.cpp

@@ -85,51 +85,6 @@ Statement::~Statement() {
 	connection_ref = nullptr;
 }
 
-// A Napi InstanceOf for Javascript Objects "Date" and "RegExp"
-static bool OtherInstanceOf(Napi::Object source, const char *object_type) {
-	if (strcmp(object_type, "Date") == 0) {
-		return source.InstanceOf(source.Env().Global().Get(object_type).As<Napi::Function>());
-	} else if (strcmp(object_type, "RegExp") == 0) {
-		return source.InstanceOf(source.Env().Global().Get(object_type).As<Napi::Function>());
-	}
-
-	return false;
-}
-
-static duckdb::Value BindParameter(const Napi::Value source) {
-	if (source.IsString()) {
-		return duckdb::Value(source.As<Napi::String>().Utf8Value());
-	} else if (OtherInstanceOf(source.As<Napi::Object>(), "RegExp")) {
-		return duckdb::Value(source.ToString().Utf8Value());
-	} else if (source.IsNumber()) {
-		if (Utils::OtherIsInt(source.As<Napi::Number>())) {
-			return duckdb::Value::INTEGER(source.As<Napi::Number>().Int32Value());
-		} else {
-			return duckdb::Value::DOUBLE(source.As<Napi::Number>().DoubleValue());
-		}
-	} else if (source.IsBoolean()) {
-		return duckdb::Value::BOOLEAN(source.As<Napi::Boolean>().Value());
-	} else if (source.IsNull()) {
-		return duckdb::Value();
-	} else if (source.IsBuffer()) {
-		Napi::Buffer<char> buffer = source.As<Napi::Buffer<char>>();
-		return duckdb::Value::BLOB(std::string(buffer.Data(), buffer.Length()));
-#if (NAPI_VERSION > 4)
-	} else if (source.IsDate()) {
-		const auto micros = int64_t(source.As<Napi::Date>().ValueOf()) * duckdb::Interval::MICROS_PER_MSEC;
-		if (micros % duckdb::Interval::MICROS_PER_DAY) {
-			return duckdb::Value::TIMESTAMP(duckdb::timestamp_t(micros));
-		} else {
-			const auto days = int32_t(micros / duckdb::Interval::MICROS_PER_DAY);
-			return duckdb::Value::DATE(duckdb::date_t(days));
-		}
-#endif
-	} else if (source.IsObject()) {
-		return duckdb::Value(source.ToString().Utf8Value());
-	}
-	return duckdb::Value();
-}
-
 static Napi::Value convert_col_val(Napi::Env &env, duckdb::Value dval, duckdb::LogicalTypeId id) {
 	Napi::Value value;
 
@@ -267,7 +222,7 @@ struct StatementParam {
 
 struct RunPreparedTask : public Task {
 	RunPreparedTask(Statement &statement, duckdb::unique_ptr<StatementParam> params, RunType run_type)
-	    : Task(statement, params->callback), params(move(params)), run_type(run_type) {
+	    : Task(statement, params->callback), params(std::move(params)), run_type(run_type) {
 	}
 
 	void DoWork() override {
@@ -362,7 +317,7 @@ struct RunPreparedTask : public Task {
 				delete static_cast<std::shared_ptr<duckdb::QueryResult> *>(hint);
 			};
 
-			std::shared_ptr<duckdb::QueryResult> result_ptr = move(result);
+			std::shared_ptr<duckdb::QueryResult> result_ptr = std::move(result);
 
 			duckdb::idx_t out_idx = 1;
 			while (true) {
@@ -418,7 +373,7 @@ struct RunPreparedTask : public Task {
 
 struct RunQueryTask : public Task {
 	RunQueryTask(Statement &statement, duckdb::unique_ptr<StatementParam> params, Napi::Promise::Deferred deferred)
-	    : Task(statement), deferred(deferred), params(move(params)) {
+	    : Task(statement), deferred(deferred), params(std::move(params)) {
 	}
 
 	void DoWork() override {
@@ -445,7 +400,7 @@ struct RunQueryTask : public Task {
 			auto db = statement.connection_ref->database_ref->Value();
 			auto query_result = QueryResult::constructor.New({db});
 			auto unwrapped = Napi::ObjectWrap<QueryResult>::Unwrap(query_result);
-			unwrapped->result = move(result);
+			unwrapped->result = std::move(result);
 			deferred.Resolve(query_result);
 		}
 	}
@@ -472,7 +427,7 @@ duckdb::unique_ptr<StatementParam> Statement::HandleArgs(const Napi::CallbackInf
 		if (p.IsUndefined()) {
 			continue;
 		}
-		params->params.push_back(BindParameter(p));
+		params->params.push_back(Utils::BindParameter(p));
 	}
 	return params;
 }

package/src/utils.cpp

@@ -20,5 +20,47 @@ Napi::Value Utils::CreateError(Napi::Env env, std::string msg) {
 
 	return obj;
 }
+// A Napi InstanceOf for Javascript Objects "Date" and "RegExp"
+static bool OtherInstanceOf(Napi::Object source, const char *object_type) {
+	if (strcmp(object_type, "Date") == 0) {
+		return source.InstanceOf(source.Env().Global().Get(object_type).As<Napi::Function>());
+	} else if (strcmp(object_type, "RegExp") == 0) {
+		return source.InstanceOf(source.Env().Global().Get(object_type).As<Napi::Function>());
+	}
 
+	return false;
+}
+duckdb::Value Utils::BindParameter(const Napi::Value source) {
+	if (source.IsString()) {
+		return duckdb::Value(source.As<Napi::String>().Utf8Value());
+	} else if (OtherInstanceOf(source.As<Napi::Object>(), "RegExp")) {
+		return duckdb::Value(source.ToString().Utf8Value());
+	} else if (source.IsNumber()) {
+		if (Utils::OtherIsInt(source.As<Napi::Number>())) {
+			return duckdb::Value::INTEGER(source.As<Napi::Number>().Int32Value());
+		} else {
+			return duckdb::Value::DOUBLE(source.As<Napi::Number>().DoubleValue());
+		}
+	} else if (source.IsBoolean()) {
+		return duckdb::Value::BOOLEAN(source.As<Napi::Boolean>().Value());
+	} else if (source.IsNull()) {
+		return duckdb::Value();
+	} else if (source.IsBuffer()) {
+		Napi::Buffer<char> buffer = source.As<Napi::Buffer<char>>();
+		return duckdb::Value::BLOB(std::string(buffer.Data(), buffer.Length()));
+#if (NAPI_VERSION > 4)
+	} else if (source.IsDate()) {
+		const auto micros = int64_t(source.As<Napi::Date>().ValueOf()) * duckdb::Interval::MICROS_PER_MSEC;
+		if (micros % duckdb::Interval::MICROS_PER_DAY) {
+			return duckdb::Value::TIMESTAMP(duckdb::timestamp_t(micros));
+		} else {
+			const auto days = int32_t(micros / duckdb::Interval::MICROS_PER_DAY);
+			return duckdb::Value::DATE(duckdb::date_t(days));
+		}
+#endif
+	} else if (source.IsObject()) {
+		return duckdb::Value(source.ToString().Utf8Value());
+	}
+	return duckdb::Value();
+}
 } // namespace node_duckdb