Address more CR comments

felixwang9817 · felixwang9817 · commit f01ef8ab59fd · 2021-10-19T01:20:41.000-07:00
Signed-off-by: Felix Wang &lt;wangfelix98@gmail.com&gt;
diff --git a/serving/src/main/java/feast/serving/registry/LocalRegistryRepo.java b/serving/src/main/java/feast/serving/registry/LocalRegistryRepo.java
@@ -93,17 +93,6 @@ public OnDemandFeatureViewProto.OnDemandFeatureViewSpec getOnDemandFeatureViewSp
             featureReference.getFeatureTable()));
   }
 
-  @Override
-  public boolean isBatchFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference) {
-    final RegistryProto.Registry registry = this.getRegistry();
-    for (final FeatureViewProto.FeatureView featureView : registry.getFeatureViewsList()) {
-      if (featureView.getSpec().getName().equals(featureReference.getFeatureTable())) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   @Override
   public boolean isOnDemandFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference) {
     final RegistryProto.Registry registry = this.getRegistry();
diff --git a/serving/src/main/java/feast/serving/registry/RegistryRepository.java b/serving/src/main/java/feast/serving/registry/RegistryRepository.java
@@ -38,7 +38,5 @@ FeatureProto.FeatureSpecV2 getFeatureSpec(
   OnDemandFeatureViewProto.OnDemandFeatureViewSpec getOnDemandFeatureViewSpec(
       String projectName, ServingAPIProto.FeatureReferenceV2 featureReference);
 
-  boolean isBatchFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);
-
   boolean isOnDemandFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);
 }
diff --git a/serving/src/main/java/feast/serving/service/OnlineServingServiceV2.java b/serving/src/main/java/feast/serving/service/OnlineServingServiceV2.java
@@ -106,11 +106,11 @@ public GetOnlineFeaturesResponse getOnlineFeatures(GetOnlineFeaturesRequestV2 re
       projectName = "default";
     }
 
-    // Split all feature references into batch feature view and ODFV references.
+    // Split all feature references into non-ODFV (e.g. batch and stream) references and ODFV.
     List<FeatureReferenceV2> allFeatureReferences = request.getFeaturesList();
     List<FeatureReferenceV2> featureReferences =
         allFeatureReferences.stream()
-            .filter(r -> this.featureSpecRetriever.isBatchFeatureReference(r))
+            .filter(r -> !this.featureSpecRetriever.isOnDemandFeatureReference(r))
             .collect(Collectors.toList());
     List<FeatureReferenceV2> onDemandFeatureReferences =
         allFeatureReferences.stream()
@@ -321,7 +321,7 @@ public GetOnlineFeaturesResponse getOnlineFeatures(GetOnlineFeaturesRequestV2 re
     // Finally, we handle ODFVs. For each ODFV ref, we send a TransformFeaturesRequest to the FTS.
     // The request should contain the entity data, the retrieved features, and the request data.
     // All of this data must be bundled together and serialized into the Arrow IPC format.
-    if (onDemandFeatureReferences.size() > 0) {
+    if (!onDemandFeatureReferences.isEmpty()) {
       // TODO: avoid hardcoding FTS address
       final ManagedChannel channel =
           ManagedChannelBuilder.forTarget("localhost:6569").usePlaintext().build();
diff --git a/serving/src/main/java/feast/serving/specs/CoreFeatureSpecRetriever.java b/serving/src/main/java/feast/serving/specs/CoreFeatureSpecRetriever.java
@@ -66,11 +66,6 @@ public OnDemandFeatureViewProto.OnDemandFeatureViewSpec getOnDemandFeatureViewSp
             featureReference.getFeatureTable()));
   }
 
-  @Override
-  public boolean isBatchFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference) {
-    return true;
-  }
-
   @Override
   public boolean isOnDemandFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference) {
     return false;
diff --git a/serving/src/main/java/feast/serving/specs/FeatureSpecRetriever.java b/serving/src/main/java/feast/serving/specs/FeatureSpecRetriever.java
@@ -39,7 +39,5 @@ FeatureViewProto.FeatureViewSpec getBatchFeatureViewSpec(
   OnDemandFeatureViewProto.OnDemandFeatureViewSpec getOnDemandFeatureViewSpec(
       String projectName, ServingAPIProto.FeatureReferenceV2 featureReference);
 
-  boolean isBatchFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);
-
   boolean isOnDemandFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);
 }
diff --git a/serving/src/main/java/feast/serving/specs/RegistryFeatureSpecRetriever.java b/serving/src/main/java/feast/serving/specs/RegistryFeatureSpecRetriever.java
@@ -79,11 +79,6 @@ public OnDemandFeatureViewProto.OnDemandFeatureViewSpec getOnDemandFeatureViewSp
     return this.registryRepository.getOnDemandFeatureViewSpec(projectName, featureReference);
   }
 
-  @Override
-  public boolean isBatchFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference) {
-    return this.registryRepository.isBatchFeatureReference(featureReference);
-  }
-
   @Override
   public boolean isOnDemandFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference) {
     return this.registryRepository.isOnDemandFeatureReference(featureReference);

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,5 @@ FeatureProto.FeatureSpecV2 getFeatureSpec(`
`38`	`38`	`OnDemandFeatureViewProto.OnDemandFeatureViewSpec getOnDemandFeatureViewSpec(`
`39`	`39`	`String projectName, ServingAPIProto.FeatureReferenceV2 featureReference);`
`40`	`40`
`41`		`- boolean isBatchFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);`
`42`		`-`
`43`	`41`	`boolean isOnDemandFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);`
`44`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,5 @@ FeatureViewProto.FeatureViewSpec getBatchFeatureViewSpec(`
`39`	`39`	`OnDemandFeatureViewProto.OnDemandFeatureViewSpec getOnDemandFeatureViewSpec(`
`40`	`40`	`String projectName, ServingAPIProto.FeatureReferenceV2 featureReference);`
`41`	`41`
`42`		`- boolean isBatchFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);`
`43`		`-`
`44`	`42`	`boolean isOnDemandFeatureReference(ServingAPIProto.FeatureReferenceV2 featureReference);`
`45`	`43`	`}`