duckdb 0.4.1-dev1562.0 → 0.4.1-dev1570.0

package/package.json

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

package/src/duckdb.cpp

@@ -100440,6 +100440,9 @@ void SinkDataChunk(Vector *child_vector, SelectionVector &sel, idx_t offset_list
 	payload_chunk.data[0].Reference(payload_vector);
 	payload_chunk.SetCardinality(offset_lists_indices);
 
+	key_chunk.Verify();
+	payload_chunk.Verify();
+
 	// sink
 	local_sort_state.SinkChunk(key_chunk, payload_chunk);
 	data_to_sort = true;
@@ -100453,6 +100456,7 @@ static void ListSortFunction(DataChunk &args, ExpressionState &state, Vector &re
 	result.SetVectorType(VectorType::FLAT_VECTOR);
 	auto &result_validity = FlatVector::Validity(result);
 
+	args.Flatten();
 	if (lists.GetType().id() == LogicalTypeId::SQLNULL) {
 		result_validity.SetInvalid(0);
 		return;
@@ -100500,7 +100504,6 @@ static void ListSortFunction(DataChunk &args, ExpressionState &state, Vector &re
 	bool data_to_sort = false;
 
 	for (idx_t i = 0; i < count; i++) {
-
 		auto lists_index = lists_data.sel->get_index(i);
 		const auto &list_entry = list_entries[lists_index];
 
@@ -100516,7 +100519,6 @@ static void ListSortFunction(DataChunk &args, ExpressionState &state, Vector &re
 		}
 
 		for (idx_t child_idx = 0; child_idx < list_entry.length; child_idx++) {
-
 			// lists_indices vector is full, sink
 			if (offset_lists_indices == STANDARD_VECTOR_SIZE) {
 				SinkDataChunk(&child_vector, sel, offset_lists_indices, info.types, info.payload_types, payload_vector,
@@ -100524,10 +100526,10 @@ static void ListSortFunction(DataChunk &args, ExpressionState &state, Vector &re
 				offset_lists_indices = 0;
 			}
 
-			auto source_idx = child_data.sel->get_index(list_entry.offset + child_idx);
+			auto source_idx = list_entry.offset + child_idx;
 			sel.set_index(offset_lists_indices, source_idx);
 			lists_indices_data[offset_lists_indices] = (uint32_t)i;
-			payload_vector_data[offset_lists_indices] = incr_payload_count;
+			payload_vector_data[offset_lists_indices] = source_idx;
 			offset_lists_indices++;
 			incr_payload_count++;
 		}
@@ -100539,7 +100541,6 @@ static void ListSortFunction(DataChunk &args, ExpressionState &state, Vector &re
 	}
 
 	if (data_to_sort) {
-
 		// add local state to global state, which sorts the data
 		global_sort_state.AddLocalState(local_sort_state);
 		global_sort_state.PrepareMergePhase();
@@ -100566,6 +100567,7 @@ static void ListSortFunction(DataChunk &args, ExpressionState &state, Vector &re
 
 			for (idx_t i = 0; i < row_count; i++) {
 				sel_sorted.set_index(sel_sorted_idx, result_data[i]);
+				D_ASSERT(result_data[i] < lists_size);
 				sel_sorted_idx++;
 			}
 		}
@@ -120346,6 +120348,7 @@ duckdb_data_chunk duckdb_result_get_chunk(duckdb_result result, idx_t chunk_idx)
 
 
 
+
 namespace duckdb {
 
 struct CTableFunctionInfo : public TableFunctionInfo {
@@ -120377,6 +120380,7 @@ struct CTableBindData : public TableFunctionData {
 	CTableFunctionInfo *info = nullptr;
 	void *bind_data = nullptr;
 	duckdb_delete_callback_t delete_callback = nullptr;
+	unique_ptr<NodeStatistics> stats;
 };
 
 struct CTableInternalBindInfo {
@@ -120491,6 +120495,14 @@ unique_ptr<LocalTableFunctionState> CTableFunctionLocalInit(ExecutionContext &co
 	return move(result);
 }
 
+unique_ptr<NodeStatistics> CTableFunctionCardinality(ClientContext &context, const FunctionData *bind_data_p) {
+	auto &bind_data = (const CTableBindData &)*bind_data_p;
+	if (!bind_data.stats) {
+		return nullptr;
+	}
+	return make_unique<NodeStatistics>(*bind_data.stats);
+}
+
 void CTableFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
 	auto &bind_data = (CTableBindData &)*data_p.bind_data;
 	auto &global_data = (CTableGlobalInitData &)*data_p.global_state;
@@ -120511,6 +120523,7 @@ duckdb_table_function duckdb_create_table_function() {
 	auto function = new duckdb::TableFunction("", {}, duckdb::CTableFunction, duckdb::CTableFunctionBind,
 	                                          duckdb::CTableFunctionInit, duckdb::CTableFunctionLocalInit);
 	function->function_info = duckdb::make_shared<duckdb::CTableFunctionInfo>();
+	function->cardinality = duckdb::CTableFunctionCardinality;
 	return function;
 }
 
@@ -120659,6 +120672,18 @@ void duckdb_bind_set_bind_data(duckdb_bind_info info, void *bind_data, duckdb_de
 	bind_info->bind_data.delete_callback = destroy;
 }
 
+void duckdb_bind_set_cardinality(duckdb_bind_info info, idx_t cardinality, bool is_exact) {
+	if (!info) {
+		return;
+	}
+	auto bind_info = (duckdb::CTableInternalBindInfo *)info;
+	if (is_exact) {
+		bind_info->bind_data.stats = duckdb::make_unique<duckdb::NodeStatistics>(cardinality);
+	} else {
+		bind_info->bind_data.stats = duckdb::make_unique<duckdb::NodeStatistics>(cardinality, cardinality);
+	}
+}
+
 void duckdb_bind_set_error(duckdb_bind_info info, const char *error) {
 	if (!info || !error) {
 		return;

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 "5fdf4a947"
-#define DUCKDB_VERSION "v0.4.1-dev1562"
+#define DUCKDB_SOURCE_ID "fce627875"
+#define DUCKDB_VERSION "v0.4.1-dev1570"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -17860,6 +17860,14 @@ Sets the user-provided bind data in the bind object. This object can be retrieve
 */
 DUCKDB_API void duckdb_bind_set_bind_data(duckdb_bind_info info, void *bind_data, duckdb_delete_callback_t destroy);
 
+/*!
+Sets the cardinality estimate for the table function, used for optimization.
+
+* info: The bind data object.
+* is_exact: Whether or not the cardinality estimate is exact, or an approximation
+*/
+DUCKDB_API void duckdb_bind_set_cardinality(duckdb_bind_info info, idx_t cardinality, bool is_exact);
+
 /*!
 Report that an error has occurred while calling bind.