duckdb 0.9.1-dev43.0 → 0.9.1-dev67.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
CHANGED
@@ -38,7 +38,7 @@ void ReadCSVData::FinalizeRead(ClientContext &context) {
|
|
38
38
|
auto number_of_threads = TaskScheduler::GetScheduler(context).NumberOfThreads();
|
39
39
|
//! If we have many csv files, we run single-threaded on each file and parallelize on the number of files
|
40
40
|
bool many_csv_files = files.size() > 1 && int64_t(files.size() * 2) >= number_of_threads;
|
41
|
-
if (options.parallel_mode != ParallelMode::PARALLEL && many_csv_files) {
|
41
|
+
if (options.parallel_mode != ParallelMode::PARALLEL && (many_csv_files || number_of_threads == 1)) {
|
42
42
|
single_threaded = true;
|
43
43
|
}
|
44
44
|
if (options.parallel_mode == ParallelMode::SINGLE_THREADED || not_supported_options ||
|
@@ -1,8 +1,8 @@
|
|
1
1
|
#ifndef DUCKDB_VERSION
|
2
|
-
#define DUCKDB_VERSION "v0.9.1-
|
2
|
+
#define DUCKDB_VERSION "v0.9.1-dev67"
|
3
3
|
#endif
|
4
4
|
#ifndef DUCKDB_SOURCE_ID
|
5
|
-
#define DUCKDB_SOURCE_ID "
|
5
|
+
#define DUCKDB_SOURCE_ID "7512d7ff4f"
|
6
6
|
#endif
|
7
7
|
#include "duckdb/function/table/system_functions.hpp"
|
8
8
|
#include "duckdb/main/database.hpp"
|
@@ -38,8 +38,8 @@ void CommonAggregateOptimizer::ExtractCommonAggregates(LogicalAggregate &aggr) {
|
|
38
38
|
// aggregate does not exist yet: add it to the map
|
39
39
|
aggregate_remap[*aggr.expressions[i]] = i;
|
40
40
|
if (i != original_index) {
|
41
|
-
// this aggregate is not erased, however an
|
42
|
-
// so we need to remap this
|
41
|
+
// this aggregate is not erased, however an aggregate BEFORE it has been erased
|
42
|
+
// so we need to remap this aggregate
|
43
43
|
ColumnBinding original_binding(aggr.aggregate_index, original_index);
|
44
44
|
ColumnBinding new_binding(aggr.aggregate_index, i);
|
45
45
|
aggregate_map[original_binding] = new_binding;
|