Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Include BeginQuery in latency metric #19064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2025
+11 −10
Merged

Include BeginQuery in latency metric #19064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions src/main/client_context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,15 @@ void ClientContext::BeginQueryInternal(ClientContextLock &lock, const string &qu
state->QueryBegin(*this);
}

// Flush the old Logger
// Flush the old logger.
logger->Flush();

// Refresh the logger to ensure we are in sync with global log settings
LoggingContext context(LogContextScope::CONNECTION);
context.connection_id = connection_id;
context.transaction_id = transaction.ActiveTransaction().global_transaction_id;
context.query_id = transaction.GetActiveQuery();
logger = db->GetLogManager().CreateLogger(context, true);
// Refresh the logger to ensure we are in sync with the global log settings.
LoggingContext logging_context(LogContextScope::CONNECTION);
logging_context.connection_id = connection_id;
logging_context.transaction_id = transaction.ActiveTransaction().global_transaction_id;
logging_context.query_id = transaction.GetActiveQuery();
logger = db->GetLogManager().CreateLogger(logging_context, true);
DUCKDB_LOG(*this, QueryLogType, query);
}

Expand Down Expand Up @@ -889,6 +889,10 @@ unique_ptr<PendingQueryResult> ClientContext::PendingStatementOrPreparedStatemen
shared_ptr<PreparedStatementData> &prepared, const PendingQueryParameters &parameters) {
unique_ptr<PendingQueryResult> pending;

// Start the profiler.
auto &profiler = QueryProfiler::Get(*this);
profiler.StartQuery(query, IsExplainAnalyze(statement ? statement.get() : prepared->unbound_statement.get()));

try {
BeginQueryInternal(lock, query);
} catch (std::exception &ex) {
Expand All @@ -900,9 +904,6 @@ unique_ptr<PendingQueryResult> ClientContext::PendingStatementOrPreparedStatemen
}
return ErrorResult<PendingQueryResult>(std::move(error), query);
}
// start the profiler
auto &profiler = QueryProfiler::Get(*this);
profiler.StartQuery(query, IsExplainAnalyze(statement ? statement.get() : prepared->unbound_statement.get()));

bool invalidate_query = true;
try {
Expand Down
Loading