[arrow-datafusion] branch master updated: Fix logical conflict (#1801)

[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 6c80725  Fix logical conflict (#1801)
6c80725 is described below

commit 6c80725f289dcebfc81acd77b8e3853255e50e13
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Wed Feb 9 15:30:41 2022 -0500

    Fix logical conflict (#1801)
---
 ballista/rust/core/src/serde/mod.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ballista/rust/core/src/serde/mod.rs b/ballista/rust/core/src/serde/mod.rs
index 3a1736c..47d69eb 100644
--- a/ballista/rust/core/src/serde/mod.rs
+++ b/ballista/rust/core/src/serde/mod.rs
@@ -591,6 +591,7 @@ mod tests {
     use datafusion::logical_plan::{
         col, DFSchemaRef, Expr, LogicalPlan, LogicalPlanBuilder, UserDefinedLogicalNode,
     };
+    use datafusion::physical_plan::expressions::PhysicalSortExpr;
     use datafusion::physical_plan::planner::{DefaultPhysicalPlanner, ExtensionPlanner};
     use datafusion::physical_plan::{
         DisplayFormatType, Distribution, ExecutionPlan, Partitioning, PhysicalPlanner,
@@ -724,6 +725,10 @@ mod tests {
             Partitioning::UnknownPartitioning(1)
         }
 
+        fn output_ordering(&self) -> Option<&[PhysicalSortExpr]> {
+            None
+        }
+
         fn required_child_distribution(&self) -> Distribution {
             Distribution::SinglePartition
         }