You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by vv...@apache.org on 2020/10/07 02:33:44 UTC
[kafka] branch kip-478-part-5-state-store-wrappers created (now
ccc12cd)
This is an automated email from the ASF dual-hosted git repository.
vvcephei pushed a change to branch kip-478-part-5-state-store-wrappers
in repository https://gitbox.apache.org/repos/asf/kafka.git.
at ccc12cd done
This branch includes the following new commits:
new 59e3e34 KAFKA-10562: Delegate store wrappers to new init method
new e53cdf4 wip
new af662e1 asdf
new f4448fd wip
new ccc12cd done
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[kafka] 03/05: asdf
Posted by vv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vvcephei pushed a commit to branch kip-478-part-5-state-store-wrappers
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit af662e15bdea5688b49d489ca8c2ce087dcaa2d6
Author: John Roesler <vv...@apache.org>
AuthorDate: Tue Oct 6 09:36:39 2020 -0500
asdf
---
.../internals/AbstractReadOnlyDecorator.java | 2 ++
.../internals/AbstractReadWriteDecorator.java | 2 ++
.../processor/internals/ProcessorContextUtils.java | 7 +++++
.../state/internals/CachingWindowStore.java | 1 +
.../internals/ChangeLoggingKeyValueBytesStore.java | 28 +++++------------
.../internals/ChangeLoggingSessionBytesStore.java | 17 +++-------
.../internals/ChangeLoggingWindowBytesStore.java | 17 +++-------
.../state/internals/InMemoryKeyValueStore.java | 1 +
.../InMemoryTimeOrderedKeyValueBuffer.java | 36 ++++++++++++++++++++++
.../streams/state/internals/KeyValueSegment.java | 1 -
...ValueToTimestampedKeyValueByteStoreAdapter.java | 1 +
.../streams/state/internals/MemoryLRUCache.java | 12 ++++++++
.../state/internals/MeteredKeyValueStore.java | 2 ++
.../state/internals/MeteredSessionStore.java | 1 +
.../internals/MeteredTimestampedKeyValueStore.java | 1 +
.../internals/MeteredTimestampedWindowStore.java | 1 +
.../state/internals/MeteredWindowStore.java | 4 +++
.../streams/state/internals/RocksDBStore.java | 29 ++++++++++++-----
.../state/internals/RocksDBWindowStore.java | 1 +
.../internals/TimestampedKeyValueStoreBuilder.java | 1 +
.../internals/TimestampedWindowStoreBuilder.java | 1 +
.../WindowToTimestampedWindowByteStoreAdapter.java | 1 +
.../ChangeLoggingSessionBytesStoreTest.java | 17 ++++++++++
23 files changed, 132 insertions(+), 52 deletions(-)
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java
index 74227af..20eb2c0 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java
@@ -20,6 +20,7 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.SessionStore;
@@ -45,6 +46,7 @@ abstract class AbstractReadOnlyDecorator<T extends StateStore, K, V> extends Wra
throw new UnsupportedOperationException(ERROR_MESSAGE);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java
index 41026c4..0bfe452 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java
@@ -21,6 +21,7 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.SessionStore;
@@ -38,6 +39,7 @@ abstract class AbstractReadWriteDecorator<T extends StateStore, K, V> extends Wr
super(inner);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
index a769157..9c84aab 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
@@ -48,6 +48,13 @@ public final class ProcessorContextUtils {
return (StreamsMetricsImpl) context.metrics();
}
+ /**
+ * Should be removed as part of KAFKA-10217
+ */
+ public static StreamsMetricsImpl getMetricsImpl(final StateStoreContext context) {
+ return (StreamsMetricsImpl) context.metrics();
+ }
+
public static String changelogFor(final ProcessorContext context, final String storeName) {
return context instanceof InternalProcessorContext
? ((InternalProcessorContext) context).changelogFor(storeName)
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
index aea32f5..c750f3a 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
@@ -69,6 +69,7 @@ class CachingWindowStore
this.maxObservedTimestamp = new AtomicLong(RecordQueue.UNKNOWN);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
initInternal(asInternalProcessorContext(context));
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java
index d5205ed..055a0f4 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java
@@ -27,6 +27,8 @@ import org.apache.kafka.streams.state.KeyValueStore;
import java.util.List;
+import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.asInternalProcessorContext;
+
public class ChangeLoggingKeyValueBytesStore
extends WrappedStateStore<KeyValueStore<Bytes, byte[]>, byte[], byte[]>
implements KeyValueStore<Bytes, byte[]> {
@@ -37,37 +39,23 @@ public class ChangeLoggingKeyValueBytesStore
super(inner);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
super.init(context, root);
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- this.context = (InternalProcessorContext) context;
-
- // if the inner store is an LRU cache, add the eviction listener to log removed record
- if (wrapped() instanceof MemoryLRUCache) {
- ((MemoryLRUCache) wrapped()).setWhenEldestRemoved((key, value) -> {
- // pass null to indicate removal
- log(key, null);
- });
- }
+ this.context = asInternalProcessorContext(context);
+ maybeSetEvictionListener();
}
@Override
public void init(final StateStoreContext context,
final StateStore root) {
super.init(context, root);
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- this.context = (InternalProcessorContext) context;
+ this.context = asInternalProcessorContext(context);
+ maybeSetEvictionListener(); }
+ private void maybeSetEvictionListener() {
// if the inner store is an LRU cache, add the eviction listener to log removed record
if (wrapped() instanceof MemoryLRUCache) {
((MemoryLRUCache) wrapped()).setWhenEldestRemoved((key, value) -> {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java
index 648a47e..0d2133d 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java
@@ -25,6 +25,8 @@ import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.SessionStore;
+import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.asInternalProcessorContext;
+
/**
* Simple wrapper around a {@link SessionStore} to support writing
* updates to a changelog
@@ -39,26 +41,17 @@ class ChangeLoggingSessionBytesStore
super(bytesStore);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
super.init(context, root);
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- this.context = (InternalProcessorContext) context;
+ this.context = asInternalProcessorContext(context);
}
@Override
public void init(final StateStoreContext context, final StateStore root) {
super.init(context, root);
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- this.context = (InternalProcessorContext) context;
+ this.context = asInternalProcessorContext(context);
}
@Override
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java
index 6eee6c3..47f088e 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java
@@ -26,6 +26,8 @@ import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.WindowStore;
import org.apache.kafka.streams.state.WindowStoreIterator;
+import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.asInternalProcessorContext;
+
/**
* Simple wrapper around a {@link WindowStore} to support writing
* updates to a changelog
@@ -44,27 +46,18 @@ class ChangeLoggingWindowBytesStore
this.retainDuplicates = retainDuplicates;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- this.context = (InternalProcessorContext) context;
+ this.context = asInternalProcessorContext(context);
super.init(context, root);
}
@Override
public void init(final StateStoreContext context,
final StateStore root) {
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- this.context = (InternalProcessorContext) context;
+ this.context = asInternalProcessorContext(context);
super.init(context, root);
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java
index b02459d..31041b9 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStore.java
@@ -50,6 +50,7 @@ public class InMemoryKeyValueStore implements KeyValueStore<Bytes, byte[]> {
return name;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryTimeOrderedKeyValueBuffer.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryTimeOrderedKeyValueBuffer.java
index e3d3ba6..d27d8ea 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryTimeOrderedKeyValueBuffer.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryTimeOrderedKeyValueBuffer.java
@@ -29,7 +29,9 @@ import org.apache.kafka.streams.kstream.internals.Change;
import org.apache.kafka.streams.kstream.internals.FullChangeSerde;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
+import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.processor.internals.RecordBatchingStateRestoreCallback;
@@ -193,6 +195,7 @@ public final class InMemoryTimeOrderedKeyValueBuffer<K, V> implements TimeOrdere
this.valueSerde = this.valueSerde == null ? FullChangeSerde.wrap(valueSerde) : this.valueSerde;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
taskId = context.taskId().toString();
@@ -223,6 +226,39 @@ public final class InMemoryTimeOrderedKeyValueBuffer<K, V> implements TimeOrdere
}
@Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ this.context = ProcessorContextUtils.asInternalProcessorContext(context);
+ init(root);
+ }
+
+ private void init(final StateStore root) {
+ taskId = this.context.taskId().toString();
+ streamsMetrics = this.context.metrics();
+
+ threadId = Thread.currentThread().getName();
+ bufferSizeSensor = StateStoreMetrics.suppressionBufferSizeSensor(
+ threadId,
+ taskId,
+ METRIC_SCOPE,
+ storeName,
+ streamsMetrics
+ );
+ bufferCountSensor = StateStoreMetrics.suppressionBufferCountSensor(
+ threadId,
+ taskId,
+ METRIC_SCOPE,
+ storeName,
+ streamsMetrics
+ );
+
+ this.context.register(root, (RecordBatchingStateRestoreCallback) this::restoreBatch);
+ changelogTopic = ProcessorStateManager.storeChangelogTopic(this.context.applicationId(), storeName);
+ updateBufferMetrics();
+ open = true;
+ partition = this.context.taskId().partition;
+ }
+
+ @Override
public boolean isOpen() {
return open;
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
index 21fbc45..a64df19 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
@@ -48,7 +48,6 @@ class KeyValueSegment extends RocksDBStore implements Comparable<KeyValueSegment
public void openDB(final ProcessorContext context) {
super.openDB(context);
// skip the registering step
- internalProcessorContext = context;
}
@Override
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java
index bb2ef26..6bb0950 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java
@@ -82,6 +82,7 @@ public class KeyValueToTimestampedKeyValueByteStoreAdapter implements KeyValueSt
return store.name();
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryLRUCache.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryLRUCache.java
index 32a91cd..236fedc 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryLRUCache.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MemoryLRUCache.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -73,6 +74,7 @@ public class MemoryLRUCache implements KeyValueStore<Bytes, byte[]> {
return this.name;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
@@ -85,6 +87,16 @@ public class MemoryLRUCache implements KeyValueStore<Bytes, byte[]> {
}
@Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ // register the store
+ context.register(root, (key, value) -> {
+ restoring = true;
+ put(Bytes.wrap(key), value);
+ restoring = false;
+ });
+ }
+
+ @Override
public boolean persistent() {
return false;
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
index 8ca7686..2c45358 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
@@ -85,6 +85,7 @@ public class MeteredKeyValueStore<K, V>
this.valueSerde = valueSerde;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
@@ -129,6 +130,7 @@ public class MeteredKeyValueStore<K, V>
e2eLatencySensor = StateStoreMetrics.e2ELatencySensor(taskId, metricsScope, name(), streamsMetrics);
}
+ @Deprecated
@SuppressWarnings("unchecked")
void initStoreSerde(final ProcessorContext context) {
final String storeName = name();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java
index 96fed94..8b9256d 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java
@@ -70,6 +70,7 @@ public class MeteredSessionStore<K, V>
this.time = time;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java
index e4e6d08..bd9cb92 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java
@@ -51,6 +51,7 @@ public class MeteredTimestampedKeyValueStore<K, V>
super(inner, metricScope, time, keySerde, valueSerde);
}
+ @Deprecated
@SuppressWarnings("unchecked")
void initStoreSerde(final ProcessorContext context) {
final String storeName = name();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java
index 0d83aba..fcc4bbe 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java
@@ -49,6 +49,7 @@ class MeteredTimestampedWindowStore<K, V>
super(inner, windowSizeMs, metricScope, time, keySerde, valueSerde);
}
+ @Deprecated
@SuppressWarnings("unchecked")
@Override
void initStoreSerde(final ProcessorContext context) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
index c4cd1f7..d47233b 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
@@ -71,6 +71,7 @@ public class MeteredWindowStore<K, V>
this.valueSerde = valueSerde;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
@@ -110,6 +111,7 @@ public class MeteredWindowStore<K, V>
e2eLatencySensor = StateStoreMetrics.e2ELatencySensor(taskId, metricsScope, name(), streamsMetrics);
}
+ @Deprecated
@SuppressWarnings("unchecked")
void initStoreSerde(final ProcessorContext context) {
final String storeName = name();
@@ -298,6 +300,8 @@ public class MeteredWindowStore<K, V>
}
private void maybeRecordE2ELatency() {
+ // Context is null if the provided context isn't an implementation of InternalProcessorContext.
+ // In that case, we _can't_ get the current timestamp, so we don't record anything.
if (e2eLatencySensor.shouldRecord() && context != null) {
final long currentTime = time.milliseconds();
final long e2eLatency = currentTime - context.timestamp();
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
index 3442d83..f72b3af 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
@@ -26,6 +26,8 @@ import org.apache.kafka.streams.errors.ProcessorStateException;
import org.apache.kafka.streams.processor.BatchingStateRestoreCallback;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
+import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -65,8 +67,10 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.function.Supplier;
import static org.apache.kafka.streams.StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG;
+import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.getMetricsImpl;
/**
* A persistent key-value store based on RocksDB.
@@ -102,7 +106,6 @@ public class RocksDBStore implements KeyValueStore<Bytes, byte[]>, BatchWritingS
private final RocksDBMetricsRecorder metricsRecorder;
- ProcessorContext internalProcessorContext;
// visible for testing
volatile BatchingStateRestoreCallback batchingStateRestoreCallback = null;
@@ -122,7 +125,7 @@ public class RocksDBStore implements KeyValueStore<Bytes, byte[]>, BatchWritingS
}
@SuppressWarnings("unchecked")
- void openDB(final ProcessorContext context) {
+ void openDB(final Map<String, Object> configs, final File stateDir) {
// initialize the default rocksdb options
final DBOptions dbOptions = new DBOptions();
@@ -161,7 +164,6 @@ public class RocksDBStore implements KeyValueStore<Bytes, byte[]>, BatchWritingS
fOptions = new FlushOptions();
fOptions.setWaitForFlush(true);
- final Map<String, Object> configs = context.appConfigs();
final Class<RocksDBConfigSetter> configSetterClass =
(Class<RocksDBConfigSetter>) configs.get(StreamsConfig.ROCKSDB_CONFIG_SETTER_CLASS_CONFIG);
@@ -170,7 +172,7 @@ public class RocksDBStore implements KeyValueStore<Bytes, byte[]>, BatchWritingS
configSetter.setConfig(name, userSpecifiedOptions, configs);
}
- dbDir = new File(new File(context.stateDir(), parentDir), name);
+ dbDir = new File(new File(stateDir, parentDir), name);
try {
Files.createDirectories(dbDir.getParentFile().toPath());
@@ -232,13 +234,26 @@ public class RocksDBStore implements KeyValueStore<Bytes, byte[]>, BatchWritingS
}
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
// open the DB dir
- internalProcessorContext = context;
- metricsRecorder.init((StreamsMetricsImpl) context.metrics(), context.taskId());
- openDB(context);
+ metricsRecorder.init(getMetricsImpl(context), context.taskId());
+ openDB(context.appConfigs(), context.stateDir());
+ batchingStateRestoreCallback = new RocksDBBatchingRestoreCallback(this);
+
+ // value getter should always read directly from rocksDB
+ // since it is only for values that are already flushed
+ context.register(root, batchingStateRestoreCallback);
+ }
+
+ @Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ // open the DB dir
+ metricsRecorder.init(getMetricsImpl(context), context.taskId());
+ openDB(context.appConfigs(), context.stateDir());
batchingStateRestoreCallback = new RocksDBBatchingRestoreCallback(this);
// value getter should always read directly from rocksDB
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java
index 7c779a6..b3ba652 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java
@@ -44,6 +44,7 @@ public class RocksDBWindowStore
this.windowSize = windowSize;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java
index 522472d..fc8e75a 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java
@@ -95,6 +95,7 @@ public class TimestampedKeyValueStoreBuilder<K, V>
this.wrapped = wrapped;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java
index 454b123..d81958e 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java
@@ -109,6 +109,7 @@ public class TimestampedWindowStoreBuilder<K, V>
this.wrapped = wrapped;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java
index bfeb33e..586e87d 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java
@@ -161,6 +161,7 @@ class WindowToTimestampedWindowByteStoreAdapter implements WindowStore<Bytes, by
return store.name();
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
index 8753342..6f85116 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
@@ -19,6 +19,7 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.kstream.internals.SessionWindow;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.ProcessorContextImpl;
@@ -63,6 +64,22 @@ public class ChangeLoggingSessionBytesStoreTest {
store.init((StateStoreContext) context, store);
}
+ @Test void shouldDelegateDeprecatedInit() {
+ inner.init((ProcessorContext) context, store);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ store.init((ProcessorContext) context, store);
+ EasyMock.verify(inner);
+ }
+
+ @Test void shouldDelegateInit() {
+ inner.init((StateStoreContext) context, store);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ store.init((StateStoreContext) context, store);
+ EasyMock.verify(inner);
+ }
+
@Test
public void shouldLogPuts() {
inner.put(key1, value1);
[kafka] 02/05: wip
Posted by vv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vvcephei pushed a commit to branch kip-478-part-5-state-store-wrappers
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit e53cdf44111b9ca2a38424452bdb6f57b88498ff
Author: John Roesler <vv...@apache.org>
AuthorDate: Mon Oct 5 16:13:51 2020 -0500
wip
---
.../apache/kafka/streams/processor/StateStore.java | 4 ++++
.../processor/internals/ProcessorContextUtils.java | 20 ++++++++++++++++++++
.../state/internals/CachingKeyValueStore.java | 11 ++++-------
.../streams/state/internals/CachingSessionStore.java | 16 ++++------------
.../streams/state/internals/CachingWindowStore.java | 15 +++------------
.../streams/state/internals/WrappedStateStore.java | 1 +
6 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/StateStore.java b/streams/src/main/java/org/apache/kafka/streams/processor/StateStore.java
index 4f47b12..570bb62 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/StateStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/StateStore.java
@@ -65,7 +65,11 @@ public interface StateStore {
*
* @throws IllegalStateException If store gets registered after initialized is already finished
* @throws StreamsException if the store's change log does not contain the partition
+ * @deprecated Since 2.7.0. Callers should invoke {@link this#init(StateStoreContext, StateStore)} instead.
+ * Implementers may choose to implement this method for backward compatibility or to throw an
+ * informative exception instead.
*/
+ @Deprecated
void init(org.apache.kafka.streams.processor.ProcessorContext context, StateStore root);
/**
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
index 41a1197..a769157 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
@@ -59,4 +59,24 @@ public final class ProcessorContextUtils {
? ((InternalProcessorContext) context).changelogFor(storeName)
: ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName);
}
+
+ public static InternalProcessorContext asInternalProcessorContext(final ProcessorContext context) {
+ if (context instanceof InternalProcessorContext) {
+ return (InternalProcessorContext) context;
+ } else {
+ throw new IllegalArgumentException(
+ "This component requires internal features of Kafka Streams and must be disabled for unit tests."
+ );
+ }
+ }
+
+ public static InternalProcessorContext asInternalProcessorContext(final StateStoreContext context) {
+ if (context instanceof InternalProcessorContext) {
+ return (InternalProcessorContext) context;
+ } else {
+ throw new IllegalArgumentException(
+ "This component requires internal features of Kafka Streams and must be disabled for unit tests."
+ );
+ }
+ }
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java
index ba2f949..d88fb4c 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java
@@ -35,6 +35,7 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.asInternalProcessorContext;
import static org.apache.kafka.streams.state.internals.ExceptionUtils.executeAll;
import static org.apache.kafka.streams.state.internals.ExceptionUtils.throwSuppressed;
@@ -55,6 +56,7 @@ public class CachingKeyValueStore
super(underlying);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
@@ -63,7 +65,7 @@ public class CachingKeyValueStore
"Caching requires internal features of KafkaStreams and must be disabled for unit tests."
);
}
- initInternal((InternalProcessorContext) context);
+ initInternal(asInternalProcessorContext(context));
super.init(context, root);
// save the stream thread as we only ever want to trigger a flush
// when the stream thread is the current thread.
@@ -73,12 +75,7 @@ public class CachingKeyValueStore
@Override
public void init(final StateStoreContext context,
final StateStore root) {
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- initInternal((InternalProcessorContext) context);
+ initInternal(asInternalProcessorContext(context));
super.init(context, root);
// save the stream thread as we only ever want to trigger a flush
// when the stream thread is the current thread.
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java
index 616bb00..c92123d 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java
@@ -35,6 +35,7 @@ import java.util.LinkedList;
import java.util.NoSuchElementException;
import java.util.Objects;
+import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.asInternalProcessorContext;
import static org.apache.kafka.streams.state.internals.ExceptionUtils.executeAll;
import static org.apache.kafka.streams.state.internals.ExceptionUtils.throwSuppressed;
@@ -62,25 +63,16 @@ class CachingSessionStore
this.maxObservedTimestamp = RecordQueue.UNKNOWN;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- initInternal((InternalProcessorContext) context);
+ initInternal(asInternalProcessorContext(context));
super.init(context, root);
}
@Override
public void init(final StateStoreContext context, final StateStore root) {
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- initInternal((InternalProcessorContext) context);
+ initInternal(asInternalProcessorContext(context));
super.init(context, root);
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
index 936f09c..aea32f5 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
@@ -38,6 +38,7 @@ import java.util.LinkedList;
import java.util.NoSuchElementException;
import java.util.concurrent.atomic.AtomicLong;
+import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.asInternalProcessorContext;
import static org.apache.kafka.streams.state.internals.ExceptionUtils.executeAll;
import static org.apache.kafka.streams.state.internals.ExceptionUtils.throwSuppressed;
@@ -70,23 +71,13 @@ class CachingWindowStore
@Override
public void init(final ProcessorContext context, final StateStore root) {
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- initInternal((InternalProcessorContext) context);
+ initInternal(asInternalProcessorContext(context));
super.init(context, root);
}
@Override
public void init(final StateStoreContext context, final StateStore root) {
- if (!(context instanceof InternalProcessorContext)) {
- throw new IllegalArgumentException(
- "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
- );
- }
- initInternal((InternalProcessorContext) context);
+ initInternal(asInternalProcessorContext(context));
super.init(context, root);
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java
index c4b4b53..e8244f7 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java
@@ -43,6 +43,7 @@ public abstract class WrappedStateStore<S extends StateStore, K, V> implements S
this.wrapped = wrapped;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
[kafka] 01/05: KAFKA-10562: Delegate store wrappers to new init
method
Posted by vv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vvcephei pushed a commit to branch kip-478-part-5-state-store-wrappers
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit 59e3e34b44a68627718a7f76ae39b08906e97ef5
Author: John Roesler <vv...@apache.org>
AuthorDate: Thu Oct 1 10:19:59 2020 -0500
KAFKA-10562: Delegate store wrappers to new init method
---
.../processor/internals/ProcessorContextUtils.java | 7 +++
.../state/internals/CachingKeyValueStore.java | 29 ++++++++++--
.../state/internals/CachingSessionStore.java | 17 +++++++
.../state/internals/CachingWindowStore.java | 12 +++++
.../internals/ChangeLoggingKeyValueBytesStore.java | 26 +++++++++++
.../internals/ChangeLoggingSessionBytesStore.java | 17 +++++++
.../internals/ChangeLoggingWindowBytesStore.java | 13 ++++++
...ValueToTimestampedKeyValueByteStoreAdapter.java | 6 +++
.../state/internals/MeteredKeyValueStore.java | 52 +++++++++++++++++----
.../state/internals/MeteredSessionStore.java | 53 ++++++++++++++++++----
.../internals/MeteredTimestampedKeyValueStore.java | 13 ++++++
.../internals/MeteredTimestampedWindowStore.java | 15 ++++++
.../state/internals/MeteredWindowStore.java | 50 ++++++++++++++++----
.../state/internals/RocksDBWindowStore.java | 14 ++++--
.../internals/TimestampedKeyValueStoreBuilder.java | 6 +++
.../internals/TimestampedWindowStoreBuilder.java | 6 +++
.../WindowToTimestampedWindowByteStoreAdapter.java | 6 +++
.../streams/state/internals/WrappedStateStore.java | 6 +++
.../ChangeLoggingSessionBytesStoreTest.java | 3 +-
...angeLoggingTimestampedWindowBytesStoreTest.java | 3 +-
.../ChangeLoggingWindowBytesStoreTest.java | 3 +-
.../streams/internals/KeyValueStoreFacade.java | 6 +++
.../kafka/streams/internals/WindowStoreFacade.java | 6 +++
23 files changed, 332 insertions(+), 37 deletions(-)
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
index 78b1ff5..41a1197 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/ProcessorContextUtils.java
@@ -17,6 +17,7 @@
package org.apache.kafka.streams.processor.internals;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
/**
@@ -52,4 +53,10 @@ public final class ProcessorContextUtils {
? ((InternalProcessorContext) context).changelogFor(storeName)
: ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName);
}
+
+ public static String changelogFor(final StateStoreContext context, final String storeName) {
+ return context instanceof InternalProcessorContext
+ ? ((InternalProcessorContext) context).changelogFor(storeName)
+ : ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName);
+ }
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java
index cae38e0..ba2f949 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingKeyValueStore.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
import org.apache.kafka.streams.state.KeyValueIterator;
@@ -57,20 +58,40 @@ public class CachingKeyValueStore
@Override
public void init(final ProcessorContext context,
final StateStore root) {
- initInternal(context);
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
+ initInternal((InternalProcessorContext) context);
+ super.init(context, root);
+ // save the stream thread as we only ever want to trigger a flush
+ // when the stream thread is the current thread.
+ streamThread = Thread.currentThread();
+ }
+
+ @Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
+ initInternal((InternalProcessorContext) context);
super.init(context, root);
// save the stream thread as we only ever want to trigger a flush
// when the stream thread is the current thread.
streamThread = Thread.currentThread();
}
- private void initInternal(final ProcessorContext context) {
- this.context = (InternalProcessorContext) context;
+ private void initInternal(final InternalProcessorContext context) {
+ this.context = context;
this.cacheName = ThreadCache.nameSpaceFromTaskIdAndStore(context.taskId().toString(), name());
this.context.registerCacheFlushListener(cacheName, entries -> {
for (final ThreadCache.DirtyEntry entry : entries) {
- putAndMaybeForward(entry, (InternalProcessorContext) context);
+ putAndMaybeForward(entry, context);
}
});
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java
index 4ac43a2..616bb00 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingSessionStore.java
@@ -22,6 +22,7 @@ import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.kstream.internals.SessionWindow;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
import org.apache.kafka.streams.processor.internals.RecordQueue;
@@ -63,6 +64,22 @@ class CachingSessionStore
@Override
public void init(final ProcessorContext context, final StateStore root) {
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
+ initInternal((InternalProcessorContext) context);
+ super.init(context, root);
+ }
+
+ @Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
initInternal((InternalProcessorContext) context);
super.init(context, root);
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
index 20be3a3..936f09c 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/CachingWindowStore.java
@@ -22,6 +22,7 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
@@ -78,6 +79,17 @@ class CachingWindowStore
super.init(context, root);
}
+ @Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Caching requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
+ initInternal((InternalProcessorContext) context);
+ super.init(context, root);
+ }
+
private void initInternal(final InternalProcessorContext context) {
this.context = context;
final String topic = ProcessorStateManager.storeChangelogTopic(context.applicationId(), name());
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java
index 236f218..d5205ed 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStore.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -40,6 +41,31 @@ public class ChangeLoggingKeyValueBytesStore
public void init(final ProcessorContext context,
final StateStore root) {
super.init(context, root);
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
+ this.context = (InternalProcessorContext) context;
+
+ // if the inner store is an LRU cache, add the eviction listener to log removed record
+ if (wrapped() instanceof MemoryLRUCache) {
+ ((MemoryLRUCache) wrapped()).setWhenEldestRemoved((key, value) -> {
+ // pass null to indicate removal
+ log(key, null);
+ });
+ }
+ }
+
+ @Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ super.init(context, root);
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
this.context = (InternalProcessorContext) context;
// if the inner store is an LRU cache, add the eviction listener to log removed record
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java
index cc586d3..648a47e 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStore.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.SessionStore;
@@ -41,6 +42,22 @@ class ChangeLoggingSessionBytesStore
@Override
public void init(final ProcessorContext context, final StateStore root) {
super.init(context, root);
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
+ this.context = (InternalProcessorContext) context;
+ }
+
+ @Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ super.init(context, root);
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
this.context = (InternalProcessorContext) context;
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java
index 8da413c..6eee6c3 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStore.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.WindowStore;
@@ -56,6 +57,18 @@ class ChangeLoggingWindowBytesStore
}
@Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ if (!(context instanceof InternalProcessorContext)) {
+ throw new IllegalArgumentException(
+ "Change logging requires internal features of KafkaStreams and must be disabled for unit tests."
+ );
+ }
+ this.context = (InternalProcessorContext) context;
+ super.init(context, root);
+ }
+
+ @Override
public byte[] fetch(final Bytes key,
final long timestamp) {
return wrapped().fetch(key, timestamp);
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java
index fa29974..bb2ef26 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueToTimestampedKeyValueByteStoreAdapter.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -88,6 +89,11 @@ public class KeyValueToTimestampedKeyValueByteStoreAdapter implements KeyValueSt
}
@Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ store.init(context, root);
+ }
+
+ @Override
public void flush() {
store.flush();
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
index 31e2eff..8ca7686 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStore.java
@@ -24,6 +24,8 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.errors.ProcessorStateException;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
+import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
@@ -65,7 +67,7 @@ public class MeteredKeyValueStore<K, V>
private Sensor rangeSensor;
private Sensor flushSensor;
private Sensor e2eLatencySensor;
- private ProcessorContext context;
+ private InternalProcessorContext context;
private StreamsMetricsImpl streamsMetrics;
private final String threadId;
private String taskId;
@@ -86,11 +88,36 @@ public class MeteredKeyValueStore<K, V>
@Override
public void init(final ProcessorContext context,
final StateStore root) {
- this.context = context;
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
taskId = context.taskId().toString();
initStoreSerde(context);
streamsMetrics = (StreamsMetricsImpl) context.metrics();
+ registerMetrics();
+ final Sensor restoreSensor =
+ StateStoreMetrics.restoreSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+
+ // register and possibly restore the state from the logs
+ maybeMeasureLatency(() -> super.init(context, root), time, restoreSensor);
+ }
+
+ @Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
+ taskId = context.taskId().toString();
+ initStoreSerde(context);
+ streamsMetrics = (StreamsMetricsImpl) context.metrics();
+
+ registerMetrics();
+ final Sensor restoreSensor =
+ StateStoreMetrics.restoreSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+
+ // register and possibly restore the state from the logs
+ maybeMeasureLatency(() -> super.init(context, root), time, restoreSensor);
+ }
+
+ private void registerMetrics() {
putSensor = StateStoreMetrics.putSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
putIfAbsentSensor = StateStoreMetrics.putIfAbsentSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
putAllSensor = StateStoreMetrics.putAllSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
@@ -100,11 +127,6 @@ public class MeteredKeyValueStore<K, V>
flushSensor = StateStoreMetrics.flushSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
deleteSensor = StateStoreMetrics.deleteSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
e2eLatencySensor = StateStoreMetrics.e2ELatencySensor(taskId, metricsScope, name(), streamsMetrics);
- final Sensor restoreSensor =
- StateStoreMetrics.restoreSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
-
- // register and possibly restore the state from the logs
- maybeMeasureLatency(() -> super.init(context, root), time, restoreSensor);
}
@SuppressWarnings("unchecked")
@@ -112,6 +134,18 @@ public class MeteredKeyValueStore<K, V>
final String storeName = name();
final String changelogTopic = ProcessorContextUtils.changelogFor(context, storeName);
serdes = new StateSerdes<>(
+ changelogTopic != null ?
+ changelogTopic :
+ ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName),
+ keySerde == null ? (Serde<K>) context.keySerde() : keySerde,
+ valueSerde == null ? (Serde<V>) context.valueSerde() : valueSerde);
+ }
+
+ @SuppressWarnings("unchecked")
+ void initStoreSerde(final StateStoreContext context) {
+ final String storeName = name();
+ final String changelogTopic = ProcessorContextUtils.changelogFor(context, storeName);
+ serdes = new StateSerdes<>(
changelogTopic != null ?
changelogTopic :
ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName),
@@ -250,7 +284,9 @@ public class MeteredKeyValueStore<K, V>
}
private void maybeRecordE2ELatency() {
- if (e2eLatencySensor.shouldRecord()) {
+ // Context is null if the provided context isn't an implementation of InternalProcessorContext.
+ // In that case, we _can't_ get the current timestamp, so we don't record anything.
+ if (e2eLatencySensor.shouldRecord() && context != null) {
final long currentTime = time.milliseconds();
final long e2eLatency = currentTime - context.timestamp();
e2eLatencySensor.record(e2eLatency, currentTime);
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java
index d8ce02a..96fed94 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredSessionStore.java
@@ -24,6 +24,8 @@ import org.apache.kafka.streams.errors.ProcessorStateException;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
+import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
@@ -51,7 +53,7 @@ public class MeteredSessionStore<K, V>
private Sensor flushSensor;
private Sensor removeSensor;
private Sensor e2eLatencySensor;
- private ProcessorContext context;
+ private InternalProcessorContext context;
private final String threadId;
private String taskId;
@@ -71,16 +73,12 @@ public class MeteredSessionStore<K, V>
@Override
public void init(final ProcessorContext context,
final StateStore root) {
- this.context = context;
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
initStoreSerde(context);
taskId = context.taskId().toString();
streamsMetrics = (StreamsMetricsImpl) context.metrics();
- putSensor = StateStoreMetrics.putSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
- fetchSensor = StateStoreMetrics.fetchSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
- flushSensor = StateStoreMetrics.flushSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
- removeSensor = StateStoreMetrics.removeSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
- e2eLatencySensor = StateStoreMetrics.e2ELatencySensor(taskId, metricsScope, name(), streamsMetrics);
+ registerMetrics();
final Sensor restoreSensor =
StateStoreMetrics.restoreSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
@@ -88,6 +86,30 @@ public class MeteredSessionStore<K, V>
maybeMeasureLatency(() -> super.init(context, root), time, restoreSensor);
}
+ @Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
+ initStoreSerde(context);
+ taskId = context.taskId().toString();
+ streamsMetrics = (StreamsMetricsImpl) context.metrics();
+
+ registerMetrics();
+ final Sensor restoreSensor =
+ StateStoreMetrics.restoreSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+
+ // register and possibly restore the state from the logs
+ maybeMeasureLatency(() -> super.init(context, root), time, restoreSensor);
+ }
+
+ private void registerMetrics() {
+ putSensor = StateStoreMetrics.putSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+ fetchSensor = StateStoreMetrics.fetchSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+ flushSensor = StateStoreMetrics.flushSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+ removeSensor = StateStoreMetrics.removeSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+ e2eLatencySensor = StateStoreMetrics.e2ELatencySensor(taskId, metricsScope, name(), streamsMetrics);
+ }
+
@SuppressWarnings("unchecked")
private void initStoreSerde(final ProcessorContext context) {
final String storeName = name();
@@ -102,6 +124,19 @@ public class MeteredSessionStore<K, V>
}
@SuppressWarnings("unchecked")
+ private void initStoreSerde(final StateStoreContext context) {
+ final String storeName = name();
+ final String changelogTopic = ProcessorContextUtils.changelogFor(context, storeName);
+ serdes = new StateSerdes<>(
+ changelogTopic != null ?
+ changelogTopic :
+ ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName),
+ keySerde == null ? (Serde<K>) context.keySerde() : keySerde,
+ valueSerde == null ? (Serde<V>) context.valueSerde() : valueSerde
+ );
+ }
+
+ @SuppressWarnings("unchecked")
@Override
public boolean setFlushListener(final CacheFlushListener<Windowed<K>, V> listener,
final boolean sendOldValues) {
@@ -255,7 +290,9 @@ public class MeteredSessionStore<K, V>
}
private void maybeRecordE2ELatency() {
- if (e2eLatencySensor.shouldRecord()) {
+ // Context is null if the provided context isn't an implementation of InternalProcessorContext.
+ // In that case, we _can't_ get the current timestamp, so we don't record anything.
+ if (e2eLatencySensor.shouldRecord() && context != null) {
final long currentTime = time.milliseconds();
final long e2eLatency = currentTime - context.timestamp();
e2eLatencySensor.record(e2eLatency, currentTime);
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java
index 022c1f8..e4e6d08 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStore.java
@@ -23,6 +23,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.streams.errors.ProcessorStateException;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -62,6 +63,18 @@ public class MeteredTimestampedKeyValueStore<K, V>
valueSerde == null ? new ValueAndTimestampSerde<>((Serde<V>) context.valueSerde()) : valueSerde);
}
+ @SuppressWarnings("unchecked")
+ void initStoreSerde(final StateStoreContext context) {
+ final String storeName = name();
+ final String changelogTopic = ProcessorContextUtils.changelogFor(context, storeName);
+ serdes = new StateSerdes<>(
+ changelogTopic != null ?
+ changelogTopic :
+ ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName),
+ keySerde == null ? (Serde<K>) context.keySerde() : keySerde,
+ valueSerde == null ? new ValueAndTimestampSerde<>((Serde<V>) context.valueSerde()) : valueSerde);
+ }
+
public RawAndDeserializedValue<V> getWithBinary(final K key) {
try {
return maybeMeasureLatency(() -> {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java
index 3c386f3..0d83aba 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStore.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.state.StateSerdes;
@@ -61,4 +62,18 @@ class MeteredTimestampedWindowStore<K, V>
valueSerde == null ? new ValueAndTimestampSerde<>((Serde<V>) context.valueSerde()) : valueSerde
);
}
+
+ @SuppressWarnings("unchecked")
+ @Override
+ void initStoreSerde(final StateStoreContext context) {
+ final String storeName = name();
+ final String changelogTopic = ProcessorContextUtils.changelogFor(context, storeName);
+ serdes = new StateSerdes<>(
+ changelogTopic != null ?
+ changelogTopic :
+ ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName),
+ keySerde == null ? (Serde<K>) context.keySerde() : keySerde,
+ valueSerde == null ? new ValueAndTimestampSerde<>((Serde<V>) context.valueSerde()) : valueSerde
+ );
+ }
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
index 85c3ec2..c4cd1f7 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/MeteredWindowStore.java
@@ -24,6 +24,8 @@ import org.apache.kafka.streams.errors.ProcessorStateException;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
+import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
@@ -50,7 +52,7 @@ public class MeteredWindowStore<K, V>
private Sensor fetchSensor;
private Sensor flushSensor;
private Sensor e2eLatencySensor;
- private ProcessorContext context;
+ private InternalProcessorContext context;
private final String threadId;
private String taskId;
@@ -72,15 +74,28 @@ public class MeteredWindowStore<K, V>
@Override
public void init(final ProcessorContext context,
final StateStore root) {
- this.context = context;
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
initStoreSerde(context);
streamsMetrics = (StreamsMetricsImpl) context.metrics();
taskId = context.taskId().toString();
- putSensor = StateStoreMetrics.putSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
- fetchSensor = StateStoreMetrics.fetchSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
- flushSensor = StateStoreMetrics.flushSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
- e2eLatencySensor = StateStoreMetrics.e2ELatencySensor(taskId, metricsScope, name(), streamsMetrics);
+ registerMetrics();
+ final Sensor restoreSensor =
+ StateStoreMetrics.restoreSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+
+ // register and possibly restore the state from the logs
+ maybeMeasureLatency(() -> super.init(context, root), time, restoreSensor);
+ }
+
+ @Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
+ initStoreSerde(context);
+ streamsMetrics = (StreamsMetricsImpl) context.metrics();
+ taskId = context.taskId().toString();
+
+ registerMetrics();
final Sensor restoreSensor =
StateStoreMetrics.restoreSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
@@ -88,6 +103,13 @@ public class MeteredWindowStore<K, V>
maybeMeasureLatency(() -> super.init(context, root), time, restoreSensor);
}
+ private void registerMetrics() {
+ putSensor = StateStoreMetrics.putSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+ fetchSensor = StateStoreMetrics.fetchSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+ flushSensor = StateStoreMetrics.flushSensor(threadId, taskId, metricsScope, name(), streamsMetrics);
+ e2eLatencySensor = StateStoreMetrics.e2ELatencySensor(taskId, metricsScope, name(), streamsMetrics);
+ }
+
@SuppressWarnings("unchecked")
void initStoreSerde(final ProcessorContext context) {
final String storeName = name();
@@ -101,6 +123,18 @@ public class MeteredWindowStore<K, V>
}
@SuppressWarnings("unchecked")
+ void initStoreSerde(final StateStoreContext context) {
+ final String storeName = name();
+ final String changelogTopic = ProcessorContextUtils.changelogFor(context, storeName);
+ serdes = new StateSerdes<>(
+ changelogTopic != null ?
+ changelogTopic :
+ ProcessorStateManager.storeChangelogTopic(context.applicationId(), storeName),
+ keySerde == null ? (Serde<K>) context.keySerde() : keySerde,
+ valueSerde == null ? (Serde<V>) context.valueSerde() : valueSerde);
+ }
+
+ @SuppressWarnings("unchecked")
@Override
public boolean setFlushListener(final CacheFlushListener<Windowed<K>, V> listener,
final boolean sendOldValues) {
@@ -122,7 +156,7 @@ public class MeteredWindowStore<K, V>
@Override
public void put(final K key,
final V value) {
- put(key, value, context.timestamp());
+ put(key, value, context != null ? context.timestamp() : 0L);
}
@Override
@@ -264,7 +298,7 @@ public class MeteredWindowStore<K, V>
}
private void maybeRecordE2ELatency() {
- if (e2eLatencySensor.shouldRecord()) {
+ if (e2eLatencySensor.shouldRecord() && context != null) {
final long currentTime = time.milliseconds();
final long e2eLatency = currentTime - context.timestamp();
e2eLatencySensor.record(e2eLatency, currentTime);
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java
index 53f0615..7c779a6 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBWindowStore.java
@@ -20,6 +20,8 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
+import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.WindowStore;
import org.apache.kafka.streams.state.WindowStoreIterator;
@@ -31,7 +33,7 @@ public class RocksDBWindowStore
private final boolean retainDuplicates;
private final long windowSize;
- private ProcessorContext context;
+ private InternalProcessorContext context;
private int seqnum = 0;
RocksDBWindowStore(final SegmentedBytesStore bytesStore,
@@ -44,14 +46,20 @@ public class RocksDBWindowStore
@Override
public void init(final ProcessorContext context, final StateStore root) {
- this.context = context;
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
+ super.init(context, root);
+ }
+
+ @Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ this.context = context instanceof InternalProcessorContext ? (InternalProcessorContext) context : null;
super.init(context, root);
}
@Deprecated
@Override
public void put(final Bytes key, final byte[] value) {
- put(key, value, context.timestamp());
+ put(key, value, context != null ? context.timestamp() : 0L);
}
@Override
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java
index be8f259..522472d 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedKeyValueStoreBuilder.java
@@ -22,6 +22,7 @@ import org.apache.kafka.common.utils.Time;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueBytesStoreSupplier;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -101,6 +102,11 @@ public class TimestampedKeyValueStoreBuilder<K, V>
}
@Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ wrapped.init(context, root);
+ }
+
+ @Override
public void put(final Bytes key,
final byte[] value) {
wrapped.put(key, value);
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java
index a544262..454b123 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedWindowStoreBuilder.java
@@ -22,6 +22,7 @@ import org.apache.kafka.common.utils.Time;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.TimestampedBytesStore;
import org.apache.kafka.streams.state.TimestampedWindowStore;
@@ -114,6 +115,11 @@ public class TimestampedWindowStoreBuilder<K, V>
wrapped.init(context, root);
}
+ @Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ wrapped.init(context, root);
+ }
+
@Deprecated
@Override
public void put(final Bytes key,
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java
index da32599..bfeb33e 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WindowToTimestampedWindowByteStoreAdapter.java
@@ -20,6 +20,7 @@ import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.WindowStore;
import org.apache.kafka.streams.state.WindowStoreIterator;
@@ -167,6 +168,11 @@ class WindowToTimestampedWindowByteStoreAdapter implements WindowStore<Bytes, by
}
@Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ store.init(context, root);
+ }
+
+ @Override
public void flush() {
store.flush();
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java
index 208bc06..c4b4b53 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/WrappedStateStore.java
@@ -19,6 +19,7 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.streams.errors.InvalidStateStoreException;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.TimestampedBytesStore;
/**
@@ -48,6 +49,11 @@ public abstract class WrappedStateStore<S extends StateStore, K, V> implements S
wrapped.init(context, root);
}
+ @Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ wrapped.init(context, root);
+ }
+
@SuppressWarnings("unchecked")
@Override
public boolean setFlushListener(final CacheFlushListener<K, V> listener,
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
index 426a334..8753342 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
@@ -19,7 +19,6 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.kstream.internals.SessionWindow;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.ProcessorContextImpl;
@@ -57,7 +56,7 @@ public class ChangeLoggingSessionBytesStoreTest {
private void init() {
EasyMock.expect(context.taskId()).andReturn(taskId);
EasyMock.expect(context.recordCollector()).andReturn(collector);
- inner.init((ProcessorContext) context, store);
+ inner.init((StateStoreContext) context, store);
EasyMock.expectLastCall();
EasyMock.replay(inner, context);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java
index 9de2207..e928678 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java
@@ -18,7 +18,6 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Bytes;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.ProcessorContextImpl;
@@ -59,7 +58,7 @@ public class ChangeLoggingTimestampedWindowBytesStoreTest {
private void init() {
EasyMock.expect(context.taskId()).andReturn(taskId);
EasyMock.expect(context.recordCollector()).andReturn(collector);
- inner.init((ProcessorContext) context, store);
+ inner.init((StateStoreContext) context, store);
EasyMock.expectLastCall();
EasyMock.replay(inner, context);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java
index c877ac6..82835bc 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java
@@ -18,7 +18,6 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Bytes;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.ProcessorContextImpl;
@@ -57,7 +56,7 @@ public class ChangeLoggingWindowBytesStoreTest {
private void init() {
EasyMock.expect(context.taskId()).andReturn(taskId);
EasyMock.expect(context.recordCollector()).andReturn(collector);
- inner.init((ProcessorContext) context, store);
+ inner.init((StateStoreContext) context, store);
EasyMock.expectLastCall();
EasyMock.replay(inner, context);
diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java
index 749c41f..bfb8433 100644
--- a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java
+++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java
@@ -20,6 +20,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.TimestampedKeyValueStore;
import org.apache.kafka.streams.state.ValueAndTimestamp;
@@ -42,6 +43,11 @@ public class KeyValueStoreFacade<K, V> extends ReadOnlyKeyValueStoreFacade<K, V>
}
@Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ inner.init(context, root);
+ }
+
+ @Override
public void put(final K key,
final V value) {
inner.put(key, ValueAndTimestamp.make(value, ConsumerRecord.NO_TIMESTAMP));
diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java
index 6945059..6186c2a 100644
--- a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java
+++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java
@@ -20,6 +20,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.TimestampedWindowStore;
import org.apache.kafka.streams.state.ValueAndTimestamp;
@@ -41,6 +42,11 @@ public class WindowStoreFacade<K, V> extends ReadOnlyWindowStoreFacade<K, V> imp
inner.init(context, root);
}
+ @Override
+ public void init(final StateStoreContext context, final StateStore root) {
+ inner.init(context, root);
+ }
+
@Deprecated
@Override
public void put(final K key,
[kafka] 04/05: wip
Posted by vv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vvcephei pushed a commit to branch kip-478-part-5-state-store-wrappers
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit f4448fd066d2839e8f15c29a7f91015023eb06f0
Author: John Roesler <vv...@apache.org>
AuthorDate: Tue Oct 6 11:58:05 2020 -0500
wip
---
.../internals/AbstractRocksDBSegmentedBytesStore.java | 1 +
.../streams/state/internals/InMemorySessionStore.java | 1 +
.../kafka/streams/state/internals/InMemoryWindowStore.java | 1 +
.../kafka/streams/state/internals/KeyValueSegment.java | 6 ++++--
.../kafka/streams/state/internals/KeyValueSegments.java | 2 +-
.../kafka/streams/state/internals/TimestampedSegment.java | 7 ++++---
.../kafka/streams/state/internals/TimestampedSegments.java | 2 +-
.../internals/GlobalProcessorContextImplTest.java | 11 ++++++-----
.../processor/internals/ProcessorContextImplTest.java | 3 ++-
.../kafka/streams/state/KeyValueStoreTestDriver.java | 3 ++-
.../org/apache/kafka/streams/state/NoOpWindowStore.java | 1 +
.../streams/state/internals/AbstractKeyValueStoreTest.java | 3 ++-
.../streams/state/internals/CachingKeyValueStoreTest.java | 2 +-
.../internals/ChangeLoggingSessionBytesStoreTest.java | 7 +++++--
.../state/internals/InMemoryKeyValueLoggedStoreTest.java | 3 ++-
.../streams/state/internals/InMemoryKeyValueStoreTest.java | 3 ++-
.../streams/state/internals/InMemoryLRUCacheStoreTest.java | 3 ++-
.../kafka/streams/state/internals/KeyValueSegmentTest.java | 2 +-
.../streams/state/internals/ReadOnlyWindowStoreStub.java | 1 +
.../streams/state/internals/RocksDBKeyValueStoreTest.java | 3 ++-
.../kafka/streams/state/internals/RocksDBStoreTest.java | 14 +++++++-------
.../streams/state/internals/TimestampedSegmentTest.java | 2 +-
.../apache/kafka/test/GenericInMemoryKeyValueStore.java | 1 +
.../test/GenericInMemoryTimestampedKeyValueStore.java | 1 +
.../test/java/org/apache/kafka/test/MockKeyValueStore.java | 1 +
.../test/java/org/apache/kafka/test/NoOpReadOnlyStore.java | 1 +
.../org/apache/kafka/test/ReadOnlySessionStoreStub.java | 1 +
.../kafka/streams/internals/KeyValueStoreFacade.java | 1 +
.../apache/kafka/streams/internals/WindowStoreFacade.java | 1 +
29 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStore.java
index 2e9882d..1014bfa 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/AbstractRocksDBSegmentedBytesStore.java
@@ -225,6 +225,7 @@ public class AbstractRocksDBSegmentedBytesStore<S extends Segment> implements Se
return name;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java
index e4fda06..2e45b48 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemorySessionStore.java
@@ -72,6 +72,7 @@ public class InMemorySessionStore implements SessionStore<Bytes, byte[]> {
return name;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
this.context = (InternalProcessorContext) context;
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java
index 49322b0..cd50b15 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryWindowStore.java
@@ -85,6 +85,7 @@ public class InMemoryWindowStore implements WindowStore<Bytes, byte[]> {
return name;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
this.context = context;
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
index a64df19..55a73c2 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
@@ -20,7 +20,9 @@ import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder;
+import java.io.File;
import java.io.IOException;
+import java.util.Map;
import java.util.Objects;
class KeyValueSegment extends RocksDBStore implements Comparable<KeyValueSegment>, Segment {
@@ -45,8 +47,8 @@ class KeyValueSegment extends RocksDBStore implements Comparable<KeyValueSegment
}
@Override
- public void openDB(final ProcessorContext context) {
- super.openDB(context);
+ public void openDB(final Map<String, Object> configs, final File stateDir) {
+ super.openDB(configs, stateDir);
// skip the registering step
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegments.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegments.java
index c8b4b90..a17666e 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegments.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegments.java
@@ -48,7 +48,7 @@ class KeyValueSegments extends AbstractSegments<KeyValueSegment> {
throw new IllegalStateException("KeyValueSegment already exists. Possible concurrent access.");
}
- newSegment.openDB(context);
+ newSegment.openDB(context.appConfigs(), context.stateDir());
return newSegment;
}
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java
index 3401d3e..59eb469 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java
@@ -20,7 +20,9 @@ import org.apache.kafka.common.utils.Utils;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder;
+import java.io.File;
import java.io.IOException;
+import java.util.Map;
import java.util.Objects;
class TimestampedSegment extends RocksDBTimestampedStore implements Comparable<TimestampedSegment>, Segment {
@@ -45,10 +47,9 @@ class TimestampedSegment extends RocksDBTimestampedStore implements Comparable<T
}
@Override
- public void openDB(final ProcessorContext context) {
- super.openDB(context);
+ public void openDB(final Map<String, Object> configs, final File stateDir) {
+ super.openDB(configs, stateDir);
// skip the registering step
- internalProcessorContext = context;
}
@Override
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegments.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegments.java
index 58f3bbc..7318208 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegments.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegments.java
@@ -48,7 +48,7 @@ class TimestampedSegments extends AbstractSegments<TimestampedSegment> {
throw new IllegalStateException("TimestampedSegment already exists. Possible concurrent access.");
}
- newSegment.openDB(context);
+ newSegment.openDB(context.appConfigs(), context.stateDir());
return newSegment;
}
}
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java
index a83c92b..1ae6630 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java
@@ -21,6 +21,7 @@ import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.To;
import org.apache.kafka.streams.processor.internals.Task.TaskType;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -147,7 +148,7 @@ public class GlobalProcessorContextImplTest {
public void shouldNotAllowInitForKeyValueStore() {
final StateStore store = globalContext.getStateStore(GLOBAL_KEY_VALUE_STORE_NAME);
try {
- store.init((ProcessorContext) null, null);
+ store.init((StateStoreContext) null, null);
fail("Should have thrown UnsupportedOperationException.");
} catch (final UnsupportedOperationException expected) { }
}
@@ -156,7 +157,7 @@ public class GlobalProcessorContextImplTest {
public void shouldNotAllowInitForTimestampedKeyValueStore() {
final StateStore store = globalContext.getStateStore(GLOBAL_TIMESTAMPED_KEY_VALUE_STORE_NAME);
try {
- store.init((ProcessorContext) null, null);
+ store.init((StateStoreContext) null, null);
fail("Should have thrown UnsupportedOperationException.");
} catch (final UnsupportedOperationException expected) { }
}
@@ -165,7 +166,7 @@ public class GlobalProcessorContextImplTest {
public void shouldNotAllowInitForWindowStore() {
final StateStore store = globalContext.getStateStore(GLOBAL_WINDOW_STORE_NAME);
try {
- store.init((ProcessorContext) null, null);
+ store.init((StateStoreContext) null, null);
fail("Should have thrown UnsupportedOperationException.");
} catch (final UnsupportedOperationException expected) { }
}
@@ -174,7 +175,7 @@ public class GlobalProcessorContextImplTest {
public void shouldNotAllowInitForTimestampedWindowStore() {
final StateStore store = globalContext.getStateStore(GLOBAL_TIMESTAMPED_WINDOW_STORE_NAME);
try {
- store.init((ProcessorContext) null, null);
+ store.init((StateStoreContext) null, null);
fail("Should have thrown UnsupportedOperationException.");
} catch (final UnsupportedOperationException expected) { }
}
@@ -183,7 +184,7 @@ public class GlobalProcessorContextImplTest {
public void shouldNotAllowInitForSessionStore() {
final StateStore store = globalContext.getStateStore(GLOBAL_SESSION_STORE_NAME);
try {
- store.init((ProcessorContext) null, null);
+ store.init((StateStoreContext) null, null);
fail("Should have thrown UnsupportedOperationException.");
} catch (final UnsupportedOperationException expected) { }
}
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorContextImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorContextImplTest.java
index ab88efa..50466e3 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorContextImplTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/ProcessorContextImplTest.java
@@ -25,6 +25,7 @@ import org.apache.kafka.streams.processor.Processor;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.PunctuationType;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.To;
import org.apache.kafka.streams.processor.internals.Task.TaskType;
@@ -767,7 +768,7 @@ public class ProcessorContextImplTest {
assertTrue(store.persistent());
assertTrue(store.isOpen());
- checkThrowsUnsupportedOperation(() -> store.init((ProcessorContext) null, null), "init()");
+ checkThrowsUnsupportedOperation(() -> store.init((StateStoreContext) null, null), "init()");
checkThrowsUnsupportedOperation(store::close, "close()");
}
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java
index 7a39121..11e707d 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/KeyValueStoreTestDriver.java
@@ -28,6 +28,7 @@ import org.apache.kafka.streams.errors.DefaultProductionExceptionHandler;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateRestoreCallback;
import org.apache.kafka.streams.processor.StateStore;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.StreamPartitioner;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.MockStreamsMetrics;
@@ -331,7 +332,7 @@ public class KeyValueStoreTestDriver<K, V> {
* @return the processing context; never null
* @see #addEntryToRestoreLog(Object, Object)
*/
- public ProcessorContext context() {
+ public StateStoreContext context() {
return context;
}
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java b/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java
index 39e5d03..0de4890 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/NoOpWindowStore.java
@@ -54,6 +54,7 @@ public class NoOpWindowStore implements ReadOnlyWindowStore, StateStore {
return "";
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java
index 4c9c044..4ab15d8 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java
@@ -22,6 +22,7 @@ import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.testutil.LogCaptureAppender;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
@@ -51,7 +52,7 @@ import static org.junit.Assert.fail;
public abstract class AbstractKeyValueStoreTest {
- protected abstract <K, V> KeyValueStore<K, V> createKeyValueStore(final ProcessorContext context);
+ protected abstract <K, V> KeyValueStore<K, V> createKeyValueStore(final StateStoreContext context);
protected InternalMockProcessorContext context;
protected KeyValueStore<Integer, String> store;
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java
index 98f0ba6..c6fe483 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java
@@ -88,7 +88,7 @@ public class CachingKeyValueStoreTest extends AbstractKeyValueStoreTest {
@SuppressWarnings("unchecked")
@Override
- protected <K, V> KeyValueStore<K, V> createKeyValueStore(final ProcessorContext context) {
+ protected <K, V> KeyValueStore<K, V> createKeyValueStore(final StateStoreContext context) {
final StoreBuilder<KeyValueStore<K, V>> storeBuilder = Stores.keyValueStoreBuilder(
Stores.persistentKeyValueStore("cache-store"),
(Serde<K>) context.keySerde(),
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
index 6f85116..c55c4e15 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingSessionBytesStoreTest.java
@@ -64,7 +64,9 @@ public class ChangeLoggingSessionBytesStoreTest {
store.init((StateStoreContext) context, store);
}
- @Test void shouldDelegateDeprecatedInit() {
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
inner.init((ProcessorContext) context, store);
EasyMock.expectLastCall();
EasyMock.replay(inner);
@@ -72,7 +74,8 @@ public class ChangeLoggingSessionBytesStoreTest {
EasyMock.verify(inner);
}
- @Test void shouldDelegateInit() {
+ @Test
+ public void shouldDelegateInit() {
inner.init((StateStoreContext) context, store);
EasyMock.expectLastCall();
EasyMock.replay(inner);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java
index 7c0d16c..6f4104e 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java
@@ -18,6 +18,7 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
@@ -28,7 +29,7 @@ public class InMemoryKeyValueLoggedStoreTest extends AbstractKeyValueStoreTest {
@SuppressWarnings("unchecked")
@Override
- protected <K, V> KeyValueStore<K, V> createKeyValueStore(final ProcessorContext context) {
+ protected <K, V> KeyValueStore<K, V> createKeyValueStore(final StateStoreContext context) {
final StoreBuilder<KeyValueStore<K, V>> storeBuilder = Stores.keyValueStoreBuilder(
Stores.inMemoryKeyValueStore("my-store"),
(Serde<K>) context.keySerde(),
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java
index 6dc90ea..b6c46e2 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java
@@ -18,6 +18,7 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
@@ -31,7 +32,7 @@ public class InMemoryKeyValueStoreTest extends AbstractKeyValueStoreTest {
@SuppressWarnings("unchecked")
@Override
- protected <K, V> KeyValueStore<K, V> createKeyValueStore(final ProcessorContext context) {
+ protected <K, V> KeyValueStore<K, V> createKeyValueStore(final StateStoreContext context) {
final StoreBuilder<KeyValueStore<K, V>> storeBuilder = Stores.keyValueStoreBuilder(
Stores.inMemoryKeyValueStore("my-store"),
(Serde<K>) context.keySerde(),
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java
index 2a86cdd..ae791cb 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java
@@ -19,6 +19,7 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
@@ -36,7 +37,7 @@ public class InMemoryLRUCacheStoreTest extends AbstractKeyValueStoreTest {
@SuppressWarnings("unchecked")
@Override
- protected <K, V> KeyValueStore<K, V> createKeyValueStore(final ProcessorContext context) {
+ protected <K, V> KeyValueStore<K, V> createKeyValueStore(final StateStoreContext context) {
final StoreBuilder<KeyValueStore<K, V>> storeBuilder = Stores.keyValueStoreBuilder(
Stores.lruMap("my-store", 10),
(Serde<K>) context.keySerde(),
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java
index c062e61..71841bd 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/KeyValueSegmentTest.java
@@ -67,7 +67,7 @@ public class KeyValueSegmentTest {
expect(mockContext.stateDir()).andReturn(directory);
replay(mockContext);
- segment.openDB(mockContext);
+ segment.openDB(mockContext.appConfigs(), mockContext.stateDir());
assertTrue(new File(directoryPath, "window").exists());
assertTrue(new File(directoryPath + File.separator + "window", "segment").exists());
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java
index 55f91f1..96c3ae0 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ReadOnlyWindowStoreStub.java
@@ -382,6 +382,7 @@ public class ReadOnlyWindowStoreStub<K, V> implements ReadOnlyWindowStore<K, V>,
return null;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
}
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java
index 5937af0..c0b5a12 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java
@@ -19,6 +19,7 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.streams.errors.InvalidStateStoreException;
import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.RocksDBConfigSetter;
@@ -38,7 +39,7 @@ public class RocksDBKeyValueStoreTest extends AbstractKeyValueStoreTest {
@SuppressWarnings("unchecked")
@Override
- protected <K, V> KeyValueStore<K, V> createKeyValueStore(final ProcessorContext context) {
+ protected <K, V> KeyValueStore<K, V> createKeyValueStore(final StateStoreContext context) {
final StoreBuilder<KeyValueStore<K, V>> storeBuilder = Stores.keyValueStoreBuilder(
Stores.persistentKeyValueStore("my-store"),
(Serde<K>) context.keySerde(),
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java
index dead979..e0aad64 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBStoreTest.java
@@ -157,7 +157,7 @@ public class RocksDBStoreTest {
metricsRecorder.addValueProviders(eq(DB_NAME), notNull(), notNull(), isNull());
replay(metricsRecorder);
- rocksDBStore.openDB(context);
+ rocksDBStore.openDB(context.appConfigs(), context.stateDir());
verify(metricsRecorder);
reset(metricsRecorder);
@@ -171,7 +171,7 @@ public class RocksDBStoreTest {
metricsRecorder.addValueProviders(eq(DB_NAME), notNull(), notNull(), notNull());
replay(metricsRecorder);
- rocksDBStore.openDB(context);
+ rocksDBStore.openDB(context.appConfigs(), context.stateDir());
verify(metricsRecorder);
reset(metricsRecorder);
@@ -182,7 +182,7 @@ public class RocksDBStoreTest {
rocksDBStore = getRocksDBStoreWithRocksDBMetricsRecorder();
try {
context = getProcessorContext(RecordingLevel.DEBUG);
- rocksDBStore.openDB(context);
+ rocksDBStore.openDB(context.appConfigs(), context.stateDir());
reset(metricsRecorder);
metricsRecorder.removeValueProviders(DB_NAME);
replay(metricsRecorder);
@@ -212,7 +212,7 @@ public class RocksDBStoreTest {
metricsRecorder.addValueProviders(eq(DB_NAME), notNull(), notNull(), isNull());
replay(metricsRecorder);
- rocksDBStore.openDB(context);
+ rocksDBStore.openDB(context.appConfigs(), context.stateDir());
verify(metricsRecorder);
reset(metricsRecorder);
}
@@ -242,7 +242,7 @@ public class RocksDBStoreTest {
"the block-based table format of RocksDB. Do not provide a new instance of BlockBasedTableConfig to " +
"the RocksDB options.",
ProcessorStateException.class,
- () -> rocksDBStore.openDB(context)
+ () -> rocksDBStore.openDB(context.appConfigs(), context.stateDir())
);
}
@@ -268,7 +268,7 @@ public class RocksDBStoreTest {
metricsRecorder.addValueProviders(eq(DB_NAME), notNull(), isNull(), notNull());
replay(metricsRecorder);
- rocksDBStore.openDB(context);
+ rocksDBStore.openDB(context.appConfigs(), context.stateDir());
verify(metricsRecorder);
reset(metricsRecorder);
}
@@ -310,7 +310,7 @@ public class RocksDBStoreTest {
assertTrue(tmpDir.setReadOnly());
- assertThrows(ProcessorStateException.class, () -> rocksDBStore.openDB(tmpContext));
+ assertThrows(ProcessorStateException.class, () -> rocksDBStore.openDB(tmpContext.appConfigs(), tmpContext.stateDir()));
}
@Test
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java
index 0e04851..3321810 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/TimestampedSegmentTest.java
@@ -67,7 +67,7 @@ public class TimestampedSegmentTest {
expect(mockContext.stateDir()).andReturn(directory);
replay(mockContext);
- segment.openDB(mockContext);
+ segment.openDB(mockContext.appConfigs(), mockContext.stateDir());
assertTrue(new File(directoryPath, "window").exists());
assertTrue(new File(directoryPath + File.separator + "window", "segment").exists());
diff --git a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java
index 649dc5b..72e6c26 100644
--- a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java
+++ b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryKeyValueStore.java
@@ -58,6 +58,7 @@ public class GenericInMemoryKeyValueStore<K extends Comparable, V>
return this.name;
}
+ @Deprecated
@Override
@SuppressWarnings("unchecked")
/* This is a "dummy" store used for testing;
diff --git a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java
index b1b75a1..c77cbac 100644
--- a/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java
+++ b/streams/src/test/java/org/apache/kafka/test/GenericInMemoryTimestampedKeyValueStore.java
@@ -59,6 +59,7 @@ public class GenericInMemoryTimestampedKeyValueStore<K extends Comparable, V>
return this.name;
}
+ @Deprecated
@Override
@SuppressWarnings("unchecked")
/* This is a "dummy" store used for testing;
diff --git a/streams/src/test/java/org/apache/kafka/test/MockKeyValueStore.java b/streams/src/test/java/org/apache/kafka/test/MockKeyValueStore.java
index 7cb376f..d9e4acf 100644
--- a/streams/src/test/java/org/apache/kafka/test/MockKeyValueStore.java
+++ b/streams/src/test/java/org/apache/kafka/test/MockKeyValueStore.java
@@ -54,6 +54,7 @@ public class MockKeyValueStore implements KeyValueStore<Object, Object> {
return name;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/src/test/java/org/apache/kafka/test/NoOpReadOnlyStore.java b/streams/src/test/java/org/apache/kafka/test/NoOpReadOnlyStore.java
index dd78c52..c6b5eee 100644
--- a/streams/src/test/java/org/apache/kafka/test/NoOpReadOnlyStore.java
+++ b/streams/src/test/java/org/apache/kafka/test/NoOpReadOnlyStore.java
@@ -69,6 +69,7 @@ public class NoOpReadOnlyStore<K, V> implements ReadOnlyKeyValueStore<K, V>, Sta
return name;
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
if (rocksdbStore) {
diff --git a/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java b/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
index 4f6d5de..a2924fc 100644
--- a/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
+++ b/streams/src/test/java/org/apache/kafka/test/ReadOnlySessionStoreStub.java
@@ -92,6 +92,7 @@ public class ReadOnlySessionStoreStub<K, V> implements ReadOnlySessionStore<K, V
return "";
}
+ @Deprecated
@Override
public void init(final ProcessorContext context, final StateStore root) {
diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java
index bfb8433..94b5c8e 100644
--- a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java
+++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/KeyValueStoreFacade.java
@@ -36,6 +36,7 @@ public class KeyValueStoreFacade<K, V> extends ReadOnlyKeyValueStoreFacade<K, V>
super(inner);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
diff --git a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java
index 6186c2a..342817e 100644
--- a/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java
+++ b/streams/test-utils/src/main/java/org/apache/kafka/streams/internals/WindowStoreFacade.java
@@ -36,6 +36,7 @@ public class WindowStoreFacade<K, V> extends ReadOnlyWindowStoreFacade<K, V> imp
super(store);
}
+ @Deprecated
@Override
public void init(final ProcessorContext context,
final StateStore root) {
[kafka] 05/05: done
Posted by vv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vvcephei pushed a commit to branch kip-478-part-5-state-store-wrappers
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit ccc12cd66af1bdce04487c48e20ec6ceee2bef92
Author: John Roesler <vv...@apache.org>
AuthorDate: Tue Oct 6 21:33:59 2020 -0500
done
---
.../examples/wordcount/WordCountProcessorTest.java | 1 +
.../wordcount/WordCountTransformerTest.java | 1 +
.../internals/AbstractReadOnlyDecorator.java | 6 ++++
.../internals/AbstractReadWriteDecorator.java | 9 ++++-
.../streams/state/internals/KeyValueSegment.java | 1 -
.../streams/state/internals/RocksDBStore.java | 3 --
.../state/internals/TimestampedSegment.java | 1 -
.../internals/GlobalProcessorContextImplTest.java | 1 -
.../state/internals/AbstractKeyValueStoreTest.java | 1 -
.../state/internals/CachingKeyValueStoreTest.java | 25 +++++++++++++
.../state/internals/CachingSessionStoreTest.java | 28 ++++++++++++++-
.../state/internals/CachingWindowStoreTest.java | 27 +++++++++++++-
.../ChangeLoggingKeyValueBytesStoreTest.java | 42 +++++++++++++++++++---
...geLoggingTimestampedKeyValueBytesStoreTest.java | 42 +++++++++++++++++++---
...angeLoggingTimestampedWindowBytesStoreTest.java | 20 +++++++++++
.../ChangeLoggingWindowBytesStoreTest.java | 20 +++++++++++
.../internals/InMemoryKeyValueLoggedStoreTest.java | 1 -
.../state/internals/InMemoryKeyValueStoreTest.java | 1 -
.../state/internals/InMemoryLRUCacheStoreTest.java | 1 -
.../state/internals/MeteredKeyValueStoreTest.java | 38 ++++++++++++++++++++
.../state/internals/MeteredSessionStoreTest.java | 38 ++++++++++++++++++++
.../MeteredTimestampedKeyValueStoreTest.java | 38 ++++++++++++++++++++
.../MeteredTimestampedWindowStoreTest.java | 41 +++++++++++++++++++++
.../state/internals/MeteredWindowStoreTest.java | 40 +++++++++++++++++++++
.../state/internals/RocksDBKeyValueStoreTest.java | 1 -
.../kafka/streams/MockProcessorContextTest.java | 3 +-
.../streams/internals/KeyValueStoreFacadeTest.java | 1 +
.../streams/internals/WindowStoreFacadeTest.java | 1 +
.../wordcount/WindowedWordCountProcessorTest.java | 4 +++
29 files changed, 412 insertions(+), 24 deletions(-)
diff --git a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountProcessorTest.java b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountProcessorTest.java
index bec77e6..ba52990 100644
--- a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountProcessorTest.java
+++ b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountProcessorTest.java
@@ -34,6 +34,7 @@ import static org.junit.Assert.assertTrue;
* Demonstrate the use of {@link MockProcessorContext} for testing the {@link Processor} in the {@link WordCountProcessorDemo}.
*/
public class WordCountProcessorTest {
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void test() {
final MockProcessorContext context = new MockProcessorContext();
diff --git a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountTransformerTest.java b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountTransformerTest.java
index 98d5012..6bb8c6c 100644
--- a/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountTransformerTest.java
+++ b/streams/examples/src/test/java/org/apache/kafka/streams/examples/wordcount/WordCountTransformerTest.java
@@ -33,6 +33,7 @@ import static org.junit.Assert.assertTrue;
* Demonstrate the use of {@link MockProcessorContext} for testing the {@link Transformer} in the {@link WordCountTransformerDemo}.
*/
public class WordCountTransformerTest {
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void test() {
final MockProcessorContext context = new MockProcessorContext();
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java
index 20eb2c0..4424cdb 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadOnlyDecorator.java
@@ -54,6 +54,12 @@ abstract class AbstractReadOnlyDecorator<T extends StateStore, K, V> extends Wra
}
@Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ throw new UnsupportedOperationException(ERROR_MESSAGE);
+ }
+
+ @Override
public void close() {
throw new UnsupportedOperationException(ERROR_MESSAGE);
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java
index 0bfe452..d077089 100644
--- a/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java
+++ b/streams/src/main/java/org/apache/kafka/streams/processor/internals/AbstractReadWriteDecorator.java
@@ -16,7 +16,6 @@
*/
package org.apache.kafka.streams.processor.internals;
-import java.util.List;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.processor.ProcessorContext;
@@ -32,6 +31,8 @@ import org.apache.kafka.streams.state.WindowStore;
import org.apache.kafka.streams.state.WindowStoreIterator;
import org.apache.kafka.streams.state.internals.WrappedStateStore;
+import java.util.List;
+
abstract class AbstractReadWriteDecorator<T extends StateStore, K, V> extends WrappedStateStore<T, K, V> {
static final String ERROR_MESSAGE = "This method may only be called by Kafka Streams";
@@ -47,6 +48,12 @@ abstract class AbstractReadWriteDecorator<T extends StateStore, K, V> extends Wr
}
@Override
+ public void init(final StateStoreContext context,
+ final StateStore root) {
+ throw new UnsupportedOperationException(ERROR_MESSAGE);
+ }
+
+ @Override
public void close() {
throw new UnsupportedOperationException(ERROR_MESSAGE);
}
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
index 55a73c2..b6d6504 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/KeyValueSegment.java
@@ -17,7 +17,6 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Utils;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder;
import java.io.File;
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
index f72b3af..3241d07 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
@@ -27,8 +27,6 @@ import org.apache.kafka.streams.processor.BatchingStateRestoreCallback;
import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
import org.apache.kafka.streams.processor.StateStoreContext;
-import org.apache.kafka.streams.processor.internals.ProcessorContextUtils;
-import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.RocksDBConfigSetter;
@@ -67,7 +65,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import java.util.function.Supplier;
import static org.apache.kafka.streams.StreamsConfig.METRICS_RECORDING_LEVEL_CONFIG;
import static org.apache.kafka.streams.processor.internals.ProcessorContextUtils.getMetricsImpl;
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java
index 59eb469..36fe0e5 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/TimestampedSegment.java
@@ -17,7 +17,6 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Utils;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.state.internals.metrics.RocksDBMetricsRecorder;
import java.io.File;
diff --git a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java
index 1ae6630..eba6f06 100644
--- a/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/processor/internals/GlobalProcessorContextImplTest.java
@@ -19,7 +19,6 @@ package org.apache.kafka.streams.processor.internals;
import org.apache.kafka.common.header.internals.RecordHeaders;
import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.streams.StreamsConfig;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStore;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.To;
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java
index 4ab15d8..3284b17 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/AbstractKeyValueStoreTest.java
@@ -21,7 +21,6 @@ import org.apache.kafka.common.serialization.Serializer;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.testutil.LogCaptureAppender;
import org.apache.kafka.streams.state.KeyValueIterator;
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java
index c6fe483..89e2b0e 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingKeyValueStoreTest.java
@@ -100,6 +100,31 @@ public class CachingKeyValueStoreTest extends AbstractKeyValueStoreTest {
return store;
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final KeyValueStore<Bytes, byte[]> inner = EasyMock.mock(InMemoryKeyValueStore.class);
+ final CachingKeyValueStore outer = new CachingKeyValueStore(inner);
+ EasyMock.expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((ProcessorContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final KeyValueStore<Bytes, byte[]> inner = EasyMock.mock(InMemoryKeyValueStore.class);
+ final CachingKeyValueStore outer = new CachingKeyValueStore(inner);
+ EasyMock.expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((StateStoreContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
@Test
public void shouldSetFlushListener() {
assertTrue(store.setFlushListener(null, true));
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingSessionStoreTest.java
index f36629d..05e97a2 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingSessionStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingSessionStoreTest.java
@@ -29,6 +29,7 @@ import org.apache.kafka.streams.kstream.SessionWindowedDeserializer;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.kstream.internals.Change;
import org.apache.kafka.streams.kstream.internals.SessionWindow;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.MockStreamsMetrics;
import org.apache.kafka.streams.processor.internals.ProcessorRecordContext;
@@ -89,7 +90,7 @@ public class CachingSessionStoreTest {
public void before() {
cachingStore = new CachingSessionStore(underlyingStore, SEGMENT_INTERVAL);
cache = new ThreadCache(new LogContext("testCache "), MAX_CACHE_SIZE_BYTES, new MockStreamsMetrics(new Metrics()));
- final InternalMockProcessorContext context = new InternalMockProcessorContext(TestUtils.tempDirectory(), null, null, null, cache);
+ context = new InternalMockProcessorContext(TestUtils.tempDirectory(), null, null, null, cache);
context.setRecordContext(new ProcessorRecordContext(DEFAULT_TIMESTAMP, 0, 0, TOPIC, null));
cachingStore.init((StateStoreContext) context, cachingStore);
}
@@ -99,6 +100,31 @@ public class CachingSessionStoreTest {
cachingStore.close();
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final SessionStore<Bytes, byte[]> inner = EasyMock.mock(InMemorySessionStore.class);
+ final CachingSessionStore outer = new CachingSessionStore(inner, SEGMENT_INTERVAL);
+ EasyMock.expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((ProcessorContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final SessionStore<Bytes, byte[]> inner = EasyMock.mock(InMemorySessionStore.class);
+ final CachingSessionStore outer = new CachingSessionStore(inner, SEGMENT_INTERVAL);
+ EasyMock.expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((StateStoreContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
@Test
public void shouldPutFetchFromCache() {
cachingStore.put(new Windowed<>(keyA, new SessionWindow(0, 0)), "1".getBytes());
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingWindowStoreTest.java
index 42b750b..2a04c48 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingWindowStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/CachingWindowStoreTest.java
@@ -25,6 +25,7 @@ import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.StreamsBuilder;
import org.apache.kafka.streams.StreamsConfig;
+import org.apache.kafka.streams.TestInputTopic;
import org.apache.kafka.streams.TopologyTestDriver;
import org.apache.kafka.streams.errors.InvalidStateStoreException;
import org.apache.kafka.streams.kstream.Consumed;
@@ -42,7 +43,6 @@ import org.apache.kafka.streams.state.StoreBuilder;
import org.apache.kafka.streams.state.Stores;
import org.apache.kafka.streams.state.WindowStore;
import org.apache.kafka.streams.state.WindowStoreIterator;
-import org.apache.kafka.streams.TestInputTopic;
import org.apache.kafka.test.InternalMockProcessorContext;
import org.apache.kafka.test.TestUtils;
import org.easymock.EasyMock;
@@ -113,6 +113,31 @@ public class CachingWindowStoreTest {
cachingStore.close();
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final WindowStore<Bytes, byte[]> inner = EasyMock.mock(WindowStore.class);
+ final CachingWindowStore outer = new CachingWindowStore(inner, WINDOW_SIZE, SEGMENT_INTERVAL);
+ EasyMock.expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((ProcessorContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final WindowStore<Bytes, byte[]> inner = EasyMock.mock(WindowStore.class);
+ final CachingWindowStore outer = new CachingWindowStore(inner, WINDOW_SIZE, SEGMENT_INTERVAL);
+ EasyMock.expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((StateStoreContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
@Test
public void shouldNotReturnDuplicatesInRanges() {
final StreamsBuilder builder = new StreamsBuilder();
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java
index 9106580..c3808b2 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingKeyValueBytesStoreTest.java
@@ -21,11 +21,15 @@ import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.streams.KeyValue;
+import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStore;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.MockStreamsMetrics;
+import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.test.InternalMockProcessorContext;
import org.apache.kafka.test.MockRecordCollector;
import org.apache.kafka.test.TestUtils;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -49,14 +53,19 @@ public class ChangeLoggingKeyValueBytesStoreTest {
@Before
public void before() {
- final InternalMockProcessorContext context = new InternalMockProcessorContext(
+ final InternalMockProcessorContext context = mockContext();
+ context.setTime(0);
+ store.init((StateStoreContext) context, store);
+ }
+
+ private InternalMockProcessorContext mockContext() {
+ return new InternalMockProcessorContext(
TestUtils.tempDirectory(),
Serdes.String(),
Serdes.Long(),
collector,
- new ThreadCache(new LogContext("testCache "), 0, new MockStreamsMetrics(new Metrics())));
- context.setTime(0);
- store.init((StateStoreContext) context, store);
+ new ThreadCache(new LogContext("testCache "), 0, new MockStreamsMetrics(new Metrics()))
+ );
}
@After
@@ -64,6 +73,31 @@ public class ChangeLoggingKeyValueBytesStoreTest {
store.close();
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final InternalMockProcessorContext context = mockContext();
+ final KeyValueStore<Bytes, byte[]> innerMock = EasyMock.mock(InMemoryKeyValueStore.class);
+ final StateStore outer = new ChangeLoggingKeyValueBytesStore(innerMock);
+ innerMock.init((ProcessorContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(innerMock);
+ outer.init((ProcessorContext) context, outer);
+ EasyMock.verify(innerMock);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final InternalMockProcessorContext context = mockContext();
+ final KeyValueStore<Bytes, byte[]> innerMock = EasyMock.mock(InMemoryKeyValueStore.class);
+ final StateStore outer = new ChangeLoggingKeyValueBytesStore(innerMock);
+ innerMock.init((StateStoreContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(innerMock);
+ outer.init((StateStoreContext) context, outer);
+ EasyMock.verify(innerMock);
+ }
+
@Test
public void shouldWriteKeyValueBytesToInnerStoreOnPut() {
store.put(hi, there);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java
index e05b171..8295f7d 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedKeyValueBytesStoreTest.java
@@ -21,12 +21,16 @@ import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.common.utils.Bytes;
import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.streams.KeyValue;
+import org.apache.kafka.streams.processor.ProcessorContext;
+import org.apache.kafka.streams.processor.StateStore;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.MockStreamsMetrics;
+import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.ValueAndTimestamp;
import org.apache.kafka.test.InternalMockProcessorContext;
import org.apache.kafka.test.MockRecordCollector;
import org.apache.kafka.test.TestUtils;
+import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -54,14 +58,19 @@ public class ChangeLoggingTimestampedKeyValueBytesStoreTest {
@Before
public void before() {
- final InternalMockProcessorContext context = new InternalMockProcessorContext(
+ final InternalMockProcessorContext context = mockContext();
+ context.setTime(0);
+ store.init((StateStoreContext) context, store);
+ }
+
+ private InternalMockProcessorContext mockContext() {
+ return new InternalMockProcessorContext(
TestUtils.tempDirectory(),
Serdes.String(),
Serdes.Long(),
collector,
- new ThreadCache(new LogContext("testCache "), 0, new MockStreamsMetrics(new Metrics())));
- context.setTime(0);
- store.init((StateStoreContext) context, store);
+ new ThreadCache(new LogContext("testCache "), 0, new MockStreamsMetrics(new Metrics()))
+ );
}
@After
@@ -69,6 +78,31 @@ public class ChangeLoggingTimestampedKeyValueBytesStoreTest {
store.close();
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final InternalMockProcessorContext context = mockContext();
+ final KeyValueStore<Bytes, byte[]> inner = EasyMock.mock(InMemoryKeyValueStore.class);
+ final StateStore outer = new ChangeLoggingTimestampedKeyValueBytesStore(inner);
+ inner.init((ProcessorContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((ProcessorContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final InternalMockProcessorContext context = mockContext();
+ final KeyValueStore<Bytes, byte[]> inner = EasyMock.mock(InMemoryKeyValueStore.class);
+ final StateStore outer = new ChangeLoggingTimestampedKeyValueBytesStore(inner);
+ inner.init((StateStoreContext) context, outer);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ outer.init((StateStoreContext) context, outer);
+ EasyMock.verify(inner);
+ }
+
@Test
public void shouldWriteKeyValueBytesToInnerStoreOnPut() {
store.put(hi, rawThere);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java
index e928678..6608739 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingTimestampedWindowBytesStoreTest.java
@@ -18,6 +18,7 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Bytes;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.ProcessorContextImpl;
@@ -65,6 +66,25 @@ public class ChangeLoggingTimestampedWindowBytesStoreTest {
store.init((StateStoreContext) context, store);
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ inner.init((ProcessorContext) context, store);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ store.init((ProcessorContext) context, store);
+ EasyMock.verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ inner.init((StateStoreContext) context, store);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ store.init((StateStoreContext) context, store);
+ EasyMock.verify(inner);
+ }
+
@Test
@SuppressWarnings("deprecation")
public void shouldLogPuts() {
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java
index 82835bc..c2c31e0 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/ChangeLoggingWindowBytesStoreTest.java
@@ -18,6 +18,7 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.utils.Bytes;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.ProcessorContextImpl;
@@ -63,6 +64,25 @@ public class ChangeLoggingWindowBytesStoreTest {
store.init((StateStoreContext) context, store);
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ inner.init((ProcessorContext) context, store);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ store.init((ProcessorContext) context, store);
+ EasyMock.verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ inner.init((StateStoreContext) context, store);
+ EasyMock.expectLastCall();
+ EasyMock.replay(inner);
+ store.init((StateStoreContext) context, store);
+ EasyMock.verify(inner);
+ }
+
@Test
@SuppressWarnings("deprecation")
public void shouldLogPuts() {
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java
index 6f4104e..f54fca1 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStoreTest.java
@@ -17,7 +17,6 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java
index b6c46e2..9730936 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueStoreTest.java
@@ -17,7 +17,6 @@
package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java
index ae791cb..a044eda 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/InMemoryLRUCacheStoreTest.java
@@ -18,7 +18,6 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.streams.KeyValue;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueStore;
import org.apache.kafka.streams.state.StoreBuilder;
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java
index 83fffef..68faa15 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredKeyValueStoreTest.java
@@ -32,6 +32,7 @@ import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.common.utils.Time;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.StreamsConfig;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
@@ -158,6 +159,43 @@ public class MeteredKeyValueStoreTest {
metered.init((StateStoreContext) context, metered);
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final KeyValueStore<Bytes, byte[]> inner = mock(KeyValueStore.class);
+ final MeteredKeyValueStore<String, String> outer = new MeteredKeyValueStore<>(
+ inner,
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ Serdes.String()
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ expectLastCall();
+ replay(inner, context);
+ outer.init((ProcessorContext) context, outer);
+ verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final KeyValueStore<Bytes, byte[]> inner = mock(KeyValueStore.class);
+ final MeteredKeyValueStore<String, String> outer = new MeteredKeyValueStore<>(
+ inner,
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ Serdes.String()
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ expectLastCall();
+ replay(inner, context);
+ outer.init((StateStoreContext) context, outer);
+ verify(inner);
+ }
+
@Test
public void shouldPassChangelogTopicNameToStateStoreSerde() {
doShouldPassChangelogTopicNameToStateStoreSerde(CHANGELOG_TOPIC);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java
index 0ff822e..a77dd07 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredSessionStoreTest.java
@@ -35,6 +35,7 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.kstream.Windowed;
import org.apache.kafka.streams.kstream.internals.SessionWindow;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
@@ -162,6 +163,43 @@ public class MeteredSessionStoreTest {
store.init((StateStoreContext) context, store);
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final SessionStore<Bytes, byte[]> inner = mock(SessionStore.class);
+ final MeteredSessionStore<String, String> outer = new MeteredSessionStore<>(
+ inner,
+ STORE_TYPE,
+ Serdes.String(),
+ Serdes.String(),
+ new MockTime()
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ expectLastCall();
+ replay(inner, context);
+ outer.init((ProcessorContext) context, outer);
+ verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final SessionStore<Bytes, byte[]> inner = mock(SessionStore.class);
+ final MeteredSessionStore<String, String> outer = new MeteredSessionStore<>(
+ inner,
+ STORE_TYPE,
+ Serdes.String(),
+ Serdes.String(),
+ new MockTime()
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ expectLastCall();
+ replay(inner, context);
+ outer.init((StateStoreContext) context, outer);
+ verify(inner);
+ }
+
@Test
public void shouldPassChangelogTopicNameToStateStoreSerde() {
doShouldPassChangelogTopicNameToStateStoreSerde(CHANGELOG_TOPIC);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java
index 3d28266..405ab4f 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedKeyValueStoreTest.java
@@ -33,6 +33,7 @@ import org.apache.kafka.common.utils.Time;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.errors.StreamsException;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.TaskId;
import org.apache.kafka.streams.processor.internals.InternalProcessorContext;
@@ -162,6 +163,43 @@ public class MeteredTimestampedKeyValueStoreTest {
metered.init((StateStoreContext) context, metered);
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final KeyValueStore<Bytes, byte[]> inner = mock(InMemoryKeyValueStore.class);
+ final MeteredTimestampedKeyValueStore<String, String> outer = new MeteredTimestampedKeyValueStore<>(
+ inner,
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ new ValueAndTimestampSerde<>(Serdes.String())
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ expectLastCall();
+ replay(inner, context);
+ outer.init((ProcessorContext) context, outer);
+ verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final KeyValueStore<Bytes, byte[]> inner = mock(InMemoryKeyValueStore.class);
+ final MeteredTimestampedKeyValueStore<String, String> outer = new MeteredTimestampedKeyValueStore<>(
+ inner,
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ new ValueAndTimestampSerde<>(Serdes.String())
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ expectLastCall();
+ replay(inner, context);
+ outer.init((StateStoreContext) context, outer);
+ verify(inner);
+ }
+
@Test
public void shouldPassChangelogTopicNameToStateStoreSerde() {
doShouldPassChangelogTopicNameToStateStoreSerde(CHANGELOG_TOPIC);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java
index 9a9d763..315a1aa 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredTimestampedWindowStoreTest.java
@@ -28,6 +28,7 @@ import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.errors.StreamsException;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
@@ -42,6 +43,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.mock;
import static org.easymock.EasyMock.niceMock;
import static org.easymock.EasyMock.replay;
@@ -95,6 +97,45 @@ public class MeteredTimestampedWindowStoreTest {
);
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final WindowStore<Bytes, byte[]> inner = mock(WindowStore.class);
+ final MeteredTimestampedWindowStore<String, String> outer = new MeteredTimestampedWindowStore<>(
+ inner,
+ WINDOW_SIZE_MS, // any size
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ new ValueAndTimestampSerde<>(new SerdeThatDoesntHandleNull())
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ expectLastCall();
+ replay(inner);
+ outer.init((ProcessorContext) context, outer);
+ verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final WindowStore<Bytes, byte[]> inner = mock(WindowStore.class);
+ final MeteredTimestampedWindowStore<String, String> outer = new MeteredTimestampedWindowStore<>(
+ inner,
+ WINDOW_SIZE_MS, // any size
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ new ValueAndTimestampSerde<>(new SerdeThatDoesntHandleNull())
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ expectLastCall();
+ replay(inner);
+ outer.init((StateStoreContext) context, outer);
+ verify(inner);
+ }
+
@Test
public void shouldPassChangelogTopicNameToStateStoreSerde() {
context.addChangelogForStore(STORE_NAME, CHANGELOG_TOPIC);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java
index 7301694..18c0fa3 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/MeteredWindowStoreTest.java
@@ -33,6 +33,7 @@ import org.apache.kafka.common.utils.LogContext;
import org.apache.kafka.common.utils.MockTime;
import org.apache.kafka.streams.StreamsConfig;
import org.apache.kafka.streams.kstream.Windowed;
+import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.processor.internals.ProcessorStateManager;
import org.apache.kafka.streams.processor.internals.metrics.StreamsMetricsImpl;
@@ -150,6 +151,45 @@ public class MeteredWindowStoreTest {
);
}
+ @SuppressWarnings("deprecation")
+ @Test
+ public void shouldDelegateDeprecatedInit() {
+ final WindowStore<Bytes, byte[]> inner = mock(WindowStore.class);
+ final MeteredWindowStore<String, String> outer = new MeteredWindowStore<>(
+ inner,
+ WINDOW_SIZE_MS, // any size
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ new SerdeThatDoesntHandleNull()
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((ProcessorContext) context, outer);
+ expectLastCall();
+ replay(inner);
+ outer.init((ProcessorContext) context, outer);
+ verify(inner);
+ }
+
+ @Test
+ public void shouldDelegateInit() {
+ final WindowStore<Bytes, byte[]> inner = mock(WindowStore.class);
+ final MeteredWindowStore<String, String> outer = new MeteredWindowStore<>(
+ inner,
+ WINDOW_SIZE_MS, // any size
+ STORE_TYPE,
+ new MockTime(),
+ Serdes.String(),
+ new SerdeThatDoesntHandleNull()
+ );
+ expect(inner.name()).andStubReturn("store");
+ inner.init((StateStoreContext) context, outer);
+ expectLastCall();
+ replay(inner);
+ outer.init((StateStoreContext) context, outer);
+ verify(inner);
+ }
+
@Test
public void shouldPassChangelogTopicNameToStateStoreSerde() {
context.addChangelogForStore(STORE_NAME, CHANGELOG_TOPIC);
diff --git a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java
index c0b5a12..e71809e 100644
--- a/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java
+++ b/streams/src/test/java/org/apache/kafka/streams/state/internals/RocksDBKeyValueStoreTest.java
@@ -18,7 +18,6 @@ package org.apache.kafka.streams.state.internals;
import org.apache.kafka.common.serialization.Serde;
import org.apache.kafka.streams.errors.InvalidStateStoreException;
-import org.apache.kafka.streams.processor.ProcessorContext;
import org.apache.kafka.streams.processor.StateStoreContext;
import org.apache.kafka.streams.state.KeyValueIterator;
import org.apache.kafka.streams.state.KeyValueStore;
diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/MockProcessorContextTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/MockProcessorContextTest.java
index fe901ed..6e2f4ed 100644
--- a/streams/test-utils/src/test/java/org/apache/kafka/streams/MockProcessorContextTest.java
+++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/MockProcessorContextTest.java
@@ -231,8 +231,7 @@ public class MockProcessorContextTest {
assertFalse(context.committed());
}
-
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"deprecation", "unchecked"}) // TODO deprecation will be fixed in KAFKA-10437
@Test
public void shouldStoreAndReturnStateStores() {
final AbstractProcessor<String, Long> processor = new AbstractProcessor<String, Long>() {
diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/KeyValueStoreFacadeTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/KeyValueStoreFacadeTest.java
index b7814c7..4d7a277 100644
--- a/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/KeyValueStoreFacadeTest.java
+++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/KeyValueStoreFacadeTest.java
@@ -53,6 +53,7 @@ public class KeyValueStoreFacadeTest {
keyValueStoreFacade = new KeyValueStoreFacade<>(mockedKeyValueTimestampStore);
}
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void shouldForwardInit() {
final ProcessorContext context = mock(ProcessorContext.class);
diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/WindowStoreFacadeTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/WindowStoreFacadeTest.java
index 3347ddd..6a2c6bd 100644
--- a/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/WindowStoreFacadeTest.java
+++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/internals/WindowStoreFacadeTest.java
@@ -47,6 +47,7 @@ public class WindowStoreFacadeTest {
windowStoreFacade = new WindowStoreFacade<>(mockedWindowTimestampStore);
}
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void shouldForwardInit() {
final ProcessorContext context = mock(ProcessorContext.class);
diff --git a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java
index 4995a77..00a9f8f 100644
--- a/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java
+++ b/streams/test-utils/src/test/java/org/apache/kafka/streams/test/wordcount/WindowedWordCountProcessorTest.java
@@ -40,6 +40,7 @@ import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThrows;
public class WindowedWordCountProcessorTest {
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void shouldWorkWithInMemoryStore() {
final MockProcessorContext context = new MockProcessorContext();
@@ -86,6 +87,7 @@ public class WindowedWordCountProcessorTest {
assertThat(capturedForwards.hasNext(), is(false));
}
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void shouldWorkWithPersistentStore() throws IOException {
final Properties properties = new Properties();
@@ -146,6 +148,7 @@ public class WindowedWordCountProcessorTest {
}
}
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void shouldFailWithLogging() {
final MockProcessorContext context = new MockProcessorContext();
@@ -164,6 +167,7 @@ public class WindowedWordCountProcessorTest {
assertThrows(IllegalArgumentException.class, () -> store.init(context, store));
}
+ @SuppressWarnings("deprecation") // TODO will be fixed in KAFKA-10437
@Test
public void shouldFailWithCaching() {
final MockProcessorContext context = new MockProcessorContext();