Apache DataFusion SQL Query Engine
minor: validate config `recursion_limit` when setting it (#23592)
Yongting Youf3939df8e4cd
diff --git a/datafusion/common/src/config.rs b/datafusion/common/src/config.rsindex b649ecad57..a3ebba29db 100644--- a/datafusion/common/src/config.rs+++ b/datafusion/common/src/config.rs@@ -301,7 +301,7 @@ config_namespace! {pub collect_spans: bool, default = false/// Specifies the recursion depth limit when parsing complex SQL Queries- pub recursion_limit: usize, default = 50+ pub recursion_limit: ConfigNonZeroUsize, default = non_zero_usize_default(50)/// Specifies the default null ordering for query results. There are 4 options:/// - `nulls_max`: Nulls appear last in ascending order.diff --git a/datafusion/core/src/execution/session_state.rs b/datafusion/core/src/execution/session_state.rsindex f1f5465212..9ca16d5ba2 100644--- a/datafusion/core/src/execution/session_state.rs+++ b/datafusion/core/src/execution/session_state.rs@@ -444,7 +444,7 @@ impl SessionState {)})?;- let recursion_limit = self.config.options().sql_parser.recursion_limit;+ let recursion_limit = self.config.options().sql_parser.recursion_limit.get();let mut statements = DFParserBuilder::new(sql).with_dialect(dialect.as_ref())@@ -492,7 +492,7 @@ impl SessionState {)})?;- let recursion_limit = self.config.options().sql_parser.recursion_limit;+ let recursion_limit = self.config.options().sql_parser.recursion_limit.get();let expr = DFParserBuilder::new(sql).with_dialect(dialect.as_ref()).with_recursion_limit(recursion_limit)diff --git a/datafusion/sql/src/parser.rs b/datafusion/sql/src/parser.rsindex c6abfffbea..0d7b7c63de 100644--- a/datafusion/sql/src/parser.rs+++ b/datafusion/sql/src/parser.rs@@ -21,7 +21,7 @@//! `CREATE EXTERNAL TABLE`use datafusion_common::DataFusionError;-use datafusion_common::config::SqlParserOptions;+use datafusion_common::config::{ConfigNonZeroUsize, SqlParserOptions};use datafusion_common::format::{ExplainFormat, ExplainStatementOptions};use datafusion_common::{Diagnostic, Span, sql_err};use sqlparser::ast::{ExprWithAlias, Ident, OrderByOptions};@@ -472,7 +472,7 @@ impl<'a, 'b> DFParserBuilder<'a, 'b> {.with_tokens_with_locations(tokens).with_recursion_limit(self.recursion_limit),options: SqlParserOptions {- recursion_limit: self.recursion_limit,+ recursion_limit: ConfigNonZeroUsize::try_new(self.recursion_limit)?,..Default::default()},supports_explain_with_utility_options: selfdiff --git a/datafusion/sqllogictest/test_files/set_variable.slt b/datafusion/sqllogictest/test_files/set_variable.sltindex c86c0007b6..58c940a0f1 100644--- a/datafusion/sqllogictest/test_files/set_variable.slt+++ b/datafusion/sqllogictest/test_files/set_variable.slt@@ -724,6 +724,9 @@ SET datafusion.runtime.list_files_cache_ttl = '1m18446744073709551556s'statement error DataFusion error: Invalid or Unsupported Configuration: value must be greater than 0SET datafusion.execution.batch_size = 0+statement error DataFusion error: Invalid or Unsupported Configuration: value must be greater than 0+SET datafusion.sql_parser.recursion_limit = 0+# Config resetstatement okRESET datafusion.catalog.create_default_catalog_and_schema