Skip to content

feat(cubesql): Allow providing API type when getting load request meta #9202

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
Feb 7, 2025
Merged

feat(cubesql): Allow providing API type when getting load request meta #9202

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions rust/cubesql/cubesql/src/compile/query_engine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pub trait QueryEngine {
.log_load_state(
Some(span_id.clone()),
auth_context,
state.get_load_request_meta(),
state.get_load_request_meta("sql"),
"SQL API Query Planning".to_string(),
serde_json::json!({
"query": span_id.query_key.clone(),
Expand Down Expand Up @@ -286,7 +286,7 @@ pub trait QueryEngine {
.log_load_state(
Some(span_id.clone()),
auth_context,
state.get_load_request_meta(),
state.get_load_request_meta("sql"),
"SQL API Query Planning Success".to_string(),
serde_json::json!({
"query": span_id.query_key.clone(),
Expand All @@ -302,7 +302,7 @@ pub trait QueryEngine {
// to catch all SQL generation errors during planning
let rewrite_plan = Self::evaluate_wrapped_sql(
self.transport_ref().clone(),
Arc::new(state.get_load_request_meta()),
Arc::new(state.get_load_request_meta("sql")),
rewrite_plan,
)
.await?;
Expand Down Expand Up @@ -390,7 +390,7 @@ impl QueryEngine for SqlQueryEngine {
) -> Result<DFSessionContext, CompilationError> {
let query_planner = Arc::new(CubeQueryPlanner::new(
self.transport_ref().clone(),
state.get_load_request_meta(),
state.get_load_request_meta("sql"),
self.config_ref().clone(),
));
let mut ctx = DFSessionContext::with_state(
Expand Down
14 changes: 7 additions & 7 deletions rust/cubesql/cubesql/src/sql/postgres/shim.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
.log_load_state(
span_id.clone(),
auth_context,
self.session.state.get_load_request_meta(),
self.session.state.get_load_request_meta("sql"),
"Load Request".to_string(),
serde_json::json!({
"query": span_id.as_ref().unwrap().query_key.clone(),
Expand Down Expand Up @@ -453,7 +453,7 @@
.log_load_state(
Some(span_id.clone()),
auth_context,
self.session.state.get_load_request_meta(),
self.session.state.get_load_request_meta("sql"),

Check warning on line 456 in rust/cubesql/cubesql/src/sql/postgres/shim.rs

View check run for this annotation

Codecov / codecov/patch

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

Added line #L456 was not covered by tests
"Data Query Status".to_string(),
serde_json::json!({
"isDataQuery": true
Expand Down Expand Up @@ -481,7 +481,7 @@
.log_load_state(
Some(span_id.clone()),
auth_context.clone(),
self.session.state.get_load_request_meta(),
self.session.state.get_load_request_meta("sql"),

Check warning on line 484 in rust/cubesql/cubesql/src/sql/postgres/shim.rs

View check run for this annotation

Codecov / codecov/patch

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

Added line #L484 was not covered by tests
"Data Query Status".to_string(),
serde_json::json!({
"isDataQuery": true,
Expand All @@ -496,7 +496,7 @@
.log_load_state(
Some(span_id.clone()),
auth_context,
self.session.state.get_load_request_meta(),
self.session.state.get_load_request_meta("sql"),
"Load Request Success".to_string(),
serde_json::json!({
"query": span_id.query_key.clone(),
Expand Down Expand Up @@ -602,7 +602,7 @@
.log_load_state(
Some(span_id.clone()),
auth_context,
self.session.state.get_load_request_meta(),
self.session.state.get_load_request_meta("sql"),
"SQL API Error".to_string(),
serde_json::json!({
"query": span_id.query_key.clone(),
Expand Down Expand Up @@ -1848,7 +1848,7 @@
.log_load_state(
span_id.clone(),
auth_context,
self.session.state.get_load_request_meta(),
self.session.state.get_load_request_meta("sql"),
"Load Request".to_string(),
serde_json::json!({
"query": {
Expand Down Expand Up @@ -1876,7 +1876,7 @@
.log_load_state(
Some(span_id.clone()),
auth_context,
self.session.state.get_load_request_meta(),
self.session.state.get_load_request_meta("sql"),
"Load Request Success".to_string(),
serde_json::json!({
"query": {
Expand Down
4 changes: 2 additions & 2 deletions rust/cubesql/cubesql/src/sql/session.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ impl SessionState {
Arc::clone(&self.temp_tables)
}

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

LoadRequestMeta::new(
self.protocol.get_name().to_string(),
"sql".to_string(),
api_type.to_string(),
application_name,
)
}
Expand Down
Loading