duckdb 0.3.5-dev250.0 → 0.3.5-dev258.0

package/package.json

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

package/src/duckdb.cpp

@@ -58827,10 +58827,10 @@ static void SortCollectionForPartition(WindowOperatorState &state, BoundWindowEx
 
 	// fuse input and sort collection into one
 	// (sorting columns are not decoded, and we need them later)
-	ChunkCollection payload;
-	payload.Fuse(input);
-	payload.Fuse(over);
-	auto payload_types = payload.Types();
+	auto payload_types = input.Types();
+	payload_types.insert(payload_types.end(), over.Types().begin(), over.Types().end());
+	DataChunk payload_chunk;
+	payload_chunk.InitializeEmpty(payload_types);
 
 	// initialise partitioning memory
 	// to minimise copying, we fill up a chunk and then sink it.
@@ -58856,8 +58856,15 @@ static void SortCollectionForPartition(WindowOperatorState &state, BoundWindowEx
 	// sink collection chunks into row format
 	const idx_t chunk_count = over.ChunkCount();
 	for (idx_t i = 0; i < chunk_count; i++) {
+		auto &input_chunk = *input.Chunks()[i];
+		for (idx_t col_idx = 0; col_idx < input_chunk.ColumnCount(); ++col_idx) {
+			payload_chunk.data[col_idx].Reference(input_chunk.data[col_idx]);
+		}
 		auto &over_chunk = *over.Chunks()[i];
-		auto &payload_chunk = *payload.Chunks()[i];
+		for (idx_t col_idx = 0; col_idx < over_chunk.ColumnCount(); ++col_idx) {
+			payload_chunk.data[input_chunk.ColumnCount() + col_idx].Reference(over_chunk.data[col_idx]);
+		}
+		payload_chunk.SetCardinality(input_chunk);
 
 		// Extract the hash partition, if any
 		if (hashes) {
@@ -83735,7 +83742,7 @@ static void HistogramFinalize(Vector &state_vector, FunctionData *, Vector &resu
 		list_struct_data = FlatVector::GetData<list_entry_t>(*count_list);
 		list_struct_data[rid].length = ListVector::GetListSize(*count_list) - old_len;
 		list_struct_data[rid].offset = old_len;
-		old_len = list_struct_data[rid].length;
+		old_len += list_struct_data[rid].length;
 	}
 }
 

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 "91d3928b6"
-#define DUCKDB_VERSION "v0.3.5-dev250"
+#define DUCKDB_SOURCE_ID "fe433d317"
+#define DUCKDB_VERSION "v0.3.5-dev258"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //