[arrow-datafusion] branch master updated: Fix select from EmptyExec always return 0 row. (#1938)

[alamb]

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 d468177  Fix select from EmptyExec always return 0 row. (#1938)
d468177 is described below

commit d468177687a596721c0a2af61f395f14c41942cd
Author: Yang Jiang <37145547+ted-ji...@users.noreply.github.com>
AuthorDate: Mon Mar 7 20:11:52 2022 +0800

    Fix select from EmptyExec always return 0 row. (#1938)
    
    * fix select from EmptyExec always return 0 row.
    
    * fix clippy
---
 ballista/rust/client/src/context.rs   | 20 ++++++++++++++++++++
 datafusion/src/physical_plan/empty.rs | 11 +++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ballista/rust/client/src/context.rs 
b/ballista/rust/client/src/context.rs
index 8a57100..f736247 100644
--- a/ballista/rust/client/src/context.rs
+++ b/ballista/rust/client/src/context.rs
@@ -542,4 +542,24 @@ mod tests {
         let results = df.collect().await.unwrap();
         pretty::print_batches(&results);
     }
+
+    #[tokio::test]
+    #[cfg(feature = "standalone")]
+    async fn test_empty_exec_with_one_row() {
+        use crate::context::BallistaContext;
+        use ballista_core::config::{
+            BallistaConfigBuilder, BALLISTA_WITH_INFORMATION_SCHEMA,
+        };
+
+        let config = BallistaConfigBuilder::default()
+            .set(BALLISTA_WITH_INFORMATION_SCHEMA, "true")
+            .build()
+            .unwrap();
+        let context = BallistaContext::standalone(&config, 1).await.unwrap();
+
+        let sql = "select EXTRACT(year FROM 
to_timestamp('2020-09-08T12:13:14+00:00'));";
+
+        let df = context.sql(sql).await.unwrap();
+        assert!(!df.collect().await.unwrap().is_empty());
+    }
 }
diff --git a/datafusion/src/physical_plan/empty.rs 
b/datafusion/src/physical_plan/empty.rs
index 9b1c71c..045026b 100644
--- a/datafusion/src/physical_plan/empty.rs
+++ b/datafusion/src/physical_plan/empty.rs
@@ -108,7 +108,10 @@ impl ExecutionPlan for EmptyExec {
         children: Vec<Arc<dyn ExecutionPlan>>,
     ) -> Result<Arc<dyn ExecutionPlan>> {
         match children.len() {
-            0 => Ok(Arc::new(EmptyExec::new(false, self.schema.clone()))),
+            0 => Ok(Arc::new(EmptyExec::new(
+                self.produce_one_row,
+                self.schema.clone(),
+            ))),
             _ => Err(DataFusionError::Internal(
                 "EmptyExec wrong number of children".to_string(),
             )),
@@ -179,11 +182,15 @@ mod tests {
     #[test]
     fn with_new_children() -> Result<()> {
         let schema = test_util::aggr_test_schema();
-        let empty = EmptyExec::new(false, schema);
+        let empty = EmptyExec::new(false, schema.clone());
+        let empty_with_row = EmptyExec::new(true, schema);
 
         let empty2 = empty.with_new_children(vec![])?;
         assert_eq!(empty.schema(), empty2.schema());
 
+        let empty_with_row_2 = empty_with_row.with_new_children(vec![])?;
+        assert_eq!(empty_with_row.schema(), empty_with_row_2.schema());
+
         let too_many_kids = vec![empty2];
         assert!(
             empty.with_new_children(too_many_kids).is_err(),