Skip to content

Delete v1 concepts #1194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feast-ci-bot merged 13 commits into from
Nov 26, 2020
Merged

Delete v1 concepts #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8af29f1
Cleanup common module
terryyylim Nov 24, 2020
3d75d3b
Cleanup core module
terryyylim Nov 24, 2020
a01e6a4
Cleanup staging module
terryyylim Nov 24, 2020
4442816
Cleanup storage module
terryyylim Nov 24, 2020
8018198
Cleanup comments and tests
terryyylim Nov 24, 2020
bc0587f
Cleanup common-test and python sdk
terryyylim Nov 24, 2020
fdfb70d
Remove models in core
terryyylim Nov 24, 2020
4251383
Cleanup protos and db migration
terryyylim Nov 24, 2020
ccf807c
Fix test
terryyylim Nov 24, 2020
abc5bd4
Fix test
terryyylim Nov 24, 2020
a3ad79e
Update golang protos
terryyylim Nov 24, 2020
945a078
Update go-mod go-sum
terryyylim Nov 24, 2020
0426fae
Revert table removal in database
terryyylim Nov 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions common-test/src/main/java/feast/common/it/DataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import feast.proto.core.FeatureProto;
import feast.proto.core.FeatureProto.FeatureSpecV2;
import feast.proto.core.FeatureTableProto.FeatureTableSpec;
import feast.proto.core.SourceProto;
import feast.proto.core.StoreProto;
import feast.proto.serving.ServingAPIProto;
import feast.proto.types.ValueProto;
Expand All @@ -50,8 +49,6 @@ public class DataGenerator {
createStore(
"test-store", StoreProto.Store.StoreType.REDIS, ImmutableList.of(defaultSubscription));

static SourceProto.Source defaultSource = createSource("localhost", "topic");

public static Triple<String, String, Boolean> getDefaultSubscription() {
return defaultSubscription;
}
Expand All @@ -60,21 +57,6 @@ public static StoreProto.Store getDefaultStore() {
return defaultStore;
}

public static SourceProto.Source getDefaultSource() {
return defaultSource;
}

public static SourceProto.Source createSource(String server, String topic) {
return SourceProto.Source.newBuilder()
.setType(SourceProto.SourceType.KAFKA)
.setKafkaSourceConfig(
SourceProto.KafkaSourceConfig.newBuilder()
.setBootstrapServers(server)
.setTopic(topic)
.build())
.build();
}

public static StoreProto.Store createStore(
String name,
StoreProto.Store.StoreType type,
Expand Down
55 changes: 0 additions & 55 deletions common/src/main/java/feast/common/models/Feature.java
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions common/src/main/java/feast/common/models/FeatureSet.java
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions common/src/main/java/feast/common/models/FeatureSetReference.java
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions core/src/main/java/feast/core/config/FeatureStreamConfig.java
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions core/src/main/java/feast/core/config/MonitoringConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package feast.core.config;

import feast.core.dao.FeatureSetRepository;
import feast.core.dao.FeatureTableRepository;
import feast.core.dao.StoreRepository;
import feast.core.metrics.collector.FeastResourceCollector;
import feast.core.metrics.collector.JVMResourceCollector;
Expand Down Expand Up @@ -47,18 +47,18 @@ public ServletRegistrationBean<HttpServlet> metricsServlet() {
/**
* Register custom Prometheus collector that exports metrics about Feast Resources.
*
* <p>For example: total number of registered feature sets and stores.
* <p>For example: total number of registered feature tables and stores.
*
* @param featureSetRepository {@link FeatureSetRepository}
* @param featureTableRepository {@link FeatureTableRepository}
* @param storeRepository {@link StoreRepository}
* @return {@link FeastResourceCollector}
*/
@Bean
@Autowired
public FeastResourceCollector feastResourceCollector(
FeatureSetRepository featureSetRepository, StoreRepository storeRepository) {
FeatureTableRepository featureTableRepository, StoreRepository storeRepository) {
FeastResourceCollector collector =
new FeastResourceCollector(featureSetRepository, storeRepository);
new FeastResourceCollector(featureTableRepository, storeRepository);
collector.register();
return collector;
}
Expand Down
42 changes: 3 additions & 39 deletions core/src/main/java/feast/core/controller/CoreServiceRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,18 @@
*/
package feast.core.controller;

import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.Timestamp;
import feast.core.config.FeastProperties;
import feast.core.model.Project;
import feast.core.service.ProjectService;
import feast.core.service.SpecService;
import feast.proto.core.CoreServiceProto.GetFeastCoreVersionResponse;
import feast.proto.core.CoreServiceProto.ListEntitiesRequest;
import feast.proto.core.CoreServiceProto.ListEntitiesResponse;
import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest;
import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse;
import feast.proto.core.CoreServiceProto.ListFeatureTablesRequest;
import feast.proto.core.CoreServiceProto.ListFeatureTablesResponse;
import feast.proto.core.CoreServiceProto.ListFeaturesRequest;
import feast.proto.core.CoreServiceProto.ListFeaturesResponse;
import feast.proto.core.CoreServiceProto.ListProjectsResponse;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
Expand Down Expand Up @@ -74,42 +66,21 @@ public CoreServiceRestController(
*
* @return (200 OK) Returns {@link GetFeastCoreVersionResponse} in JSON.
*/
@RequestMapping(value = "/v1/version", method = RequestMethod.GET)
@RequestMapping(value = "/v2/version", method = RequestMethod.GET)
public GetFeastCoreVersionResponse getVersion() {
GetFeastCoreVersionResponse response =
GetFeastCoreVersionResponse.newBuilder().setVersion(feastProperties.getVersion()).build();
return response;
}

/**
* GET /feature-sets : Retrieve a list of Feature Sets according to filtering parameters of Feast
* project name and feature set name. If none matches, an empty JSON response is returned.
*
* @param project Request Parameter: Name of feast project to search in. If set to <code>"*"
* </code>, all existing projects will be filtered. However, asterisk can NOT be
* combined with other strings (for example <code>"merchant_*"</code>) to use as wildcard to
* filter feature sets.
* @param name Request Parameter: Feature set name. If set to "*", filter * all feature sets by
* default. Asterisk can be used as wildcard to filter * feature sets.
* @return (200 OK) Return {@link ListFeatureSetsResponse} in JSON.
*/
@RequestMapping(value = "/v1/feature-sets", method = RequestMethod.GET)
public ListFeatureSetsResponse listFeatureSets(
@RequestParam(defaultValue = Project.DEFAULT_NAME) String project, @RequestParam String name)
throws InvalidProtocolBufferException {
ListFeatureSetsRequest.Filter.Builder filterBuilder =
ListFeatureSetsRequest.Filter.newBuilder().setProject(project).setFeatureSetName(name);
return specService.listFeatureSets(filterBuilder.build());
}

/**
* GET /features : List Features based on project and entities.
*
* @param entities Request Parameter: List of all entities every returned feature should belong
* to. At least one entity is required. For example, if <code>entity1</code> and <code>entity2
* </code> are given, then all features returned (if any) will belong to BOTH
* entities.
* @param project (Optional) Request Parameter: A single project where the feature set of all
* @param project (Optional) Request Parameter: A single project where the feature table of all
* features returned is under. If not provided, the default project will be used, usually
* <code>default</code>.
* @return (200 OK) Return {@link ListFeaturesResponse} in JSON.
Expand All @@ -128,7 +99,7 @@ public ListFeaturesResponse listFeatures(
*
* @return (200 OK) Returns {@link ListProjectsResponse} in JSON.
*/
@RequestMapping(value = "/v1/projects", method = RequestMethod.GET)
@RequestMapping(value = "/v2/projects", method = RequestMethod.GET)
public ListProjectsResponse listProjects() {
List<Project> projects = projectService.listProjects();
return ListProjectsResponse.newBuilder()
Expand Down Expand Up @@ -165,11 +136,4 @@ public ListFeatureTablesResponse listFeatureTables(
ListFeatureTablesRequest.Filter.newBuilder().setProject(project);
return specService.listFeatureTables(filterBuilder.build());
}

private Timestamp utcTimeStringToTimestamp(String utcTimeString) {
long epochSecond =
LocalDate.parse(utcTimeString, DateTimeFormatter.ISO_DATE)
.toEpochSecond(LocalTime.MIN, ZoneOffset.UTC);
return Timestamp.newBuilder().setSeconds(epochSecond).setNanos(0).build();
}
}
Loading