duckdb 0.4.1-dev1016.0 → 0.4.1-dev1019.0

package/package.json

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

package/src/duckdb.cpp

@@ -79499,18 +79499,21 @@ unique_ptr<PhysicalOperator> PhysicalPlanGenerator::CreatePlan(LogicalWindow &op
 	types.resize(output_idx);
 
 	// Identify streaming windows
-	vector<idx_t> window_expressions;
-	bool process_streaming = true;
+	vector<idx_t> blocking_windows;
+	vector<idx_t> streaming_windows;
 	for (idx_t expr_idx = 0; expr_idx < op.expressions.size(); expr_idx++) {
-		window_expressions.push_back(expr_idx);
-		if (!IsStreamingWindow(op.expressions[expr_idx])) {
-			process_streaming = false;
+		if (IsStreamingWindow(op.expressions[expr_idx])) {
+			streaming_windows.push_back(expr_idx);
+		} else {
+			blocking_windows.push_back(expr_idx);
 		}
 	}
+
 	// Process the window functions by sharing the partition/order definitions
 	vector<idx_t> evaluation_order;
-	while (!window_expressions.empty()) {
-		auto &remaining = window_expressions;
+	while (!blocking_windows.empty() || !streaming_windows.empty()) {
+		const bool process_streaming = blocking_windows.empty();
+		auto &remaining = process_streaming ? streaming_windows : blocking_windows;
 
 		// Find all functions that share the partitioning of the first remaining expression
 		const auto over_idx = remaining[0];
@@ -79547,7 +79550,7 @@ unique_ptr<PhysicalOperator> PhysicalPlanGenerator::CreatePlan(LogicalWindow &op
 		plan = move(window);
 
 		// Remember the projection order if we changed it
-		if (!remaining.empty() || !evaluation_order.empty()) {
+		if (!streaming_windows.empty() || !blocking_windows.empty() || !evaluation_order.empty()) {
 			evaluation_order.insert(evaluation_order.end(), matching.begin(), matching.end());
 		}
 	}

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 "6937493e4"
-#define DUCKDB_VERSION "v0.4.1-dev1016"
+#define DUCKDB_SOURCE_ID "dd29735fe"
+#define DUCKDB_VERSION "v0.4.1-dev1019"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //