Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/version.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by rconfigure.py, do not edit by hand
# DuckDB version information

duckdb_version <- "1.4.0-dev4103"
duckdb_version <- "1.4.0-dev4109"

# Function to get DuckDB version without establishing a connection
get_duckdb_version <- function() {
Expand Down
7 changes: 3 additions & 4 deletions src/duckdb/src/common/sorting/hashed_sort.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,9 @@ HashedSortLocalSinkState::HashedSortLocalSinkState(ExecutionContext &context, co
}
// OVER(...)
payload_chunk.Initialize(allocator, payload_types);
} else {
unsorted = make_uniq<ColumnDataCollection>(context.client, hashed_sort.payload_types);
unsorted->InitializeAppend(unsorted_append);
}
}

Expand Down Expand Up @@ -369,10 +372,6 @@ SinkResultType HashedSort::Sink(ExecutionContext &context, DataChunk &input_chun

// OVER()
if (gstate.hashed_sort.sort_col_count == 0) {
if (!lstate.unsorted) {
lstate.unsorted = make_uniq<ColumnDataCollection>(context.client, payload_types);
lstate.unsorted->InitializeAppend(lstate.unsorted_append);
}
lstate.unsorted->Append(lstate.unsorted_append, input_chunk);
return SinkResultType::NEED_MORE_INPUT;
}
Expand Down
3 changes: 3 additions & 0 deletions src/duckdb/src/function/table/table_scan.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,9 @@ class DuckTableScanState : public TableScanGlobalState {
l_state.scan_state.options.force_fetch_row = ClientConfig::GetConfig(context).force_fetch_row;

do {
if (context.interrupted) {
throw InterruptException();
}
if (bind_data.is_create_index) {
storage.CreateIndexScan(l_state.scan_state, output,
TableScanType::TABLE_SCAN_COMMITTED_ROWS_OMIT_PERMANENTLY_DELETED);
Expand Down
6 changes: 3 additions & 3 deletions src/duckdb/src/function/table/version/pragma_version.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef DUCKDB_PATCH_VERSION
#define DUCKDB_PATCH_VERSION "0-dev4103"
#define DUCKDB_PATCH_VERSION "0-dev4109"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 4
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.4.0-dev4103"
#define DUCKDB_VERSION "v1.4.0-dev4109"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "4659028e3a"
#define DUCKDB_SOURCE_ID "b3edbac851"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down