duckdb 0.6.2-dev939.0 → 0.6.2-dev942.0

package/package.json

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

package/src/duckdb/src/execution/window_segment_tree.cpp

@@ -167,23 +167,6 @@ void WindowSegmentTree::ConstructTree() {
 void WindowSegmentTree::Compute(Vector &result, idx_t rid, idx_t begin, idx_t end) {
 	D_ASSERT(input_ref);
 
-	// No arguments, so just count
-	if (inputs.ColumnCount() == 0) {
-		D_ASSERT(GetTypeIdSize(result_type.InternalType()) == sizeof(idx_t));
-		auto data = FlatVector::GetData<idx_t>(result);
-		// Slice to any filtered rows
-		if (!filter_mask.AllValid()) {
-			idx_t filtered = 0;
-			for (idx_t i = begin; i < end; ++i) {
-				filtered += filter_mask.RowIsValid(i);
-			}
-			data[rid] = filtered;
-		} else {
-			data[rid] = end - begin;
-		}
-		return;
-	}
-
 	// If we have a window function, use that
 	if (aggregate.window && UseWindowAPI()) {
 		// Frame boundaries

package/src/duckdb/src/function/aggregate/distributive/count.cpp

@@ -33,6 +33,26 @@ struct CountStarFunction : public BaseCountFunction {
 	static void ConstantOperation(STATE *state, AggregateInputData &, idx_t count) {
 		*state += count;
 	}
+
+	template <typename RESULT_TYPE>
+	static void Window(Vector inputs[], const ValidityMask &filter_mask, AggregateInputData &aggr_input_data,
+	                   idx_t input_count, data_ptr_t state, const FrameBounds &frame, const FrameBounds &prev,
+	                   Vector &result, idx_t rid, idx_t bias) {
+		D_ASSERT(input_count == 0);
+		auto data = FlatVector::GetData<RESULT_TYPE>(result);
+		const auto begin = frame.first;
+		const auto end = frame.second;
+		// Slice to any filtered rows
+		if (!filter_mask.AllValid()) {
+			RESULT_TYPE filtered = 0;
+			for (auto i = begin; i < end; ++i) {
+				filtered += filter_mask.RowIsValid(i);
+			}
+			data[rid] = filtered;
+		} else {
+			data[rid] = end - begin;
+		}
+	}
 };
 
 struct CountFunction : public BaseCountFunction {
@@ -72,6 +92,7 @@ AggregateFunction CountStarFun::GetFunction() {
 	auto fun = AggregateFunction::NullaryAggregate<int64_t, int64_t, CountStarFunction>(LogicalType::BIGINT);
 	fun.name = "count_star";
 	fun.null_handling = FunctionNullHandling::SPECIAL_HANDLING;
+	fun.window = CountStarFunction::Window<int64_t>;
 	// TODO is there a better way to set those?
 	fun.serialize = CountStarSerialize;
 	fun.deserialize = CountStarDeserialize;
@@ -98,6 +119,7 @@ void CountFun::RegisterFunction(BuiltinFunctions &set) {
 	// the count function can also be called without arguments
 	count_function.arguments.clear();
 	count_function.statistics = nullptr;
+	count_function.window = CountStarFunction::Window<int64_t>;
 	count.AddFunction(count_function);
 	set.AddFunction(count);
 }

package/src/duckdb/src/function/scalar/system/aggregate_export.cpp

@@ -219,6 +219,7 @@ static unique_ptr<FunctionData> BindAggregateState(ClientContext &context, Scala
 		// FIXME: this is really hacky
 		// but the aggregate state export needs a rework around how it handles more complex aggregates anyway
 		vector<unique_ptr<Expression>> args;
+		args.reserve(state_type.bound_argument_types.size());
 		for (auto &arg_type : state_type.bound_argument_types) {
 			args.push_back(make_unique<BoundConstantExpression>(Value(arg_type)));
 		}
@@ -302,7 +303,6 @@ ExportAggregateFunction::Bind(unique_ptr<BoundAggregateExpression> child_aggrega
 	// this should be required
 	D_ASSERT(bound_function.state_size);
 	D_ASSERT(bound_function.finalize);
-	D_ASSERT(!bound_function.window);
 
 	D_ASSERT(child_aggregate->function.return_type.id() != LogicalTypeId::INVALID);
 #ifdef DEBUG

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev939"
+#define DUCKDB_VERSION "0.6.2-dev942"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "db2bb06ef5"
+#define DUCKDB_SOURCE_ID "2dcdc24556"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"