feat(oceanbase-oracle): split execution time from client wait
This commit is contained in:
1 parent
1294708eea
commit
33afb0b432
58 files changed
+843
-11
No files matched your search
@@ -588,6 +588,7 @@ fn limited_query_result(result: ChJsonResult, execution_time_ms: u128, max_rows:
|
||||
rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms,
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -845,6 +846,7 @@ pub async fn execute_query_with_max_rows(
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -362,6 +362,7 @@ fn query_result(
|
||||
rows: result.rows,
|
||||
affected_rows,
|
||||
execution_time_ms,
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -571,6 +571,7 @@ fn document_query_result(result: DocumentQueryResult, started: Instant) -> Query
|
||||
rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: started.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -589,6 +590,7 @@ fn affected_query_result(affected_rows: u64, started: Instant) -> QueryResult {
|
||||
rows: Vec::new(),
|
||||
affected_rows,
|
||||
execution_time_ms: started.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -2355,6 +2355,7 @@ fn parse_elasticsearch_response_with_sql_parser(
|
||||
rows,
|
||||
affected_rows: row_count,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -2381,6 +2382,7 @@ fn parse_elasticsearch_response_with_sql_parser(
|
||||
rows,
|
||||
affected_rows: row_count,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -2553,6 +2555,7 @@ fn raw_json_response_result(
|
||||
rows: vec![vec![serde_json::Value::Number(status.into()), serde_json::Value::String(body_text.into())]],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -2620,6 +2623,7 @@ fn parse_elasticsearch_rest_response_with_sql_parser(
|
||||
rows,
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -3129,6 +3133,7 @@ pub fn parse_tabular_sql_response(
|
||||
.and_then(serde_json::Value::as_u64)
|
||||
.unwrap_or(rows.len() as u64),
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: body.get("cursor").and_then(|cursor| cursor.as_str()).map(str::to_string),
|
||||
has_more: body.get("cursor").and_then(|cursor| cursor.as_str()).is_some(),
|
||||
|
||||
@@ -366,6 +366,7 @@ fn build_query_result(rows: Vec<serde_json::Value>, start: Instant) -> QueryResu
|
||||
rows: out_rows,
|
||||
affected_rows: affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -514,6 +514,7 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
|
||||
affected_rows: rows.len() as u64,
|
||||
rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -530,6 +531,7 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -729,6 +731,7 @@ fn parse_flux_csv(text: &str, start: Instant) -> Result<QueryResult, String> {
|
||||
affected_rows: rows.len() as u64,
|
||||
rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -1888,6 +1888,7 @@ fn raw_response_result(status: u16, body: String, start: Instant, truncated: boo
|
||||
rows: vec![vec![Value::Number(status.into()), Value::String(body)]],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -4553,6 +4553,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
|
||||
rows: vec![],
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4595,6 +4596,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
|
||||
rows: result_rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4687,6 +4689,7 @@ async fn execute_result_set_with_text_protocol_on_conn(
|
||||
rows: result_rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4815,6 +4818,7 @@ async fn execute_result_sets_with_text_protocol_on_conn(
|
||||
rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4841,6 +4845,7 @@ async fn execute_result_sets_with_text_protocol_on_conn(
|
||||
rows: vec![],
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5022,6 +5027,7 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
|
||||
rows: result_rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5497,6 +5503,7 @@ pub async fn execute_query_on_conn_with_limits_progress(
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5534,6 +5541,7 @@ pub async fn execute_query_on_conn_with_limits_progress(
|
||||
rows: vec![],
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5662,6 +5670,7 @@ pub async fn execute_non_result_batch_on_conn(
|
||||
rows: vec![],
|
||||
affected_rows: result.affected_rows(),
|
||||
execution_time_ms: elapsed_ms.saturating_sub(previous_elapsed_ms),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -1959,6 +1959,7 @@ async fn execute_select_prepared(
|
||||
rows: result_rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -2054,6 +2055,7 @@ async fn execute_select_text(
|
||||
rows: result_rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -7606,6 +7608,7 @@ pub async fn execute_query_with_max_rows(
|
||||
rows: vec![],
|
||||
affected_rows: affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -8432,6 +8435,7 @@ async fn execute_query_with_max_rows_inner(
|
||||
rows: vec![],
|
||||
affected_rows: affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -13997,6 +14001,7 @@ mod tests {
|
||||
]],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -314,6 +314,7 @@ pub async fn execute_query_with_max_rows(
|
||||
rows: vec![],
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -367,6 +368,7 @@ fn query_result_from_rqlite_result(
|
||||
rows: result.values,
|
||||
affected_rows: 0,
|
||||
execution_time_ms,
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -2947,6 +2947,7 @@ fn execute_query_blocking(
|
||||
rows: result_rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -2964,6 +2965,7 @@ fn execute_query_blocking(
|
||||
rows: vec![],
|
||||
affected_rows: conn.changes(),
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -114,6 +114,7 @@ impl SqliteWorkerClient {
|
||||
rows: rows.unwrap_or_default(),
|
||||
affected_rows: affected_rows.unwrap_or(0),
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
truncated: truncated.unwrap_or(false),
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -695,6 +695,7 @@ fn server_messages_query_result(messages: Vec<String>, start: Instant) -> Option
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -767,6 +768,7 @@ async fn collect_first_result_limited(
|
||||
rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -1686,6 +1688,7 @@ fn push_sqlserver_result_set(results: &mut Vec<QueryResult>, result: Option<SqlS
|
||||
rows: result.rows,
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: result.truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -1744,6 +1747,7 @@ fn push_sqlserver_ordered_events(
|
||||
rows: vec![],
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -3369,6 +3373,7 @@ async fn execute_query_with_max_rows_inner(
|
||||
rows: vec![],
|
||||
affected_rows: result.rows_affected().iter().sum::<u64>(),
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -3414,6 +3419,7 @@ pub async fn execute_batch_with_max_rows_metadata(
|
||||
rows: vec![],
|
||||
affected_rows: result.rows_affected().iter().sum::<u64>(),
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -3508,6 +3514,7 @@ pub async fn execute_simple_batch_with_max_rows_metadata(
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -3934,6 +3941,7 @@ mod tests {
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -3958,6 +3966,7 @@ mod tests {
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -3977,6 +3986,7 @@ mod tests {
|
||||
rows: vec![vec![serde_json::json!(1)]],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -4729,6 +4739,7 @@ mod tests {
|
||||
rows: vec![vec![serde_json::json!("app_user"), serde_json::json!("8")]],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 0,
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -5101,6 +5112,7 @@ mod tests {
|
||||
rows: vec![vec![serde_json::json!(42), serde_json::json!(101)]],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: 1,
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -363,6 +363,7 @@ pub async fn execute_query_with_max_rows(
|
||||
rows: vec![],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -385,6 +386,7 @@ pub async fn execute_query_with_max_rows(
|
||||
rows: vec![],
|
||||
affected_rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -404,6 +406,7 @@ pub async fn execute_query_with_max_rows(
|
||||
rows: vec![],
|
||||
affected_rows: affected,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -585,6 +588,7 @@ fn query_result_from_turso_result(
|
||||
rows: result.values,
|
||||
affected_rows: 0,
|
||||
execution_time_ms,
|
||||
server_execute_time_us: None,
|
||||
truncated,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -922,6 +922,7 @@ fn json_to_query_result(status: u16, body: Value, start: Instant) -> QueryResult
|
||||
]],
|
||||
affected_rows: 0,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
@@ -956,6 +957,7 @@ fn values_to_query_result(items: Vec<Value>, start: Instant) -> QueryResult {
|
||||
affected_rows: rows.len() as u64,
|
||||
rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
truncated: false,
|
||||
session_id: None,
|
||||
has_more: false,
|
||||
|
||||
@@ -353,6 +353,7 @@ fn series_result_to_query_result(series: Vec<SeriesResult>, start: Instant) -> Q
|
||||
affected_rows: rows.len() as u64,
|
||||
rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
spatial_columns: vec![],
|
||||
spatial_values: vec![],
|
||||
truncated: false,
|
||||
@@ -390,6 +391,7 @@ fn simple_result(rows: Vec<Vec<Value>>, value_type: &str, start: Instant) -> Que
|
||||
affected_rows: rows.len() as u64,
|
||||
rows,
|
||||
execution_time_ms: start.elapsed().as_millis(),
|
||||
server_execute_time_us: None,
|
||||
spatial_columns: vec![],
|
||||
spatial_values: vec![],
|
||||
truncated: false,
|
||||
|
||||
Reference in new issue
Block a user