call fallback only when theres missing keys (#1009)

pyalex · mrzzy · commit e1d5fb2e366d · 2020-09-16T14:43:12.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,7 @@
 - Fix Github Actions versioned image push [\#994](https://github.com/feast-dev/feast/pull/994)([mrzzy](https://github.com/mrzzy))
 - Fix Go SDK extra colon in metadata header for Authentication [\#1001](https://github.com/feast-dev/feast/pull/1001)([mrzzy](https://github.com/mrzzy))
 - Fix lint version not pulling tags. [\#999](https://github.com/feast-dev/feast/pull/999)([mrzzy](https://github.com/mrzzy))
+- Call fallback only when theres missing keys [\#1009](https://github.com/feast-dev/feast/pull/751) ([pyalex](https://github.com/pyalex))
 
 **Merged pull requests:**
 
diff --git a/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisClusterOnlineRetriever.java b/storage/connectors/redis/src/main/java/feast/storage/connectors/redis/retriever/RedisClusterOnlineRetriever.java
@@ -228,6 +228,10 @@ private List<byte[]> sendMultiGet(List<RedisKey> keys) {
                 .boxed()
                 .collect(Collectors.toList());
 
+        if (indexMissingValue.isEmpty()) {
+          return redisValues;
+        }
+
         byte[][] fallbackBinaryKeys =
             indexMissingValue.stream()
                 .map(i -> fallbackSerializer.serialize(keys.get(i)))
diff --git a/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/RedisClusterOnlineRetrieverTest.java b/storage/connectors/redis/src/test/java/feast/storage/connectors/redis/retriever/RedisClusterOnlineRetrieverTest.java
@@ -18,7 +18,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 import com.google.common.collect.ImmutableList;
@@ -147,7 +147,9 @@ public void shouldReturnResponseWithValuesIfKeysPresent() {
     List<KeyValue<byte[], byte[]>> featureRowBytes = Lists.newArrayList(keyValue1, keyValue2);
 
     OnlineRetriever redisClusterOnlineRetriever =
-        new RedisClusterOnlineRetriever.Builder(connection, serializer).build();
+        new RedisClusterOnlineRetriever.Builder(connection, serializer)
+            .withFallbackSerializer(fallbackSerializer)
+            .build();
     when(syncCommands.mget(serializedKey1, serializedKey2)).thenReturn(featureRowBytes);
 
     List<Optional<FeatureRow>> expected =
@@ -174,6 +176,9 @@ public void shouldReturnResponseWithValuesIfKeysPresent() {
     List<Optional<FeatureRow>> actual =
         redisClusterOnlineRetriever.getOnlineFeatures(entityRows, featureSetRequest);
     assertThat(actual, equalTo(expected));
+
+    // check that fallback is used only when there's something to fallback
+    verify(syncCommands, never()).mget();
   }
 
   @Test
