This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new a337ca75d7 chore: avoid erroneuous warning for FFI table operation
(only not default value) (#15579)
a337ca75d7 is described below
commit a337ca75d758f2b92905045fc89e971a955851d4
Author: Chen Chongchen <chenkov...@qq.com>
AuthorDate: Wed Apr 9 22:58:13 2025 +0800
chore: avoid erroneuous warning for FFI table operation (only not default
value) (#15579)
* warning only not default value
* fmt
---
datafusion/common/src/config.rs | 47 +++++++++++++++++++++++++++++++++++++----
1 file changed, 43 insertions(+), 4 deletions(-)
diff --git a/datafusion/common/src/config.rs b/datafusion/common/src/config.rs
index b0f17630c9..449ce22693 100644
--- a/datafusion/common/src/config.rs
+++ b/datafusion/common/src/config.rs
@@ -149,9 +149,17 @@ macro_rules! config_namespace {
// $(#[allow(deprecated)])?
{
$(let value = $transform(value);)? // Apply
transformation if specified
- $(log::warn!($warn);)? // Log warning if
specified
#[allow(deprecated)]
- self.$field_name.set(rem, value.as_ref())
+ let ret = self.$field_name.set(rem,
value.as_ref());
+
+ $(if !$warn.is_empty() {
+ let default: $field_type = $default;
+ #[allow(deprecated)]
+ if default != self.$field_name {
+ log::warn!($warn);
+ }
+ })? // Log warning if specified, and the value
is not the default
+ ret
}
},
)*
@@ -1999,8 +2007,8 @@ mod tests {
use std::collections::HashMap;
use crate::config::{
- ConfigEntry, ConfigExtension, ConfigFileType, ExtensionOptions,
Extensions,
- TableOptions,
+ ConfigEntry, ConfigExtension, ConfigField, ConfigFileType,
ExtensionOptions,
+ Extensions, TableOptions,
};
#[derive(Default, Debug, Clone)]
@@ -2085,6 +2093,37 @@ mod tests {
assert_eq!(table_config.csv.escape.unwrap() as char, '\'');
}
+ #[test]
+ fn warning_only_not_default() {
+ use std::sync::atomic::AtomicUsize;
+ static COUNT: AtomicUsize = AtomicUsize::new(0);
+ use log::{Level, LevelFilter, Metadata, Record};
+ struct SimpleLogger;
+ impl log::Log for SimpleLogger {
+ fn enabled(&self, metadata: &Metadata) -> bool {
+ metadata.level() <= Level::Info
+ }
+
+ fn log(&self, record: &Record) {
+ if self.enabled(record.metadata()) {
+ COUNT.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
+ }
+ }
+ fn flush(&self) {}
+ }
+ log::set_logger(&SimpleLogger).unwrap();
+ log::set_max_level(LevelFilter::Info);
+ let mut sql_parser_options =
crate::config::SqlParserOptions::default();
+ sql_parser_options
+ .set("enable_options_value_normalization", "false")
+ .unwrap();
+ assert_eq!(COUNT.load(std::sync::atomic::Ordering::Relaxed), 0);
+ sql_parser_options
+ .set("enable_options_value_normalization", "true")
+ .unwrap();
+ assert_eq!(COUNT.load(std::sync::atomic::Ordering::Relaxed), 1);
+ }
+
#[cfg(feature = "parquet")]
#[test]
fn parquet_table_options() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@datafusion.apache.org
For additional commands, e-mail: commits-h...@datafusion.apache.org
