Skip to content

Flink: Fix checkArgument message for flink streaming #15907

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
genxiong7 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Flink: Fix checkArgument message for flink streaming #15907

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
15 changes: 9 additions & 6 deletions flink/v1.20/flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,26 @@ void validate() {
if (startingStrategy == StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_ID) {
Preconditions.checkArgument(
startSnapshotId != null,
"Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: null");
"Invalid starting snapshot id for %s strategy: null",
startingStrategy);
Preconditions.checkArgument(
startSnapshotTimestamp == null,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot timestamp for %s strategy: not null",
startingStrategy);
}
if (startingStrategy == StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP) {
Preconditions.checkArgument(
startSnapshotTimestamp != null,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_TIMESTAMP strategy: null");
"Invalid starting snapshot timestamp for %s strategy: null",
startingStrategy);
Preconditions.checkArgument(
startSnapshotId == null,
"Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot id for %s strategy: not null",
startingStrategy);
}

Preconditions.checkArgument(
tag == null,
String.format("Cannot scan table using ref %s configured for streaming reader", tag));
tag == null, "Cannot scan table using ref %s configured for streaming reader", tag);
Preconditions.checkArgument(
snapshotId == null, "Cannot set snapshot-id option for streaming reader");
Preconditions.checkArgument(
Expand Down
9 changes: 5 additions & 4 deletions flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/source/TestScanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void testIncrementalFromSnapshotId() {
.startingStrategy(StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_ID)
.build();
assertException(
context, "Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: null");
context, "Invalid starting snapshot id for INCREMENTAL_FROM_SNAPSHOT_ID strategy: null");

context =
ScanContext.builder()
Expand All @@ -42,7 +42,7 @@ void testIncrementalFromSnapshotId() {
.build();
assertException(
context,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot timestamp for INCREMENTAL_FROM_SNAPSHOT_ID strategy: not null");
}

@Test
Expand All @@ -54,7 +54,7 @@ void testIncrementalFromSnapshotTimestamp() {
.build();
assertException(
context,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_TIMESTAMP strategy: null");
"Invalid starting snapshot timestamp for INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP strategy: null");

context =
ScanContext.builder()
Expand All @@ -64,7 +64,8 @@ void testIncrementalFromSnapshotTimestamp() {
.startSnapshotTimestamp(1L)
.build();
assertException(
context, "Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
context,
"Invalid starting snapshot id for INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP strategy: not null");
}

@Test
Expand Down
15 changes: 9 additions & 6 deletions flink/v2.0/flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,26 @@ void validate() {
if (startingStrategy == StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_ID) {
Preconditions.checkArgument(
startSnapshotId != null,
"Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: null");
"Invalid starting snapshot id for %s strategy: null",
startingStrategy);
Preconditions.checkArgument(
startSnapshotTimestamp == null,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot timestamp for %s strategy: not null",
startingStrategy);
}
if (startingStrategy == StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP) {
Preconditions.checkArgument(
startSnapshotTimestamp != null,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_TIMESTAMP strategy: null");
"Invalid starting snapshot timestamp for %s strategy: null",
startingStrategy);
Preconditions.checkArgument(
startSnapshotId == null,
"Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot id for %s strategy: not null",
startingStrategy);
}

Preconditions.checkArgument(
tag == null,
String.format("Cannot scan table using ref %s configured for streaming reader", tag));
tag == null, "Cannot scan table using ref %s configured for streaming reader", tag);
Preconditions.checkArgument(
snapshotId == null, "Cannot set snapshot-id option for streaming reader");
Preconditions.checkArgument(
Expand Down
9 changes: 5 additions & 4 deletions flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/source/TestScanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void testIncrementalFromSnapshotId() {
.startingStrategy(StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_ID)
.build();
assertException(
context, "Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: null");
context, "Invalid starting snapshot id for INCREMENTAL_FROM_SNAPSHOT_ID strategy: null");

context =
ScanContext.builder()
Expand All @@ -42,7 +42,7 @@ void testIncrementalFromSnapshotId() {
.build();
assertException(
context,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot timestamp for INCREMENTAL_FROM_SNAPSHOT_ID strategy: not null");
}

@Test
Expand All @@ -54,7 +54,7 @@ void testIncrementalFromSnapshotTimestamp() {
.build();
assertException(
context,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_TIMESTAMP strategy: null");
"Invalid starting snapshot timestamp for INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP strategy: null");

context =
ScanContext.builder()
Expand All @@ -64,7 +64,8 @@ void testIncrementalFromSnapshotTimestamp() {
.startSnapshotTimestamp(1L)
.build();
assertException(
context, "Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
context,
"Invalid starting snapshot id for INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP strategy: not null");
}

@Test
Expand Down
15 changes: 9 additions & 6 deletions flink/v2.1/flink/src/main/java/org/apache/iceberg/flink/source/ScanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,23 +136,26 @@ void validate() {
if (startingStrategy == StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_ID) {
Preconditions.checkArgument(
startSnapshotId != null,
"Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: null");
"Invalid starting snapshot id for %s strategy: null",
startingStrategy);
Preconditions.checkArgument(
startSnapshotTimestamp == null,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot timestamp for %s strategy: not null",
startingStrategy);
}
if (startingStrategy == StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP) {
Preconditions.checkArgument(
startSnapshotTimestamp != null,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_TIMESTAMP strategy: null");
"Invalid starting snapshot timestamp for %s strategy: null",
startingStrategy);
Preconditions.checkArgument(
startSnapshotId == null,
"Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot id for %s strategy: not null",
startingStrategy);
}

Preconditions.checkArgument(
tag == null,
String.format("Cannot scan table using ref %s configured for streaming reader", tag));
tag == null, "Cannot scan table using ref %s configured for streaming reader", tag);
Preconditions.checkArgument(
snapshotId == null, "Cannot set snapshot-id option for streaming reader");
Preconditions.checkArgument(
Expand Down
9 changes: 5 additions & 4 deletions flink/v2.1/flink/src/test/java/org/apache/iceberg/flink/source/TestScanContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void testIncrementalFromSnapshotId() {
.startingStrategy(StreamingStartingStrategy.INCREMENTAL_FROM_SNAPSHOT_ID)
.build();
assertException(
context, "Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: null");
context, "Invalid starting snapshot id for INCREMENTAL_FROM_SNAPSHOT_ID strategy: null");

context =
ScanContext.builder()
Expand All @@ -42,7 +42,7 @@ void testIncrementalFromSnapshotId() {
.build();
assertException(
context,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
"Invalid starting snapshot timestamp for INCREMENTAL_FROM_SNAPSHOT_ID strategy: not null");
}

@Test
Expand All @@ -54,7 +54,7 @@ void testIncrementalFromSnapshotTimestamp() {
.build();
assertException(
context,
"Invalid starting snapshot timestamp for SPECIFIC_START_SNAPSHOT_TIMESTAMP strategy: null");
"Invalid starting snapshot timestamp for INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP strategy: null");

context =
ScanContext.builder()
Expand All @@ -64,7 +64,8 @@ void testIncrementalFromSnapshotTimestamp() {
.startSnapshotTimestamp(1L)
.build();
assertException(
context, "Invalid starting snapshot id for SPECIFIC_START_SNAPSHOT_ID strategy: not null");
context,
"Invalid starting snapshot id for INCREMENTAL_FROM_SNAPSHOT_TIMESTAMP strategy: not null");
}

@Test
Expand Down