Minor fix to deserializer cache

rayokota · Jul 27, 2024 · 127e0f7 · 127e0f7
1 parent 2ef627a
commit 127e0f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>io.kcache</groupId>
     <artifactId>kwack</artifactId>
-    <version>0.7.0</version>
+    <version>0.8.0</version>
     <packaging>jar</packaging>
 
     <name>kwack</name>

diff --git a/src/main/java/io/kcache/kwack/KwackEngine.java b/src/main/java/io/kcache/kwack/KwackEngine.java
@@ -43,6 +43,7 @@
 import io.reactivex.rxjava3.core.Observable;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
+import io.vavr.Tuple3;
 import java.io.ByteArrayOutputStream;
 import java.io.UncheckedIOException;
 import java.sql.Blob;
@@ -132,7 +133,7 @@ public class KwackEngine implements Configurable, Closeable {
     private Map<String, Serde> valueSerdes;
     private final Map<String, ColumnDef> keyColDefs = new HashMap<>();
     private final Map<String, ColumnDef> valueColDefs = new HashMap<>();
-    private final Map<Tuple2<Serde, ParsedSchema>, Deserializer<?>> deserializers = new HashMap<>();
+    private final Map<Tuple3<Boolean, Serde, ParsedSchema>, Deserializer<?>> deserializers = new HashMap<>();
     private final Map<ParsedSchema, ColumnDef> columnDefs = new HashMap<>();
     private String query;
     private EnumSet<RowAttribute> rowAttributes;
@@ -391,7 +392,7 @@ public Optional<ParsedSchema> parseSchema(Serde serde) {
             serde.setId(id);
             return Optional.of(parsedSchema);
         } catch (Exception e) {
-            LOG.error("Could not parse schema " + schema, e);
+            LOG.error("Could not parse schema {}", schema, e);
             return Optional.empty();
         }
     }
@@ -494,7 +495,8 @@ private Tuple2<Context, Object> deserialize(boolean isKey, String topic, byte[]
     }
 
     public Deserializer<?> getDeserializer(boolean isKey, Tuple2<Serde, ParsedSchema> schema) {
-        return deserializers.computeIfAbsent(schema, k -> createDeserializer(isKey, schema));
+        return deserializers.computeIfAbsent(Tuple.of(isKey, schema._1, schema._2),
+            k -> createDeserializer(isKey, schema));
     }
 
     private Deserializer<?> createDeserializer(boolean isKey, Tuple2<Serde, ParsedSchema> schema) {

diff --git a/src/test/java/io/kcache/kwack/AvroKeyTest.java b/src/test/java/io/kcache/kwack/AvroKeyTest.java
@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Random;
 import java.util.UUID;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericData;