File tree Expand file tree Collapse file tree
core/src/main/java/org/apache/iceberg
main/java/org/apache/iceberg
test/java/org/apache/iceberg/spark/source Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -299,6 +299,10 @@ private DeleteFileIndex planDeletesLocally(List<ManifestFile> deleteManifests) {
299299 builder .planWith (planExecutor ());
300300 }
301301
302+ if (shouldIgnoreResiduals ()) {
303+ builder .ignoreResiduals ();
304+ }
305+
302306 return builder
303307 .specsById (specs ())
304308 .filterData (filter ())
Original file line number Diff line number Diff line change 2626import java .util .stream .Collectors ;
2727import java .util .stream .IntStream ;
2828import org .apache .iceberg .expressions .Expression ;
29+ import org .apache .iceberg .expressions .Expressions ;
2930import org .apache .iceberg .io .CloseableIterable ;
3031import org .apache .iceberg .io .ClosingIterator ;
3132import org .apache .iceberg .io .FileIO ;
@@ -253,7 +254,7 @@ private static class ReadDeleteManifest implements FlatMapFunction<ManifestFileB
253254
254255 ReadDeleteManifest (Broadcast <Table > table , TableScanContext context ) {
255256 this .table = table ;
256- this .filter = context .rowFilter ();
257+ this .filter = context .ignoreResiduals () ? Expressions . alwaysTrue () : context . rowFilter ();
257258 this .isCaseSensitive = context .caseSensitive ();
258259 }
259260
Original file line number Diff line number Diff line change @@ -693,8 +693,7 @@ public Scan buildCopyOnWriteScan() {
693693 Schema expectedSchema = schemaWithMetadataColumns ();
694694
695695 BatchScan scan =
696- table
697- .newBatchScan ()
696+ newBatchScan ()
698697 .useSnapshot (snapshot .snapshotId ())
699698 .ignoreResiduals ()
700699 .caseSensitive (caseSensitive )
Original file line number Diff line number Diff line change @@ -302,12 +302,12 @@ public void limitPushedDownToSparkScan() {
302302 .isEqualTo (limit );
303303
304304 // verify CoW scan
305- assertThat (builder .buildCopyOnWriteScan ())
306- . extracting ( "scan" )
307- .extracting ("scan" )
308- . extracting ( "context" )
309- . extracting ( "minRowsRequested" )
310- .isEqualTo (limit );
305+ scanAssert = assertThat (builder .buildCopyOnWriteScan ()). extracting ( "scan" );
306+ if ( LOCAL == planningMode ) {
307+ scanAssert = scanAssert .extracting ("scan" );
308+ }
309+
310+ scanAssert . extracting ( "context" ). extracting ( "minRowsRequested" ) .isEqualTo (limit );
311311
312312 // verify MoR scan
313313 scanAssert = assertThat (builder .buildMergeOnReadScan ()).extracting ("scan" );
You can’t perform that action at this time.
0 commit comments