-
Notifications
You must be signed in to change notification settings - Fork 1.9k
support SET variable
#4069
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.
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
support SET variable
#4069
Changes from all commits
4cd9aba
798998c
1f26272
2fe8fc2
ecd4b0f
4bc89a2
955c3e5
6704dde
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -67,7 +67,7 @@ use crate::error::{DataFusionError, Result}; | |
| use crate::logical_expr::{ | ||
| CreateCatalog, CreateCatalogSchema, CreateExternalTable, CreateMemoryTable, | ||
| CreateView, DropTable, DropView, Explain, LogicalPlan, LogicalPlanBuilder, | ||
| TableSource, TableType, UNNAMED_TABLE, | ||
| SetVariable, TableSource, TableType, UNNAMED_TABLE, | ||
| }; | ||
| use crate::optimizer::optimizer::{OptimizerConfig, OptimizerRule}; | ||
| use datafusion_sql::{ResolvedTableReference, TableReference}; | ||
|
|
@@ -341,6 +341,60 @@ impl SessionContext { | |
| ))), | ||
| } | ||
| } | ||
|
|
||
| LogicalPlan::SetVariable(SetVariable { | ||
| variable, value, .. | ||
| }) => { | ||
| let config_options = &self.state.write().config.config_options; | ||
|
|
||
| let old_value = | ||
| config_options.read().get(&variable).ok_or_else(|| { | ||
| DataFusionError::Execution(format!( | ||
| "Can not SET variable: Unknown Variable {}", | ||
| variable | ||
| )) | ||
| })?; | ||
|
|
||
| match old_value { | ||
| ScalarValue::Boolean(_) => { | ||
| let new_value = value.parse::<bool>().map_err(|_| { | ||
| DataFusionError::Execution(format!( | ||
| "Failed to parse {} as bool", | ||
| value, | ||
| )) | ||
| })?; | ||
| config_options.write().set_bool(&variable, new_value); | ||
| } | ||
|
|
||
| ScalarValue::UInt64(_) => { | ||
| let new_value = value.parse::<u64>().map_err(|_| { | ||
| DataFusionError::Execution(format!( | ||
| "Failed to parse {} as u64", | ||
| value, | ||
| )) | ||
| })?; | ||
| config_options.write().set_u64(&variable, new_value); | ||
| } | ||
|
|
||
| ScalarValue::Utf8(_) => { | ||
| let new_value = value.parse::<String>().map_err(|_| { | ||
| DataFusionError::Execution(format!( | ||
| "Failed to parse {} as String", | ||
| value, | ||
| )) | ||
| })?; | ||
| config_options.write().set_string(&variable, new_value); | ||
| } | ||
|
|
||
| _ => { | ||
| return Err(DataFusionError::Execution( | ||
| "Unsupported Scalar Value Type".to_string(), | ||
| )) | ||
| } | ||
| } | ||
|
Comment on lines
+358
to
+394
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. not sure whether it's a good way to check the data type. ideally we should use DataType defined in but this information is gone once it's been converted to
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think checking the existing type is a reasonable approach |
||
| self.return_empty_dataframe() | ||
| } | ||
|
|
||
| LogicalPlan::CreateCatalogSchema(CreateCatalogSchema { | ||
| schema_name, | ||
| if_not_exists, | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,296 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| // KIND, either express or implied. See the License for the | ||
| // specific language governing permissions and limitations | ||
| // under the License. | ||
|
|
||
| use super::*; | ||
|
|
||
| #[tokio::test] | ||
| async fn set_variable_to_value() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| ctx.sql("SET datafusion.execution.batch_size to 1") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.batch_size") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------+---------+", | ||
| "| datafusion.execution.batch_size | 1 |", | ||
| "+---------------------------------+---------+", | ||
| ]; | ||
| assert_batches_sorted_eq!(expected, &result); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_variable_to_value_with_equal_sign() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| ctx.sql("SET datafusion.execution.batch_size = 1") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.batch_size") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------+---------+", | ||
| "| datafusion.execution.batch_size | 1 |", | ||
| "+---------------------------------+---------+", | ||
| ]; | ||
| assert_batches_sorted_eq!(expected, &result); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_variable_to_value_with_single_quoted_string() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| ctx.sql("SET datafusion.execution.batch_size to '1'") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.batch_size") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------+---------+", | ||
| "| datafusion.execution.batch_size | 1 |", | ||
| "+---------------------------------+---------+", | ||
| ]; | ||
| assert_batches_sorted_eq!(expected, &result); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_variable_to_value_case_insensitive() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| ctx.sql("SET datafusion.EXECUTION.batch_size to '1'") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.batch_size") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------+---------+", | ||
| "| datafusion.execution.batch_size | 1 |", | ||
| "+---------------------------------+---------+", | ||
| ]; | ||
| assert_batches_sorted_eq!(expected, &result); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_variable_unknown_variable() { | ||
| let ctx = SessionContext::new(); | ||
|
|
||
| let err = plan_and_collect(&ctx, "SET aabbcc to '1'") | ||
| .await | ||
| .unwrap_err(); | ||
| assert_eq!( | ||
| err.to_string(), | ||
| "Execution error: Can not SET variable: Unknown Variable aabbcc" | ||
| ); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_bool_variable() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| ctx.sql("SET datafusion.execution.coalesce_batches to true") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.coalesce_batches") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------------+---------+", | ||
| "| datafusion.execution.coalesce_batches | true |", | ||
| "+---------------------------------------+---------+", | ||
| ]; | ||
| assert_batches_eq!(expected, &result); | ||
|
|
||
| ctx.sql("SET datafusion.execution.coalesce_batches to 'false'") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.coalesce_batches") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------------+---------+", | ||
| "| datafusion.execution.coalesce_batches | false |", | ||
| "+---------------------------------------+---------+", | ||
| ]; | ||
| assert_batches_eq!(expected, &result); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_bool_variable_bad_value() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| let err = plan_and_collect(&ctx, "SET datafusion.execution.coalesce_batches to 1") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Execution error: Failed to parse 1 as bool" | ||
| ); | ||
|
|
||
| let err = plan_and_collect(&ctx, "SET datafusion.execution.coalesce_batches to abc") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Execution error: Failed to parse abc as bool" | ||
| ); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_u64_variable() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| ctx.sql("SET datafusion.execution.batch_size to 0") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.batch_size") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------+---------+", | ||
| "| datafusion.execution.batch_size | 0 |", | ||
| "+---------------------------------+---------+", | ||
| ]; | ||
| assert_batches_eq!(expected, &result); | ||
|
|
||
| ctx.sql("SET datafusion.execution.batch_size to '1'") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.batch_size") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------+---------+", | ||
| "| datafusion.execution.batch_size | 1 |", | ||
| "+---------------------------------+---------+", | ||
| ]; | ||
| assert_batches_eq!(expected, &result); | ||
|
|
||
| ctx.sql("SET datafusion.execution.batch_size to +2") | ||
| .await | ||
| .unwrap(); | ||
| let result = plan_and_collect(&ctx, "SHOW datafusion.execution.batch_size") | ||
| .await | ||
| .unwrap(); | ||
| let expected = vec![ | ||
| "+---------------------------------+---------+", | ||
| "| name | setting |", | ||
| "+---------------------------------+---------+", | ||
| "| datafusion.execution.batch_size | 2 |", | ||
| "+---------------------------------+---------+", | ||
| ]; | ||
| assert_batches_eq!(expected, &result); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_u64_variable_bad_value() { | ||
| let ctx = | ||
| SessionContext::with_config(SessionConfig::new().with_information_schema(true)); | ||
|
|
||
| let err = plan_and_collect(&ctx, "SET datafusion.execution.batch_size to -1") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Execution error: Failed to parse -1 as u64" | ||
| ); | ||
|
|
||
| let err = plan_and_collect(&ctx, "SET datafusion.execution.batch_size to abc") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Execution error: Failed to parse abc as u64" | ||
| ); | ||
|
|
||
| let err = plan_and_collect(&ctx, "SET datafusion.execution.batch_size to 0.1") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Execution error: Failed to parse 0.1 as u64" | ||
| ); | ||
| } | ||
|
|
||
| #[tokio::test] | ||
| async fn set_time_zone() { | ||
| // we don't support changing time zone for now until all time zone issues fixed and related function completed | ||
|
|
||
| let ctx = SessionContext::new(); | ||
|
|
||
| // for full variable name | ||
| let err = plan_and_collect(&ctx, "set datafusion.execution.time_zone = '8'") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Error during planning: Changing Time Zone isn't supported yet" | ||
| ); | ||
|
Comment on lines
+261
to
+275
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should get back to this once time zone is fully integrated
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
|
|
||
| // for alias time zone | ||
| let err = plan_and_collect(&ctx, "set time zone = '8'") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Error during planning: Changing Time Zone isn't supported yet" | ||
| ); | ||
|
|
||
| // for alias timezone | ||
| let err = plan_and_collect(&ctx, "set timezone = '8'") | ||
| .await | ||
| .unwrap_err(); | ||
|
|
||
| assert_eq!( | ||
| err.to_string(), | ||
| "Error during planning: Changing Time Zone isn't supported yet" | ||
| ); | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
better refactor this part in the follow on pr once #3909 merged