duckdb 0.6.2-dev1008.0 → 0.6.2-dev1011.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
|
@@ -23,7 +23,6 @@ struct ListSortBindData : public FunctionData {
|
|
|
23
23
|
vector<LogicalType> payload_types;
|
|
24
24
|
|
|
25
25
|
ClientContext &context;
|
|
26
|
-
unique_ptr<GlobalSortState> global_sort_state;
|
|
27
26
|
RowLayout payload_layout;
|
|
28
27
|
vector<BoundOrderByNode> orders;
|
|
29
28
|
|
|
@@ -94,6 +93,7 @@ void SinkDataChunk(Vector *child_vector, SelectionVector &sel, idx_t offset_list
|
|
|
94
93
|
payload_chunk.Verify();
|
|
95
94
|
|
|
96
95
|
// sink
|
|
96
|
+
key_chunk.Flatten();
|
|
97
97
|
local_sort_state.SinkChunk(key_chunk, payload_chunk);
|
|
98
98
|
data_to_sort = true;
|
|
99
99
|
}
|
|
@@ -116,8 +116,7 @@ static void ListSortFunction(DataChunk &args, ExpressionState &state, Vector &re
|
|
|
116
116
|
|
|
117
117
|
// initialize the global and local sorting state
|
|
118
118
|
auto &buffer_manager = BufferManager::GetBufferManager(info.context);
|
|
119
|
-
|
|
120
|
-
auto &global_sort_state = *info.global_sort_state;
|
|
119
|
+
GlobalSortState global_sort_state(buffer_manager, info.orders, info.payload_layout);
|
|
121
120
|
LocalSortState local_sort_state;
|
|
122
121
|
local_sort_state.Initialize(global_sort_state, buffer_manager);
|
|
123
122
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
#ifndef DUCKDB_VERSION
|
|
2
|
-
#define DUCKDB_VERSION "0.6.2-
|
|
2
|
+
#define DUCKDB_VERSION "0.6.2-dev1011"
|
|
3
3
|
#endif
|
|
4
4
|
#ifndef DUCKDB_SOURCE_ID
|
|
5
|
-
#define DUCKDB_SOURCE_ID "
|
|
5
|
+
#define DUCKDB_SOURCE_ID "71a27493d2"
|
|
6
6
|
#endif
|
|
7
7
|
#include "duckdb/function/table/system_functions.hpp"
|
|
8
8
|
#include "duckdb/main/database.hpp"
|