Clean up

datafusion-cli/src/exec.rs

@@ -128,7 +128,7 @@ pub async fn exec_from_repl(
     )));
     rl.load_history(".history").ok();
 
-    let mut print_options = print_options.clone();
+    let mut print_options = *print_options;
 
     loop {
         match rl.readline("❯ ") {
@@ -215,13 +215,17 @@ async fn exec_and_print(
     for statement in statements {
         let mut plan = ctx.state().statement_to_plan(statement).await?;
 
+        // For plans like `Explain` ignore `MaxRows` option and always display all rows
         let should_ignore_maxrows = matches!(
             plan,
             LogicalPlan::Explain(_)
                 | LogicalPlan::DescribeTable(_)
                 | LogicalPlan::Analyze(_)
         );
 
+        // Note that cmd is a mutable reference so that create_external_table function can remove all
+        // datafusion-cli specific options before passing through to datafusion. Otherwise, datafusion
+        // will raise Configuration errors.
         if let LogicalPlan::Ddl(DdlStatement::CreateExternalTable(cmd)) = &mut plan {
             create_external_table(ctx, cmd).await?;
         }
@@ -293,9 +297,8 @@ mod tests {
     use std::str::FromStr;
 
     use super::*;
-
-    use datafusion_common::file_options::StatementOptions;
-    use datafusion_common::{plan_err, FileTypeWriterOptions};
+    use datafusion::common::plan_err;
+    use datafusion_common::{file_options::StatementOptions, FileTypeWriterOptions};
 
     async fn create_external_table_test(location: &str, sql: &str) -> Result<()> {
         let ctx = SessionContext::new();

datafusion-cli/src/main.rs

@@ -334,7 +334,6 @@ fn extract_memory_pool_size(size: &str) -> Result<usize, String> {
 #[cfg(test)]
 mod tests {
     use super::*;
-
     use datafusion::assert_batches_eq;
 
     fn assert_conversion(input: &str, expected: Result<usize, String>) {

datafusion-cli/src/print_format.rs

@@ -104,15 +104,13 @@ fn format_batches_with_maxrows<W: std::io::Write>(
                 }
             }
 
-            // Formatting and writing to the writer
             let formatted = pretty_format_batches_with_options(
                 &filtered_batches,
                 &DEFAULT_FORMAT_OPTIONS,
             )?;
             write!(writer, "{}", formatted)?;
         }
         MaxRows::Unlimited => {
-            // Format all rows and write to the writer
             let formatted =
                 pretty_format_batches_with_options(batches, &DEFAULT_FORMAT_OPTIONS)?;
             write!(writer, "{}", formatted)?;
@@ -124,7 +122,7 @@ fn format_batches_with_maxrows<W: std::io::Write>(
 
 impl PrintFormat {
     /// Print the batches to a writer using the specified format
-    pub fn print_batches_to_writer<W: std::io::Write>(
+    pub fn print_batches<W: std::io::Write>(
         &self,
         writer: &mut W,
         batches: &[RecordBatch],

datafusion-cli/src/print_options.rs

@@ -103,7 +103,7 @@ impl PrintOptions {
         let mut writer = stdout.lock();
 
         self.format
-            .print_batches_to_writer(&mut writer, batches, self.maxrows, true)?;
+            .print_batches(&mut writer, batches, self.maxrows, true)?;
 
         let row_count: usize = batches.iter().map(|b| b.num_rows()).sum();
         let timing_info = get_timing_info_str(row_count, self.maxrows, query_start_time);
@@ -134,9 +134,9 @@ impl PrintOptions {
 
         while let Some(Ok(batch)) = stream.next().await {
             row_count += batch.num_rows();
-            self.format.print_batches_to_writer(
+            self.format.print_batches(
                 &mut writer,
-                &vec![batch],
+                &[batch],
                 MaxRows::Unlimited,
                 with_header,
             )?;