hlteoh37 commented on code in PR #145:
URL:
https://github.com/apache/flink-connector-aws/pull/145#discussion_r1669358672
##########
flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/proxy/KinesisStreamProxyTest.java:
##########
@@ -413,10 +414,15 @@ private List<Shard> getTestShards(final int startShardId,
final int endShardId)
private Consumer<ListShardsRequest> getListShardRequestValidation(
final String streamArn, final String startShardId, final String
nextToken) {
return req -> {
+ ShardFilter startingPosition = null;
+ if (startShardId != null) {
+ startingPosition =
+
ListShardsStartingPosition.fromShardId(startShardId).getShardFilter();
+ }
ListShardsRequest expectedReq =
ListShardsRequest.builder()
.streamARN(streamArn)
- .exclusiveStartShardId(startShardId)
+ .shardFilter(startingPosition)
Review Comment:
Do we need to add a test for startingPosition of AT_TIMESTAMP?
##########
flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/enumerator/tracker/SplitTrackerTest.java:
##########
@@ -0,0 +1,371 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.kinesis.source.enumerator.tracker;
+
+import
org.apache.flink.connector.kinesis.source.enumerator.KinesisShardSplitWithAssignmentStatus;
+import
org.apache.flink.connector.kinesis.source.enumerator.SplitAssignmentStatus;
+import org.apache.flink.connector.kinesis.source.split.KinesisShardSplit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static
org.apache.flink.connector.kinesis.source.util.TestUtil.generateShardId;
+import static
org.apache.flink.connector.kinesis.source.util.TestUtil.getTestSplit;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+class SplitTrackerTest {
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testSplitWithoutParentAreAvailableToAssign(boolean
preserveShardOrdering) {
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+
+ KinesisShardSplit split = getTestSplit(generateShardId(1),
Collections.emptySet());
+
+ splitTracker.addSplits(Collections.singletonList(split));
+
+ List<KinesisShardSplit> pendingSplits =
splitTracker.splitsAvailableForAssignment();
+
+ assertThat(pendingSplits).containsExactly(split);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testStateSnapshot(boolean preserveShardOrdering) {
+ List<KinesisShardSplit> assignedSplits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()));
+ List<KinesisShardSplit> unassignedSplits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(3),
Collections.emptySet()),
+ // Shards produced by splitting parent shard
+ getTestSplit(generateShardId(4),
Collections.singleton(generateShardId(1))),
+ getTestSplit(generateShardId(5),
Collections.singleton(generateShardId(1))),
+ // Shard produced by merging 2 parent shards
+ getTestSplit(
+ generateShardId(6),
+ new HashSet<>(
+ Arrays.asList(generateShardId(2),
generateShardId(3)))));
+
+ List<KinesisShardSplitWithAssignmentStatus> assignedSplitsWithStatus =
+ assignedSplits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED))
+ .collect(Collectors.toList());
+ List<KinesisShardSplitWithAssignmentStatus> unassignedSplitsWithStatus
=
+ unassignedSplits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.UNASSIGNED))
+ .collect(Collectors.toList());
+ List<KinesisShardSplitWithAssignmentStatus> expectedState =
+ new ArrayList<>(assignedSplitsWithStatus);
+ expectedState.addAll(unassignedSplitsWithStatus);
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+
+ splitTracker.addSplits(assignedSplits);
+ splitTracker.addSplits(unassignedSplits);
+ splitTracker.markAsAssigned(assignedSplits);
+
+ // Verify that produced state is the same
+ assertThat(splitTracker.snapshotState(0))
+ .containsExactlyInAnyOrderElementsOf(expectedState);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testSplitSnapshotStateDoesNotIncludeFinishedSplits(boolean
preserveShardOrdering) {
+ List<KinesisShardSplit> splits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()),
+ getTestSplit(generateShardId(3),
Collections.emptySet()));
+
+ List<KinesisShardSplitWithAssignmentStatus> expectedSplitState =
+ splits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED))
+ .collect(Collectors.toList());
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+ splitTracker.addSplits(splits);
+ splitTracker.markAsAssigned(splits);
+
+ String splitIdToFinish = expectedSplitState.get(0).split().splitId();
+
splitTracker.markAsFinished(Collections.singletonList(splitIdToFinish));
+
+ // Verify that state does not contain finished split
+ assertThat(splitTracker.snapshotState(0))
+ .doesNotContain(expectedSplitState.get(0))
+ .containsExactlyInAnyOrder(expectedSplitState.get(1),
expectedSplitState.get(2));
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testSplitSnapshotMarkingSplitsAsAssignedCorrectlyMappedToState(
+ boolean preserveShardOrdering) {
+ List<KinesisShardSplit> splits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()),
+ getTestSplit(generateShardId(3),
Collections.emptySet()));
+
+ List<KinesisShardSplitWithAssignmentStatus> expectedSplitState =
+ splits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED))
+ .collect(Collectors.toList());
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+ splitTracker.addSplits(splits);
+ splitTracker.markAsAssigned(splits);
+
+ // Verify that state correctly marked splits as assigned
+ assertThat(splitTracker.snapshotState(0))
+ .containsExactlyInAnyOrderElementsOf(expectedSplitState);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testStateRestore(boolean preserveShardOrdering) {
+ List<KinesisShardSplit> splits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()),
+ getTestSplit(generateShardId(3),
Collections.emptySet()),
+ // Shards produced by splitting parent shard
+ getTestSplit(generateShardId(4),
Collections.singleton(generateShardId(1))),
+ getTestSplit(generateShardId(5),
Collections.singleton(generateShardId(1))),
+ // Shard produced by merging 2 parent shards
+ getTestSplit(
+ generateShardId(6),
+ new HashSet<>(
+ Arrays.asList(generateShardId(2),
generateShardId(3)))));
+
+ Stream<KinesisShardSplitWithAssignmentStatus> assignedSplits =
+ splits.subList(0, 3).stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED));
+ Stream<KinesisShardSplitWithAssignmentStatus> unassignedSplits =
+ splits.subList(3, splits.size()).stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.UNASSIGNED));
+ List<KinesisShardSplitWithAssignmentStatus> initialState =
+ Stream.concat(assignedSplits,
unassignedSplits).collect(Collectors.toList());
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering,
initialState);
+
+ // Verify that produced state is the same
+
assertThat(splitTracker.snapshotState(0)).containsExactlyInAnyOrderElementsOf(initialState);
+
+ // Verify that all previously assigned splits are marked as assigned
+ for (KinesisShardSplitWithAssignmentStatus splitWithAssignmentStatus :
initialState) {
+
assertThat(splitTracker.isAssigned(splitWithAssignmentStatus.split().splitId()))
+ .isEqualTo(
+ splitWithAssignmentStatus
+ .assignmentStatus()
+ .equals(SplitAssignmentStatus.ASSIGNED));
+ }
+ }
+
+ //
-----------------------------------------------------------------------------------------
+ // Shard ordering disabled
+ //
-----------------------------------------------------------------------------------------
+
+ @Test
+ public void testUnorderedAllUnassignedSplitsAvailableForAssignment() {
+ List<KinesisShardSplit> splits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()),
+ getTestSplit(generateShardId(3),
Collections.emptySet()),
+ // Shards produced by splitting parent shard
+ getTestSplit(generateShardId(4),
Collections.singleton(generateShardId(1))),
+ getTestSplit(generateShardId(5),
Collections.singleton(generateShardId(1))),
+ // Shard produced by merging 2 parent shards
+ getTestSplit(
+ generateShardId(6),
+ new HashSet<>(
+ Arrays.asList(generateShardId(2),
generateShardId(3)))));
+
Review Comment:
nit: This can be abstracted away to some form of util like
`KinesisSplitTestScenarios`, since these are useful cases shard conditions to
consider when testing.
##########
flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/enumerator/KinesisStreamsSourceEnumeratorTest.java:
##########
@@ -275,53 +262,8 @@ void testAddSplitsBackWithoutSplitIsNoOp() throws
Throwable {
// Given enumerator has no assigned splits
// When we add splits back
// Then handled gracefully with no exception thrown
Review Comment:
This comment is no longer true
##########
flink-connector-aws/flink-connector-aws-kinesis-streams/src/main/java/org/apache/flink/connector/kinesis/source/enumerator/tracker/SplitTracker.java:
##########
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.kinesis.source.enumerator.tracker;
+
+import org.apache.flink.annotation.Internal;
+import
org.apache.flink.connector.kinesis.source.enumerator.KinesisShardSplitWithAssignmentStatus;
+import
org.apache.flink.connector.kinesis.source.enumerator.SplitAssignmentStatus;
+import org.apache.flink.connector.kinesis.source.split.KinesisShardSplit;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/** This class is used to track shard hierarchy. */
+@Internal
+public class SplitTracker {
+ /**
+ * Flag controlling if tracker should wait before all parent splits will
be completed before
+ * assigning split to readers.
+ */
+ private final boolean preserveShardOrdering;
+
+ /** Map of all discovered splits that have not been completed. */
+ private final Map<String, KinesisShardSplit> knownSplits = new
ConcurrentHashMap<>();
+
+ /** Set of currently assigned split id. */
+ private final Set<String> assignedSplits = new HashSet<>();
+
+ public SplitTracker(boolean preserveShardOrdering) {
+ this(preserveShardOrdering, Collections.emptyList());
+ }
+
+ public SplitTracker(
+ boolean preserveShardOrdering,
+ List<KinesisShardSplitWithAssignmentStatus> initialState) {
+ this.preserveShardOrdering = preserveShardOrdering;
+
+ initialState.forEach(
+ splitWithStatus -> {
+ knownSplits.put(splitWithStatus.split().splitId(),
splitWithStatus.split());
+ if
(SplitAssignmentStatus.ASSIGNED.equals(splitWithStatus.assignmentStatus())) {
+ assignedSplits.add(splitWithStatus.split().splitId());
+ }
+ });
+ }
+
+ /**
+ * Add newly discovered splits to tracker.
+ *
+ * @param splitsToAdd collection of splits to add to tracking
+ */
+ public void addSplits(Collection<KinesisShardSplit> splitsToAdd) {
+ splitsToAdd.forEach(split -> knownSplits.put(split.splitId(), split));
+ }
+
+ /**
+ * Mark splits as assigned. Assigned splits will no longer be returned as
pending splits.
+ *
+ * @param splitsToAssign collection of splits to mark as assigned
+ */
+ public void markAsAssigned(Collection<KinesisShardSplit> splitsToAssign) {
+ splitsToAssign.forEach(split -> assignedSplits.add(split.splitId()));
+ }
+
+ /**
+ * Mark splits with specified ids as finished.
+ *
+ * @param finishedSplitIds collection of split ids to mark as finished
+ */
+ public void markAsFinished(Collection<String> finishedSplitIds) {
Review Comment:
what happens if we mark an unassigned split as finished? Should we validate
and throw Exception here?
##########
flink-connector-aws/flink-connector-aws-kinesis-streams/src/main/java/org/apache/flink/connector/kinesis/source/enumerator/tracker/SplitTracker.java:
##########
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.kinesis.source.enumerator.tracker;
+
+import org.apache.flink.annotation.Internal;
+import
org.apache.flink.connector.kinesis.source.enumerator.KinesisShardSplitWithAssignmentStatus;
+import
org.apache.flink.connector.kinesis.source.enumerator.SplitAssignmentStatus;
+import org.apache.flink.connector.kinesis.source.split.KinesisShardSplit;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/** This class is used to track shard hierarchy. */
+@Internal
+public class SplitTracker {
+ /**
+ * Flag controlling if tracker should wait before all parent splits will
be completed before
+ * assigning split to readers.
+ */
+ private final boolean preserveShardOrdering;
+
+ /** Map of all discovered splits that have not been completed. */
+ private final Map<String, KinesisShardSplit> knownSplits = new
ConcurrentHashMap<>();
+
+ /** Set of currently assigned split id. */
+ private final Set<String> assignedSplits = new HashSet<>();
+
+ public SplitTracker(boolean preserveShardOrdering) {
+ this(preserveShardOrdering, Collections.emptyList());
+ }
+
+ public SplitTracker(
+ boolean preserveShardOrdering,
+ List<KinesisShardSplitWithAssignmentStatus> initialState) {
+ this.preserveShardOrdering = preserveShardOrdering;
+
+ initialState.forEach(
+ splitWithStatus -> {
+ knownSplits.put(splitWithStatus.split().splitId(),
splitWithStatus.split());
+ if
(SplitAssignmentStatus.ASSIGNED.equals(splitWithStatus.assignmentStatus())) {
+ assignedSplits.add(splitWithStatus.split().splitId());
+ }
+ });
+ }
+
+ /**
+ * Add newly discovered splits to tracker.
+ *
+ * @param splitsToAdd collection of splits to add to tracking
+ */
+ public void addSplits(Collection<KinesisShardSplit> splitsToAdd) {
+ splitsToAdd.forEach(split -> knownSplits.put(split.splitId(), split));
+ }
+
+ /**
+ * Mark splits as assigned. Assigned splits will no longer be returned as
pending splits.
+ *
+ * @param splitsToAssign collection of splits to mark as assigned
+ */
+ public void markAsAssigned(Collection<KinesisShardSplit> splitsToAssign) {
+ splitsToAssign.forEach(split -> assignedSplits.add(split.splitId()));
+ }
Review Comment:
What happens if we `markAsAssigned` an unknown split? Should we validate
here?
##########
flink-connector-aws/flink-connector-aws-kinesis-streams/src/test/java/org/apache/flink/connector/kinesis/source/enumerator/tracker/SplitTrackerTest.java:
##########
@@ -0,0 +1,371 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.connector.kinesis.source.enumerator.tracker;
+
+import
org.apache.flink.connector.kinesis.source.enumerator.KinesisShardSplitWithAssignmentStatus;
+import
org.apache.flink.connector.kinesis.source.enumerator.SplitAssignmentStatus;
+import org.apache.flink.connector.kinesis.source.split.KinesisShardSplit;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static
org.apache.flink.connector.kinesis.source.util.TestUtil.generateShardId;
+import static
org.apache.flink.connector.kinesis.source.util.TestUtil.getTestSplit;
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+class SplitTrackerTest {
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testSplitWithoutParentAreAvailableToAssign(boolean
preserveShardOrdering) {
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+
+ KinesisShardSplit split = getTestSplit(generateShardId(1),
Collections.emptySet());
+
+ splitTracker.addSplits(Collections.singletonList(split));
+
+ List<KinesisShardSplit> pendingSplits =
splitTracker.splitsAvailableForAssignment();
+
+ assertThat(pendingSplits).containsExactly(split);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testStateSnapshot(boolean preserveShardOrdering) {
+ List<KinesisShardSplit> assignedSplits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()));
+ List<KinesisShardSplit> unassignedSplits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(3),
Collections.emptySet()),
+ // Shards produced by splitting parent shard
+ getTestSplit(generateShardId(4),
Collections.singleton(generateShardId(1))),
+ getTestSplit(generateShardId(5),
Collections.singleton(generateShardId(1))),
+ // Shard produced by merging 2 parent shards
+ getTestSplit(
+ generateShardId(6),
+ new HashSet<>(
+ Arrays.asList(generateShardId(2),
generateShardId(3)))));
+
+ List<KinesisShardSplitWithAssignmentStatus> assignedSplitsWithStatus =
+ assignedSplits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED))
+ .collect(Collectors.toList());
+ List<KinesisShardSplitWithAssignmentStatus> unassignedSplitsWithStatus
=
+ unassignedSplits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.UNASSIGNED))
+ .collect(Collectors.toList());
+ List<KinesisShardSplitWithAssignmentStatus> expectedState =
+ new ArrayList<>(assignedSplitsWithStatus);
+ expectedState.addAll(unassignedSplitsWithStatus);
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+
+ splitTracker.addSplits(assignedSplits);
+ splitTracker.addSplits(unassignedSplits);
+ splitTracker.markAsAssigned(assignedSplits);
+
+ // Verify that produced state is the same
+ assertThat(splitTracker.snapshotState(0))
+ .containsExactlyInAnyOrderElementsOf(expectedState);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testSplitSnapshotStateDoesNotIncludeFinishedSplits(boolean
preserveShardOrdering) {
+ List<KinesisShardSplit> splits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()),
+ getTestSplit(generateShardId(3),
Collections.emptySet()));
+
+ List<KinesisShardSplitWithAssignmentStatus> expectedSplitState =
+ splits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED))
+ .collect(Collectors.toList());
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+ splitTracker.addSplits(splits);
+ splitTracker.markAsAssigned(splits);
+
+ String splitIdToFinish = expectedSplitState.get(0).split().splitId();
+
splitTracker.markAsFinished(Collections.singletonList(splitIdToFinish));
+
+ // Verify that state does not contain finished split
+ assertThat(splitTracker.snapshotState(0))
+ .doesNotContain(expectedSplitState.get(0))
+ .containsExactlyInAnyOrder(expectedSplitState.get(1),
expectedSplitState.get(2));
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testSplitSnapshotMarkingSplitsAsAssignedCorrectlyMappedToState(
+ boolean preserveShardOrdering) {
+ List<KinesisShardSplit> splits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()),
+ getTestSplit(generateShardId(3),
Collections.emptySet()));
+
+ List<KinesisShardSplitWithAssignmentStatus> expectedSplitState =
+ splits.stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED))
+ .collect(Collectors.toList());
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering);
+ splitTracker.addSplits(splits);
+ splitTracker.markAsAssigned(splits);
+
+ // Verify that state correctly marked splits as assigned
+ assertThat(splitTracker.snapshotState(0))
+ .containsExactlyInAnyOrderElementsOf(expectedSplitState);
+ }
+
+ @ParameterizedTest
+ @ValueSource(booleans = {true, false})
+ public void testStateRestore(boolean preserveShardOrdering) {
+ List<KinesisShardSplit> splits =
+ Arrays.asList(
+ // Shards without parents
+ getTestSplit(generateShardId(1),
Collections.emptySet()),
+ getTestSplit(generateShardId(2),
Collections.emptySet()),
+ getTestSplit(generateShardId(3),
Collections.emptySet()),
+ // Shards produced by splitting parent shard
+ getTestSplit(generateShardId(4),
Collections.singleton(generateShardId(1))),
+ getTestSplit(generateShardId(5),
Collections.singleton(generateShardId(1))),
+ // Shard produced by merging 2 parent shards
+ getTestSplit(
+ generateShardId(6),
+ new HashSet<>(
+ Arrays.asList(generateShardId(2),
generateShardId(3)))));
+
+ Stream<KinesisShardSplitWithAssignmentStatus> assignedSplits =
+ splits.subList(0, 3).stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.ASSIGNED));
+ Stream<KinesisShardSplitWithAssignmentStatus> unassignedSplits =
+ splits.subList(3, splits.size()).stream()
+ .map(
+ split ->
+ new
KinesisShardSplitWithAssignmentStatus(
+ split,
SplitAssignmentStatus.UNASSIGNED));
+ List<KinesisShardSplitWithAssignmentStatus> initialState =
+ Stream.concat(assignedSplits,
unassignedSplits).collect(Collectors.toList());
+
+ SplitTracker splitTracker = new SplitTracker(preserveShardOrdering,
initialState);
+
+ // Verify that produced state is the same
+
assertThat(splitTracker.snapshotState(0)).containsExactlyInAnyOrderElementsOf(initialState);
+
+ // Verify that all previously assigned splits are marked as assigned
+ for (KinesisShardSplitWithAssignmentStatus splitWithAssignmentStatus :
initialState) {
+
assertThat(splitTracker.isAssigned(splitWithAssignmentStatus.split().splitId()))
+ .isEqualTo(
+ splitWithAssignmentStatus
+ .assignmentStatus()
+ .equals(SplitAssignmentStatus.ASSIGNED));
+ }
Review Comment:
nit: Isn't this redundant after `containsExactlyInAnyOrderElementsOf`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
