@@ -188,10 +188,10 @@ impl OperatorStateStore {
188188 }
189189
190190 for ( table_epoch, table) in self . immutable_tables . lock ( ) . iter ( ) . rev ( ) {
191- if let Some ( del_ep) = deleted_epoch {
192- if * table_epoch <= del_ep {
193- continue ;
194- }
191+ if let Some ( del_ep) = deleted_epoch
192+ && * table_epoch <= del_ep
193+ {
194+ continue ;
195195 }
196196 if let Some ( batches) = table. get ( key) {
197197 out. extend ( batches. clone ( ) ) ;
@@ -208,10 +208,10 @@ impl OperatorStateStore {
208208 let mut acc = Vec :: new ( ) ;
209209 for path in paths {
210210 let file_epoch = extract_epoch ( & path) ;
211- if let Some ( del_ep) = deleted_epoch {
212- if file_epoch <= del_ep {
213- continue ;
214- }
211+ if let Some ( del_ep) = deleted_epoch
212+ && file_epoch <= del_ep
213+ {
214+ continue ;
215215 }
216216
217217 // Native Bloom Filter intercepts empty reads here
@@ -387,8 +387,8 @@ impl OperatorStateStore {
387387 for path in & files_to_merge {
388388 let file_epoch = extract_epoch ( path) ;
389389 let file = File :: open ( path) . map_err ( StateEngineError :: IoError ) ?;
390- let mut reader = ParquetRecordBatchReaderBuilder :: try_new ( file) ?. build ( ) ?;
391- while let Some ( batch) = reader. next ( ) {
390+ let reader = ParquetRecordBatchReaderBuilder :: try_new ( file) ?. build ( ) ?;
391+ for batch in reader {
392392 let b = batch?;
393393 if let Some ( filtered) =
394394 filter_tombstones_from_batch ( & b, & tombstone_snapshot, file_epoch) ?
@@ -482,8 +482,8 @@ impl OperatorStateStore {
482482 let mut map = HashMap :: new ( ) ;
483483 for path in tomb_paths {
484484 let file = File :: open ( & path) . map_err ( StateEngineError :: IoError ) ?;
485- let mut reader = ParquetRecordBatchReaderBuilder :: try_new ( file) ?. build ( ) ?;
486- while let Some ( batch) = reader. next ( ) {
485+ let reader = ParquetRecordBatchReaderBuilder :: try_new ( file) ?. build ( ) ?;
486+ for batch in reader {
487487 let batch = batch?;
488488 let key_col = batch
489489 . column ( 0 )
@@ -527,9 +527,9 @@ impl OperatorStateStore {
527527 let builder = ParquetRecordBatchReaderBuilder :: try_new ( file) ?;
528528 let schema = builder. parquet_schema ( ) ;
529529 let mask = ProjectionMask :: leaves ( schema, vec ! [ schema. columns( ) . len( ) - 1 ] ) ;
530- let mut reader = builder. with_projection ( mask) . build ( ) ?;
530+ let reader = builder. with_projection ( mask) . build ( ) ?;
531531
532- while let Some ( batch) = reader. next ( ) {
532+ for batch in reader {
533533 let batch = batch?;
534534 let key_col = batch
535535 . column ( 0 )
0 commit comments