Merge commit '079ddb04b7c36006f571d7253ffd752f8d5a44ff'

Author: silezhou

datafusion-testing

@@ -123,8 +123,18 @@ impl DisplayAs for CoalesceBatchesExec {
                 Ok(())
             }
             DisplayFormatType::TreeRender => {
-                // TODO: collect info
-                write!(f, "")
+                writeln!(f, "target_batch_size={}", self.target_batch_size)?;
+                if let Some(fetch) = self.fetch {
+                    write!(f, "limit={fetch}")?;
+                };
+                Ok(())
+            }
+            DisplayFormatType::TreeRender => {
+                writeln!(f, "target_batch_size={}", self.target_batch_size)?;
+                if let Some(fetch) = self.fetch {
+                    write!(f, "limit={fetch}")?;
+                };
+                Ok(())
             }
         }
     }

datafusion/physical-plan/src/coalesce_batches.rs

@@ -193,8 +193,17 @@ impl DisplayAs for LazyMemoryExec {
                 )
             }
             DisplayFormatType::TreeRender => {
-                // TODO: collect info
-                write!(f, "")
+                //TODO: remove batch_size, add one line per generator
+                writeln!(
+                    f,
+                    "batch_generators={}",
+                    self.batch_generators
+                        .iter()
+                        .map(|g| g.read().to_string())
+                        .collect::<Vec<String>>()
+                        .join(", ")
+                )?;
+                Ok(())
             }
         }
     }

datafusion/physical-plan/src/memory.rs

@@ -564,18 +564,18 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
                         Ok(DataType::UInt32)
                     }
             SQLDataType::Varchar(length) => {
-                        match (length, self.options.support_varchar_with_length) {
-                            (Some(_), false) => plan_err!("does not support Varchar with length, please set `support_varchar_with_length` to be true"),
-                            _ => {
+                match (length, self.options.support_varchar_with_length) {
+                    (Some(_), false) => plan_err!("does not support Varchar with length, please set `support_varchar_with_length` to be true"),
+                    _ => {
                         if self.options.map_varchar_to_utf8view {
                             Ok(DataType::Utf8View)
                         } else {
                             Ok(DataType::Utf8)
                         }
                     }
-                        }
-                    }
-            SQLDataType::BigIntUnsigned(_) | SQLDataType::Int8Unsigned(_) => Ok(DataType::UInt64),
+                }
+            }
+            SQLDataType::UnsignedBigInt(_) | SQLDataType::UnsignedInt8(_) => Ok(DataType::UInt64),
             SQLDataType::Float(_) => Ok(DataType::Float32),
             SQLDataType::Real | SQLDataType::Float4 => Ok(DataType::Float32),
             SQLDataType::Double(ExactNumberInfo::None) | SQLDataType::DoublePrecision | SQLDataType::Float8 => Ok(DataType::Float64),

datafusion/sql/src/planner.rs

@@ -29,6 +29,7 @@ use crate::utils::{
 use datafusion_common::error::DataFusionErrorBuilder;
 use datafusion_common::tree_node::{TreeNode, TreeNodeRecursion};
 use datafusion_common::{not_impl_err, plan_err, Column, Result};
+use datafusion_common::{not_impl_err, plan_err, Column, Result};
 use datafusion_common::{RecursionUnnestOption, UnnestOptions};
 use datafusion_expr::expr::{Alias, PlannedReplaceSelectItem, WildcardOptions};
 use datafusion_expr::expr_rewriter::{
@@ -37,6 +38,8 @@ use datafusion_expr::expr_rewriter::{
 use datafusion_expr::utils::{
     expand_qualified_wildcard, expand_wildcard, expr_as_column_expr, expr_to_columns,
     find_aggregate_exprs, find_window_exprs,
+    expand_qualified_wildcard, expand_wildcard, expr_as_column_expr, expr_to_columns,
+    find_aggregate_exprs, find_window_exprs,
 };
 use datafusion_expr::{
     Aggregate, Expr, Filter, GroupingSet, LogicalPlan, LogicalPlanBuilder,
@@ -99,18 +102,6 @@ impl<S: ContextProvider> SqlToRel<'_, S> {
             debug_assert!(!matches!(expr, Expr::Wildcard { .. }));
         }
 
-        // TOOD: remove this after Expr::Wildcard is removed
-        #[allow(deprecated)]
-        for expr in &select_exprs {
-            debug_assert!(!matches!(expr, Expr::Wildcard { .. }));
-        }
-
-        // TOOD: remove this after Expr::Wildcard is removed
-        #[allow(deprecated)]
-        for expr in &select_exprs {
-            debug_assert!(!matches!(expr, Expr::Wildcard { .. }));
-        }
-
         let order_by =
             to_order_by_exprs_with_select(query_order_by, Some(select_exprs.clone()))?;
 

datafusion/sql/src/select.rs

@@ -21,6 +21,7 @@ use datafusion_expr::test::function_stub::{
     count_udaf, max_udaf, min_udaf, sum, sum_udaf,
 };
 use datafusion_expr::{
+    cast, col, lit, table_scan, wildcard, EmptyRelation, Expr, Extension, LogicalPlan,
     cast, col, lit, table_scan, wildcard, EmptyRelation, Expr, Extension, LogicalPlan,
     LogicalPlanBuilder, Union, UserDefinedLogicalNode, UserDefinedLogicalNodeCore,
 };
@@ -38,6 +39,7 @@ use datafusion_sql::unparser::{expr_to_sql, plan_to_sql, Unparser};
 use sqlparser::ast::Statement;
 use std::hash::Hash;
 use std::ops::Add;
+use std::ops::Add;
 use std::sync::Arc;
 use std::{fmt, vec};