[arrow-datafusion] branch master updated: remove type renaming (#4273)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alamb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git


The following commit(s) were added to refs/heads/master by this push:
     new 37f78a8be remove type renaming (#4273)
37f78a8be is described below

commit 37f78a8be89dd78d0e371948e2de52a12c63c9f5
Author: Remzi Yang <59...@users.noreply.github.com>
AuthorDate: Sat Nov 19 04:27:55 2022 +0800

    remove type renaming (#4273)
    
    Signed-off-by: remzi <13...@gmail.com>
    
    Signed-off-by: remzi <13...@gmail.com>
---
 datafusion/expr/src/columnar_value.rs           | 12 +++---------
 datafusion/expr/src/lib.rs                      |  2 +-
 datafusion/physical-expr/src/scalar_function.rs |  3 +--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/datafusion/expr/src/columnar_value.rs b/datafusion/expr/src/columnar_value.rs
index 48a29208b..9a18bdcea 100644
--- a/datafusion/expr/src/columnar_value.rs
+++ b/datafusion/expr/src/columnar_value.rs
@@ -20,7 +20,6 @@
 use arrow::array::ArrayRef;
 use arrow::array::NullArray;
 use arrow::datatypes::DataType;
-use arrow::record_batch::RecordBatch;
 use datafusion_common::ScalarValue;
 use std::sync::Arc;
 
@@ -54,15 +53,10 @@ impl ColumnarValue {
             ColumnarValue::Scalar(scalar) => scalar.to_array_of_size(num_rows),
         }
     }
-}
-
-/// null columnar values are implemented as a null array in order to pass batch
-/// num_rows
-pub type NullColumnarValue = ColumnarValue;
 
-impl From<&RecordBatch> for NullColumnarValue {
-    fn from(batch: &RecordBatch) -> Self {
-        let num_rows = batch.num_rows();
+    /// null columnar values are implemented as a null array in order to pass batch
+    /// num_rows
+    pub fn create_null_array(num_rows: usize) -> Self {
         ColumnarValue::Array(Arc::new(NullArray::new(num_rows)))
     }
 }
diff --git a/datafusion/expr/src/lib.rs b/datafusion/expr/src/lib.rs
index c8958cb23..e061b1345 100644
--- a/datafusion/expr/src/lib.rs
+++ b/datafusion/expr/src/lib.rs
@@ -55,7 +55,7 @@ pub mod window_function;
 pub use accumulator::{Accumulator, AggregateState};
 pub use aggregate_function::AggregateFunction;
 pub use built_in_function::BuiltinScalarFunction;
-pub use columnar_value::{ColumnarValue, NullColumnarValue};
+pub use columnar_value::ColumnarValue;
 pub use expr::{
     Between, BinaryExpr, Case, Cast, Expr, GetIndexedField, GroupingSet, Like,
 };
diff --git a/datafusion/physical-expr/src/scalar_function.rs b/datafusion/physical-expr/src/scalar_function.rs
index fe674497a..cdcaf42b2 100644
--- a/datafusion/physical-expr/src/scalar_function.rs
+++ b/datafusion/physical-expr/src/scalar_function.rs
@@ -37,7 +37,6 @@ use arrow::record_batch::RecordBatch;
 use datafusion_common::Result;
 use datafusion_expr::BuiltinScalarFunction;
 use datafusion_expr::ColumnarValue;
-pub use datafusion_expr::NullColumnarValue;
 use datafusion_expr::ScalarFunctionImplementation;
 use std::any::Any;
 use std::fmt::Debug;
@@ -134,7 +133,7 @@ impl PhysicalExpr for ScalarFunctionExpr {
         // indicating the batch size (as a convention)
         let inputs = match (self.args.len(), self.name.parse::<BuiltinScalarFunction>()) {
             (0, Ok(scalar_fun)) if scalar_fun.supports_zero_argument() => {
-                vec![NullColumnarValue::from(batch)]
+                vec![ColumnarValue::create_null_array(batch.num_rows())]
             }
             _ => self
                 .args