duckdb 0.4.1-dev2403.0 → 0.4.1-dev2407.0

package/package.json

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

package/src/duckdb.cpp

@@ -50323,7 +50323,7 @@ vector<idx_t> ListVector::Search(Vector &list, const Value &key, idx_t row) {
 	vector<idx_t> offsets;
 
 	auto &list_vector = ListVector::GetEntry(list);
-	auto &entry = ((list_entry_t *)list.GetData())[row];
+	auto &entry = ListVector::GetData(list)[row];
 
 	switch (list_vector.GetType().InternalType()) {
 	case PhysicalType::BOOL:
@@ -105196,7 +105196,7 @@ void FillResult(Value &values, Vector &result, idx_t row) {
 	}
 
 	//! now set the pointer
-	auto &entry = ((list_entry_t *)result.GetData())[row];
+	auto &entry = ListVector::GetData(result)[row];
 	entry.length = list_values.size();
 	entry.offset = current_offset;
 }
@@ -105206,19 +105206,29 @@ static void MapExtractFunction(DataChunk &args, ExpressionState &state, Vector &
 	D_ASSERT(args.data[0].GetType().id() == LogicalTypeId::MAP);
 	result.SetVectorType(VectorType::FLAT_VECTOR);
 
+	if (args.data[1].GetType().id() == LogicalTypeId::SQLNULL) {
+		//! We don't need to look through the map if the 'key' to look for is NULL
+		//! Because maps can't have NULL as key
+		ListVector::SetListSize(result, 0);
+		result.SetVectorType(VectorType::CONSTANT_VECTOR);
+		auto list_data = ConstantVector::GetData<list_entry_t>(result);
+		list_data->offset = 0;
+		list_data->length = 0;
+		result.Verify(args.size());
+		return;
+	}
+
 	auto &map = args.data[0];
 	auto &key = args.data[1];
 
-	auto key_value = key.GetValue(0);
 	UnifiedVectorFormat offset_data;
 
 	auto &children = StructVector::GetEntries(map);
+
 	children[0]->ToUnifiedFormat(args.size(), offset_data);
-	auto &key_type = ListType::GetChildType(children[0]->GetType());
-	if (key_type != LogicalTypeId::SQLNULL) {
-		key_value = key_value.CastAs(key_type);
-	}
 	for (idx_t row = 0; row < args.size(); row++) {
+		idx_t row_index = offset_data.sel->get_index(row);
+		auto key_value = key.GetValue(row_index);
 		auto offsets = ListVector::Search(*children[0], key_value, offset_data.sel->get_index(row));
 		auto values = ListVector::GetValuesFromOffsets(*children[1], offsets);
 		FillResult(values, result, row);
@@ -105239,11 +105249,14 @@ static unique_ptr<FunctionData> MapExtractBind(ClientContext &context, ScalarFun
 	if (arguments[0]->return_type.id() != LogicalTypeId::MAP) {
 		throw BinderException("MAP_EXTRACT can only operate on MAPs");
 	}
-	auto &child_types = StructType::GetChildTypes(arguments[0]->return_type);
-	auto &value_type = ListType::GetChildType(child_types[1].second);
+	auto &value_type = MapType::ValueType(arguments[0]->return_type);
 
 	//! Here we have to construct the List Type that will be returned
 	bound_function.return_type = LogicalType::LIST(value_type);
+	auto key_type = MapType::KeyType(arguments[0]->return_type);
+	if (key_type.id() != LogicalTypeId::SQLNULL && arguments[1]->return_type.id() != LogicalTypeId::SQLNULL) {
+		bound_function.arguments[1] = MapType::KeyType(arguments[0]->return_type);
+	}
 	return make_unique<VariableReturnBindData>(value_type);
 }
 

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 "784e66880"
-#define DUCKDB_VERSION "v0.4.1-dev2403"
+#define DUCKDB_SOURCE_ID "109f932c4"
+#define DUCKDB_VERSION "v0.4.1-dev2407"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //