();
- for (FieldVector column : columnNameToColumn.values()) {
- column.setValueCount(values.size());
- columnFields.add(column.getField());
columns.add(column);
+ columnFields.add(column.getField());
}
+
VectorSchemaRoot schemaRoot = new VectorSchemaRoot(columnFields, columns);
// Serialize the VectorSchemaRoot into Arrow IPC format.
diff --git a/java/serving/src/main/java/feast/serving/service/ServingServiceV2.java b/java/serving/src/main/java/feast/serving/service/ServingServiceV2.java
index 05acb31b78e..4a44f4e09e5 100644
--- a/java/serving/src/main/java/feast/serving/service/ServingServiceV2.java
+++ b/java/serving/src/main/java/feast/serving/service/ServingServiceV2.java
@@ -17,8 +17,6 @@
package feast.serving.service;
import feast.proto.serving.ServingAPIProto;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse;
public interface ServingServiceV2 {
/**
@@ -36,23 +34,15 @@ ServingAPIProto.GetFeastServingInfoResponse getFeastServingInfo(
/**
* Get features from an online serving store, given a list of {@link
- * feast.proto.serving.ServingAPIProto.FeatureReferenceV2}s to retrieve, and list of {@link
- * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2.EntityRow}s to join the
- * retrieved values to.
- *
- * Features can be queried across feature tables, but each {@link
- * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2.EntityRow} must contain all
- * entities for all feature tables included in the request.
+ * feast.proto.serving.ServingAPIProto.FeatureReferenceV2}s to retrieve or name of the feature
+ * service, and vectorized entities Map<String, {@link
+ * feast.proto.types.ValueProto.RepeatedValue}> to join the retrieved values to.
*
*
This request is fulfilled synchronously.
*
- * @param getFeaturesRequest {@link GetOnlineFeaturesRequestV2} containing list of {@link
- * feast.proto.serving.ServingAPIProto.FeatureReferenceV2}s to retrieve and list of {@link
- * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2.EntityRow}s to join the
- * retrieved values to.
- * @return {@link GetOnlineFeaturesResponse} with list of {@link
- * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues} for each {@link
- * feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2.EntityRow} supplied.
+ * @return {@link feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse} with list of
+ * {@link feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FeatureVector}.
*/
- GetOnlineFeaturesResponse getOnlineFeatures(GetOnlineFeaturesRequestV2 getFeaturesRequest);
+ ServingAPIProto.GetOnlineFeaturesResponse getOnlineFeatures(
+ ServingAPIProto.GetOnlineFeaturesRequest getFeaturesRequest);
}
diff --git a/java/serving/src/main/java/feast/serving/service/TransformationService.java b/java/serving/src/main/java/feast/serving/service/TransformationService.java
index caa52793020..e993e76e0a7 100644
--- a/java/serving/src/main/java/feast/serving/service/TransformationService.java
+++ b/java/serving/src/main/java/feast/serving/service/TransformationService.java
@@ -17,14 +17,11 @@
package feast.serving.service;
import feast.proto.serving.ServingAPIProto;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse;
import feast.proto.serving.TransformationServiceAPIProto.TransformFeaturesRequest;
import feast.proto.serving.TransformationServiceAPIProto.TransformFeaturesResponse;
import feast.proto.serving.TransformationServiceAPIProto.ValueType;
import feast.proto.types.ValueProto;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.tuple.Pair;
@@ -38,28 +35,13 @@ public interface TransformationService {
TransformFeaturesResponse transformFeatures(TransformFeaturesRequest transformFeaturesRequest);
/**
- * Extract the set of request data feature names and the list of on demand feature inputs from a
- * list of ODFV references.
+ * Extract the list of on demand feature inputs from a list of ODFV references.
*
* @param onDemandFeatureReferences list of ODFV references to be parsed
- * @param projectName project name
- * @return a pair containing the set of request data feature names and list of on demand feature
- * inputs
+ * @return list of on demand feature inputs
*/
- Pair, List>
- extractRequestDataFeatureNamesAndOnDemandFeatureInputs(
- List onDemandFeatureReferences, String projectName);
-
- /**
- * Separate the entity rows of a request into entity data and request feature data.
- *
- * @param requestDataFeatureNames set of feature names for the request data
- * @param request the GetOnlineFeaturesRequestV2 containing the entity rows
- * @return a pair containing the set of request data feature names and list of on demand feature
- * inputs
- */
- Pair, Map>>
- separateEntityRows(Set requestDataFeatureNames, GetOnlineFeaturesRequestV2 request);
+ List extractOnDemandFeaturesDependencies(
+ List onDemandFeatureReferences);
/**
* Process a response from the feature transformation server by augmenting the given lists of
@@ -68,15 +50,13 @@ public interface TransformationService {
* @param transformFeaturesResponse response to be processed
* @param onDemandFeatureViewName name of ODFV to which the response corresponds
* @param onDemandFeatureStringReferences set of all ODFV references that should be kept
- * @param values list of field maps to be augmented with additional fields from the response
- * @param statuses list of status maps to be augmented
+ * @param responseBuilder {@link ServingAPIProto.GetOnlineFeaturesResponse.Builder}
*/
void processTransformFeaturesResponse(
TransformFeaturesResponse transformFeaturesResponse,
String onDemandFeatureViewName,
Set onDemandFeatureStringReferences,
- List> values,
- List> statuses);
+ ServingAPIProto.GetOnlineFeaturesResponse.Builder responseBuilder);
/**
* Serialize data into Arrow IPC format, to be sent to the Python feature transformation server.
@@ -84,5 +64,5 @@ void processTransformFeaturesResponse(
* @param values list of field maps to be serialized
* @return the data packaged into a ValueType proto object
*/
- ValueType serializeValuesIntoArrowIPC(List> values);
+ ValueType serializeValuesIntoArrowIPC(List>> values);
}
diff --git a/java/serving/src/main/java/feast/serving/util/RequestHelper.java b/java/serving/src/main/java/feast/serving/util/RequestHelper.java
index 4d478f430f2..f730e019821 100644
--- a/java/serving/src/main/java/feast/serving/util/RequestHelper.java
+++ b/java/serving/src/main/java/feast/serving/util/RequestHelper.java
@@ -16,27 +16,28 @@
*/
package feast.serving.util;
+import feast.common.models.Feature;
+import feast.proto.serving.ServingAPIProto;
import feast.proto.serving.ServingAPIProto.FeatureReferenceV2;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2;
public class RequestHelper {
- public static void validateOnlineRequest(GetOnlineFeaturesRequestV2 request) {
+ public static void validateOnlineRequest(ServingAPIProto.GetOnlineFeaturesRequest request) {
// All EntityRows should not be empty
- if (request.getEntityRowsCount() <= 0) {
+ if (request.getEntitiesCount() <= 0) {
throw new IllegalArgumentException("Entity value must be provided");
}
// All FeatureReferences should have FeatureTable name and Feature name
- for (FeatureReferenceV2 featureReference : request.getFeaturesList()) {
- validateOnlineRequestFeatureReference(featureReference);
+ for (String featureReference : request.getFeatures().getValList()) {
+ validateOnlineRequestFeatureReference(Feature.parseFeatureReference(featureReference));
}
}
public static void validateOnlineRequestFeatureReference(FeatureReferenceV2 featureReference) {
- if (featureReference.getFeatureTable().isEmpty()) {
+ if (featureReference.getFeatureViewName().isEmpty()) {
throw new IllegalArgumentException("FeatureTable name must be provided in FeatureReference");
}
- if (featureReference.getName().isEmpty()) {
+ if (featureReference.getFeatureName().isEmpty()) {
throw new IllegalArgumentException("Feature name must be provided in FeatureReference");
}
}
diff --git a/java/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java b/java/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java
index 238df549513..3ab9f43c341 100644
--- a/java/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java
+++ b/java/serving/src/main/java/feast/serving/util/mappers/ResponseJSONMapper.java
@@ -16,8 +16,7 @@
*/
package feast.serving.util.mappers;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues;
+import feast.proto.serving.ServingAPIProto;
import feast.proto.types.ValueProto.Value;
import java.util.List;
import java.util.Map;
@@ -27,15 +26,23 @@
public class ResponseJSONMapper {
public static List> mapGetOnlineFeaturesResponse(
- GetOnlineFeaturesResponse response) {
- return response.getFieldValuesList().stream()
+ ServingAPIProto.GetOnlineFeaturesResponse response) {
+ return response.getResultsList().stream()
.map(fieldValues -> convertFieldValuesToMap(fieldValues))
.collect(Collectors.toList());
}
- private static Map convertFieldValuesToMap(FieldValues fieldValues) {
- return fieldValues.getFieldsMap().entrySet().stream()
- .collect(Collectors.toMap(es -> es.getKey(), es -> extractValue(es.getValue())));
+ private static Map convertFieldValuesToMap(
+ ServingAPIProto.GetOnlineFeaturesResponse.FeatureVector vec) {
+ return Map.of(
+ "values",
+ vec.getValuesList().stream()
+ .map(ResponseJSONMapper::extractValue)
+ .collect(Collectors.toList()),
+ "statuses",
+ vec.getStatusesList(),
+ "event_timestamp",
+ vec.getEventTimestampsList());
}
private static Object extractValue(Value value) {
diff --git a/java/serving/src/main/resources/application.yml b/java/serving/src/main/resources/application.yml
index 4fba32a0ae6..1f6d5b34c43 100644
--- a/java/serving/src/main/resources/application.yml
+++ b/java/serving/src/main/resources/application.yml
@@ -1,4 +1,5 @@
feast:
+ project: ""
registry: "prompt_dory/data/registry.db"
registryRefreshInterval: 0
diff --git a/java/serving/src/test/java/feast/serving/it/ServingBase.java b/java/serving/src/test/java/feast/serving/it/ServingBase.java
deleted file mode 100644
index 3a42f9a85e5..00000000000
--- a/java/serving/src/test/java/feast/serving/it/ServingBase.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- * Copyright 2018-2021 The Feast Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package feast.serving.it;
-
-import static org.awaitility.Awaitility.await;
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.jupiter.api.Assertions.*;
-
-import com.google.common.collect.ImmutableList;
-import com.google.inject.*;
-import com.google.inject.Module;
-import com.google.inject.util.Modules;
-import com.google.protobuf.Timestamp;
-import feast.proto.core.FeatureProto;
-import feast.proto.core.FeatureViewProto;
-import feast.proto.core.RegistryProto;
-import feast.proto.serving.ServingAPIProto;
-import feast.proto.serving.ServingServiceGrpc;
-import feast.proto.types.ValueProto;
-import feast.serving.config.*;
-import feast.serving.grpc.OnlineServingGrpcServiceV2;
-import feast.serving.util.DataGenerator;
-import io.grpc.*;
-import io.grpc.inprocess.InProcessChannelBuilder;
-import io.grpc.inprocess.InProcessServerBuilder;
-import io.grpc.protobuf.services.ProtoReflectionService;
-import io.grpc.util.MutableHandlerRegistry;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.time.Duration;
-import java.util.concurrent.TimeUnit;
-import org.junit.jupiter.api.*;
-import org.testcontainers.containers.DockerComposeContainer;
-import org.testcontainers.containers.wait.strategy.Wait;
-import org.testcontainers.junit.jupiter.Testcontainers;
-
-@Testcontainers
-abstract class ServingBase {
- static DockerComposeContainer environment;
-
- ServingServiceGrpc.ServingServiceBlockingStub servingStub;
- Injector injector;
- String serverName;
- ManagedChannel channel;
- Server server;
- MutableHandlerRegistry serviceRegistry;
-
- @BeforeAll
- static void globalSetup() {
- environment =
- new DockerComposeContainer(
- new File("src/test/resources/docker-compose/docker-compose-redis-it.yml"))
- .withExposedService("redis", 6379)
- .withOptions()
- .waitingFor(
- "materialize",
- Wait.forLogMessage(".*Materialization finished.*\\n", 1)
- .withStartupTimeout(Duration.ofMinutes(5)));
- environment.start();
- }
-
- @AfterAll
- static void globalTeardown() {
- environment.stop();
- }
-
- @BeforeEach
- public void envSetUp() throws Exception {
-
- AbstractModule appPropertiesModule =
- new AbstractModule() {
- @Override
- protected void configure() {
- bind(OnlineServingGrpcServiceV2.class);
- }
-
- @Provides
- ApplicationProperties applicationProperties() {
- final ApplicationProperties p = new ApplicationProperties();
- p.setAwsRegion("us-east-1");
-
- final ApplicationProperties.FeastProperties feastProperties = createFeastProperties();
- p.setFeast(feastProperties);
-
- final ApplicationProperties.TracingProperties tracingProperties =
- new ApplicationProperties.TracingProperties();
- feastProperties.setTracing(tracingProperties);
-
- tracingProperties.setEnabled(false);
- return p;
- }
- };
-
- Module overrideConfig = registryConfig();
- Module registryConfig;
- if (overrideConfig != null) {
- registryConfig = Modules.override(new RegistryConfig()).with(registryConfig());
- } else {
- registryConfig = new RegistryConfig();
- }
-
- injector =
- Guice.createInjector(
- new ServingServiceConfigV2(),
- registryConfig,
- new InstrumentationConfig(),
- appPropertiesModule);
-
- OnlineServingGrpcServiceV2 onlineServingGrpcServiceV2 =
- injector.getInstance(OnlineServingGrpcServiceV2.class);
-
- serverName = InProcessServerBuilder.generateName();
-
- server =
- InProcessServerBuilder.forName(serverName)
- .fallbackHandlerRegistry(serviceRegistry)
- .addService(onlineServingGrpcServiceV2)
- .addService(ProtoReflectionService.newInstance())
- .build();
- server.start();
-
- channel = InProcessChannelBuilder.forName(serverName).usePlaintext().directExecutor().build();
-
- servingStub =
- ServingServiceGrpc.newBlockingStub(channel)
- .withDeadlineAfter(5, TimeUnit.SECONDS)
- .withWaitForReady();
- }
-
- @AfterEach
- public void envTeardown() throws Exception {
- // assume channel and server are not null
- channel.shutdown();
- server.shutdown();
- // fail the test if cannot gracefully shutdown
- try {
- assert channel.awaitTermination(5, TimeUnit.SECONDS)
- : "channel cannot be gracefully shutdown";
- assert server.awaitTermination(5, TimeUnit.SECONDS) : "server cannot be gracefully shutdown";
- } finally {
- channel.shutdownNow();
- server.shutdownNow();
- }
- }
-
- protected ServingAPIProto.GetOnlineFeaturesRequestV2 buildOnlineRequest(int driverId) {
- // getOnlineFeatures Information
- String projectName = "feast_project";
- String entityName = "driver_id";
-
- // Instantiate EntityRows
- final Timestamp timestamp = Timestamp.getDefaultInstance();
- ServingAPIProto.GetOnlineFeaturesRequestV2.EntityRow entityRow1 =
- DataGenerator.createEntityRow(
- entityName, DataGenerator.createInt64Value(driverId), timestamp.getSeconds());
- ImmutableList entityRows =
- ImmutableList.of(entityRow1);
-
- // Instantiate FeatureReferences
- ServingAPIProto.FeatureReferenceV2 feature1Reference =
- DataGenerator.createFeatureReference("driver_hourly_stats", "conv_rate");
- ServingAPIProto.FeatureReferenceV2 feature2Reference =
- DataGenerator.createFeatureReference("driver_hourly_stats", "avg_daily_trips");
- ImmutableList featureReferences =
- ImmutableList.of(feature1Reference, feature2Reference);
-
- // Build GetOnlineFeaturesRequestV2
- return TestUtils.createOnlineFeatureRequest(projectName, featureReferences, entityRows);
- }
-
- static RegistryProto.Registry registryProto = readLocalRegistry();
-
- private static RegistryProto.Registry readLocalRegistry() {
- try {
- return RegistryProto.Registry.parseFrom(
- Files.readAllBytes(Paths.get("src/test/resources/docker-compose/feast10/registry.db")));
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- return null;
- }
-
- @Test
- public void shouldGetOnlineFeatures() {
- ServingAPIProto.GetOnlineFeaturesRequestV2 req = buildOnlineRequest(1005);
- ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
- servingStub.withDeadlineAfter(1000, TimeUnit.MILLISECONDS).getOnlineFeaturesV2(req);
-
- assertEquals(1, featureResponse.getFieldValuesCount());
-
- final ServingAPIProto.GetOnlineFeaturesResponse.FieldValues fieldValue =
- featureResponse.getFieldValues(0);
- for (final String key :
- ImmutableList.of(
- "driver_hourly_stats:avg_daily_trips", "driver_hourly_stats:conv_rate", "driver_id")) {
- assertTrue(fieldValue.containsFields(key));
- assertTrue(fieldValue.containsStatuses(key));
- assertEquals(
- ServingAPIProto.GetOnlineFeaturesResponse.FieldStatus.PRESENT,
- fieldValue.getStatusesOrThrow(key));
- }
-
- assertEquals(
- 500, fieldValue.getFieldsOrThrow("driver_hourly_stats:avg_daily_trips").getInt64Val());
- assertEquals(1005, fieldValue.getFieldsOrThrow("driver_id").getInt64Val());
- assertEquals(
- 0.5, fieldValue.getFieldsOrThrow("driver_hourly_stats:conv_rate").getDoubleVal(), 0.0001);
- }
-
- @Test
- public void shouldGetOnlineFeaturesWithOutsideMaxAgeStatus() {
- ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
- servingStub.getOnlineFeaturesV2(buildOnlineRequest(1001));
-
- assertEquals(1, featureResponse.getFieldValuesCount());
-
- final ServingAPIProto.GetOnlineFeaturesResponse.FieldValues fieldValue =
- featureResponse.getFieldValues(0);
- for (final String key :
- ImmutableList.of("driver_hourly_stats:avg_daily_trips", "driver_hourly_stats:conv_rate")) {
- assertTrue(fieldValue.containsFields(key));
- assertTrue(fieldValue.containsStatuses(key));
- assertEquals(
- ServingAPIProto.GetOnlineFeaturesResponse.FieldStatus.OUTSIDE_MAX_AGE,
- fieldValue.getStatusesOrThrow(key));
- }
-
- assertEquals(
- 100, fieldValue.getFieldsOrThrow("driver_hourly_stats:avg_daily_trips").getInt64Val());
- assertEquals(1001, fieldValue.getFieldsOrThrow("driver_id").getInt64Val());
- assertEquals(
- 0.1, fieldValue.getFieldsOrThrow("driver_hourly_stats:conv_rate").getDoubleVal(), 0.0001);
- }
-
- @Test
- public void shouldGetOnlineFeaturesWithNotFoundStatus() {
- ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
- servingStub.getOnlineFeaturesV2(buildOnlineRequest(-1));
-
- assertEquals(1, featureResponse.getFieldValuesCount());
-
- final ServingAPIProto.GetOnlineFeaturesResponse.FieldValues fieldValue =
- featureResponse.getFieldValues(0);
- for (final String key :
- ImmutableList.of("driver_hourly_stats:avg_daily_trips", "driver_hourly_stats:conv_rate")) {
- assertTrue(fieldValue.containsFields(key));
- assertTrue(fieldValue.containsStatuses(key));
- assertEquals(
- ServingAPIProto.GetOnlineFeaturesResponse.FieldStatus.NOT_FOUND,
- fieldValue.getStatusesOrThrow(key));
- }
- }
-
- @Test
- public void shouldRefreshRegistryAndServeNewFeatures() throws InterruptedException {
- updateRegistryFile(
- registryProto
- .toBuilder()
- .addFeatureViews(
- FeatureViewProto.FeatureView.newBuilder()
- .setSpec(
- FeatureViewProto.FeatureViewSpec.newBuilder()
- .setName("new_view")
- .addEntities("driver_id")
- .addFeatures(
- FeatureProto.FeatureSpecV2.newBuilder()
- .setName("new_feature")
- .setValueType(ValueProto.ValueType.Enum.BOOL))))
- .build());
-
- ServingAPIProto.GetOnlineFeaturesRequestV2 request =
- buildOnlineRequest(1005)
- .toBuilder()
- .addFeatures(DataGenerator.createFeatureReference("new_view", "new_feature"))
- .build();
-
- await()
- .ignoreException(StatusRuntimeException.class)
- .atMost(5, TimeUnit.SECONDS)
- .until(() -> servingStub.getOnlineFeaturesV2(request).getFieldValuesCount(), equalTo(1));
- }
-
- abstract ApplicationProperties.FeastProperties createFeastProperties();
-
- AbstractModule registryConfig() {
- return null;
- }
-
- abstract void updateRegistryFile(RegistryProto.Registry registry);
-}
diff --git a/java/serving/src/test/java/feast/serving/it/ServingBaseTests.java b/java/serving/src/test/java/feast/serving/it/ServingBaseTests.java
new file mode 100644
index 00000000000..c610d7df6b1
--- /dev/null
+++ b/java/serving/src/test/java/feast/serving/it/ServingBaseTests.java
@@ -0,0 +1,184 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2021 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package feast.serving.it;
+
+import static org.awaitility.Awaitility.await;
+import static org.hamcrest.Matchers.equalTo;
+import static org.junit.jupiter.api.Assertions.*;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import feast.proto.core.FeatureProto;
+import feast.proto.core.FeatureViewProto;
+import feast.proto.core.RegistryProto;
+import feast.proto.serving.ServingAPIProto;
+import feast.proto.serving.ServingAPIProto.FieldStatus;
+import feast.proto.types.ValueProto;
+import feast.serving.util.DataGenerator;
+import io.grpc.StatusRuntimeException;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.*;
+
+abstract class ServingBaseTests extends ServingEnvironment {
+
+ protected ServingAPIProto.GetOnlineFeaturesRequest buildOnlineRequest(int driverId) {
+ // getOnlineFeatures Information
+ String entityName = "driver_id";
+
+ // Instantiate EntityRows
+ Map entityRows =
+ ImmutableMap.of(
+ entityName,
+ ValueProto.RepeatedValue.newBuilder()
+ .addVal(DataGenerator.createInt64Value(driverId))
+ .build());
+
+ ImmutableList featureReferences =
+ ImmutableList.of("driver_hourly_stats:conv_rate", "driver_hourly_stats:avg_daily_trips");
+
+ // Build GetOnlineFeaturesRequestV2
+ return TestUtils.createOnlineFeatureRequest(featureReferences, entityRows);
+ }
+
+ static RegistryProto.Registry registryProto = readLocalRegistry();
+
+ private static RegistryProto.Registry readLocalRegistry() {
+ try {
+ return RegistryProto.Registry.parseFrom(
+ Files.readAllBytes(Paths.get("src/test/resources/docker-compose/feast10/registry.db")));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return null;
+ }
+
+ @Test
+ public void shouldGetOnlineFeatures() {
+ ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
+ servingStub.getOnlineFeatures(buildOnlineRequest(1005));
+
+ assertEquals(2, featureResponse.getResultsCount());
+ assertEquals(1, featureResponse.getResults(0).getValuesCount());
+
+ assertEquals(
+ ImmutableList.of("driver_hourly_stats:conv_rate", "driver_hourly_stats:avg_daily_trips"),
+ featureResponse.getMetadata().getFeatureNames().getValList());
+
+ for (int featureIdx : List.of(0, 1)) {
+ assertEquals(
+ List.of(ServingAPIProto.FieldStatus.PRESENT),
+ featureResponse.getResults(featureIdx).getStatusesList());
+ }
+
+ assertEquals(0.5, featureResponse.getResults(0).getValues(0).getDoubleVal(), 0.0001);
+ assertEquals(500, featureResponse.getResults(1).getValues(0).getInt64Val());
+ }
+
+ @Test
+ public void shouldGetOnlineFeaturesWithOutsideMaxAgeStatus() {
+ ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
+ servingStub.getOnlineFeatures(buildOnlineRequest(1001));
+
+ assertEquals(2, featureResponse.getResultsCount());
+ assertEquals(1, featureResponse.getResults(0).getValuesCount());
+
+ for (int featureIdx : List.of(0, 1)) {
+ assertEquals(
+ FieldStatus.OUTSIDE_MAX_AGE, featureResponse.getResults(featureIdx).getStatuses(0));
+ }
+
+ assertEquals(0.1, featureResponse.getResults(0).getValues(0).getDoubleVal(), 0.0001);
+ assertEquals(100, featureResponse.getResults(1).getValues(0).getInt64Val());
+ }
+
+ @Test
+ public void shouldGetOnlineFeaturesWithNotFoundStatus() {
+ ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
+ servingStub.getOnlineFeatures(buildOnlineRequest(-1));
+
+ assertEquals(2, featureResponse.getResultsCount());
+ assertEquals(1, featureResponse.getResults(0).getValuesCount());
+
+ for (final int featureIdx : List.of(0, 1)) {
+ assertEquals(FieldStatus.NOT_FOUND, featureResponse.getResults(featureIdx).getStatuses(0));
+ }
+ }
+
+ @Test
+ public void shouldRefreshRegistryAndServeNewFeatures() throws InterruptedException {
+ updateRegistryFile(
+ registryProto
+ .toBuilder()
+ .addFeatureViews(
+ FeatureViewProto.FeatureView.newBuilder()
+ .setSpec(
+ FeatureViewProto.FeatureViewSpec.newBuilder()
+ .setName("new_view")
+ .addEntities("driver_id")
+ .addFeatures(
+ FeatureProto.FeatureSpecV2.newBuilder()
+ .setName("new_feature")
+ .setValueType(ValueProto.ValueType.Enum.BOOL))))
+ .build());
+
+ ServingAPIProto.GetOnlineFeaturesRequest request = buildOnlineRequest(1005);
+
+ ServingAPIProto.GetOnlineFeaturesRequest requestWithNewFeature =
+ request
+ .toBuilder()
+ .setFeatures(request.getFeatures().toBuilder().addVal("new_view:new_feature"))
+ .build();
+
+ await()
+ .ignoreException(StatusRuntimeException.class)
+ .atMost(5, TimeUnit.SECONDS)
+ .until(
+ () -> servingStub.getOnlineFeatures(requestWithNewFeature).getResultsCount(),
+ equalTo(3));
+ }
+
+ /** https://github.com/feast-dev/feast/issues/2253 */
+ @Test
+ public void shouldGetOnlineFeaturesWithStringEntity() {
+ Map entityRows =
+ ImmutableMap.of(
+ "entity",
+ ValueProto.RepeatedValue.newBuilder()
+ .addVal(DataGenerator.createStrValue("key-1"))
+ .build());
+
+ ImmutableList featureReferences =
+ ImmutableList.of("feature_view_0:feature_0", "feature_view_0:feature_1");
+
+ ServingAPIProto.GetOnlineFeaturesRequest req =
+ TestUtils.createOnlineFeatureRequest(featureReferences, entityRows);
+
+ ServingAPIProto.GetOnlineFeaturesResponse resp = servingStub.getOnlineFeatures(req);
+
+ for (final int featureIdx : List.of(0, 1)) {
+ assertEquals(FieldStatus.PRESENT, resp.getResults(featureIdx).getStatuses(0));
+ }
+ }
+
+ abstract void updateRegistryFile(RegistryProto.Registry registry);
+}
diff --git a/java/serving/src/test/java/feast/serving/it/ServingBenchmarkIT.java b/java/serving/src/test/java/feast/serving/it/ServingBenchmarkIT.java
new file mode 100644
index 00000000000..1d77c2e4f7c
--- /dev/null
+++ b/java/serving/src/test/java/feast/serving/it/ServingBenchmarkIT.java
@@ -0,0 +1,152 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2021 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package feast.serving.it;
+
+import com.google.api.client.util.Lists;
+import com.google.common.base.Stopwatch;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.math.Quantiles;
+import feast.proto.serving.ServingAPIProto;
+import feast.proto.types.ValueProto;
+import feast.serving.config.ApplicationProperties;
+import feast.serving.util.DataGenerator;
+import java.util.List;
+import java.util.LongSummaryStatistics;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ServingBenchmarkIT extends ServingEnvironment {
+ private Random rand = new Random();
+ public static final Logger log = LoggerFactory.getLogger(ServingBenchmarkIT.class);
+
+ private static int WARM_UP_COUNT = 10;
+
+ @Override
+ ApplicationProperties.FeastProperties createFeastProperties() {
+ return TestUtils.createBasicFeastProperties(
+ environment.getServiceHost("redis", 6379), environment.getServicePort("redis", 6379));
+ }
+
+ protected ServingAPIProto.GetOnlineFeaturesRequest buildOnlineRequest(
+ int rowsCount, int featuresCount) {
+ List entities =
+ IntStream.range(0, rowsCount)
+ .mapToObj(
+ i -> DataGenerator.createStrValue(String.format("key-%s", rand.nextInt(1000))))
+ .collect(Collectors.toList());
+
+ List featureReferences =
+ IntStream.range(0, featuresCount)
+ .mapToObj(i -> String.format("feature_view_%d:feature_%d", i / 10, i))
+ .collect(Collectors.toList());
+
+ Map entityRows =
+ ImmutableMap.of(
+ "entity", ValueProto.RepeatedValue.newBuilder().addAllVal(entities).build());
+
+ return TestUtils.createOnlineFeatureRequest(featureReferences, entityRows);
+ }
+
+ protected ServingAPIProto.GetOnlineFeaturesRequest buildOnlineRequest(int rowsCount) {
+ List entities =
+ IntStream.range(0, rowsCount)
+ .mapToObj(i -> DataGenerator.createInt64Value(rand.nextInt(1000)))
+ .collect(Collectors.toList());
+
+ Map entityRows =
+ ImmutableMap.of(
+ "entity", ValueProto.RepeatedValue.newBuilder().addAllVal(entities).build());
+
+ return TestUtils.createOnlineFeatureRequest("benchmark_feature_service", entityRows);
+ }
+
+ @Test
+ public void benchmarkServing100rows10features() {
+ ServingAPIProto.GetOnlineFeaturesRequest req = buildOnlineRequest(100, 10);
+
+ measure(
+ () -> servingStub.withDeadlineAfter(1, TimeUnit.SECONDS).getOnlineFeatures(req),
+ "100 rows; 10 features",
+ 1000);
+ }
+
+ @Test
+ public void benchmarkServing100rows50features() {
+ ServingAPIProto.GetOnlineFeaturesRequest req = buildOnlineRequest(100, 50);
+
+ measure(
+ () -> servingStub.withDeadlineAfter(1, TimeUnit.SECONDS).getOnlineFeatures(req),
+ "100 rows; 50 features",
+ 1000);
+ }
+
+ @Test
+ public void benchmarkServing100rows100features() {
+ ServingAPIProto.GetOnlineFeaturesRequest req = buildOnlineRequest(100, 100);
+
+ measure(
+ () -> servingStub.withDeadlineAfter(1, TimeUnit.SECONDS).getOnlineFeatures(req),
+ "100 rows; 100 features",
+ 1000);
+ }
+
+ @Test
+ public void benchmarkServing100rowsFullFeatureService() {
+ ServingAPIProto.GetOnlineFeaturesRequest req = buildOnlineRequest(100);
+
+ measure(
+ () -> servingStub.withDeadlineAfter(1, TimeUnit.SECONDS).getOnlineFeatures(req),
+ "100 rows; Full FS",
+ 1000);
+ }
+
+ private void measure(Runnable target, String name, int runs) {
+ Stopwatch timer = Stopwatch.createUnstarted();
+
+ List records = Lists.newArrayList();
+
+ for (int i = 0; i < runs; i++) {
+ timer.reset();
+ timer.start();
+ target.run();
+ timer.stop();
+ if (i >= WARM_UP_COUNT) {
+ records.add(timer.elapsed(TimeUnit.MILLISECONDS));
+ }
+ }
+
+ LongSummaryStatistics summary =
+ records.stream().collect(Collectors.summarizingLong(Long::longValue));
+
+ log.info(String.format("Test %s took (min): %d ms", name, summary.getMin()));
+ log.info(String.format("Test %s took (avg): %f ms", name, summary.getAverage()));
+ log.info(
+ String.format("Test %s took (median): %f ms", name, Quantiles.median().compute(records)));
+ log.info(
+ String.format(
+ "Test %s took (95p): %f ms", name, Quantiles.percentiles().index(95).compute(records)));
+ log.info(
+ String.format(
+ "Test %s took (99p): %f ms", name, Quantiles.percentiles().index(99).compute(records)));
+ }
+}
diff --git a/java/serving/src/test/java/feast/serving/it/ServingEnvironment.java b/java/serving/src/test/java/feast/serving/it/ServingEnvironment.java
new file mode 100644
index 00000000000..c00dc7b1f31
--- /dev/null
+++ b/java/serving/src/test/java/feast/serving/it/ServingEnvironment.java
@@ -0,0 +1,172 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2021 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package feast.serving.it;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+
+import com.google.inject.*;
+import com.google.inject.Module;
+import com.google.inject.util.Modules;
+import feast.proto.serving.ServingServiceGrpc;
+import feast.serving.config.*;
+import feast.serving.grpc.OnlineServingGrpcServiceV2;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+import io.grpc.Server;
+import io.grpc.util.MutableHandlerRegistry;
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.containers.wait.strategy.Wait;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+@Testcontainers
+abstract class ServingEnvironment {
+ static DockerComposeContainer environment;
+
+ ServingServiceGrpc.ServingServiceBlockingStub servingStub;
+ Injector injector;
+ String serverName;
+ ManagedChannel channel;
+ Server server;
+ MutableHandlerRegistry serviceRegistry;
+
+ static int serverPort = getFreePort();
+
+ @BeforeAll
+ static void globalSetup() {
+ environment =
+ new DockerComposeContainer(
+ new File("src/test/resources/docker-compose/docker-compose-redis-it.yml"))
+ .withExposedService("redis", 6379)
+ .withExposedService("feast", 8080)
+ .waitingFor("feast", Wait.forListeningPort());
+ environment.start();
+ }
+
+ @AfterAll
+ static void globalTeardown() {
+ environment.stop();
+ }
+
+ @BeforeEach
+ public void envSetUp() throws Exception {
+ AbstractModule appPropertiesModule =
+ new AbstractModule() {
+ @Override
+ protected void configure() {
+ bind(OnlineServingGrpcServiceV2.class);
+ }
+
+ @Provides
+ ApplicationProperties applicationProperties() {
+ final ApplicationProperties p = new ApplicationProperties();
+
+ ApplicationProperties.GrpcServer grpcServer = new ApplicationProperties.GrpcServer();
+ ApplicationProperties.Server server = new ApplicationProperties.Server();
+ server.setPort(serverPort);
+ grpcServer.setServer(server);
+ p.setGrpc(grpcServer);
+
+ final ApplicationProperties.FeastProperties feastProperties = createFeastProperties();
+ feastProperties.setAwsRegion("us-east-1");
+ p.setFeast(feastProperties);
+
+ final ApplicationProperties.TracingProperties tracingProperties =
+ new ApplicationProperties.TracingProperties();
+ feastProperties.setTracing(tracingProperties);
+
+ tracingProperties.setEnabled(false);
+ return p;
+ }
+ };
+
+ Module overrideConfig = registryConfig();
+ Module registryConfig;
+ if (overrideConfig != null) {
+ registryConfig = Modules.override(new RegistryConfig()).with(registryConfig());
+ } else {
+ registryConfig = new RegistryConfig();
+ }
+
+ injector =
+ Guice.createInjector(
+ new ServingServiceConfigV2(),
+ registryConfig,
+ new InstrumentationConfig(),
+ appPropertiesModule,
+ new ServerModule());
+
+ server = injector.getInstance(Server.class);
+ server.start();
+
+ channel = ManagedChannelBuilder.forAddress("localhost", serverPort).usePlaintext().build();
+
+ servingStub =
+ ServingServiceGrpc.newBlockingStub(channel)
+ .withDeadlineAfter(5, TimeUnit.SECONDS)
+ .withWaitForReady();
+ }
+
+ @AfterEach
+ public void envTeardown() throws Exception {
+ // assume channel and server are not null
+ channel.shutdown();
+ server.shutdown();
+ // fail the test if cannot gracefully shutdown
+ try {
+ assert channel.awaitTermination(5, TimeUnit.SECONDS)
+ : "channel cannot be gracefully shutdown";
+ assert server.awaitTermination(5, TimeUnit.SECONDS) : "server cannot be gracefully shutdown";
+ } finally {
+ channel.shutdownNow();
+ server.shutdownNow();
+ }
+
+ server = null;
+ channel = null;
+ servingStub = null;
+ }
+
+ abstract ApplicationProperties.FeastProperties createFeastProperties();
+
+ AbstractModule registryConfig() {
+ return null;
+ }
+
+ private static int getFreePort() {
+ ServerSocket serverSocket;
+ try {
+ serverSocket = new ServerSocket(0);
+ } catch (IOException e) {
+ throw new RuntimeException("Couldn't allocate port");
+ }
+
+ assertThat(serverSocket, is(notNullValue()));
+ assertThat(serverSocket.getLocalPort(), greaterThan(0));
+
+ return serverSocket.getLocalPort();
+ }
+}
diff --git a/java/serving/src/test/java/feast/serving/it/ServingRedisGSRegistryIT.java b/java/serving/src/test/java/feast/serving/it/ServingRedisGSRegistryIT.java
index 36e0eebe8d4..78871cd45c2 100644
--- a/java/serving/src/test/java/feast/serving/it/ServingRedisGSRegistryIT.java
+++ b/java/serving/src/test/java/feast/serving/it/ServingRedisGSRegistryIT.java
@@ -20,8 +20,6 @@
import com.google.cloud.storage.*;
import com.google.cloud.storage.testing.RemoteStorageHelper;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import feast.proto.core.RegistryProto;
import feast.serving.config.ApplicationProperties;
import java.util.concurrent.ExecutionException;
@@ -29,7 +27,7 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
-public class ServingRedisGSRegistryIT extends ServingBase {
+public class ServingRedisGSRegistryIT extends ServingBaseTests {
static Storage storage =
RemoteStorageHelper.create()
.getOptions()
@@ -64,16 +62,9 @@ static void tearDown() throws ExecutionException, InterruptedException {
@Override
ApplicationProperties.FeastProperties createFeastProperties() {
final ApplicationProperties.FeastProperties feastProperties =
- new ApplicationProperties.FeastProperties();
+ TestUtils.createBasicFeastProperties(
+ environment.getServiceHost("redis", 6379), environment.getServicePort("redis", 6379));
feastProperties.setRegistry(blobId.toGsUtilUri());
- feastProperties.setRegistryRefreshInterval(1);
-
- feastProperties.setActiveStore("online");
-
- feastProperties.setStores(
- ImmutableList.of(
- new ApplicationProperties.Store(
- "online", "REDIS", ImmutableMap.of("host", "localhost", "port", "6379"))));
return feastProperties;
}
diff --git a/java/serving/src/test/java/feast/serving/it/ServingRedisLocalRegistryIT.java b/java/serving/src/test/java/feast/serving/it/ServingRedisLocalRegistryIT.java
index 53fda39466e..c83d8dbbf1c 100644
--- a/java/serving/src/test/java/feast/serving/it/ServingRedisLocalRegistryIT.java
+++ b/java/serving/src/test/java/feast/serving/it/ServingRedisLocalRegistryIT.java
@@ -16,27 +16,14 @@
*/
package feast.serving.it;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import feast.proto.core.RegistryProto;
import feast.serving.config.ApplicationProperties;
-public class ServingRedisLocalRegistryIT extends ServingBase {
+public class ServingRedisLocalRegistryIT extends ServingBaseTests {
@Override
ApplicationProperties.FeastProperties createFeastProperties() {
- final ApplicationProperties.FeastProperties feastProperties =
- new ApplicationProperties.FeastProperties();
- feastProperties.setRegistry("src/test/resources/docker-compose/feast10/registry.db");
- feastProperties.setRegistryRefreshInterval(1);
-
- feastProperties.setActiveStore("online");
-
- feastProperties.setStores(
- ImmutableList.of(
- new ApplicationProperties.Store(
- "online", "REDIS", ImmutableMap.of("host", "localhost", "port", "6379"))));
-
- return feastProperties;
+ return TestUtils.createBasicFeastProperties(
+ environment.getServiceHost("redis", 6379), environment.getServicePort("redis", 6379));
}
@Override
diff --git a/java/serving/src/test/java/feast/serving/it/ServingRedisS3RegistryIT.java b/java/serving/src/test/java/feast/serving/it/ServingRedisS3RegistryIT.java
index 648fdaa5b59..d67fbf26215 100644
--- a/java/serving/src/test/java/feast/serving/it/ServingRedisS3RegistryIT.java
+++ b/java/serving/src/test/java/feast/serving/it/ServingRedisS3RegistryIT.java
@@ -21,8 +21,6 @@
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
import com.amazonaws.services.s3.model.ObjectMetadata;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
import feast.proto.core.RegistryProto;
@@ -31,7 +29,7 @@
import org.junit.jupiter.api.BeforeAll;
import org.testcontainers.junit.jupiter.Container;
-public class ServingRedisS3RegistryIT extends ServingBase {
+public class ServingRedisS3RegistryIT extends ServingBaseTests {
@Container static final S3MockContainer s3Mock = new S3MockContainer("2.2.3");
private static AmazonS3 createClient() {
@@ -64,16 +62,9 @@ static void setUp() {
@Override
ApplicationProperties.FeastProperties createFeastProperties() {
final ApplicationProperties.FeastProperties feastProperties =
- new ApplicationProperties.FeastProperties();
+ TestUtils.createBasicFeastProperties(
+ environment.getServiceHost("redis", 6379), environment.getServicePort("redis", 6379));
feastProperties.setRegistry("s3://test-bucket/registry.db");
- feastProperties.setRegistryRefreshInterval(1);
-
- feastProperties.setActiveStore("online");
-
- feastProperties.setStores(
- ImmutableList.of(
- new ApplicationProperties.Store(
- "online", "REDIS", ImmutableMap.of("host", "localhost", "port", "6379"))));
return feastProperties;
}
diff --git a/java/serving/src/test/java/feast/serving/it/TestUtils.java b/java/serving/src/test/java/feast/serving/it/TestUtils.java
index fb88b2fb372..867fa4afb06 100644
--- a/java/serving/src/test/java/feast/serving/it/TestUtils.java
+++ b/java/serving/src/test/java/feast/serving/it/TestUtils.java
@@ -16,9 +16,13 @@
*/
package feast.serving.it;
-import feast.proto.serving.ServingAPIProto.FeatureReferenceV2;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import feast.proto.serving.ServingAPIProto;
+import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequest;
import feast.proto.serving.ServingServiceGrpc;
+import feast.proto.types.ValueProto;
+import feast.serving.config.ApplicationProperties;
import io.grpc.Channel;
import io.grpc.ManagedChannelBuilder;
import java.util.*;
@@ -32,14 +36,55 @@ public static ServingServiceGrpc.ServingServiceBlockingStub getServingServiceStu
return ServingServiceGrpc.newBlockingStub(secureChannel);
}
- public static GetOnlineFeaturesRequestV2 createOnlineFeatureRequest(
- String projectName,
- List featureReferences,
- List entityRows) {
- return GetOnlineFeaturesRequestV2.newBuilder()
- .setProject(projectName)
- .addAllFeatures(featureReferences)
- .addAllEntityRows(entityRows)
+ public static GetOnlineFeaturesRequest createOnlineFeatureRequest(
+ List featureReferences, Map entityRows) {
+ return createOnlineFeatureRequest(featureReferences, entityRows, new HashMap<>());
+ }
+
+ public static GetOnlineFeaturesRequest createOnlineFeatureRequest(
+ List featureReferences,
+ Map entityRows,
+ Map requestContext) {
+ return GetOnlineFeaturesRequest.newBuilder()
+ .setFeatures(ServingAPIProto.FeatureList.newBuilder().addAllVal(featureReferences))
+ .putAllEntities(entityRows)
+ .putAllRequestContext(requestContext)
+ .build();
+ }
+
+ public static GetOnlineFeaturesRequest createOnlineFeatureRequest(
+ String featureService, Map entityRows) {
+ return createOnlineFeatureRequest(featureService, entityRows, new HashMap<>());
+ }
+
+ public static GetOnlineFeaturesRequest createOnlineFeatureRequest(
+ String featureService,
+ Map entityRows,
+ Map requestContext) {
+ return GetOnlineFeaturesRequest.newBuilder()
+ .setFeatureService(featureService)
+ .putAllEntities(entityRows)
+ .putAllRequestContext(requestContext)
.build();
}
+
+ public static ApplicationProperties.FeastProperties createBasicFeastProperties(
+ String redisHost, Integer redisPort) {
+ final ApplicationProperties.FeastProperties feastProperties =
+ new ApplicationProperties.FeastProperties();
+ feastProperties.setRegistry("src/test/resources/docker-compose/feast10/registry.db");
+ feastProperties.setRegistryRefreshInterval(1);
+
+ feastProperties.setActiveStore("online");
+ feastProperties.setProject("feast_project");
+
+ feastProperties.setStores(
+ ImmutableList.of(
+ new ApplicationProperties.Store(
+ "online",
+ "REDIS",
+ ImmutableMap.of("host", redisHost, "port", redisPort.toString()))));
+
+ return feastProperties;
+ }
}
diff --git a/java/serving/src/test/java/feast/serving/it/TransformationServiceIT.java b/java/serving/src/test/java/feast/serving/it/TransformationServiceIT.java
new file mode 100644
index 00000000000..102d8515285
--- /dev/null
+++ b/java/serving/src/test/java/feast/serving/it/TransformationServiceIT.java
@@ -0,0 +1,103 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright 2018-2022 The Feast Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package feast.serving.it;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Lists;
+import feast.proto.serving.ServingAPIProto;
+import feast.proto.types.ValueProto;
+import feast.serving.config.ApplicationProperties;
+import feast.serving.util.DataGenerator;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+public class TransformationServiceIT extends ServingEnvironment {
+ @Override
+ ApplicationProperties.FeastProperties createFeastProperties() {
+ ApplicationProperties.FeastProperties feastProperties =
+ TestUtils.createBasicFeastProperties(
+ environment.getServiceHost("redis", 6379), environment.getServicePort("redis", 6379));
+ feastProperties.setTransformationServiceEndpoint(
+ String.format(
+ "%s:%d",
+ environment.getServiceHost("feast", 8080), environment.getServicePort("feast", 8080)));
+ return feastProperties;
+ }
+
+ private ServingAPIProto.GetOnlineFeaturesRequest buildOnlineRequest(
+ int driverId, boolean transformedFeaturesOnly) {
+ Map entityRows =
+ ImmutableMap.of(
+ "driver_id",
+ ValueProto.RepeatedValue.newBuilder()
+ .addVal(DataGenerator.createInt64Value(driverId))
+ .build());
+
+ Map requestContext =
+ ImmutableMap.of(
+ "val_to_add",
+ ValueProto.RepeatedValue.newBuilder().addVal(DataGenerator.createInt64Value(3)).build(),
+ "val_to_add_2",
+ ValueProto.RepeatedValue.newBuilder()
+ .addVal(DataGenerator.createInt64Value(5))
+ .build());
+
+ List featureReferences =
+ Lists.newArrayList(
+ "transformed_conv_rate:conv_rate_plus_val1",
+ "transformed_conv_rate:conv_rate_plus_val2");
+
+ if (!transformedFeaturesOnly) {
+ featureReferences.add("driver_hourly_stats:conv_rate");
+ }
+
+ return TestUtils.createOnlineFeatureRequest(featureReferences, entityRows, requestContext);
+ }
+
+ @Test
+ public void shouldCalculateOnDemandFeatures() {
+ ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
+ servingStub.getOnlineFeatures(buildOnlineRequest(1005, false));
+
+ for (int featureIdx : List.of(0, 1, 2)) {
+ assertEquals(
+ List.of(ServingAPIProto.FieldStatus.PRESENT),
+ featureResponse.getResults(featureIdx).getStatusesList());
+ }
+
+ // conv_rate
+ assertEquals(0.5, featureResponse.getResults(0).getValues(0).getDoubleVal(), 0.0001);
+ // conv_rate + val_to_add (3.0)
+ assertEquals(3.5, featureResponse.getResults(1).getValues(0).getDoubleVal(), 0.0001);
+ // conv_rate + val_to_add_2 (5.0)
+ assertEquals(5.5, featureResponse.getResults(2).getValues(0).getDoubleVal(), 0.0001);
+ }
+
+ @Test
+ public void shouldCorrectlyFetchDependantFeatures() {
+ ServingAPIProto.GetOnlineFeaturesResponse featureResponse =
+ servingStub.getOnlineFeatures(buildOnlineRequest(1005, true));
+
+ // conv_rate + val_to_add (3.0)
+ assertEquals(3.5, featureResponse.getResults(0).getValues(0).getDoubleVal(), 0.0001);
+ // conv_rate + val_to_add_2 (5.0)
+ assertEquals(5.5, featureResponse.getResults(1).getValues(0).getDoubleVal(), 0.0001);
+ }
+}
diff --git a/java/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java b/java/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java
index c43e3218c7f..64d2e20c9b3 100644
--- a/java/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java
+++ b/java/serving/src/test/java/feast/serving/service/OnlineServingServiceTest.java
@@ -29,10 +29,8 @@
import feast.proto.core.FeatureProto;
import feast.proto.core.FeatureViewProto;
import feast.proto.serving.ServingAPIProto;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesRequestV2;
+import feast.proto.serving.ServingAPIProto.FieldStatus;
import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldStatus;
-import feast.proto.serving.ServingAPIProto.GetOnlineFeaturesResponse.FieldValues;
import feast.proto.types.ValueProto;
import feast.serving.registry.Registry;
import feast.serving.registry.RegistryRepository;
@@ -42,8 +40,9 @@
import io.opentracing.Tracer;
import io.opentracing.Tracer.SpanBuilder;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentMatchers;
@@ -62,6 +61,8 @@ public class OnlineServingServiceTest {
List mockedFeatureRows;
List featureSpecs;
+ Timestamp now = Timestamp.newBuilder().setSeconds(System.currentTimeMillis() / 1000).build();
+
@Before
public void setUp() {
initMocks(this);
@@ -71,56 +72,57 @@ public void setUp() {
OnlineTransformationService onlineTransformationService =
new OnlineTransformationService(transformationServiceEndpoint, registryRepo);
onlineServingServiceV2 =
- new OnlineServingServiceV2(retrieverV2, tracer, registryRepo, onlineTransformationService);
+ new OnlineServingServiceV2(
+ retrieverV2, tracer, registryRepo, onlineTransformationService, "feast_project");
mockedFeatureRows = new ArrayList<>();
mockedFeatureRows.add(
new ProtoFeature(
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_1")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_1")
.build(),
- Timestamp.newBuilder().setSeconds(100).build(),
+ now,
createStrValue("1")));
mockedFeatureRows.add(
new ProtoFeature(
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_2")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_2")
.build(),
- Timestamp.newBuilder().setSeconds(100).build(),
+ now,
createStrValue("2")));
mockedFeatureRows.add(
new ProtoFeature(
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_1")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_1")
.build(),
- Timestamp.newBuilder().setSeconds(100).build(),
+ now,
createStrValue("3")));
mockedFeatureRows.add(
new ProtoFeature(
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_2")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_2")
.build(),
- Timestamp.newBuilder().setSeconds(100).build(),
+ now,
createStrValue("4")));
mockedFeatureRows.add(
new ProtoFeature(
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_3")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_3")
.build(),
- Timestamp.newBuilder().setSeconds(100).build(),
+ now,
createStrValue("5")));
mockedFeatureRows.add(
new ProtoFeature(
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_1")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_1")
.build(),
- Timestamp.newBuilder().setSeconds(50).build(),
+ Timestamp.newBuilder().setSeconds(1).build(),
createStrValue("6")));
featureSpecs = new ArrayList<>();
@@ -141,66 +143,63 @@ public void shouldReturnResponseWithValuesAndMetadataIfKeysPresent() {
String projectName = "default";
ServingAPIProto.FeatureReferenceV2 featureReference1 =
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_1")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_1")
.build();
ServingAPIProto.FeatureReferenceV2 featureReference2 =
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_2")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_2")
.build();
List featureReferences =
List.of(featureReference1, featureReference2);
- GetOnlineFeaturesRequestV2 request = getOnlineFeaturesRequestV2(projectName, featureReferences);
+ ServingAPIProto.GetOnlineFeaturesRequest request = getOnlineFeaturesRequest(featureReferences);
- List> featureRows =
+ List> featureRows =
List.of(
- ImmutableMap.of(
- mockedFeatureRows.get(0).getFeatureReference(), mockedFeatureRows.get(0),
- mockedFeatureRows.get(1).getFeatureReference(), mockedFeatureRows.get(1)),
- ImmutableMap.of(
- mockedFeatureRows.get(2).getFeatureReference(), mockedFeatureRows.get(2),
- mockedFeatureRows.get(3).getFeatureReference(), mockedFeatureRows.get(3)));
+ List.of(mockedFeatureRows.get(0), mockedFeatureRows.get(1)),
+ List.of(mockedFeatureRows.get(2), mockedFeatureRows.get(3)));
- when(retrieverV2.getOnlineFeatures(any(), any(), any(), any())).thenReturn(featureRows);
- when(registry.getFeatureViewSpec(any(), any())).thenReturn(getFeatureViewSpec());
- when(registry.getFeatureSpec(projectName, mockedFeatureRows.get(0).getFeatureReference()))
+ when(retrieverV2.getOnlineFeatures(any(), any(), any())).thenReturn(featureRows);
+ when(registry.getFeatureViewSpec(any())).thenReturn(getFeatureViewSpec());
+ when(registry.getFeatureSpec(mockedFeatureRows.get(0).getFeatureReference()))
.thenReturn(featureSpecs.get(0));
- when(registry.getFeatureSpec(projectName, mockedFeatureRows.get(1).getFeatureReference()))
+ when(registry.getFeatureSpec(mockedFeatureRows.get(1).getFeatureReference()))
.thenReturn(featureSpecs.get(1));
- when(registry.getFeatureSpec(projectName, mockedFeatureRows.get(2).getFeatureReference()))
+ when(registry.getFeatureSpec(mockedFeatureRows.get(2).getFeatureReference()))
.thenReturn(featureSpecs.get(0));
- when(registry.getFeatureSpec(projectName, mockedFeatureRows.get(3).getFeatureReference()))
+ when(registry.getFeatureSpec(mockedFeatureRows.get(3).getFeatureReference()))
.thenReturn(featureSpecs.get(1));
when(tracer.buildSpan(ArgumentMatchers.any())).thenReturn(Mockito.mock(SpanBuilder.class));
GetOnlineFeaturesResponse expected =
GetOnlineFeaturesResponse.newBuilder()
- .addFieldValues(
- FieldValues.newBuilder()
- .putFields("entity1", createInt64Value(1))
- .putStatuses("entity1", FieldStatus.PRESENT)
- .putFields("entity2", createStrValue("a"))
- .putStatuses("entity2", FieldStatus.PRESENT)
- .putFields("featuretable_1:feature_1", createStrValue("1"))
- .putStatuses("featuretable_1:feature_1", FieldStatus.PRESENT)
- .putFields("featuretable_1:feature_2", createStrValue("2"))
- .putStatuses("featuretable_1:feature_2", FieldStatus.PRESENT)
- .build())
- .addFieldValues(
- FieldValues.newBuilder()
- .putFields("entity1", createInt64Value(2))
- .putStatuses("entity1", FieldStatus.PRESENT)
- .putFields("entity2", createStrValue("b"))
- .putStatuses("entity2", FieldStatus.PRESENT)
- .putFields("featuretable_1:feature_1", createStrValue("3"))
- .putStatuses("featuretable_1:feature_1", FieldStatus.PRESENT)
- .putFields("featuretable_1:feature_2", createStrValue("4"))
- .putStatuses("featuretable_1:feature_2", FieldStatus.PRESENT)
- .build())
+ .addResults(
+ GetOnlineFeaturesResponse.FeatureVector.newBuilder()
+ .addValues(createStrValue("1"))
+ .addValues(createStrValue("3"))
+ .addStatuses(FieldStatus.PRESENT)
+ .addStatuses(FieldStatus.PRESENT)
+ .addEventTimestamps(now)
+ .addEventTimestamps(now))
+ .addResults(
+ GetOnlineFeaturesResponse.FeatureVector.newBuilder()
+ .addValues(createStrValue("2"))
+ .addValues(createStrValue("4"))
+ .addStatuses(FieldStatus.PRESENT)
+ .addStatuses(FieldStatus.PRESENT)
+ .addEventTimestamps(now)
+ .addEventTimestamps(now))
+ .setMetadata(
+ ServingAPIProto.GetOnlineFeaturesResponseMetadata.newBuilder()
+ .setFeatureNames(
+ ServingAPIProto.FeatureList.newBuilder()
+ .addVal("featureview_1:feature_1")
+ .addVal("featureview_1:feature_2")))
.build();
- GetOnlineFeaturesResponse actual = onlineServingServiceV2.getOnlineFeatures(request);
+ ServingAPIProto.GetOnlineFeaturesResponse actual =
+ onlineServingServiceV2.getOnlineFeatures(request);
assertThat(actual, equalTo(expected));
}
@@ -209,17 +208,17 @@ public void shouldReturnResponseWithUnsetValuesAndMetadataIfKeysNotPresent() {
String projectName = "default";
ServingAPIProto.FeatureReferenceV2 featureReference1 =
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_1")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_1")
.build();
ServingAPIProto.FeatureReferenceV2 featureReference2 =
ServingAPIProto.FeatureReferenceV2.newBuilder()
- .setFeatureTable("featuretable_1")
- .setName("feature_2")
+ .setFeatureViewName("featureview_1")
+ .setFeatureName("feature_2")
.build();
List featureReferences =
List.of(featureReference1, featureReference2);
- GetOnlineFeaturesRequestV2 request = getOnlineFeaturesRequestV2(projectName, featureReferences);
+ ServingAPIProto.GetOnlineFeaturesRequest request = getOnlineFeaturesRequest(featureReferences);
List entityKeyList1 = new ArrayList<>();
List
+
-The above architecture is the minimal Feast deployment. Want to run the full Feast on GCP/AWS? Click [here](https://docs.feast.dev/how-to-guides/feast-gcp-aws).
+The above architecture is the minimal Feast deployment. Want to run the full Feast on Snowflake/GCP/AWS? Click [here](https://docs.feast.dev/how-to-guides/feast-snowflake-gcp-aws).
## 🐣 Getting Started
@@ -133,7 +133,7 @@ pprint(feature_vector)
Please refer to the official documentation at [Documentation](https://docs.feast.dev/)
* [Quickstart](https://docs.feast.dev/getting-started/quickstart)
* [Tutorials](https://docs.feast.dev/tutorials/tutorials-overview)
- * [Running Feast with GCP/AWS](https://docs.feast.dev/how-to-guides/feast-gcp-aws)
+ * [Running Feast with Snowflake/GCP/AWS](https://docs.feast.dev/how-to-guides/feast-snowflake-gcp-aws)
* [Change Log](https://github.com/feast-dev/feast/blob/master/CHANGELOG.md)
* [Slack (#Feast)](https://slack.feast.dev/)
diff --git a/java/CONTRIBUTING.md b/java/CONTRIBUTING.md
index 1694b3f33f9..86eacfef419 100644
--- a/java/CONTRIBUTING.md
+++ b/java/CONTRIBUTING.md
@@ -5,7 +5,6 @@
### Overview
This guide is targeted at developers looking to contribute to Feast components in
the feast-java Repository:
-- [Feast Core](#feast-core)
- [Feast Serving](#feast-serving)
- [Feast Java Client](#feast-java-client)
@@ -15,11 +14,14 @@ the feast-java Repository:
#### Common Setup
Common Environment Setup for all feast-java Feast components:
-1. . Ensure following development tools are installed:
-- Java SE Development Kit 11, Maven 3.6, `make`
+
+Ensure following development tools are installed:
+- Java SE Development Kit 11
+- Maven 3.6
+- `make`
#### Code Style
-feast-java's codebase conforms to the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).
+Feast's Java codebase conforms to the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).
Automatically format the code to conform the style guide by:
@@ -59,82 +61,8 @@ Specifically, proto-generated code is not indexed by IntelliJ. To fix this, navi
- target/generated-sources/protobuf/java
- target/generated-sources/annotations
-
-## Feast Core
-### Environment Setup
-Setting up your development environment for Feast Core:
-1. Complete the feast-java [Common Setup](#common-setup)
-2. Boot up a PostgreSQL instance (version 11 and above). Example of doing so via Docker:
-```sh
-# spawn a PostgreSQL instance as a Docker container running in the background
-docker run \
- --rm -it -d \
- --name postgres \
- -e POSTGRES_DB=postgres \
- -e POSTGRES_USER=postgres \
- -e POSTGRES_PASSWORD=password \
- -p 5432:5432 postgres:12-alpine
-```
-
-### Configuration
-Feast Core is configured using it's [application.yml](https://docs.feast.dev/reference/configuration-reference#1-feast-core-and-feast-online-serving).
-
-### Building and Running
-1. Build / Compile Feast Core with Maven to produce an executable Feast Core JAR
-```sh
-mvn package -pl core --also-make -Dmaven.test.skip=true
-```
-
-2. Run Feast Core using the built JAR:
-```sh
-# where X.X.X is the version of the Feast Core JAR built
-java -jar core/target/feast-core-X.X.X-exec.jar
-```
-
-### Unit / Integration Tests
-Unit & Integration Tests can be used to verify functionality:
-```sh
-# run unit tests
-mvn test -pl core --also-make
-# run integration tests
-mvn verify -pl core --also-make
-```
-
## Feast Serving
-### Environment Setup
-Setting up your development environment for Feast Serving:
-1. Complete the feast-java [Common Setup](#common-setup)
-2. Boot up a Redis instance (version 5.x). Example of doing so via Docker:
-```sh
-docker run --name redis --rm -it -d -p 6379:6379 redis:5-alpine
-```
-
-> Feast Serving requires a running Feast Core instance to retrieve Feature metadata
-> in order to serve features. See the [Feast Core section](#feast-core) for
-> how to get a Feast Core instance running.
-
-### Configuration
-Feast Serving is configured using it's [application.yml](https://docs.feast.dev/reference/configuration-reference#1-feast-core-and-feast-online-serving).
-
-### Building and Running
-1. Build / Compile Feast Serving with Maven to produce an executable Feast Serving JAR
-```sh
-mvn package -pl serving --also-make -Dmaven.test.skip=true
-
-2. Run Feast Serving using the built JAR:
-```sh
-# where X.X.X is the version of the Feast serving JAR built
-java -jar serving/target/feast-serving-X.X.X-exec.jar
-```
-
-### Unit / Integration Tests
-Unit & Integration Tests can be used to verify functionality:
-```sh
-# run unit tests
-mvn test -pl serving --also-make
-# run integration tests
-mvn verify -pl serving --also-make
-```
+See instructions [here](serving/README.md) for developing.
## Feast Java Client
### Environment Setup
@@ -144,9 +72,6 @@ Setting up your development environment for Feast Java SDK:
> Feast Java Client is a Java Client for retrieving Features from a running Feast Serving instance.
> See the [Feast Serving Section](#feast-serving) section for how to get a Feast Serving instance running.
-### Configuration
-Feast Java Client is [configured as code](https://docs.feast.dev/v/master/reference/configuration-reference#4-feast-java-and-go-sdk)
-
### Building
1. Build / Compile Feast Java Client with Maven:
diff --git a/java/README.md b/java/README.md
index 8d6141faa84..ff5a1b85539 100644
--- a/java/README.md
+++ b/java/README.md
@@ -1,5 +1,4 @@
# Feast Java components
-[](https://github.com/feast-dev/feast-java/actions/workflows/complete.yml)
### Overview
@@ -19,4 +18,4 @@ Guides on Contributing:
- [Development Guide for feast-java (this repository)](CONTRIBUTING.md)
### Installing using Helm
-Please see the Helm charts in [charts](https://github.com/feast-dev/feast-helm-charts).
+Please see the Helm charts in [infra/charts/feast](../infra/charts/feast).
diff --git a/java/common/pom.xml b/java/common/pom.xml
index 0c5651876ea..e5a648a7f95 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -33,13 +33,14 @@