@@ -16,7 +16,6 @@ use vortex_array::expr::Expression;
1616use vortex_array:: expr:: Root ;
1717use vortex_array:: mask:: MaskExecutor ;
1818use vortex_array:: serde:: ArrayParts ;
19- use vortex_array:: session:: ArraySessionExt ;
2019use vortex_dtype:: DType ;
2120use vortex_dtype:: FieldMask ;
2221use vortex_error:: VortexExpect ;
@@ -134,7 +133,6 @@ impl LayoutReader for FlatReader {
134133 let array = self . array_future ( ) ;
135134 let expr = expr. clone ( ) ;
136135 let session = self . session . clone ( ) ;
137- let optimizer = self . session . arrays ( ) . optimizer ( ) . clone ( ) ;
138136
139137 Ok ( MaskFuture :: new ( mask. len ( ) , async move {
140138 // TODO(ngates): if the mask density is low enough, or if the mask is dense within a range
@@ -151,13 +149,8 @@ impl LayoutReader for FlatReader {
151149 let array_mask = if * USE_VORTEX_OPERATORS {
152150 // Apply the expression to the array.
153151 let array = array. apply ( & expr) ?;
154-
155- tracing:: debug!( "Filter Array:\n {}" , array. display_tree( ) ) ;
156- let array = optimizer. optimize_array ( & array) ?;
157- tracing:: info!( "Optimized Filter Array:\n {}" , array. display_tree( ) ) ;
158-
159152 // Evaluate the array into a mask.
160- let array_mask = array. execute_mask ( & session) ?;
153+ let array_mask = array. execute_mask_optimized ( & session) ?;
161154 mask. bitand ( & array_mask)
162155 } else {
163156 // TODO(ngates): the mask may actually be dense within a range, as is often the case when
@@ -213,7 +206,6 @@ impl LayoutReader for FlatReader {
213206 let name = self . name . clone ( ) ;
214207 let array = self . array_future ( ) ;
215208 let expr = expr. clone ( ) ;
216- let optimizer = self . session . arrays ( ) . optimizer ( ) . clone ( ) ;
217209
218210 Ok ( async move {
219211 tracing:: debug!( "Flat array evaluation {} - {}" , name, expr) ;
@@ -235,9 +227,6 @@ impl LayoutReader for FlatReader {
235227 array = array. filter ( mask) ?;
236228 }
237229
238- tracing:: debug!( "Project Array:\n {}" , array. display_tree( ) ) ;
239- let array = optimizer. optimize_array ( & array) ?;
240- tracing:: info!( "Optimized Project Array:\n {}" , array. display_tree( ) ) ;
241230 array
242231 } else {
243232 // Filter the array based on the row mask.
0 commit comments