feat(query): cross-database timing details, drop OceanBase audit query
This commit is contained in:
1 parent
4b9a1c4d5c
commit
d0497e0ca6
69 files changed
+973
-180
No files matched your search
@@ -1922,6 +1922,7 @@ for line in sys.stdin:
|
||||
affected_rows,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -7410,6 +7410,7 @@ mod tests {
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -716,6 +716,7 @@ async fn fetch_table_export_batch(
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -10797,6 +10797,7 @@ CREATE TABLE "Other"."prefix""Source"."NAME" ("ID" INT);"#;
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -2175,6 +2175,7 @@ async fn do_execute_typed(
|
||||
}
|
||||
let cancel_for_agent = cancel_token.clone();
|
||||
let result = async move {
|
||||
let lock_started = std::time::Instant::now();
|
||||
let mut client = match cancel_for_agent.as_ref() {
|
||||
Some(token) => {
|
||||
tokio::select! {
|
||||
@@ -2188,7 +2189,10 @@ async fn do_execute_typed(
|
||||
}
|
||||
None => client.lock().await,
|
||||
};
|
||||
if let Some(session_id) = options.result_session_id.as_deref() {
|
||||
let lock_ms = lock_started.elapsed().as_secs_f64() * 1000.0;
|
||||
let response: Result<db::QueryResult, AgentCallError> = if let Some(session_id) =
|
||||
options.result_session_id.as_deref()
|
||||
{
|
||||
let params = agent_fetch_query_page_params(session_id, options.page_size.unwrap_or(MAX_ROWS));
|
||||
client
|
||||
.fetch_query_page_typed_with_timeout_and_cancel(params, rpc_timeout, cancel_for_agent.clone())
|
||||
@@ -2203,7 +2207,14 @@ async fn do_execute_typed(
|
||||
client
|
||||
.execute_query_typed_with_timeout_and_cancel(params, rpc_timeout, cancel_for_agent.clone())
|
||||
.await
|
||||
}
|
||||
};
|
||||
response.map(|mut result| {
|
||||
// Older agents have no phase map. Do not imply complete telemetry.
|
||||
if let Some(timings) = result.query_timings_ms.as_mut() {
|
||||
timings.insert("core_lock".into(), lock_ms);
|
||||
}
|
||||
result
|
||||
})
|
||||
}
|
||||
.await
|
||||
.map(|result| truncate_result_with_max_rows(result, max_rows));
|
||||
@@ -4208,6 +4219,7 @@ fn error_query_result(message: String) -> db::QueryResult {
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4227,6 +4239,7 @@ fn empty_query_result(execution_time_ms: u128) -> db::QueryResult {
|
||||
affected_rows: 0,
|
||||
execution_time_ms,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4574,6 +4587,7 @@ async fn execute_statements_inner(
|
||||
affected_rows: total_affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5188,6 +5202,7 @@ async fn exec_tx_pg_inner(
|
||||
affected_rows: total_affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5282,6 +5297,7 @@ async fn exec_tx_mysql_inner(
|
||||
affected_rows: total_affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5478,6 +5494,7 @@ async fn exec_tx_sqlite_inner(
|
||||
affected_rows: total_affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5611,6 +5628,7 @@ async fn exec_tx_explicit_inner(
|
||||
affected_rows: total_affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -6614,7 +6632,9 @@ async fn execute_manual_txn_agent_statement(
|
||||
execution_schema,
|
||||
options,
|
||||
);
|
||||
let lock_started = std::time::Instant::now();
|
||||
let mut locked = client.lock().await;
|
||||
let lock_ms = lock_started.elapsed().as_secs_f64() * 1000.0;
|
||||
let result = match request {
|
||||
ManualTxnAgentQueryRequest::Execute(params) => {
|
||||
locked.execute_query_typed_with_timeout::<db::QueryResult>(params, None).await
|
||||
@@ -6627,7 +6647,12 @@ async fn execute_manual_txn_agent_statement(
|
||||
}
|
||||
};
|
||||
result
|
||||
.map(|result| truncate_result_with_max_rows(result, Some(row_limit.max(1))))
|
||||
.map(|mut result| {
|
||||
if let Some(timings) = result.query_timings_ms.as_mut() {
|
||||
timings.insert("core_lock".into(), lock_ms);
|
||||
}
|
||||
truncate_result_with_max_rows(result, Some(row_limit.max(1)))
|
||||
})
|
||||
.map_err(|error| error.into_legacy_string())
|
||||
}
|
||||
|
||||
@@ -6719,6 +6744,7 @@ async fn execute_manual_txn_postgres_statement(
|
||||
affected_rows: affected,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -6754,6 +6780,7 @@ async fn execute_manual_txn_mysql_statement(
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -6786,6 +6813,7 @@ async fn execute_manual_txn_mysql_statement(
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -6806,6 +6834,7 @@ async fn execute_manual_txn_mysql_statement(
|
||||
affected_rows,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -6863,6 +6892,7 @@ pub async fn commit_manual_transaction(state: &AppState, txn_session_id: &str) -
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -6893,6 +6923,7 @@ pub async fn rollback_manual_transaction(state: &AppState, txn_session_id: &str)
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -9109,6 +9140,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 4,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -9384,6 +9416,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -10444,6 +10477,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -10470,6 +10504,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -11766,6 +11801,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -11804,6 +11840,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -11872,6 +11909,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -11912,6 +11950,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -11944,6 +11983,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -11983,6 +12023,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -12016,6 +12057,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -1383,6 +1383,7 @@ fn query_result(columns: Vec<String>, rows: Vec<Vec<serde_json::Value>>, affecte
|
||||
affected_rows,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -206,6 +206,7 @@ mod tests {
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -3225,6 +3225,7 @@ mod tests {
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4096,6 +4097,7 @@ done
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4124,6 +4126,7 @@ done
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4149,6 +4152,7 @@ done
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4178,6 +4182,7 @@ done
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4206,6 +4211,7 @@ done
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5177,6 +5183,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5226,6 +5233,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5431,6 +5439,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5450,6 +5459,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5487,6 +5497,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5682,6 +5693,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5788,6 +5800,7 @@ for line in sys.stdin:
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -685,6 +685,7 @@ fn execute_change_transaction(
|
||||
affected_rows: 0,
|
||||
execution_time_ms: started_at.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
query_timings_ms: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
Reference in new issue
Block a user