Skip to content

Commit 6583d72

Browse files
terryyylimterryyylim
authored
Delete v1 concepts (feast-dev#1194)
* Cleanup common module Signed-off-by: Terence <terencelimxp@gmail.com> * Cleanup core module Signed-off-by: Terence <terencelimxp@gmail.com> * Cleanup staging module Signed-off-by: Terence <terencelimxp@gmail.com> * Cleanup storage module Signed-off-by: Terence <terencelimxp@gmail.com> * Cleanup comments and tests Signed-off-by: Terence <terencelimxp@gmail.com> * Cleanup common-test and python sdk Signed-off-by: Terence <terencelimxp@gmail.com> * Remove models in core Signed-off-by: Terence <terencelimxp@gmail.com> * Cleanup protos and db migration Signed-off-by: Terence <terencelimxp@gmail.com> * Fix test Signed-off-by: Terence <terencelimxp@gmail.com> * Fix test Signed-off-by: Terence <terencelimxp@gmail.com> * Update golang protos Signed-off-by: Terence <terencelimxp@gmail.com> * Update go-mod go-sum Signed-off-by: Terence <terencelimxp@gmail.com> * Revert table removal in database Signed-off-by: Terence <terencelimxp@gmail.com>
1 parent 542e7d7 commit 6583d72

77 files changed

Lines changed: 2865 additions & 9063 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common-test/src/main/java/feast/common/it/DataGenerator.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import feast.proto.core.FeatureProto;
3434
import feast.proto.core.FeatureProto.FeatureSpecV2;
3535
import feast.proto.core.FeatureTableProto.FeatureTableSpec;
36-
import feast.proto.core.SourceProto;
3736
import feast.proto.core.StoreProto;
3837
import feast.proto.serving.ServingAPIProto;
3938
import feast.proto.types.ValueProto;
@@ -50,8 +49,6 @@ public class DataGenerator {
5049
createStore(
5150
"test-store", StoreProto.Store.StoreType.REDIS, ImmutableList.of(defaultSubscription));
5251

53-
static SourceProto.Source defaultSource = createSource("localhost", "topic");
54-
5552
public static Triple<String, String, Boolean> getDefaultSubscription() {
5653
return defaultSubscription;
5754
}
@@ -60,21 +57,6 @@ public static StoreProto.Store getDefaultStore() {
6057
return defaultStore;
6158
}
6259

63-
public static SourceProto.Source getDefaultSource() {
64-
return defaultSource;
65-
}
66-
67-
public static SourceProto.Source createSource(String server, String topic) {
68-
return SourceProto.Source.newBuilder()
69-
.setType(SourceProto.SourceType.KAFKA)
70-
.setKafkaSourceConfig(
71-
SourceProto.KafkaSourceConfig.newBuilder()
72-
.setBootstrapServers(server)
73-
.setTopic(topic)
74-
.build())
75-
.build();
76-
}
77-
7860
public static StoreProto.Store createStore(
7961
String name,
8062
StoreProto.Store.StoreType type,

‎common/src/main/java/feast/common/models/Feature.java‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎common/src/main/java/feast/common/models/FeatureSet.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎common/src/main/java/feast/common/models/FeatureSetReference.java‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎core/src/main/java/feast/core/config/FeatureStreamConfig.java‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎core/src/main/java/feast/core/config/MonitoringConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package feast.core.config;
1818

19-
import feast.core.dao.FeatureSetRepository;
19+
import feast.core.dao.FeatureTableRepository;
2020
import feast.core.dao.StoreRepository;
2121
import feast.core.metrics.collector.FeastResourceCollector;
2222
import feast.core.metrics.collector.JVMResourceCollector;
@@ -47,18 +47,18 @@ public ServletRegistrationBean<HttpServlet> metricsServlet() {
4747
/**
4848
* Register custom Prometheus collector that exports metrics about Feast Resources.
4949
*
50-
* <p>For example: total number of registered feature sets and stores.
50+
* <p>For example: total number of registered feature tables and stores.
5151
*
52-
* @param featureSetRepository {@link FeatureSetRepository}
52+
* @param featureTableRepository {@link FeatureTableRepository}
5353
* @param storeRepository {@link StoreRepository}
5454
* @return {@link FeastResourceCollector}
5555
*/
5656
@Bean
5757
@Autowired
5858
public FeastResourceCollector feastResourceCollector(
59-
FeatureSetRepository featureSetRepository, StoreRepository storeRepository) {
59+
FeatureTableRepository featureTableRepository, StoreRepository storeRepository) {
6060
FeastResourceCollector collector =
61-
new FeastResourceCollector(featureSetRepository, storeRepository);
61+
new FeastResourceCollector(featureTableRepository, storeRepository);
6262
collector.register();
6363
return collector;
6464
}

‎core/src/main/java/feast/core/controller/CoreServiceRestController.java‎

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,18 @@
1616
*/
1717
package feast.core.controller;
1818

19-
import com.google.protobuf.InvalidProtocolBufferException;
20-
import com.google.protobuf.Timestamp;
2119
import feast.core.config.FeastProperties;
2220
import feast.core.model.Project;
2321
import feast.core.service.ProjectService;
2422
import feast.core.service.SpecService;
2523
import feast.proto.core.CoreServiceProto.GetFeastCoreVersionResponse;
2624
import feast.proto.core.CoreServiceProto.ListEntitiesRequest;
2725
import feast.proto.core.CoreServiceProto.ListEntitiesResponse;
28-
import feast.proto.core.CoreServiceProto.ListFeatureSetsRequest;
29-
import feast.proto.core.CoreServiceProto.ListFeatureSetsResponse;
3026
import feast.proto.core.CoreServiceProto.ListFeatureTablesRequest;
3127
import feast.proto.core.CoreServiceProto.ListFeatureTablesResponse;
3228
import feast.proto.core.CoreServiceProto.ListFeaturesRequest;
3329
import feast.proto.core.CoreServiceProto.ListFeaturesResponse;
3430
import feast.proto.core.CoreServiceProto.ListProjectsResponse;
35-
import java.time.LocalDate;
36-
import java.time.LocalTime;
37-
import java.time.ZoneOffset;
38-
import java.time.format.DateTimeFormatter;
3931
import java.util.Arrays;
4032
import java.util.List;
4133
import java.util.Optional;
@@ -74,42 +66,21 @@ public CoreServiceRestController(
7466
*
7567
* @return (200 OK) Returns {@link GetFeastCoreVersionResponse} in JSON.
7668
*/
77-
@RequestMapping(value = "/v1/version", method = RequestMethod.GET)
69+
@RequestMapping(value = "/v2/version", method = RequestMethod.GET)
7870
public GetFeastCoreVersionResponse getVersion() {
7971
GetFeastCoreVersionResponse response =
8072
GetFeastCoreVersionResponse.newBuilder().setVersion(feastProperties.getVersion()).build();
8173
return response;
8274
}
8375

84-
/**
85-
* GET /feature-sets : Retrieve a list of Feature Sets according to filtering parameters of Feast
86-
* project name and feature set name. If none matches, an empty JSON response is returned.
87-
*
88-
* @param project Request Parameter: Name of feast project to search in. If set to <code>"*"
89-
* </code>, all existing projects will be filtered. However, asterisk can NOT be
90-
* combined with other strings (for example <code>"merchant_*"</code>) to use as wildcard to
91-
* filter feature sets.
92-
* @param name Request Parameter: Feature set name. If set to "*", filter * all feature sets by
93-
* default. Asterisk can be used as wildcard to filter * feature sets.
94-
* @return (200 OK) Return {@link ListFeatureSetsResponse} in JSON.
95-
*/
96-
@RequestMapping(value = "/v1/feature-sets", method = RequestMethod.GET)
97-
public ListFeatureSetsResponse listFeatureSets(
98-
@RequestParam(defaultValue = Project.DEFAULT_NAME) String project, @RequestParam String name)
99-
throws InvalidProtocolBufferException {
100-
ListFeatureSetsRequest.Filter.Builder filterBuilder =
101-
ListFeatureSetsRequest.Filter.newBuilder().setProject(project).setFeatureSetName(name);
102-
return specService.listFeatureSets(filterBuilder.build());
103-
}
104-
10576
/**
10677
* GET /features : List Features based on project and entities.
10778
*
10879
* @param entities Request Parameter: List of all entities every returned feature should belong
10980
* to. At least one entity is required. For example, if <code>entity1</code> and <code>entity2
11081
* </code> are given, then all features returned (if any) will belong to BOTH
11182
* entities.
112-
* @param project (Optional) Request Parameter: A single project where the feature set of all
83+
* @param project (Optional) Request Parameter: A single project where the feature table of all
11384
* features returned is under. If not provided, the default project will be used, usually
11485
* <code>default</code>.
11586
* @return (200 OK) Return {@link ListFeaturesResponse} in JSON.
@@ -128,7 +99,7 @@ public ListFeaturesResponse listFeatures(
12899
*
129100
* @return (200 OK) Returns {@link ListProjectsResponse} in JSON.
130101
*/
131-
@RequestMapping(value = "/v1/projects", method = RequestMethod.GET)
102+
@RequestMapping(value = "/v2/projects", method = RequestMethod.GET)
132103
public ListProjectsResponse listProjects() {
133104
List<Project> projects = projectService.listProjects();
134105
return ListProjectsResponse.newBuilder()
@@ -165,11 +136,4 @@ public ListFeatureTablesResponse listFeatureTables(
165136
ListFeatureTablesRequest.Filter.newBuilder().setProject(project);
166137
return specService.listFeatureTables(filterBuilder.build());
167138
}
168-
169-
private Timestamp utcTimeStringToTimestamp(String utcTimeString) {
170-
long epochSecond =
171-
LocalDate.parse(utcTimeString, DateTimeFormatter.ISO_DATE)
172-
.toEpochSecond(LocalTime.MIN, ZoneOffset.UTC);
173-
return Timestamp.newBuilder().setSeconds(epochSecond).setNanos(0).build();
174-
}
175139
}

0 commit comments

Comments
 (0)