Merge branch 'main' into return_type

jonahgao · Jan 11, 2025 · f2b4f02 · f2b4f02
2 parents 8bd0719 + 17446ad
commit f2b4f02
Show file tree

Hide file tree

Showing 24 changed files with 931 additions and 869 deletions.
diff --git a/datafusion-cli/Cargo.toml b/datafusion-cli/Cargo.toml
@@ -66,7 +66,7 @@ url = "2.5.4"
 
 [dev-dependencies]
 assert_cmd = "2.0"
-ctor = "0.2.0"
+ctor = "0.2.9"
 predicates = "3.0"
 rstest = "0.22"
 

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/core/tests/physical_optimizer/combine_partial_final_agg.rs b/datafusion/core/tests/physical_optimizer/combine_partial_final_agg.rs
@@ -15,6 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
+//! Tests for [`CombinePartialFinalAggregate`] physical optimizer rule
+//!
+//! Note these tests are not in the same module as the optimizer pass because
+//! they rely on `ParquetExec` which is in the core crate.
 use std::sync::Arc;
 
 use arrow::datatypes::{DataType, Field, Schema, SchemaRef};