duckdb 0.4.1-dev1564.0 → 0.4.1-dev1574.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.4.1-dev1564.0",
+  "version": "0.4.1-dev1574.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++;
 			}
 		}
@@ -174186,6 +174188,7 @@ static void BindConstraints(Binder &binder, BoundCreateTableInfo &info) {
 	auto &base = (CreateTableInfo &)*info.base;
 
 	bool has_primary_key = false;
+	unordered_set<idx_t> not_null_columns;
 	vector<idx_t> primary_keys;
 	for (idx_t i = 0; i < base.constraints.size(); i++) {
 		auto &cond = base.constraints[i];
@@ -174198,6 +174201,7 @@ static void BindConstraints(Binder &binder, BoundCreateTableInfo &info) {
 			auto &not_null = (NotNullConstraint &)*cond;
 			auto &col = base.columns[not_null.index];
 			info.bound_constraints.push_back(make_unique<BoundNotNullConstraint>(col.StorageOid()));
+			not_null_columns.insert(not_null.index);
 			break;
 		}
 		case ConstraintType::UNIQUE: {
@@ -174285,6 +174289,10 @@ static void BindConstraints(Binder &binder, BoundCreateTableInfo &info) {
 	if (has_primary_key) {
 		// if there is a primary key index, also create a NOT NULL constraint for each of the columns
 		for (auto &column_index : primary_keys) {
+			if (not_null_columns.count(column_index)) {
+				//! No need to create a NotNullConstraint, it's already present
+				continue;
+			}
 			auto &column = base.columns[column_index];
 			base.constraints.push_back(make_unique<NotNullConstraint>(column_index));
 			info.bound_constraints.push_back(make_unique<BoundNotNullConstraint>(column.StorageOid()));

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 "ebe45abbb"
-#define DUCKDB_VERSION "v0.4.1-dev1564"
+#define DUCKDB_SOURCE_ID "314b7e383"
+#define DUCKDB_VERSION "v0.4.1-dev1574"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //