dajac commented on code in PR #18014: URL: https://github.com/apache/kafka/pull/18014#discussion_r1869106815
########## share-coordinator/src/test/java/org/apache/kafka/coordinator/share/ShareCoordinatorOffsetsManagerTest.java: ########## @@ -0,0 +1,206 @@ +/* + * 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.kafka.coordinator.share; + +import org.apache.kafka.common.Uuid; +import org.apache.kafka.server.share.SharePartitionKey; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Stream; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +public class ShareCoordinatorOffsetsManagerTest { + + private ShareCoordinatorOffsetsManager manager; + private static final SharePartitionKey KEY1 = SharePartitionKey.getInstance("gs1", Uuid.randomUuid(), 0); + private static final SharePartitionKey KEY2 = SharePartitionKey.getInstance("gs2", Uuid.randomUuid(), 0); + private static final SharePartitionKey KEY3 = SharePartitionKey.getInstance("gs1", Uuid.randomUuid(), 1); + private static final SharePartitionKey KEY4 = SharePartitionKey.getInstance("gs1", Uuid.randomUuid(), 7); + + @BeforeEach + public void setUp() { + manager = new ShareCoordinatorOffsetsManager(); + } + + @Test + public void testUpdateStateAddsToInternalState() { + assertEquals(Optional.empty(), manager.updateState(KEY1, 0L)); + assertEquals(Optional.of(10L), manager.updateState(KEY1, 10L)); //[0-9] offsets are redundant + assertEquals(Optional.empty(), manager.updateState(KEY2, 15L)); + + assertEquals(10L, manager.entries().get(KEY1).offset()); + assertEquals(15L, manager.entries().get(KEY2).offset()); + } + + private static class ShareOffsetTestHolder { + static class TestTuple { + final SharePartitionKey key; + final long offset; + final Optional<Long> expectedOffset; + + private TestTuple(SharePartitionKey key, long offset, Optional<Long> expectedOffset) { + this.key = key; + this.offset = offset; + this.expectedOffset = expectedOffset; + } + + static TestTuple instance(SharePartitionKey key, long offset, Optional<Long> expectedOffset) { + return new TestTuple(key, offset, expectedOffset); + } + } + + private final String testName; + private final List<TestTuple> tuples; + private final boolean shouldRun; + + ShareOffsetTestHolder(String testName, List<TestTuple> tuples) { + this(testName, tuples, true); + } + + ShareOffsetTestHolder(String testName, List<TestTuple> tuples, boolean shouldRun) { + this.testName = testName; + this.tuples = tuples; + this.shouldRun = shouldRun; + } + } + + static Stream<ShareOffsetTestHolder> generateNoRedundantStateCases() { + return Stream.of( + new ShareOffsetTestHolder( + "no redundant state single key", + List.of( + ShareOffsetTestHolder.TestTuple.instance(KEY1, 10L, Optional.empty()) + ) + ), + + new ShareOffsetTestHolder( + "no redundant state multiple keys", + List.of( + ShareOffsetTestHolder.TestTuple.instance(KEY1, 10L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY4, 11L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 13L, Optional.empty()) + ) + ) + ); + } + + static Stream<ShareOffsetTestHolder> generateRedundantStateCases() { + return Stream.of( + new ShareOffsetTestHolder( + "redundant state single key", + List.of( + ShareOffsetTestHolder.TestTuple.instance(KEY1, 10L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY1, 11L, Optional.of(11L)), + ShareOffsetTestHolder.TestTuple.instance(KEY1, 15L, Optional.of(15L)) + ) + ), + + new ShareOffsetTestHolder( + "redundant state multiple keys", + // KEY1: 10 17 + // KEY2: 11 16 + // KEY3: 15 + List.of( + ShareOffsetTestHolder.TestTuple.instance(KEY1, 10L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 11L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY3, 15L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 16L, Optional.empty()), // KEY2 11 redundant but should not be returned + ShareOffsetTestHolder.TestTuple.instance(KEY1, 17L, Optional.of(15L)) + ) + ) + ); + + } + + static Stream<ShareOffsetTestHolder> generateComplexCases() { + return Stream.of( + new ShareOffsetTestHolder( + "redundant state reverse key order", + // requests come in order KEY1, KEY2, KEY3, KEY3, KEY2, KEY1 + List.of( + ShareOffsetTestHolder.TestTuple.instance(KEY1, 10L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 11L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY3, 15L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY3, 18L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 20L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY1, 25L, Optional.of(18L)) + ) + ), + + new ShareOffsetTestHolder( + "redundant state cold partition", + List.of( + ShareOffsetTestHolder.TestTuple.instance(KEY1, 10L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 11L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY3, 15L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 18L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY3, 20L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 22L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY3, 25L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY2, 27L, Optional.empty()), // last redundant + ShareOffsetTestHolder.TestTuple.instance(KEY3, 28L, Optional.empty()), + ShareOffsetTestHolder.TestTuple.instance(KEY1, 30L, Optional.of(27L)) + ) + ) + ); + } + + @ParameterizedTest + @MethodSource("generateNoRedundantStateCases") + public void testUpdateStateNoRedundantState(ShareOffsetTestHolder holder) { + if (holder.shouldRun) { + holder.tuples.forEach(tuple -> assertEquals(tuple.expectedOffset, manager.updateState(tuple.key, tuple.offset), holder.testName)); + } + } + + @ParameterizedTest + @MethodSource("generateRedundantStateCases") + public void testUpdateStateRedundantState(ShareOffsetTestHolder holder) { + if (holder.shouldRun) { + holder.tuples.forEach(tuple -> assertEquals(tuple.expectedOffset, manager.updateState(tuple.key, tuple.offset), holder.testName)); + } + } + + @ParameterizedTest + @MethodSource("generateComplexCases") + public void testUpdateStateComplexCases(ShareOffsetTestHolder holder) { + if (holder.shouldRun) { + holder.tuples.forEach(tuple -> assertEquals(tuple.expectedOffset, manager.updateState(tuple.key, tuple.offset), holder.testName)); + } + } + + @Test + public void testPurge() { + ShareCoordinatorOffsetsManager manager = spy(new ShareCoordinatorOffsetsManager()); + for (long i : List.of(10L, 20L, 30L, 40L, 50L)) { + manager.updateState(KEY1, i); + } + assertEquals(1, manager.curState().size()); + verify(manager, times(5)).purge(); + } +} Review Comment: nit: We usually have an empty line at the end. -- 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: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org