Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix: respect max messages per batch option #512

Merged
merged 2 commits into from
Nov 17, 2022
Merged

fix: respect max messages per batch option #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
644b363
fix: respect max messages per batch option
hannahrogers-google Nov 16, 2022
896ac7a
fix formatting
hannahrogers-google Nov 16, 2022
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
17 changes: 15 additions & 2 deletions src/main/java/com/google/cloud/pubsublite/spark/PslMicroBatchStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import com.google.common.annotations.VisibleForTesting;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.concurrent.GuardedBy;
import org.apache.spark.sql.connector.read.InputPartition;
import org.apache.spark.sql.connector.read.PartitionReaderFactory;
import org.apache.spark.sql.connector.read.streaming.MicroBatchStream;
Expand All @@ -37,6 +38,9 @@ public class PslMicroBatchStream extends BaseDataStream implements MicroBatchStr
private final PerTopicHeadOffsetReader headOffsetReader;
private final PslReadDataSourceOptions options;

@GuardedBy("this")
private SparkSourceOffset lastEndOffset = null;

@VisibleForTesting
PslMicroBatchStream(
CursorClient cursorClient,
Expand All @@ -61,8 +65,17 @@ public class PslMicroBatchStream extends BaseDataStream implements MicroBatchStr
}

@Override
public SparkSourceOffset latestOffset() {
return PslSparkUtils.toSparkSourceOffset(headOffsetReader.getHeadOffset());
public synchronized SparkSourceOffset latestOffset() {
SparkSourceOffset newStartingOffset = (lastEndOffset == null) ? initialOffset() : lastEndOffset;
SparkSourceOffset headOffset =
PslSparkUtils.toSparkSourceOffset(headOffsetReader.getHeadOffset());
lastEndOffset =
PslSparkUtils.getSparkEndOffset(
headOffset,
newStartingOffset,
options.maxMessagesPerBatch(),
headOffset.getPartitionOffsetMap().size());
return lastEndOffset;
}

@Override
Expand Down
14 changes: 13 additions & 1 deletion src/test/java/com/google/cloud/pubsublite/spark/PslMicroBatchStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public class PslMicroBatchStreamTest {
private static final PslReadDataSourceOptions OPTIONS =
PslReadDataSourceOptions.builder()
.setSubscriptionPath(UnitTestExamples.exampleSubscriptionPath())
.setMaxMessagesPerBatch(500)
.build();
private final CursorClient cursorClient = mock(CursorClient.class);
private final MultiPartitionCommitter committer = mock(MultiPartitionCommitter.class);
Expand All @@ -52,15 +53,26 @@ public class PslMicroBatchStreamTest {

@Test
public void testLatestOffset() {
// Called when retreiving the initial offset on the first 'latestOffset' call
when(partitionCountReader.getPartitionCount()).thenReturn(2);
when(cursorClient.listPartitionCursors(UnitTestExamples.exampleSubscriptionPath()))
.thenReturn(ApiFutures.immediateFuture(ImmutableMap.of()));
when(headOffsetReader.getHeadOffset()).thenReturn(createPslSourceOffset(301L, 200L));
// First return head offsets that will not exceed maxMessagesPerBatch, then exceed the limit
when(headOffsetReader.getHeadOffset())
.thenReturn(createPslSourceOffset(301L, 200L))
.thenReturn(createPslSourceOffset(1000L, 250L));
assertThat(((SparkSourceOffset) stream.latestOffset()).getPartitionOffsetMap())
.containsExactly(
Partition.of(0L),
SparkPartitionOffset.create(Partition.of(0L), 300L),
Partition.of(1L),
SparkPartitionOffset.create(Partition.of(1L), 199L));
assertThat(((SparkSourceOffset) stream.latestOffset()).getPartitionOffsetMap())
.containsExactly(
Partition.of(0L),
SparkPartitionOffset.create(Partition.of(0L), 800L),
Partition.of(1L),
SparkPartitionOffset.create(Partition.of(1L), 249L));
}

@Test
Expand Down