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

Change register to apply #4

Merged
merged 6 commits into from
Dec 13, 2018
Merged

Change register to apply #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4337787
Add eq functions for checking diff between specs
Dec 11, 2018
3fb8581
Add apply functions to core service
Dec 12, 2018
5eb5c1d
Update go package to reflect new repository
Dec 12, 2018
3443bae
Change register command to apply
Dec 12, 2018
0c66305
Create audit log objects
Dec 12, 2018
f878d3f
Clean up update code
Dec 13, 2018
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: 9 additions & 9 deletions core/src/main/java/feast/core/grpc/CoreServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,16 @@ public void registerFeature(
FeatureSpec request, StreamObserver<RegisterFeatureResponse> responseObserver) {
try {
validator.validateFeatureSpec(request);
FeatureInfo feature = specService.registerFeature(request);
FeatureInfo feature = specService.applyFeature(request);
RegisterFeatureResponse response =
RegisterFeatureResponse.newBuilder().setFeatureId(feature.getId()).build();
responseObserver.onNext(response);
responseObserver.onCompleted();
} catch (RegistrationException e) {
log.error("Error in registerFeature: {}", e);
log.error("Error in applyFeature: {}", e);
responseObserver.onError(getRuntimeException(e));
} catch (IllegalArgumentException e) {
log.error("Error in registerFeature: {}", e);
log.error("Error in applyFeature: {}", e);
responseObserver.onError(getBadRequestException(e));
}
}
Expand All @@ -262,16 +262,16 @@ public void registerFeatureGroup(
StreamObserver<RegisterFeatureGroupResponse> responseObserver) {
try {
validator.validateFeatureGroupSpec(request);
FeatureGroupInfo featureGroup = specService.registerFeatureGroup(request);
FeatureGroupInfo featureGroup = specService.applyFeatureGroup(request);
RegisterFeatureGroupResponse response =
RegisterFeatureGroupResponse.newBuilder().setFeatureGroupId(featureGroup.getId()).build();
responseObserver.onNext(response);
responseObserver.onCompleted();
} catch (RegistrationException e) {
log.error("Error in registerFeatureGroup: {}", e);
log.error("Error in applyFeatureGroup: {}", e);
responseObserver.onError(getRuntimeException(e));
} catch (IllegalArgumentException e) {
log.error("Error in registerFeatureGroup: {}", e);
log.error("Error in applyFeatureGroup: {}", e);
responseObserver.onError(getBadRequestException(e));
}
}
Expand All @@ -286,16 +286,16 @@ public void registerEntity(
EntitySpec request, StreamObserver<RegisterEntityResponse> responseObserver) {
try {
validator.validateEntitySpec(request);
EntityInfo entity = specService.registerEntity(request);
EntityInfo entity = specService.applyEntity(request);
RegisterEntityResponse response =
RegisterEntityResponse.newBuilder().setEntityName(entity.getName()).build();
responseObserver.onNext(response);
responseObserver.onCompleted();
} catch (RegistrationException e) {
log.error("Error in registerEntity: {}", e);
log.error("Error in applyEntity: {}", e);
responseObserver.onError(getRuntimeException(e));
} catch (IllegalArgumentException e) {
log.error("Error in registerEntity: {}", e);
log.error("Error in applyEntity: {}", e);
responseObserver.onError(getBadRequestException(e));
}
}
Expand Down
13 changes: 6 additions & 7 deletions core/src/main/java/feast/core/model/EntityInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,13 @@ public EntityDetail getEntityDetail() {
}

/**
* Checks if this is eq to the other given entity
* Updates the entity info with specifications from the incoming entity spec.
*
* @param otherEntity
* @return boolean
* @param update new entity spec
*/
public boolean eq(EntityInfo otherEntity) {
return otherEntity.getName().equals(this.getName()) &&
otherEntity.getDescription().equals(this.getDescription()) &&
otherEntity.getTags().equals(this.getTags());
public void update(EntitySpec update) {
this.description = update.getDescription();
this.tags = String.join(",", update.getTagsList());
}

}
96 changes: 51 additions & 45 deletions core/src/main/java/feast/core/model/FeatureGroupInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

package feast.core.model;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import feast.core.UIServiceProto.UIServiceTypes.FeatureGroupDetail;
import feast.core.util.TypeConversion;
import feast.specs.FeatureGroupSpecProto.FeatureGroupSpec;
import feast.specs.FeatureSpecProto.DataStore;
import feast.specs.FeatureSpecProto.DataStores;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;

import javax.persistence.*;

Expand All @@ -39,8 +39,7 @@
@Table(name = "feature_groups")
public class FeatureGroupInfo extends AbstractTimestampEntity {

@Id
private String id;
@Id private String id;

@Column(name = "tags")
private String tags;
Expand All @@ -63,68 +62,75 @@ public FeatureGroupInfo() {
super();
}

public FeatureGroupInfo(FeatureGroupSpec spec,
StorageInfo servingStore,
StorageInfo warehouseStore) {
public FeatureGroupInfo(
FeatureGroupSpec spec, StorageInfo servingStore, StorageInfo warehouseStore) {
this.id = spec.getId();
this.tags = String.join(",", spec.getTagsList());
this.servingStore = servingStore;
this.warehouseStore = warehouseStore;
this.servingStoreOpts =
TypeConversion.convertMapToJsonString(spec.getDataStores().getServing().getOptionsMap());
TypeConversion.convertMapToJsonString(spec.getDataStores().getServing().getOptionsMap());
this.warehouseStoreOpts =
TypeConversion.convertMapToJsonString(spec.getDataStores().getWarehouse().getOptionsMap());
TypeConversion.convertMapToJsonString(spec.getDataStores().getWarehouse().getOptionsMap());
}

/**
* Get the feature group spec associated with this record.
*/
/** Get the feature group spec associated with this record. */
public FeatureGroupSpec getFeatureGroupSpec() {
DataStore servingDataStore =
DataStore.newBuilder()
.setId(servingStore.getId())
.putAllOptions(TypeConversion.convertJsonStringToMap(servingStoreOpts))
.build();
DataStore.newBuilder()
.setId(servingStore.getId())
.putAllOptions(TypeConversion.convertJsonStringToMap(servingStoreOpts))
.build();
DataStore warehouseDataStore =
DataStore.newBuilder()
.setId(warehouseStore.getId())
.putAllOptions(TypeConversion.convertJsonStringToMap(warehouseStoreOpts))
.build();
DataStore.newBuilder()
.setId(warehouseStore.getId())
.putAllOptions(TypeConversion.convertJsonStringToMap(warehouseStoreOpts))
.build();
DataStores dataStores =
DataStores.newBuilder()
.setWarehouse(warehouseDataStore)
.setServing(servingDataStore)
.build();
return FeatureGroupSpec.newBuilder()
.setId(id)
.addAllTags(TypeConversion.convertTagStringToList(tags))
.setDataStores(dataStores)
DataStores.newBuilder()
.setWarehouse(warehouseDataStore)
.setServing(servingDataStore)
.build();
return FeatureGroupSpec.newBuilder()
.setId(id)
.addAllTags(TypeConversion.convertTagStringToList(tags))
.setDataStores(dataStores)
.build();
}

/**
* Get the feature group detail containing both spec and metadata, associated with this record.
*/
public FeatureGroupDetail getFeatureGroupDetail() {
return FeatureGroupDetail.newBuilder()
.setSpec(this.getFeatureGroupSpec())
.setLastUpdated(TypeConversion.convertTimestamp(this.getLastUpdated()))
.build();
.setSpec(this.getFeatureGroupSpec())
.setLastUpdated(TypeConversion.convertTimestamp(this.getLastUpdated()))
.build();
}

/**
* Checks if this is eq to the other given feature group
*
* @param otherFeatureGroup
* @return boolean
*/
public boolean eq(FeatureGroupInfo otherFeatureGroup) {
return otherFeatureGroup.getId() == this.id &&
otherFeatureGroup.getTags() == this.getTags() &&
otherFeatureGroup.getServingStoreOpts() == this.servingStoreOpts &&
getStorageId(otherFeatureGroup.getServingStore()) == getStorageId(this.getServingStore()) &&
otherFeatureGroup.getWarehouseStoreOpts() == this.warehouseStoreOpts &&
getStorageId(otherFeatureGroup.getWarehouseStore()) == getStorageId(this.getWarehouseStore());
public void update(FeatureGroupSpec update) throws IllegalArgumentException {
if (!isLegalUpdate(update)) {
throw new IllegalArgumentException(
"Feature group already exists. Update only allowed for fields: [tags]");
}
this.tags = String.join(",", update.getTagsList());
}

private boolean isLegalUpdate(FeatureGroupSpec update) {
DataStore updatedWarehouseStore =
update.getDataStores().hasWarehouse() ? update.getDataStores().getWarehouse() : null;
DataStore updatedServingStore =
update.getDataStores().hasServing() ? update.getDataStores().getServing() : null;
return isStoreEqual(this.warehouseStore, this.warehouseStoreOpts, updatedWarehouseStore)
&& isStoreEqual(this.servingStore, this.servingStoreOpts, updatedServingStore);
}

private boolean isStoreEqual(StorageInfo oldStore, String oldStoreOpts, DataStore newStore) {
return getStorageId(oldStore).equals(newStore == null ? "" : newStore.getId())
&& oldStoreOpts.equals(
newStore == null
? ""
: TypeConversion.convertMapToJsonString(newStore.getOptionsMap()));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need to have oldStoreOpts here? Can this also be a method on StorageInfo?

}

private String getStorageId(StorageInfo storage) {
Expand Down
64 changes: 40 additions & 24 deletions core/src/main/java/feast/core/model/FeatureInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package feast.core.model;

import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import feast.core.UIServiceProto.UIServiceTypes.FeatureDetail;
import feast.core.storage.BigQueryStorageManager;
import feast.core.util.TypeConversion;
Expand All @@ -30,11 +28,9 @@
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import org.apache.logging.log4j.util.Strings;

import javax.persistence.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -133,10 +129,11 @@ public FeatureInfo(
if (spec.getDataStores() != null) {
this.servingStore = servingStore;
this.servingStoreOpts =
TypeConversion.convertMapToJsonString(spec.getDataStores().getServing().getOptionsMap());
TypeConversion.convertMapToJsonString(spec.getDataStores().getServing().getOptionsMap());
this.warehouseStore = warehouseStore;
this.warehouseStoreOpts =
TypeConversion.convertMapToJsonString(spec.getDataStores().getWarehouse().getOptionsMap());
TypeConversion.convertMapToJsonString(
spec.getDataStores().getWarehouse().getOptionsMap());
}
this.bigQueryView = createBigqueryViewLink(warehouseStore);
}
Expand Down Expand Up @@ -258,31 +255,50 @@ private String createBigqueryViewLink(StorageInfo warehouseStore) {
}

/**
* Checks if this is eq to the other given feature
* Updates the feature info with specifications from the incoming feature spec.
*
* @param otherFeature
* @return boolean
* <p>TODO: maybe allow changes to id, store etc if no jobs are feeding into this feature
*
* @param update new feature spec
*/
public boolean eq(FeatureInfo otherFeature) {
return otherFeature.getId() == this.id &&
otherFeature.getEntity().getName() == this.entity.getName() &&
otherFeature.getOwner() == this.owner &&
otherFeature.getUri() == this.uri &&
otherFeature.getDescription() == this.description &&
otherFeature.getGranularity() == this.granularity &&
otherFeature.getValueType() == this.valueType &&
otherFeature.getTags() == this.tags &&
otherFeature.getOptions() == this.options &&
getFeatureGroupId(otherFeature.getFeatureGroup()) == getFeatureGroupId(this.getFeatureGroup()) &&
otherFeature.getServingStoreOpts() == this.servingStoreOpts &&
getStorageId(otherFeature.getServingStore()) == getStorageId(this.getServingStore()) &&
otherFeature.getWarehouseStoreOpts() == this.warehouseStoreOpts &&
getStorageId(otherFeature.getWarehouseStore()) == getStorageId(this.getWarehouseStore());
public void update(FeatureSpec update) throws IllegalArgumentException {
if (!isLegalUpdate(update)) {
throw new IllegalArgumentException(
"Feature already exists. Update only allowed for fields: [owner, description, uri, tags]");
}
this.owner = update.getOwner();
this.description = update.getDescription();
this.uri = update.getUri();
this.tags = String.join(",", update.getTagsList());
}

private boolean isLegalUpdate(FeatureSpec update) {
DataStore updatedWarehouseStore =
update.getDataStores().hasWarehouse() ? update.getDataStores().getWarehouse() : null;
DataStore updatedServingStore =
update.getDataStores().hasServing() ? update.getDataStores().getServing() : null;
return update.getName().equals(this.name)
&& update.getEntity().equals(this.entity.getName())
&& update.getGranularityValue() == this.granularity.getNumber()
&& update.getValueTypeValue() == this.valueType.getNumber()
&& update.getGroup().equals(getFeatureGroupId(this.featureGroup))
&& TypeConversion.convertMapToJsonString(update.getOptionsMap()).equals(this.options)
&& isStoreEqual(this.warehouseStore, this.warehouseStoreOpts, updatedWarehouseStore)
&& isStoreEqual(this.servingStore, this.servingStoreOpts, updatedServingStore);
}

private boolean isStoreEqual(StorageInfo oldStore, String oldStoreOpts, DataStore newStore) {
return getStorageId(oldStore).equals(newStore == null ? "" : newStore.getId())
&& oldStoreOpts.equals(
newStore == null
? ""
: TypeConversion.convertMapToJsonString(newStore.getOptionsMap()));
}

private String getFeatureGroupId(FeatureGroupInfo featureGroupInfo) {
return featureGroupInfo == null ? "" : featureGroupInfo.getId();
}

private String getStorageId(StorageInfo storage) {
return storage == null ? "" : storage.getId();
}
Expand Down
12 changes: 0 additions & 12 deletions core/src/main/java/feast/core/model/StorageInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,4 @@ public StorageDetail getStorageDetail() {
.setLastUpdated(convertTimestamp(this.getLastUpdated()))
.build();
}

/**
* Checks if this is eq to the other given storage
*
* @param otherStorage
* @return boolean
*/
public boolean eq(StorageInfo otherStorage) {
return otherStorage.getId().equals(this.id) &&
otherStorage.getType().equals(this.type) &&
otherStorage.getOptions().equals(this.options);
}
}
Loading