Skip to content

[BEAM-222] Don't advance beyond last valid value #248

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

Closed
mshields822 wants to merge 1 commit into from
Closed

[BEAM-222] Don't advance beyond last valid value #248

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
4 changes: 2 additions & 2 deletions sdks/java/core/src/test/java/org/apache/beam/sdk/runners/dataflow/TestCountingSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,15 +173,15 @@ public boolean start() {

@Override
public boolean advance() {
if (current >= numMessagesPerShard) {
if (current >= numMessagesPerShard - 1) {
return false;
}
Copy link
Contributor

@dhalperi dhalperi Apr 26, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be reordered below the if below it? Probably little harm.

Copy link
Contributor Author

@mshields822 mshields822 Apr 26, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer this order - if done early exit, if want to repeat repeat, otherwise advance to valid position.

Copy link
Contributor

@dhalperi dhalperi Apr 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes. just confirming it's okay that you can't repeat the last element.

// If testing dedup, occasionally insert a duplicate value;
if (current >= 0 && dedup && ThreadLocalRandom.current().nextInt(5) == 0) {
return true;
}
current++;
return current < numMessagesPerShard;
return true;
}

@Override
Expand Down
18 changes: 18 additions & 0 deletions .../java/core/src/test/java/org/apache/beam/sdk/runners/dataflow/TestCountingSourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,22 @@ public void testRespectsCheckpointContract() throws IOException {
assertEquals(2L, (long) reader.getCurrent().getValue());
assertFalse(reader.advance());
}

@Test
public void testCanResumeWithExpandedCount() throws IOException {
TestCountingSource source = new TestCountingSource(1);
PipelineOptions options = PipelineOptionsFactory.create();
TestCountingSource.CountingSourceReader reader =
source.createReader(options, null /* no checkpoint */);
assertTrue(reader.start());
assertEquals(0L, (long) reader.getCurrent().getValue());
assertFalse(reader.advance());
TestCountingSource.CounterMark checkpoint = reader.getCheckpointMark();
checkpoint.finalizeCheckpoint();
source = new TestCountingSource(2);
reader = source.createReader(options, checkpoint);
assertTrue(reader.start());
assertEquals(1L, (long) reader.getCurrent().getValue());
assertFalse(reader.advance());
}
}