Skip to content

[SPARK] Simplify shouldProcess check in Spark3 streaming source #3268

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

Merged
rdblue merged 5 commits into from
Oct 11, 2021
Merged

[SPARK] Simplify shouldProcess check in Spark3 streaming source #3268

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae4193a
[SPARK] Simplify shouldProcess precondition check in Spark3 streaming…
kbendick Oct 9, 2021
8ce3a1e
Add in missing closing paren
kbendick Oct 9, 2021
20bf910
Revert Add in missing closing paren
kbendick Oct 9, 2021
4bf81f0
Revert to using switch
kbendick Oct 10, 2021
89b0b13
Clean up error message to instruct user to set the read option to han…
kbendick Oct 10, 2021
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
20 changes: 14 additions & 6 deletions spark3/src/main/java/org/apache/iceberg/spark/source/SparkMicroBatchStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,20 @@ private List<FileScanTask> planFiles(StreamingOffset startOffset, StreamingOffse

private boolean shouldProcess(Snapshot snapshot) {
String op = snapshot.operation();
Preconditions.checkState(!op.equals(DataOperations.DELETE) || skipDelete,
"Cannot process delete snapshot: %s", snapshot.snapshotId());
Preconditions.checkState(
op.equals(DataOperations.DELETE) || op.equals(DataOperations.APPEND) || op.equals(DataOperations.REPLACE),
"Cannot process %s snapshot: %s", op.toLowerCase(Locale.ROOT), snapshot.snapshotId());
return op.equals(DataOperations.APPEND);
switch (op) {
case DataOperations.APPEND:
return true;
case DataOperations.REPLACE:
return false;
case DataOperations.DELETE:
Preconditions.checkState(skipDelete,
"Cannot process delete snapshot : %s. Set read option %s to allow skipping snapshots of type delete",
snapshot.snapshotId(), SparkReadOptions.STREAMING_SKIP_DELETE_SNAPSHOTS);
return false;
default:
throw new IllegalStateException(String.format(
"Cannot process %s snapshot: %s", op.toLowerCase(Locale.ROOT), snapshot.snapshotId()));
}
}

private static class InitialOffsetStore {
Expand Down