duckdb 0.3.3-dev1399.0 → 0.3.3-dev1401.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/duckdb.cpp +7 -3
- package/src/duckdb.hpp +2 -2
- package/src/parquet-amalgamation.cpp +36830 -36830
package/package.json
CHANGED
package/src/duckdb.cpp
CHANGED
|
@@ -71601,17 +71601,21 @@ void RadixPartitionedHashTable::GetData(ExecutionContext &context, DataChunk &ch
|
|
|
71601
71601
|
// special case hack to sort out aggregating from empty intermediates
|
|
71602
71602
|
// for aggregations without groups
|
|
71603
71603
|
if (gstate.is_empty && grouping_set.empty()) {
|
|
71604
|
-
D_ASSERT(chunk.ColumnCount() == op.aggregates.size());
|
|
71604
|
+
D_ASSERT(chunk.ColumnCount() == null_groups.size() + op.aggregates.size());
|
|
71605
71605
|
// for each column in the aggregates, set to initial state
|
|
71606
71606
|
chunk.SetCardinality(1);
|
|
71607
|
-
for (
|
|
71607
|
+
for (auto null_group : null_groups) {
|
|
71608
|
+
chunk.data[null_group].SetVectorType(VectorType::CONSTANT_VECTOR);
|
|
71609
|
+
ConstantVector::SetNull(chunk.data[null_group], true);
|
|
71610
|
+
}
|
|
71611
|
+
for (idx_t i = 0; i < op.aggregates.size(); i++) {
|
|
71608
71612
|
D_ASSERT(op.aggregates[i]->GetExpressionClass() == ExpressionClass::BOUND_AGGREGATE);
|
|
71609
71613
|
auto &aggr = (BoundAggregateExpression &)*op.aggregates[i];
|
|
71610
71614
|
auto aggr_state = unique_ptr<data_t[]>(new data_t[aggr.function.state_size()]);
|
|
71611
71615
|
aggr.function.initialize(aggr_state.get());
|
|
71612
71616
|
|
|
71613
71617
|
Vector state_vector(Value::POINTER((uintptr_t)aggr_state.get()));
|
|
71614
|
-
aggr.function.finalize(state_vector, aggr.bind_info.get(), chunk.data[i], 1, 0);
|
|
71618
|
+
aggr.function.finalize(state_vector, aggr.bind_info.get(), chunk.data[null_groups.size() + i], 1, 0);
|
|
71615
71619
|
if (aggr.function.destructor) {
|
|
71616
71620
|
aggr.function.destructor(state_vector, 1);
|
|
71617
71621
|
}
|
package/src/duckdb.hpp
CHANGED
|
@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
|
|
|
11
11
|
#pragma once
|
|
12
12
|
#define DUCKDB_AMALGAMATION 1
|
|
13
13
|
#define DUCKDB_AMALGAMATION_EXTENDED 1
|
|
14
|
-
#define DUCKDB_SOURCE_ID "
|
|
15
|
-
#define DUCKDB_VERSION "v0.3.3-
|
|
14
|
+
#define DUCKDB_SOURCE_ID "29c1379da"
|
|
15
|
+
#define DUCKDB_VERSION "v0.3.3-dev1401"
|
|
16
16
|
//===----------------------------------------------------------------------===//
|
|
17
17
|
// DuckDB
|
|
18
18
|
//
|