Skip to content
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

Jump to bottom

Feature Table is not being update when only max_age was changed #1208

Merged
merged 2 commits into from
Dec 2, 2020
Merged

Feature Table is not being update when only max_age was changed #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0102b2
fix max age
pyalex Dec 1, 2020
1a4d38a
format
pyalex Dec 1, 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
2 changes: 1 addition & 1 deletion core/src/main/java/feast/core/model/FeatureTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ && getProject().equals(other.getProject())
&& getLabelsJSON().equals(other.getLabelsJSON())
&& getFeatures().equals(other.getFeatures())
&& getEntities().equals(other.getEntities())
&& getMaxAgeSecs() == getMaxAgeSecs()
&& getMaxAgeSecs() == other.getMaxAgeSecs()
&& Optional.ofNullable(getBatchSource()).equals(Optional.ofNullable(other.getBatchSource()))
&& Optional.ofNullable(getStreamSource())
.equals(Optional.ofNullable(other.getStreamSource()));
Expand Down
138 changes: 52 additions & 86 deletions core/src/test/java/feast/core/service/SpecServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import static org.junit.jupiter.api.Assertions.assertThrows;

import avro.shaded.com.google.common.collect.ImmutableMap;
import com.google.protobuf.Duration;
import feast.common.it.BaseIT;
import feast.common.it.DataGenerator;
import feast.common.it.SimpleCoreClient;
Expand All @@ -38,6 +39,7 @@
import io.grpc.ManagedChannelBuilder;
import io.grpc.StatusRuntimeException;
import java.util.*;
import java.util.stream.IntStream;
import org.apache.commons.lang3.tuple.Triple;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
Expand All @@ -61,6 +63,9 @@ public static void globalSetUp(@Value("${grpc.server.port}") int port) {
apiClient = new SimpleCoreClient(stub);
}

private FeatureTableProto.FeatureTableSpec example1;
private FeatureTableProto.FeatureTableSpec example2;

@BeforeEach
public void initState() {

Expand All @@ -78,8 +83,8 @@ public void initState() {
ImmutableMap.of("label_key2", "label_value2"));
apiClient.simpleApplyEntity("default", entitySpec1);
apiClient.simpleApplyEntity("default", entitySpec2);
apiClient.applyFeatureTable(
"default",

example1 =
DataGenerator.createFeatureTableSpec(
"featuretable1",
Arrays.asList("entity1", "entity2"),
Expand All @@ -94,9 +99,9 @@ public void initState() {
.toBuilder()
.setBatchSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.build());
apiClient.applyFeatureTable(
"default",
.build();

example2 =
DataGenerator.createFeatureTableSpec(
"featuretable2",
Arrays.asList("entity1", "entity2"),
Expand All @@ -111,7 +116,10 @@ public void initState() {
.toBuilder()
.setBatchSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.build());
.build();

apiClient.applyFeatureTable("default", example1);
apiClient.applyFeatureTable("default", example2);
apiClient.simpleApplyEntity(
"project1",
DataGenerator.createEntitySpecV2(
Expand Down Expand Up @@ -422,26 +430,10 @@ public void shouldThrowExceptionGivenNoSuchFeatureTable() {

@Test
public void shouldReturnFeatureTableIfExists() {
FeatureTableSpec featureTableSpec =
DataGenerator.createFeatureTableSpec(
"featuretable1",
Arrays.asList("entity1", "entity2"),
new HashMap<>() {
{
put("feature1", ValueProto.ValueType.Enum.STRING);
put("feature2", ValueProto.ValueType.Enum.FLOAT);
}
},
7200,
ImmutableMap.of("feat_key2", "feat_value2"))
.toBuilder()
.setBatchSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.build();
FeatureTableProto.FeatureTable featureTable =
apiClient.simpleGetFeatureTable("default", "featuretable1");

assertTrue(TestUtil.compareFeatureTableSpec(featureTable.getSpec(), featureTableSpec));
assertTrue(TestUtil.compareFeatureTableSpec(featureTable.getSpec(), example1));
}
}

Expand Down Expand Up @@ -544,17 +536,9 @@ public void shouldFilterFeaturesByEntitiesAndLabels() {
@Nested
public class ApplyFeatureTable {
private FeatureTableSpec getTestSpec() {
return DataGenerator.createFeatureTableSpec(
"ft",
List.of("entity1", "entity2"),
Map.of(
"feature1", ValueProto.ValueType.Enum.INT64,
"feature2", ValueProto.ValueType.Enum.FLOAT),
3600,
Map.of())
return example1
.toBuilder()
.setBatchSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.setName("apply_test")
.setStreamSource(
DataGenerator.createKafkaDataSourceSpec(
"localhost:9092", "topic", "class.path", "ts_col"))
Expand All @@ -574,22 +558,17 @@ public void shouldUpdateExistingTableWithValidSpec() {
FeatureTableProto.FeatureTable table = apiClient.applyFeatureTable("default", getTestSpec());

FeatureTableSpec updatedSpec =
DataGenerator.createFeatureTableSpec(
"ft",
List.of("entity1", "entity2"),
Map.of(
"feature2", ValueProto.ValueType.Enum.FLOAT,
"feature3", ValueProto.ValueType.Enum.INT64,
"feature4", ValueProto.ValueType.Enum.INT64),
2100,
Map.of("test", "labels"))
getTestSpec()
.toBuilder()
.clearFeatures()
.addFeatures(
DataGenerator.createFeatureSpecV2(
"feature5", ValueProto.ValueType.Enum.FLOAT, ImmutableMap.of()))
.setStreamSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.setBatchSource(
DataGenerator.createKafkaDataSourceSpec(
"localhost:9092", "topic", "class.path", "ts_col"))
"localhost:9092", "new_topic", "new.class", "ts_col"))
.build();

FeatureTableProto.FeatureTable updatedTable =
apiClient.applyFeatureTable("default", updatedSpec);

Expand All @@ -599,22 +578,21 @@ public void shouldUpdateExistingTableWithValidSpec() {

@Test
public void shouldUpdateFeatureTableOnEntityChange() {
List<String> entities = Arrays.asList("entity1", "entity2");
FeatureTableProto.FeatureTableSpec updatedSpec =
DataGenerator.createFeatureTableSpec(
"featuretable1",
Arrays.asList("entity1"),
new HashMap<>() {
{
put("feature1", ValueProto.ValueType.Enum.STRING);
put("feature2", ValueProto.ValueType.Enum.FLOAT);
}
},
7200,
ImmutableMap.of("feat_key2", "feat_value2"))
getTestSpec().toBuilder().clearEntities().addEntities("entity1").build();

FeatureTableProto.FeatureTable updatedTable =
apiClient.applyFeatureTable("default", updatedSpec);

assertTrue(TestUtil.compareFeatureTableSpec(updatedTable.getSpec(), updatedSpec));
}

@Test
public void shouldUpdateFeatureTableOnMaxAgeChange() {
FeatureTableProto.FeatureTableSpec updatedSpec =
getTestSpec()
.toBuilder()
.setBatchSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.setMaxAge(Duration.newBuilder().setSeconds(600).build())
.build();

FeatureTableProto.FeatureTable updatedTable =
Expand All @@ -625,21 +603,19 @@ public void shouldUpdateFeatureTableOnEntityChange() {

@Test
public void shouldUpdateFeatureTableOnFeatureTypeChange() {
int featureIdx =
IntStream.range(0, getTestSpec().getFeaturesCount())
.filter(i -> getTestSpec().getFeatures(i).getName().equals("feature2"))
.findFirst()
.orElse(-1);

FeatureTableProto.FeatureTableSpec updatedSpec =
DataGenerator.createFeatureTableSpec(
"featuretable1",
Arrays.asList("entity1", "entity2"),
new HashMap<>() {
{
put("feature1", ValueProto.ValueType.Enum.STRING);
put("feature2", ValueProto.ValueType.Enum.STRING_LIST);
}
},
7200,
ImmutableMap.of("feat_key2", "feat_value2"))
getTestSpec()
.toBuilder()
.setBatchSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.setFeatures(
featureIdx,
DataGenerator.createFeatureSpecV2(
"feature2", ValueProto.ValueType.Enum.STRING_LIST, ImmutableMap.of()))
.build();

FeatureTableProto.FeatureTable updatedTable =
Expand All @@ -651,21 +627,11 @@ public void shouldUpdateFeatureTableOnFeatureTypeChange() {
@Test
public void shouldUpdateFeatureTableOnFeatureAddition() {
FeatureTableProto.FeatureTableSpec updatedSpec =
DataGenerator.createFeatureTableSpec(
"featuretable1",
Arrays.asList("entity1", "entity2"),
new HashMap<>() {
{
put("feature1", ValueProto.ValueType.Enum.STRING);
put("feature2", ValueProto.ValueType.Enum.FLOAT);
put("feature3", ValueProto.ValueType.Enum.FLOAT);
}
},
7200,
ImmutableMap.of("feat_key2", "feat_value2"))
getTestSpec()
.toBuilder()
.setBatchSource(
DataGenerator.createFileDataSourceSpec("file:///path/to/file", "ts_col", ""))
.addFeatures(
DataGenerator.createFeatureSpecV2(
"feature6", ValueProto.ValueType.Enum.FLOAT, ImmutableMap.of()))
.build();

FeatureTableProto.FeatureTable updatedTable =
Expand Down