@@ -20,7 +20,8 @@ use datafusion::{
2020 optimizer:: { optimizer:: Optimizer , OptimizerConfig , OptimizerRule } ,
2121 physical_expr:: EquivalenceProperties ,
2222 physical_plan:: {
23- DisplayAs , DisplayFormatType , ExecutionMode , ExecutionPlan , Partitioning , PlanProperties ,
23+ execution_plan:: { Boundedness , EmissionType } ,
24+ DisplayAs , DisplayFormatType , ExecutionPlan , Partitioning , PlanProperties ,
2425 SendableRecordBatchStream ,
2526 } ,
2627 sql:: {
@@ -579,15 +580,18 @@ fn rewrite_table_scans_in_expr(
579580 } )
580581 } )
581582 . transpose ( ) ?,
582- ..options
583+ ..* options
583584 } ;
584585 if let Some ( rewrite) = qualifier. as_ref ( ) . and_then ( |q| known_rewrites. get ( q) ) {
585586 Ok ( Expr :: Wildcard {
586587 qualifier : Some ( rewrite. clone ( ) ) ,
587- options,
588+ options : Box :: new ( options ) ,
588589 } )
589590 } else {
590- Ok ( Expr :: Wildcard { qualifier, options } )
591+ Ok ( Expr :: Wildcard {
592+ qualifier,
593+ options : Box :: new ( options) ,
594+ } )
591595 }
592596 }
593597 Expr :: GroupingSet ( gs) => match gs {
@@ -676,7 +680,8 @@ impl VirtualExecutionPlan {
676680 let props = PlanProperties :: new (
677681 EquivalenceProperties :: new ( Arc :: new ( schema) ) ,
678682 Partitioning :: UnknownPartitioning ( 1 ) ,
679- ExecutionMode :: Bounded ,
683+ EmissionType :: Incremental ,
684+ Boundedness :: Bounded ,
680685 ) ;
681686 Self {
682687 plan,
@@ -952,7 +957,7 @@ mod tests {
952957 // different tables in single aggregation expression
953958 (
954959 "SELECT COUNT(CASE WHEN appt.a > 0 THEN appt.a ELSE dft.a END) FROM app_table as appt, foo.df_table as dft" ,
955- "SELECT count(CASE WHEN (appt.a > 0) THEN appt.a ELSE dft.a END) FROM remote_table AS appt JOIN remote_table AS dft"
960+ "SELECT count(CASE WHEN (appt.a > 0) THEN appt.a ELSE dft.a END) FROM remote_table AS appt CROSS JOIN remote_table AS dft"
956961 ) ,
957962 ] ;
958963
0 commit comments