Skip to content

feat(cubesql): QueryRouter - remove some MySQL functionality #8818

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
Oct 16, 2024
Merged

feat(cubesql): QueryRouter - remove some MySQL functionality #8818

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
20 changes: 0 additions & 20 deletions rust/cubesql/cubesql/src/compile/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5324,26 +5324,6 @@ ORDER BY
Ok(())
}

#[tokio::test]
async fn test_show_processlist() -> Result<(), CubeError> {
insta::assert_snapshot!(
"show_processlist",
execute_query("SHOW processlist".to_string(), DatabaseProtocol::MySQL).await?
);

Ok(())
}

#[tokio::test]
async fn test_show_warnings() -> Result<(), CubeError> {
insta::assert_snapshot!(
"show_warnings",
execute_query("SHOW warnings".to_string(), DatabaseProtocol::MySQL).await?
);

Ok(())
}

#[tokio::test]
async fn test_information_schema_collations() -> Result<(), CubeError> {
insta::assert_snapshot!(
Expand Down
111 changes: 22 additions & 89 deletions rust/cubesql/cubesql/src/compile/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,101 +230,34 @@
variable: &Vec<ast::Ident>,
span_id: Option<Arc<SpanId>>,
) -> CompilationResult<QueryPlan> {
let name = variable.to_vec()[0].value.clone();
if self.state.protocol == DatabaseProtocol::PostgreSQL {
let full_variable = variable.iter().map(|v| v.value.to_lowercase()).join("_");
let full_variable = match full_variable.as_str() {
"transaction_isolation_level" => "transaction_isolation",
x => x,
};
let stmt = if name.eq_ignore_ascii_case("all") {
parse_sql_to_statement(
&"SELECT name, setting, short_desc as description FROM pg_catalog.pg_settings"
.to_string(),
self.state.protocol.clone(),
&mut None,
)?
} else {
parse_sql_to_statement(
// TODO: column name might be expected to match variable name
&format!(
"SELECT setting FROM pg_catalog.pg_settings where name = '{}'",
escape_single_quote_string(full_variable),
),
self.state.protocol.clone(),
&mut None,
)?
};
let full_variable = variable.iter().map(|v| v.value.to_lowercase()).join("_");
let full_variable = match full_variable.as_str() {
"transaction_isolation_level" => "transaction_isolation",
x => x,
};

self.create_df_logical_plan(stmt, &mut None, span_id.clone())
.await
} else if name.eq_ignore_ascii_case("databases") || name.eq_ignore_ascii_case("schemas") {
Ok(QueryPlan::MetaTabular(
StatusFlags::empty(),
Box::new(dataframe::DataFrame::new(
vec![dataframe::Column::new(
"Database".to_string(),
ColumnType::String,
ColumnFlags::empty(),
)],
vec![
dataframe::Row::new(vec![dataframe::TableValue::String("db".to_string())]),
dataframe::Row::new(vec![dataframe::TableValue::String(
"information_schema".to_string(),
)]),
dataframe::Row::new(vec![dataframe::TableValue::String(
"mysql".to_string(),
)]),
dataframe::Row::new(vec![dataframe::TableValue::String(
"performance_schema".to_string(),
)]),
dataframe::Row::new(vec![dataframe::TableValue::String("sys".to_string())]),
],
)),
))
} else if name.eq_ignore_ascii_case("processlist") {
let stmt = parse_sql_to_statement(
&"SELECT * FROM information_schema.processlist".to_string(),
let name = variable.to_vec()[0].value.clone();
let stmt = if name.eq_ignore_ascii_case("all") {
parse_sql_to_statement(
&"SELECT name, setting, short_desc as description FROM pg_catalog.pg_settings"
.to_string(),

Check warning on line 243 in rust/cubesql/cubesql/src/compile/router.rs

View check run for this annotation

Codecov / codecov/patch

rust/cubesql/cubesql/src/compile/router.rs#L241-L243 

Added lines #L241 - L243 were not covered by tests
self.state.protocol.clone(),
&mut None,
)?;

self.create_df_logical_plan(stmt, &mut None, span_id.clone())
.await
} else if name.eq_ignore_ascii_case("warnings") {
Ok(QueryPlan::MetaTabular(
StatusFlags::empty(),
Box::new(dataframe::DataFrame::new(
vec![
dataframe::Column::new(
"Level".to_string(),
ColumnType::VarStr,
ColumnFlags::NOT_NULL,
),
dataframe::Column::new(
"Code".to_string(),
ColumnType::Int32,
ColumnFlags::NOT_NULL | ColumnFlags::UNSIGNED,
),
dataframe::Column::new(
"Message".to_string(),
ColumnType::VarStr,
ColumnFlags::NOT_NULL,
),
],
vec![],
)),
))
)?

Check warning on line 246 in rust/cubesql/cubesql/src/compile/router.rs

View check run for this annotation

Codecov / codecov/patch

rust/cubesql/cubesql/src/compile/router.rs#L246 

Added line #L246 was not covered by tests
} else {
self.create_df_logical_plan(
ast::Statement::ShowVariable {
variable: variable.clone(),
},
parse_sql_to_statement(
// TODO: column name might be expected to match variable name
&format!(
"SELECT setting FROM pg_catalog.pg_settings where name = '{}'",
escape_single_quote_string(full_variable),
),
self.state.protocol.clone(),
&mut None,
span_id.clone(),
)
)?
};

self.create_df_logical_plan(stmt, &mut None, span_id.clone())
.await
}
}

fn explain_to_plan(
Expand Down
10 changes: 0 additions & 10 deletions rust/cubesql/cubesql/src/compile/snapshots/cubesql__compile__tests__show_processlist.snap
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions rust/cubesql/cubesql/src/compile/snapshots/cubesql__compile__tests__show_warnings.snap
View file
Open in desktop

This file was deleted.

Loading