Skip to content

MINOR need to get a new transformer for each get() call. can't share'em #4435

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
guozhangwang merged 1 commit into from
Jan 18, 2018
Merged

MINOR need to get a new transformer for each get() call. can't share'em #4435

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 streams/src/main/java/org/apache/kafka/streams/kstream/internals/AbstractStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@ public VR apply(final K readOnlyKey, final V value) {

static <K, V, VR> InternalValueTransformerWithKeySupplier<K, V, VR> toInternalValueTransformerSupplier(final ValueTransformerSupplier<V, VR> valueTransformerSupplier) {
Objects.requireNonNull(valueTransformerSupplier, "valueTransformerSupplier can't be null");
final ValueTransformer<V, VR> valueTransformer = valueTransformerSupplier.get();
return new InternalValueTransformerWithKeySupplier<K, V, VR>() {
@Override
public InternalValueTransformerWithKey<K, V, VR> get() {
final ValueTransformer<V, VR> valueTransformer = valueTransformerSupplier.get();
return new InternalValueTransformerWithKey<K, V, VR>() {
@Override
public VR punctuate(final long timestamp) {
Expand Down Expand Up @@ -162,10 +162,10 @@ public void close() {

static <K, V, VR> InternalValueTransformerWithKeySupplier<K, V, VR> toInternalValueTransformerSupplier(final ValueTransformerWithKeySupplier<K, V, VR> valueTransformerWithKeySupplier) {
Objects.requireNonNull(valueTransformerWithKeySupplier, "valueTransformerSupplier can't be null");
final ValueTransformerWithKey<K, V, VR> valueTransformerWithKey = valueTransformerWithKeySupplier.get();
return new InternalValueTransformerWithKeySupplier<K, V, VR>() {
@Override
public InternalValueTransformerWithKey<K, V, VR> get() {
final ValueTransformerWithKey<K, V, VR> valueTransformerWithKey = valueTransformerWithKeySupplier.get();
return new InternalValueTransformerWithKey<K, V, VR>() {
@Override
public VR punctuate(final long timestamp) {
Expand Down
33 changes: 33 additions & 0 deletions streams/src/test/java/org/apache/kafka/streams/kstream/internals/AbstractStreamTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import org.apache.kafka.streams.Consumed;
import org.apache.kafka.streams.StreamsBuilder;
import org.apache.kafka.streams.kstream.KStream;
import org.apache.kafka.streams.kstream.ValueTransformerSupplier;
import org.apache.kafka.streams.kstream.ValueTransformerWithKeySupplier;
import org.apache.kafka.streams.processor.AbstractProcessor;
import org.apache.kafka.streams.processor.Processor;
import org.apache.kafka.streams.processor.ProcessorSupplier;
Expand All @@ -30,6 +32,10 @@

import java.util.Random;

import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
import static org.junit.Assert.assertTrue;

public class AbstractStreamTest {
Expand All @@ -38,6 +44,33 @@ public class AbstractStreamTest {
@Rule
public final KStreamTestDriver driver = new KStreamTestDriver();

@Test
public void testToInternlValueTransformerSupplierSuppliesNewTransformers() {
final ValueTransformerSupplier vts = createMock(ValueTransformerSupplier.class);
expect(vts.get()).andReturn(null).times(3);
final InternalValueTransformerWithKeySupplier ivtwks =
AbstractStream.toInternalValueTransformerSupplier(vts);
replay(vts);
ivtwks.get();
ivtwks.get();
ivtwks.get();
verify(vts);
}

@Test
public void testToInternalValueTransformerSupplierSuppliesNewTransformers() {
final ValueTransformerWithKeySupplier vtwks =
createMock(ValueTransformerWithKeySupplier.class);
expect(vtwks.get()).andReturn(null).times(3);
final InternalValueTransformerWithKeySupplier ivtwks =
AbstractStream.toInternalValueTransformerSupplier(vtwks);
replay(vtwks);
ivtwks.get();
ivtwks.get();
ivtwks.get();
verify(vtwks);
}

@Test
public void testShouldBeExtensible() {
final StreamsBuilder builder = new StreamsBuilder();
Expand Down