duckdb 0.5.2-dev1345.0 → 0.5.2-dev1347.0

package/package.json

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

package/src/duckdb.cpp

@@ -36004,6 +36004,7 @@ void RadixScatterListVector(Vector &v, UnifiedVectorFormat &vdata, const Selecti
 	auto list_data = ListVector::GetData(v);
 	auto &child_vector = ListVector::GetEntry(v);
 	auto list_size = ListVector::GetListSize(v);
+	child_vector.Flatten(list_size);
 
 	// serialize null values
 	if (has_null) {
@@ -55411,8 +55412,8 @@ static idx_t DistinctSelectList(Vector &left, Vector &right, idx_t count, const
 	SelectionVector lcursor(count);
 	SelectionVector rcursor(count);
 
-	ListVector::GetEntry(left).Flatten(count);
-	ListVector::GetEntry(right).Flatten(count);
+	ListVector::GetEntry(left).Flatten(ListVector::GetListSize(left));
+	ListVector::GetEntry(right).Flatten(ListVector::GetListSize(right));
 	Vector lchild(ListVector::GetEntry(left), lcursor, count);
 	Vector rchild(ListVector::GetEntry(right), rcursor, count);
 
@@ -107782,8 +107783,8 @@ static void TemplatedContainsOrPosition(DataChunk &args, ExpressionState &state,
 	value_vector.ToUnifiedFormat(count, value_data);
 
 	// not required for a comparison of nested types
-	auto child_value = FlatVector::GetData<CHILD_TYPE>(child_vector);
-	auto values = FlatVector::GetData<CHILD_TYPE>(value_vector);
+	auto child_value = (CHILD_TYPE *)child_data.data;
+	auto values = (CHILD_TYPE *)value_data.data;
 
 	for (idx_t i = 0; i < count; i++) {
 		auto list_index = list_data.sel->get_index(i);
@@ -108802,8 +108803,8 @@ namespace duckdb {
 template <class T, bool HEAP_REF = false, bool VALIDITY_ONLY = false>
 void ListExtractTemplate(idx_t count, UnifiedVectorFormat &list_data, UnifiedVectorFormat &offsets_data,
                          Vector &child_vector, idx_t list_size, Vector &result) {
-	UnifiedVectorFormat child_data;
-	child_vector.ToUnifiedFormat(list_size, child_data);
+	UnifiedVectorFormat child_format;
+	child_vector.ToUnifiedFormat(list_size, child_format);
 
 	T *result_data;
 
@@ -108820,40 +108821,46 @@ void ListExtractTemplate(idx_t count, UnifiedVectorFormat &list_data, UnifiedVec
 
 	// this is lifted from ExecuteGenericLoop because we can't push the list child data into this otherwise
 	// should have gone with GetValue perhaps
+	auto child_data = (T *)child_format.data;
 	for (idx_t i = 0; i < count; i++) {
 		auto list_index = list_data.sel->get_index(i);
 		auto offsets_index = offsets_data.sel->get_index(i);
-		if (list_data.validity.RowIsValid(list_index) && offsets_data.validity.RowIsValid(offsets_index)) {
-			auto list_entry = ((list_entry_t *)list_data.data)[list_index];
-			auto offsets_entry = ((int64_t *)offsets_data.data)[offsets_index];
+		if (!list_data.validity.RowIsValid(list_index)) {
+			result_mask.SetInvalid(i);
+			continue;
+		}
+		if (!offsets_data.validity.RowIsValid(offsets_index)) {
+			result_mask.SetInvalid(i);
+			continue;
+		}
+		auto list_entry = ((list_entry_t *)list_data.data)[list_index];
+		auto offsets_entry = ((int64_t *)offsets_data.data)[offsets_index];
 
-			// 1-based indexing
-			if (offsets_entry == 0) {
+		// 1-based indexing
+		if (offsets_entry == 0) {
+			result_mask.SetInvalid(i);
+			continue;
+		}
+		offsets_entry = (offsets_entry > 0) ? offsets_entry - 1 : offsets_entry;
+
+		idx_t child_offset;
+		if (offsets_entry < 0) {
+			if ((idx_t)-offsets_entry > list_entry.length) {
 				result_mask.SetInvalid(i);
 				continue;
 			}
-			offsets_entry = (offsets_entry > 0) ? offsets_entry - 1 : offsets_entry;
-
-			idx_t child_offset;
-			if (offsets_entry < 0) {
-				if ((idx_t)-offsets_entry > list_entry.length) {
-					result_mask.SetInvalid(i);
-					continue;
-				}
-				child_offset = list_entry.offset + list_entry.length + offsets_entry;
-			} else {
-				if ((idx_t)offsets_entry >= list_entry.length) {
-					result_mask.SetInvalid(i);
-					continue;
-				}
-				child_offset = list_entry.offset + offsets_entry;
-			}
-			if (child_data.validity.RowIsValid(child_offset)) {
-				if (!VALIDITY_ONLY) {
-					result_data[i] = ((T *)child_data.data)[child_offset];
-				}
-			} else {
+			child_offset = list_entry.offset + list_entry.length + offsets_entry;
+		} else {
+			if ((idx_t)offsets_entry >= list_entry.length) {
 				result_mask.SetInvalid(i);
+				continue;
+			}
+			child_offset = list_entry.offset + offsets_entry;
+		}
+		auto child_index = child_format.sel->get_index(child_offset);
+		if (child_format.validity.RowIsValid(child_index)) {
+			if (!VALIDITY_ONLY) {
+				result_data[i] = child_data[child_index];
 			}
 		} else {
 			result_mask.SetInvalid(i);
@@ -109200,6 +109207,7 @@ static void ListLambdaFunction(DataChunk &args, ExpressionState &state, Vector &
 	// get the child vector and child data
 	auto lists_size = ListVector::GetListSize(lists);
 	auto &child_vector = ListVector::GetEntry(lists);
+	child_vector.Flatten(lists_size);
 	UnifiedVectorFormat child_data;
 	child_vector.ToUnifiedFormat(lists_size, child_data);
 
@@ -109284,10 +109292,8 @@ static void ListLambdaFunction(DataChunk &args, ExpressionState &state, Vector &
 
 		// iterate list elements and create transformed expression columns
 		for (idx_t child_idx = 0; child_idx < list_entry.length; child_idx++) {
-
 			// reached STANDARD_VECTOR_SIZE elements
 			if (elem_cnt == STANDARD_VECTOR_SIZE) {
-
 				lambda_chunk.Reset();
 				ExecuteExpression(types, result_types, elem_cnt, sel, sel_vectors, input_chunk, lambda_chunk,
 				                  child_vector, args, expr_executor);

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 "6aa8bb2cff"
-#define DUCKDB_VERSION "v0.5.2-dev1345"
+#define DUCKDB_SOURCE_ID "80ef5caa5b"
+#define DUCKDB_VERSION "v0.5.2-dev1347"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //