Skip to content

Spark: Aligned compaction commit filtering between fillQueue methods #17176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sandmannn wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

Spark: Aligned compaction commit filtering between fillQueue methods #17176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...v4.1/spark/src/main/java/org/apache/iceberg/spark/source/AsyncSparkMicroBatchPlanner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ private void fillQueue(StreamingOffset fromOffset, StreamingOffset toOffset) {
LOG.debug("filling queue from {}, to: {}", fromOffset, toOffset);
Snapshot currentSnapshot = table().snapshot(fromOffset.snapshotId());
// this could be a partial snapshot so add it outside the loop
if (currentSnapshot != null) {
if (currentSnapshot != null && shouldProcess(currentSnapshot)) {
addMicroBatchToQueue(
currentSnapshot,
fromOffset.position(),
Expand Down
19 changes: 19 additions & 0 deletions ...4.1/spark/src/test/java/org/apache/iceberg/spark/source/TestStructuredStreamingRead3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,25 @@ public void testReadStreamFromEmptyTable() throws Exception {
assertThat(actual).isEmpty();
}

@TestTemplate
public void testStreamingWithReplaceSnapshot() throws Exception {
List<SimpleRecord> batchAddedBeforeCompaction =
Lists.newArrayList(new SimpleRecord(1, "val1"), new SimpleRecord(2, "val2"));
appendData(batchAddedBeforeCompaction);
table.refresh();

long timeAfterFirstAppend = table.currentSnapshot().timestampMillis() + 1;
waitUntilAfter(timeAfterFirstAppend);
makeRewriteDataFiles();

List<SimpleRecord> batchAddedAfterCompaction =
Lists.newArrayList(new SimpleRecord(3, "val3"), new SimpleRecord(4, "val4"));
appendData(batchAddedAfterCompaction);
StreamingQuery query =
startStream(SparkReadOptions.STREAM_FROM_TIMESTAMP, Long.toString(timeAfterFirstAppend));
assertThat(rowsAvailable(query)).containsExactlyInAnyOrderElementsOf(batchAddedAfterCompaction);
}

@TestTemplate
public void testReadStreamWithSnapshotTypeOverwriteErrorsOut() throws Exception {
// upgrade table to version 2 - to facilitate creation of Snapshot of type OVERWRITE.
Expand Down
Loading