Skip to content

Commit ae5d977

Browse files
authored
feat(cubesql): Allow providing API type when getting load request meta (#9202)
1 parent f8e523b commit ae5d977

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

rust/cubesql/cubesql/src/compile/query_engine.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ pub trait QueryEngine {
104104
.log_load_state(
105105
Some(span_id.clone()),
106106
auth_context,
107-
state.get_load_request_meta(),
107+
state.get_load_request_meta("sql"),
108108
"SQL API Query Planning".to_string(),
109109
serde_json::json!({
110110
"query": span_id.query_key.clone(),
@@ -286,7 +286,7 @@ pub trait QueryEngine {
286286
.log_load_state(
287287
Some(span_id.clone()),
288288
auth_context,
289-
state.get_load_request_meta(),
289+
state.get_load_request_meta("sql"),
290290
"SQL API Query Planning Success".to_string(),
291291
serde_json::json!({
292292
"query": span_id.query_key.clone(),
@@ -302,7 +302,7 @@ pub trait QueryEngine {
302302
// to catch all SQL generation errors during planning
303303
let rewrite_plan = Self::evaluate_wrapped_sql(
304304
self.transport_ref().clone(),
305-
Arc::new(state.get_load_request_meta()),
305+
Arc::new(state.get_load_request_meta("sql")),
306306
rewrite_plan,
307307
)
308308
.await?;
@@ -390,7 +390,7 @@ impl QueryEngine for SqlQueryEngine {
390390
) -> Result<DFSessionContext, CompilationError> {
391391
let query_planner = Arc::new(CubeQueryPlanner::new(
392392
self.transport_ref().clone(),
393-
state.get_load_request_meta(),
393+
state.get_load_request_meta("sql"),
394394
self.config_ref().clone(),
395395
));
396396
let mut ctx = DFSessionContext::with_state(

rust/cubesql/cubesql/src/sql/postgres/shim.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ impl AsyncPostgresShim {
401401
.log_load_state(
402402
span_id.clone(),
403403
auth_context,
404-
self.session.state.get_load_request_meta(),
404+
self.session.state.get_load_request_meta("sql"),
405405
"Load Request".to_string(),
406406
serde_json::json!({
407407
"query": span_id.as_ref().unwrap().query_key.clone(),
@@ -453,7 +453,7 @@ impl AsyncPostgresShim {
453453
.log_load_state(
454454
Some(span_id.clone()),
455455
auth_context,
456-
self.session.state.get_load_request_meta(),
456+
self.session.state.get_load_request_meta("sql"),
457457
"Data Query Status".to_string(),
458458
serde_json::json!({
459459
"isDataQuery": true
@@ -481,7 +481,7 @@ impl AsyncPostgresShim {
481481
.log_load_state(
482482
Some(span_id.clone()),
483483
auth_context.clone(),
484-
self.session.state.get_load_request_meta(),
484+
self.session.state.get_load_request_meta("sql"),
485485
"Data Query Status".to_string(),
486486
serde_json::json!({
487487
"isDataQuery": true,
@@ -496,7 +496,7 @@ impl AsyncPostgresShim {
496496
.log_load_state(
497497
Some(span_id.clone()),
498498
auth_context,
499-
self.session.state.get_load_request_meta(),
499+
self.session.state.get_load_request_meta("sql"),
500500
"Load Request Success".to_string(),
501501
serde_json::json!({
502502
"query": span_id.query_key.clone(),
@@ -602,7 +602,7 @@ impl AsyncPostgresShim {
602602
.log_load_state(
603603
Some(span_id.clone()),
604604
auth_context,
605-
self.session.state.get_load_request_meta(),
605+
self.session.state.get_load_request_meta("sql"),
606606
"SQL API Error".to_string(),
607607
serde_json::json!({
608608
"query": span_id.query_key.clone(),
@@ -1848,7 +1848,7 @@ impl AsyncPostgresShim {
18481848
.log_load_state(
18491849
span_id.clone(),
18501850
auth_context,
1851-
self.session.state.get_load_request_meta(),
1851+
self.session.state.get_load_request_meta("sql"),
18521852
"Load Request".to_string(),
18531853
serde_json::json!({
18541854
"query": {
@@ -1876,7 +1876,7 @@ impl AsyncPostgresShim {
18761876
.log_load_state(
18771877
Some(span_id.clone()),
18781878
auth_context,
1879-
self.session.state.get_load_request_meta(),
1879+
self.session.state.get_load_request_meta("sql"),
18801880
"Load Request Success".to_string(),
18811881
serde_json::json!({
18821882
"query": {

rust/cubesql/cubesql/src/sql/session.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ impl SessionState {
377377
Arc::clone(&self.temp_tables)
378378
}
379379

380-
pub fn get_load_request_meta(&self) -> LoadRequestMeta {
380+
pub fn get_load_request_meta(&self, api_type: &str) -> LoadRequestMeta {
381381
let application_name = if let Some(var) = self.get_variable("application_name") {
382382
Some(var.value.to_string())
383383
} else {
@@ -386,7 +386,7 @@ impl SessionState {
386386

387387
LoadRequestMeta::new(
388388
self.protocol.get_name().to_string(),
389-
"sql".to_string(),
389+
api_type.to_string(),
390390
application_name,
391391
)
392392
}

0 commit comments

Comments
 (0)