You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by gu...@apache.org on 2016/07/06 19:27:21 UTC
kafka git commit: KAFKA-3836: KStreamReduce and KTableReduce should
not pass nulls to Deserializers
Repository: kafka
Updated Branches:
refs/heads/trunk b64302f9c -> 7218648ae
KAFKA-3836: KStreamReduce and KTableReduce should not pass nulls to Deserializers
Minor changes to check null changes.
Author: Jeyhun Karimov <je...@gmail.com>
Reviewers: Guozhang Wang <wa...@gmail.com>
Closes #1591 from jeyhunkarimov/KAFKA-3836
Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/7218648a
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/7218648a
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/7218648a
Branch: refs/heads/trunk
Commit: 7218648ae7ac1ce93f3ff25702b99c3af236fd0f
Parents: b64302f
Author: Jeyhun Karimov <je...@gmail.com>
Authored: Wed Jul 6 12:27:10 2016 -0700
Committer: Guozhang Wang <wa...@gmail.com>
Committed: Wed Jul 6 12:27:10 2016 -0700
----------------------------------------------------------------------
.../internals/InMemoryKeyValueLoggedStore.java | 8 ++++++--
.../streams/state/internals/RocksDBStore.java | 21 ++++++++++++++------
2 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kafka/blob/7218648a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStore.java
----------------------------------------------------------------------
diff --git a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStore.java b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStore.java
index e13bba3..3c2e659 100644
--- a/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStore.java
+++ b/streams/src/main/java/org/apache/kafka/streams/state/internals/InMemoryKeyValueLoggedStore.java
@@ -65,8 +65,12 @@ public class InMemoryKeyValueLoggedStore<K, V> implements KeyValueStore<K, V> {
@Override
public void restore(byte[] key, byte[] value) {
- // directly call inner functions so that the operation is not logged
- inner.put(serdes.keyFrom(key), serdes.valueFrom(value));
+ // directly call inner functions so that the operation is not logged. Check value for null, to avoid deserialization error.
+ if (value == null) {
+ inner.put(serdes.keyFrom(key), null);
+ } else {
+ inner.put(serdes.keyFrom(key), serdes.valueFrom(value));
+ }
}
});
http://git-wip-us.apache.org/repos/asf/kafka/blob/7218648a/streams/src/main/java/org/apache/kafka/streams/state/internals/RocksDBStore.java
----------------------------------------------------------------------
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 4109ebf..394406f 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
@@ -237,17 +237,26 @@ public class RocksDBStore<K, V> implements KeyValueStore<K, V> {
public V get(K key) {
if (cache != null) {
RocksDBCacheEntry entry = cache.get(key);
-
if (entry == null) {
- V value = serdes.valueFrom(getInternal(serdes.rawKey(key)));
- cache.put(key, new RocksDBCacheEntry(value));
-
- return value;
+ byte[] byteValue = getInternal(serdes.rawKey(key));
+ //Check value for null, to avoid deserialization error
+ if (byteValue == null) {
+ return null;
+ } else {
+ V value = serdes.valueFrom(byteValue);
+ cache.put(key, new RocksDBCacheEntry(value));
+ return value;
+ }
} else {
return entry.value;
}
} else {
- return serdes.valueFrom(getInternal(serdes.rawKey(key)));
+ byte[] byteValue = getInternal(serdes.rawKey(key));
+ if (byteValue == null) {
+ return null;
+ } else {
+ return serdes.valueFrom(byteValue);
+ }
}
}