Preserve null values when parsing SearchReplies (#3518) (#3551)

a-TODO-rov · web-flow · commit d8706c46b97a · 2025-12-04T13:49:59.000+02:00
EncodedComplexOutput was skipping null values instead of passing them on. Then SearchReplyParser needs to store null values as they are and not try to decode them. This affected both RESP2 and RESP3 parsing. Added two integration tests in RediSearchAggregateIntegrationTests to verify that nulls in JSON documents are parsed correctly. (cherry picked from commit 0796a4e)
diff --git a/src/main/java/io/lettuce/core/output/EncodedComplexOutput.java b/src/main/java/io/lettuce/core/output/EncodedComplexOutput.java
@@ -25,16 +25,12 @@ public EncodedComplexOutput(RedisCodec<K, V> codec, ComplexDataParser<T> parser)
 
     @Override
     public void set(ByteBuffer bytes) {
-        if (bytes != null) {
-            data.storeObject(bytes.asReadOnlyBuffer());
-        }
+        data.storeObject(bytes == null ? null : bytes.asReadOnlyBuffer());
     }
 
     @Override
     public void setSingle(ByteBuffer bytes) {
-        if (bytes != null) {
-            data.storeObject(bytes.asReadOnlyBuffer());
-        }
+        data.storeObject(bytes == null ? null : bytes.asReadOnlyBuffer());
     }
 
 }
diff --git a/src/main/java/io/lettuce/core/search/SearchReplyParser.java b/src/main/java/io/lettuce/core/search/SearchReplyParser.java
@@ -186,11 +186,13 @@ private void parseResults(SearchReply<K, V> searchReply, List<Object> resultsLis
                     ComplexData resultData = (ComplexData) resultsList.get(i);
                     List<Object> resultEntries = resultData.getDynamicList();
 
-                    Map<K, V> resultEntriesProcessed = IntStream.range(0, resultEntries.size() / 2).boxed()
-                            .collect(Collectors.toMap(idx -> codec.decodeKey((ByteBuffer) resultEntries.get(idx * 2)),
-                                    idx -> codec.decodeValue((ByteBuffer) resultEntries.get(idx * 2 + 1))));
+                    for (int idx = 0; idx < resultEntries.size(); idx += 2) {
+                        K decodedKey = codec.decodeKey((ByteBuffer) resultEntries.get(idx));
+                        Object value = resultEntries.get(idx + 1);
+                        V decodedValue = value == null ? null : codec.decodeValue((ByteBuffer) value);
+                        searchResult.addFields(decodedKey, decodedValue);
+                    }
 
-                    searchResult.addFields(resultEntriesProcessed);
                     i++;
                 }
 
@@ -265,7 +267,7 @@ public SearchReply<K, V> parse(ComplexData data) {
                         ComplexData extraAttributes = (ComplexData) resultEntry.get(EXTRA_ATTRIBUTES_KEY);
                         extraAttributes.getDynamicMap().forEach((key, value) -> {
                             K decodedKey = codec.decodeKey((ByteBuffer) key);
-                            V decodedValue = codec.decodeValue((ByteBuffer) value);
+                            V decodedValue = value == null ? null : codec.decodeValue((ByteBuffer) value);
                             searchResult.addFields(decodedKey, decodedValue);
                         });
                     }
diff --git a/src/test/java/io/lettuce/core/search/RediSearchAggregateIntegrationTests.java b/src/test/java/io/lettuce/core/search/RediSearchAggregateIntegrationTests.java

Original file line number	Diff line number	Diff line change
`@@ -25,16 +25,12 @@ public EncodedComplexOutput(RedisCodec<K, V> codec, ComplexDataParser<T> parser)`
`25`	`25`
`26`	`26`	`@Override`
`27`	`27`	`public void set(ByteBuffer bytes) {`
`28`		`- if (bytes != null) {`
`29`		`- data.storeObject(bytes.asReadOnlyBuffer());`
`30`		`- }`
	`28`	`+ data.storeObject(bytes == null ? null : bytes.asReadOnlyBuffer());`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`@Override`
`34`	`32`	`public void setSingle(ByteBuffer bytes) {`
`35`		`- if (bytes != null) {`
`36`		`- data.storeObject(bytes.asReadOnlyBuffer());`
`37`		`- }`
	`33`	`+ data.storeObject(bytes == null ? null : bytes.asReadOnlyBuffer());`
`38`	`34`	`}`
`39`	`35`
`40`	`36`	`}`