Skip to content

KAFKA-7833: Add missing test #8847

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

Merged
mjsax merged 1 commit into from
Jun 11, 2020
Merged

KAFKA-7833: Add missing test #8847

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
7 changes: 5 additions & 2 deletions ...s/src/main/java/org/apache/kafka/streams/processor/internals/InternalTopologyBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,11 @@ private void validateGlobalStoreArguments(final String sourceName,
if (nodeFactories.containsKey(processorName)) {
throw new TopologyException("Processor " + processorName + " is already added.");
}
if (stateFactories.containsKey(storeName) || globalStateBuilders.containsKey(storeName)) {
throw new TopologyException("StateStore " + storeName + " is already added.");
if (stateFactories.containsKey(storeName)) {
throw new TopologyException("A different StateStore has already been added with the name " + storeName);
}
if (globalStateBuilders.containsKey(storeName)) {
throw new TopologyException("A different GlobalStateStore has already been added with the name " + storeName);
}

@mjsax mjsax Jun 11, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Minor improvement for the error message

if (loggingEnabled) {
throw new TopologyException("StateStore " + storeName + " for global table must not have logging enabled.");
Expand Down
131 changes: 98 additions & 33 deletions ...c/test/java/org/apache/kafka/streams/processor/internals/InternalTopologyBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.kafka.streams.errors.TopologyException;
import org.apache.kafka.streams.processor.StateStore;
import org.apache.kafka.streams.processor.TopicNameExtractor;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
import org.apache.kafka.test.MockKeyValueStoreBuilder;
Expand Down Expand Up @@ -62,7 +63,7 @@ public class InternalTopologyBuilderTest {

private final Serde<String> stringSerde = Serdes.String();
private final InternalTopologyBuilder builder = new InternalTopologyBuilder();
private final StoreBuilder<?> storeBuilder = new MockKeyValueStoreBuilder("store", false);
private final StoreBuilder<?> storeBuilder = new MockKeyValueStoreBuilder("testStore", false);

@mjsax mjsax Jun 11, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Just renaming the store to make the error message in the tests easier to read.


@Test
public void shouldAddSourceWithOffsetReset() {
Expand Down Expand Up @@ -372,48 +373,112 @@ public void testAddStateStoreWithSink() {

@Test
public void shouldNotAllowToAddStoresWithSameName() {
final StoreBuilder<KeyValueStore<Object, Object>> otherBuilder =

@mjsax mjsax Jun 11, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Just refactoring:

  • add missing generic types
  • use assertThrows
  • add check for error message

new MockKeyValueStoreBuilder("testStore", false);

builder.addStateStore(storeBuilder);
final StoreBuilder otherBuilder = new MockKeyValueStoreBuilder("store", false);
try {
builder.addStateStore(otherBuilder);
fail("Should throw TopologyException with store name conflict");
} catch (final TopologyException expected) { /* ok */ }

final TopologyException exception = assertThrows(
TopologyException.class,
() -> builder.addStateStore(otherBuilder)
);

assertThat(
exception.getMessage(),
equalTo("Invalid topology: A different StateStore has already been added with the name testStore")
);
}

@Test
public void shouldNotAllowToAddStoresWithSameNameWhenFirstStoreIsGlobal() {
final StoreBuilder storeBuilder = new MockKeyValueStoreBuilder("store", false).withLoggingDisabled();

@mjsax mjsax Jun 11, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

As above

final StoreBuilder<KeyValueStore<Object, Object>> globalBuilder =
new MockKeyValueStoreBuilder("testStore", false).withLoggingDisabled();

builder.addGlobalStore(
storeBuilder,
globalBuilder,
"global-store",
null,
null,
null,
"global-topic",
"global-processor",
new MockProcessorSupplier<>()
);

final TopologyException exception = assertThrows(
TopologyException.class,
() -> builder.addStateStore(storeBuilder)
);

assertThat(
exception.getMessage(),
equalTo("Invalid topology: A different GlobalStateStore has already been added with the name testStore")
);
}

@Test
public void shouldNotAllowToAddStoresWithSameNameWhenSecondStoreIsGlobal() {

@mjsax mjsax Jun 11, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

As above (the diff is just weird... this is an existing test; cf. below)

final StoreBuilder<KeyValueStore<Object, Object>> globalBuilder =
new MockKeyValueStoreBuilder("testStore", false).withLoggingDisabled();

builder.addStateStore(storeBuilder);

final TopologyException exception = assertThrows(
TopologyException.class,
() -> builder.addGlobalStore(
globalBuilder,
"global-store",
null,
null,
null,
"global-topic",
"global-processor",
new MockProcessorSupplier<>());
try {
builder.addStateStore(storeBuilder);
fail("Should throw TopologyException with store name conflict");
} catch (final TopologyException expected) { /* ok */ }
new MockProcessorSupplier<>()
)
);

assertThat(
exception.getMessage(),
equalTo("Invalid topology: A different StateStore has already been added with the name testStore")
);
}

@Test
public void shouldNotAllowToAddStoresWithSameNameWhenSecondStoreIsGlobal() {
final StoreBuilder storeBuilder = new MockKeyValueStoreBuilder("store", false).withLoggingDisabled();
builder.addStateStore(storeBuilder);
try {
builder.addGlobalStore(
storeBuilder,
"global-store",
null,
null,
null,
"global-topic",
"global-processor",
new MockProcessorSupplier<>());
fail("Should throw TopologyException with store name conflict");
} catch (final TopologyException expected) { /* ok */ }
public void shouldNotAllowToAddGlobalStoresWithSameName() {

@mjsax mjsax Jun 11, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This is the missing test case.

final StoreBuilder<KeyValueStore<Object, Object>> firstGlobalBuilder =
new MockKeyValueStoreBuilder("testStore", false).withLoggingDisabled();
final StoreBuilder<KeyValueStore<Object, Object>> secondGlobalBuilder =
new MockKeyValueStoreBuilder("testStore", false).withLoggingDisabled();

builder.addGlobalStore(
firstGlobalBuilder,
"global-store",
null,
null,
null,
"global-topic",
"global-processor",
new MockProcessorSupplier<>()
);

final TopologyException exception = assertThrows(
TopologyException.class,
() -> builder.addGlobalStore(
secondGlobalBuilder,
"global-store-2",
null,
null,
null,
"global-topic",
"global-processor-2",
new MockProcessorSupplier<>()
)
);

assertThat(
exception.getMessage(),
equalTo("Invalid topology: A different GlobalStateStore has already been added with the name testStore")
);
}

@Test
Expand Down Expand Up @@ -682,7 +747,7 @@ public void shouldAssociateStateStoreNameWhenStateStoreSupplierIsInternal() {
builder.addStateStore(storeBuilder, "processor");
final Map<String, List<String>> stateStoreNameToSourceTopic = builder.stateStoreNameToSourceTopics();
assertEquals(1, stateStoreNameToSourceTopic.size());
assertEquals(Collections.singletonList("topic"), stateStoreNameToSourceTopic.get("store"));
assertEquals(Collections.singletonList("topic"), stateStoreNameToSourceTopic.get("testStore"));
}

@Test
Expand All @@ -692,7 +757,7 @@ public void shouldAssociateStateStoreNameWhenStateStoreSupplierIsExternal() {
builder.addStateStore(storeBuilder, "processor");
final Map<String, List<String>> stateStoreNameToSourceTopic = builder.stateStoreNameToSourceTopics();
assertEquals(1, stateStoreNameToSourceTopic.size());
assertEquals(Collections.singletonList("topic"), stateStoreNameToSourceTopic.get("store"));
assertEquals(Collections.singletonList("topic"), stateStoreNameToSourceTopic.get("testStore"));
}

@Test
Expand All @@ -704,7 +769,7 @@ public void shouldCorrectlyMapStateStoreToInternalTopics() {
builder.addStateStore(storeBuilder, "processor");
final Map<String, List<String>> stateStoreNameToSourceTopic = builder.stateStoreNameToSourceTopics();
assertEquals(1, stateStoreNameToSourceTopic.size());
assertEquals(Collections.singletonList("appId-internal-topic"), stateStoreNameToSourceTopic.get("store"));
assertEquals(Collections.singletonList("appId-internal-topic"), stateStoreNameToSourceTopic.get("testStore"));
}

@Test
Expand Down Expand Up @@ -754,11 +819,11 @@ public void shouldAddInternalTopicConfigForNonWindowStores() {
builder.buildTopology();
final Map<Integer, InternalTopologyBuilder.TopicsInfo> topicGroups = builder.topicGroups();
final InternalTopologyBuilder.TopicsInfo topicsInfo = topicGroups.values().iterator().next();
final InternalTopicConfig topicConfig = topicsInfo.stateChangelogTopics.get("appId-store-changelog");
final InternalTopicConfig topicConfig = topicsInfo.stateChangelogTopics.get("appId-testStore-changelog");
final Map<String, String> properties = topicConfig.getProperties(Collections.emptyMap(), 10000);
assertEquals(2, properties.size());
assertEquals(TopicConfig.CLEANUP_POLICY_COMPACT, properties.get(TopicConfig.CLEANUP_POLICY_CONFIG));
assertEquals("appId-store-changelog", topicConfig.name());
assertEquals("appId-testStore-changelog", topicConfig.name());
assertTrue(topicConfig instanceof UnwindowedChangelogTopicConfig);
}

Expand Down