added "DEFAULT_CLI_FORMAT_OPTIONS" for cli and sqllogic test (#14052)

* added "DEFAULT_CLI_FORMAT_OPTIONS" for cli and sqllotic test * cargo fmt fix * fixed few errors
apache · Jan 11, 2025 · 17446ad · 17446ad
1 parent d91a7c0
commit 17446ad
Show file tree

Hide file tree

Showing 14 changed files with 370 additions and 365 deletions.
diff --git a/datafusion-cli/src/print_format.rs b/datafusion-cli/src/print_format.rs
@@ -26,7 +26,7 @@ use arrow::datatypes::SchemaRef;
 use arrow::json::{ArrayWriter, LineDelimitedWriter};
 use arrow::record_batch::RecordBatch;
 use arrow::util::pretty::pretty_format_batches_with_options;
-use datafusion::common::format::DEFAULT_FORMAT_OPTIONS;
+use datafusion::common::format::DEFAULT_CLI_FORMAT_OPTIONS;
 use datafusion::error::Result;
 
 /// Allow records to be printed in different formats
@@ -133,7 +133,7 @@ fn format_batches_with_maxrows<W: std::io::Write>(
 
             let formatted = pretty_format_batches_with_options(
                 &filtered_batches,
-                &DEFAULT_FORMAT_OPTIONS,
+                &DEFAULT_CLI_FORMAT_OPTIONS,
             )?;
             if over_limit {
                 let mut formatted_str = format!("{}", formatted);
@@ -145,7 +145,7 @@ fn format_batches_with_maxrows<W: std::io::Write>(
         }
         MaxRows::Unlimited => {
             let formatted =
-                pretty_format_batches_with_options(batches, &DEFAULT_FORMAT_OPTIONS)?;
+                pretty_format_batches_with_options(batches, &DEFAULT_CLI_FORMAT_OPTIONS)?;
             writeln!(writer, "{}", formatted)?;
         }
     }
@@ -201,7 +201,7 @@ impl PrintFormat {
                 let empty_batch = RecordBatch::new_empty(schema);
                 let formatted = pretty_format_batches_with_options(
                     &[empty_batch],
-                    &DEFAULT_FORMAT_OPTIONS,
+                    &DEFAULT_CLI_FORMAT_OPTIONS,
                 )?;
                 writeln!(writer, "{}", formatted)?;
             }

diff --git a/datafusion/common/src/format.rs b/datafusion/common/src/format.rs
@@ -27,3 +27,7 @@ pub const DEFAULT_CAST_OPTIONS: CastOptions<'static> = CastOptions {
     safe: false,
     format_options: DEFAULT_FORMAT_OPTIONS,
 };
+
+pub const DEFAULT_CLI_FORMAT_OPTIONS: FormatOptions<'static> = FormatOptions::new()
+    .with_duration_format(DurationFormat::Pretty)
+    .with_null("NULL");
diff --git a/datafusion/functions-nested/src/map.rs b/datafusion/functions-nested/src/map.rs
@@ -195,7 +195,7 @@ SELECT MAP('type', 'test');
 
 SELECT MAP(['POST', 'HEAD', 'PATCH'], [41, 33, null]);
 ----
-{POST: 41, HEAD: 33, PATCH: }
+{POST: 41, HEAD: 33, PATCH: NULL}
 
 SELECT MAP([[1,2], [3,4]], ['a', 'b']);
 ----

diff --git a/datafusion/sqllogictest/src/engines/datafusion_engine/normalize.rs b/datafusion/sqllogictest/src/engines/datafusion_engine/normalize.rs
@@ -20,7 +20,7 @@ use arrow::array::{Array, AsArray};
 use arrow::datatypes::Fields;
 use arrow::util::display::ArrayFormatter;
 use arrow::{array, array::ArrayRef, datatypes::DataType, record_batch::RecordBatch};
-use datafusion_common::format::DEFAULT_FORMAT_OPTIONS;
+use datafusion_common::format::DEFAULT_CLI_FORMAT_OPTIONS;
 use datafusion_common::DataFusionError;
 use std::path::PathBuf;
 use std::sync::LazyLock;
@@ -240,7 +240,8 @@ pub fn cell_to_string(col: &ArrayRef, row: usize) -> Result<String> {
                 Ok(cell_to_string(dict.values(), key)?)
             }
             _ => {
-                let f = ArrayFormatter::try_new(col.as_ref(), &DEFAULT_FORMAT_OPTIONS);
+                let f =
+                    ArrayFormatter::try_new(col.as_ref(), &DEFAULT_CLI_FORMAT_OPTIONS);
                 Ok(f.unwrap().value(row).to_string())
             }
         }

diff --git a/datafusion/sqllogictest/test_files/aggregate.slt b/datafusion/sqllogictest/test_files/aggregate.slt
@@ -4236,7 +4236,7 @@ query T?
 SELECT tag, array_agg(millis - arrow_cast(secs, 'Timestamp(Millisecond, None)')) FROM t GROUP BY tag ORDER BY tag;
 ----
 X [0 days 0 hours 0 mins 0.011 secs, 0 days 0 hours 0 mins 0.123 secs]
-Y [, 0 days 0 hours 0 mins 0.432 secs]
+Y [NULL, 0 days 0 hours 0 mins 0.432 secs]
 
 statement ok
 drop table t_source;