Skip to content

Commit

Permalink
chore: Update vendored sources to duckdb/duckdb@fa2daf7 (#349)
Browse files Browse the repository at this point in the history
Merge pull request duckdb/duckdb#13731 from maiadegraaf/blocked_thread_fix

Co-authored-by: krlmlr <[email protected]>
  • Loading branch information
github-actions[bot] and krlmlr authored Sep 10, 2024
1 parent 0979a01 commit d59cdc2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
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-dev5179"
#define DUCKDB_PATCH_VERSION "1-dev5181"
#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-dev5179"
#define DUCKDB_VERSION "v1.0.1-dev5181"
#endif
#ifndef DUCKDB_SOURCE_ID
#define DUCKDB_SOURCE_ID "a65fc4ed08"
#define DUCKDB_SOURCE_ID "fa2daf7a09"
#endif
#include "duckdb/function/table/system_functions.hpp"
#include "duckdb/main/database.hpp"
Expand Down
7 changes: 4 additions & 3 deletions src/duckdb/src/main/query_profiler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -684,11 +684,12 @@ void QueryProfiler::WriteToFile(const char *path, string &info) const {
}
}

profiler_settings_t ErasePhaseTimingSettings(profiler_settings_t settings) {
profiler_settings_t EraseQueryRootSettings(profiler_settings_t settings) {
profiler_settings_t phase_timing_settings_to_erase;

for (auto &setting : settings) {
if (MetricsUtils::IsOptimizerMetric(setting) || MetricsUtils::IsPhaseTimingMetric(setting)) {
if (MetricsUtils::IsOptimizerMetric(setting) || MetricsUtils::IsPhaseTimingMetric(setting) ||
setting == MetricsType::BLOCKED_THREAD_TIME) {
phase_timing_settings_to_erase.insert(setting);
}
}
Expand All @@ -711,7 +712,7 @@ unique_ptr<ProfilingNode> QueryProfiler::CreateTree(const PhysicalOperator &root
info = ProfilingInfo(settings, depth);
auto child_settings = settings;
if (depth == 0) {
child_settings = ErasePhaseTimingSettings(child_settings);
child_settings = EraseQueryRootSettings(child_settings);
}
node->depth = depth;

Expand Down

0 comments on commit d59cdc2

Please sign in to comment.