duckdb 0.6.2-dev2448.0 → 0.6.2-dev2480.0

package/package.json

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

package/src/duckdb/extension/json/include/json_scan.hpp

@@ -253,6 +253,13 @@ public:
 
 struct JSONScan {
 public:
+	static void AutoDetect(ClientContext &context, JSONScanData &bind_data, vector<LogicalType> &return_types,
+	                       vector<string> &names);
+
+	static void InitializeBindData(ClientContext &context, JSONScanData &bind_data,
+	                               const named_parameter_map_t &named_parameters, vector<string> &names,
+	                               vector<LogicalType> &return_types);
+
 	static double JSONScanProgress(ClientContext &context, const FunctionData *bind_data_p,
 	                               const GlobalTableFunctionState *global_state) {
 		auto &gstate = ((JSONGlobalTableFunctionState &)*global_state).state;

package/src/duckdb/extension/json/json_functions/read_json.cpp

@@ -5,8 +5,8 @@
 
 namespace duckdb {
 
-void AutoDetect(ClientContext &context, JSONScanData &bind_data, vector<LogicalType> &return_types,
-                vector<string> &names) {
+void JSONScan::AutoDetect(ClientContext &context, JSONScanData &bind_data, vector<LogicalType> &return_types,
+                          vector<string> &names) {
 	auto original_scan_type = bind_data.type;
 	bind_data.type = JSONScanType::SAMPLE; // Set scan type to sample for the auto-detect, we restore it later
 	JSONScanGlobalState gstate(context, bind_data);
@@ -81,9 +81,10 @@ void AutoDetect(ClientContext &context, JSONScanData &bind_data, vector<LogicalT
 	bind_data.stored_readers = std::move(gstate.json_readers);
 }
 
-void BindReadJSONInput(ClientContext &context, JSONScanData &bind_data, TableFunctionBindInput &input,
-                       vector<LogicalType> &return_types, vector<string> &names) {
-	for (auto &kv : input.named_parameters) {
+void JSONScan::InitializeBindData(ClientContext &context, JSONScanData &bind_data,
+                                  const named_parameter_map_t &named_parameters, vector<string> &names,
+                                  vector<LogicalType> &return_types) {
+	for (auto &kv : named_parameters) {
 		auto loption = StringUtil::Lower(kv.first);
 		if (loption == "columns") {
 			auto &child_type = kv.second.type();
@@ -159,7 +160,7 @@ unique_ptr<FunctionData> ReadJSONBind(ClientContext &context, TableFunctionBindI
 	auto result = JSONScanData::Bind(context, input);
 	auto &bind_data = (JSONScanData &)*result;
 
-	BindReadJSONInput(context, bind_data, input, return_types, names);
+	JSONScan::InitializeBindData(context, bind_data, input.named_parameters, names, return_types);
 
 	if (!bind_data.names.empty()) {
 		bind_data.auto_detect = false; // override auto_detect when columns are specified
@@ -170,7 +171,7 @@ unique_ptr<FunctionData> ReadJSONBind(ClientContext &context, TableFunctionBindI
 	bind_data.InitializeFormats();
 
 	if (bind_data.auto_detect) {
-		AutoDetect(context, bind_data, return_types, names);
+		JSONScan::AutoDetect(context, bind_data, return_types, names);
 		bind_data.names = names;
 	}
 

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev2448"
+#define DUCKDB_VERSION "0.6.2-dev2480"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "2023a43a5f"
+#define DUCKDB_SOURCE_ID "fc11c159ca"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/main/relation/read_csv_relation.hpp

@@ -17,14 +17,13 @@ struct BufferedCSVReaderOptions;
 
 class ReadCSVRelation : public TableFunctionRelation {
 public:
-	ReadCSVRelation(const std::shared_ptr<ClientContext> &context, string csv_file, vector<ColumnDefinition> columns,
-	                string alias = string());
-	ReadCSVRelation(const std::shared_ptr<ClientContext> &context, string csv_file, BufferedCSVReaderOptions options,
-	                string alias = string());
+	ReadCSVRelation(const std::shared_ptr<ClientContext> &context, const string &csv_file,
+	                vector<ColumnDefinition> columns, string alias = string());
+	ReadCSVRelation(const std::shared_ptr<ClientContext> &context, const string &csv_file,
+	                BufferedCSVReaderOptions options, string alias = string());
 
 	string alias;
 	bool auto_detect;
-	string csv_file;
 
 public:
 	string GetAlias() override;

package/src/duckdb/src/include/duckdb/main/relation/read_json_relation.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "duckdb/main/relation/table_function_relation.hpp"
+#include "duckdb/main/client_context.hpp"
+#include "duckdb/common/named_parameter_map.hpp"
+#include "duckdb/parser/column_definition.hpp"
+#include "duckdb/common/string.hpp"
+#include "duckdb/common/vector.hpp"
+
+namespace duckdb {
+
+class ReadJSONRelation : public TableFunctionRelation {
+public:
+	ReadJSONRelation(const shared_ptr<ClientContext> &context, string json_file, named_parameter_map_t options,
+	                 bool auto_detect, string alias = "");
+	string json_file;
+	string alias;
+
+public:
+	string GetAlias() override;
+};
+
+} // namespace duckdb

package/src/duckdb/src/include/duckdb.h

@@ -192,6 +192,11 @@ typedef struct {
 	idx_t size;
 } duckdb_blob;
 
+typedef struct {
+	uint64_t offset;
+	uint64_t length;
+} duckdb_list_entry;
+
 typedef struct {
 #if DUCKDB_API_VERSION < DUCKDB_API_0_3_2
 	void *data;
@@ -1561,6 +1566,24 @@ Returns the size of the child vector of the list
 */
 DUCKDB_API idx_t duckdb_list_vector_get_size(duckdb_vector vector);
 
+/*!
+Sets the total size of the underlying child-vector of a list vector.
+
+* vector: The list vector.
+* size: The size of the child list.
+* returns: The duckdb state. Returns DuckDBError if the vector is nullptr.
+*/
+DUCKDB_API duckdb_state duckdb_list_vector_set_size(duckdb_vector vector, idx_t size);
+
+/*!
+Sets the total capacity of the underlying child-vector of a list.
+
+* vector: The list vector.
+* required_capacity: the total capacity to reserve.
+* return: The duckdb state. Returns DuckDBError if the vector is nullptr.
+*/
+DUCKDB_API duckdb_state duckdb_list_vector_reserve(duckdb_vector vector, idx_t required_capacity);
+
 /*!
 Retrieves the child vector of a struct vector.
 

package/src/duckdb/src/main/capi/data_chunk-c.cpp

@@ -1,6 +1,7 @@
-#include "duckdb/main/capi/capi_internal.hpp"
 #include "duckdb/common/types/data_chunk.hpp"
 #include "duckdb/common/types/string_type.hpp"
+#include "duckdb/main/capi/capi_internal.hpp"
+
 #include <string.h>
 
 duckdb_data_chunk duckdb_create_data_chunk(duckdb_logical_type *ctypes, idx_t column_count) {
@@ -128,6 +129,24 @@ idx_t duckdb_list_vector_get_size(duckdb_vector vector) {
 	return duckdb::ListVector::GetListSize(*v);
 }
 
+duckdb_state duckdb_list_vector_set_size(duckdb_vector vector, idx_t size) {
+	if (!vector) {
+		return duckdb_state::DuckDBError;
+	}
+	auto v = (duckdb::Vector *)vector;
+	duckdb::ListVector::SetListSize(*v, size);
+	return duckdb_state::DuckDBSuccess;
+}
+
+duckdb_state duckdb_list_vector_reserve(duckdb_vector vector, idx_t required_capacity) {
+	if (!vector) {
+		return duckdb_state::DuckDBError;
+	}
+	auto v = (duckdb::Vector *)vector;
+	duckdb::ListVector::Reserve(*v, required_capacity);
+	return duckdb_state::DuckDBSuccess;
+}
+
 duckdb_vector duckdb_struct_vector_get_child(duckdb_vector vector, idx_t index) {
 	if (!vector) {
 		return nullptr;

package/src/duckdb/src/main/relation/read_csv_relation.cpp

@@ -12,10 +12,10 @@
 
 namespace duckdb {
 
-ReadCSVRelation::ReadCSVRelation(const std::shared_ptr<ClientContext> &context, string csv_file_p,
+ReadCSVRelation::ReadCSVRelation(const std::shared_ptr<ClientContext> &context, const string &csv_file,
                                  vector<ColumnDefinition> columns_p, string alias_p)
-    : TableFunctionRelation(context, "read_csv", {Value(csv_file_p)}, nullptr, false), alias(std::move(alias_p)),
-      auto_detect(false), csv_file(std::move(csv_file_p)) {
+    : TableFunctionRelation(context, "read_csv", {Value(csv_file)}, nullptr, false), alias(std::move(alias_p)),
+      auto_detect(false) {
 
 	if (alias.empty()) {
 		alias = StringUtil::Split(csv_file, ".")[0];
@@ -31,10 +31,10 @@ ReadCSVRelation::ReadCSVRelation(const std::shared_ptr<ClientContext> &context,
 	AddNamedParameter("columns", Value::STRUCT(std::move(column_names)));
 }
 
-ReadCSVRelation::ReadCSVRelation(const std::shared_ptr<ClientContext> &context, string csv_file_p,
+ReadCSVRelation::ReadCSVRelation(const std::shared_ptr<ClientContext> &context, const string &csv_file,
                                  BufferedCSVReaderOptions options, string alias_p)
-    : TableFunctionRelation(context, "read_csv_auto", {Value(csv_file_p)}, nullptr, false), alias(std::move(alias_p)),
-      auto_detect(true), csv_file(std::move(csv_file_p)) {
+    : TableFunctionRelation(context, "read_csv_auto", {Value(csv_file)}, nullptr, false), alias(std::move(alias_p)),
+      auto_detect(true) {
 
 	if (alias.empty()) {
 		alias = StringUtil::Split(csv_file, ".")[0];

package/src/duckdb/src/main/relation/read_json_relation.cpp

@@ -0,0 +1,20 @@
+#include "duckdb/main/relation/read_json_relation.hpp"
+#include "duckdb/parser/column_definition.hpp"
+namespace duckdb {
+
+ReadJSONRelation::ReadJSONRelation(const shared_ptr<ClientContext> &context, string json_file_p,
+                                   named_parameter_map_t options, bool auto_detect, string alias_p)
+    : TableFunctionRelation(context, auto_detect ? "read_json_auto" : "read_json", {Value(json_file_p)},
+                            std::move(options)),
+      json_file(std::move(json_file_p)), alias(std::move(alias_p)) {
+
+	if (alias.empty()) {
+		alias = StringUtil::Split(json_file, ".")[0];
+	}
+}
+
+string ReadJSONRelation::GetAlias() {
+	return alias;
+}
+
+} // namespace duckdb

package/src/duckdb/src/main/relation/table_function_relation.cpp

@@ -22,7 +22,7 @@ TableFunctionRelation::TableFunctionRelation(const std::shared_ptr<ClientContext
     : Relation(context, RelationType::TABLE_FUNCTION_RELATION), name(std::move(name_p)),
       parameters(std::move(parameters_p)), named_parameters(std::move(named_parameters)),
       input_relation(std::move(input_relation_p)), auto_initialize(auto_init) {
-	context->TryBindRelation(*this, this->columns);
+	InitializeColumns();
 }
 
 TableFunctionRelation::TableFunctionRelation(const std::shared_ptr<ClientContext> &context, string name_p,

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"