Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@186e4b5
Browse files Browse the repository at this point in the history
Merge pull request duckdb/duckdb#13290 from Mytherin/windowtaskscheduling
Merge pull request duckdb/duckdb#13288 from Mytherin/disablewebsitedocs
  • Loading branch information
krlmlr committed Aug 3, 2024
1 parent 07d9bdf commit 264dcf6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 13 deletions.
14 changes: 4 additions & 10 deletions src/duckdb/src/execution/operator/aggregate/physical_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,17 @@ class WindowHashGroup {
stage = WindowGroupStage::FINALIZE;
return true;
}
break;
return false;
case WindowGroupStage::FINALIZE:
if (finalized == blocks) {
stage = WindowGroupStage::GETDATA;
return true;
}
break;
return false;
default:
break;
// never block in GETDATA
return true;
}

return false;
}

//! The hash partition data
Expand Down Expand Up @@ -899,11 +898,6 @@ SourceResultType PhysicalWindow::GetData(ExecutionContext &context, DataChunk &c
gsource.returned += chunk.size();

if (chunk.size() == 0) {
lock_guard<mutex> guard(gsource.lock);
for (auto &state : gsource.blocked_tasks) {
state.Callback();
}
gsource.blocked_tasks.clear();
return SourceResultType::FINISHED;
}
return SourceResultType::HAVE_MORE_OUTPUT;
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 "1-dev3760"
#define DUCKDB_PATCH_VERSION "1-dev3764"
#endif
#ifndef DUCKDB_MINOR_VERSION
#define DUCKDB_MINOR_VERSION 0
Expand All @@ -8,10 +8,10 @@
#define DUCKDB_MAJOR_VERSION 1
#endif
#ifndef DUCKDB_VERSION
#define DUCKDB_VERSION "v1.0.1-dev3760"
#define DUCKDB_VERSION "v1.0.1-dev3764"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "1a6c39fb64"
#define DUCKDB_SOURCE_ID "186e4b5255"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down

0 comments on commit 264dcf6

Please sign in to comment.