Skip to content

Fix multi cells issue in bigtable retriver #22

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
pyalex merged 1 commit into from
Apr 5, 2021
Merged

Fix multi cells issue in bigtable retriver #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions serving/src/test/java/feast/serving/it/ServingServiceBigTableIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static void globalSetup() throws IOException {
SchemaBuilder.record("DriverData")
.namespace(featureTableName)
.fields()
.requiredInt(feature1Reference.getName())
.requiredLong(feature1Reference.getName())
.requiredDouble(feature2Reference.getName())
.nullableString(feature3Reference.getName(), "null")
.requiredString(feature4Reference.getName())
Expand All @@ -228,7 +228,7 @@ static void globalSetup() throws IOException {

GenericRecord record =
new GenericRecordBuilder(ftSchema)
.set("trip_cost", 5)
.set("trip_cost", 5L)
.set("trip_distance", 3.5)
.set("trip_empty", null)
.set("trip_wrong_type", "test")
Expand All @@ -245,7 +245,7 @@ static void globalSetup() throws IOException {
SchemaBuilder.record("DriverMerchantData")
.namespace(rideMerchantFeatureTableName)
.fields()
.requiredInt(feature1Reference.getName())
.requiredLong(feature1Reference.getName())
.requiredDouble(feature2Reference.getName())
.nullableString(feature3Reference.getName(), "null")
.requiredString(feature4Reference.getName())
Expand All @@ -256,7 +256,7 @@ static void globalSetup() throws IOException {
// Entity-Feature Row
GenericRecord compoundEntityRecord =
new GenericRecordBuilder(compoundFtSchema)
.set("trip_cost", 10)
.set("trip_cost", 10L)
.set("trip_distance", 5.5)
.set("trip_empty", null)
.set("trip_wrong_type", "wrong_type")
Expand Down
4 changes: 2 additions & 2 deletions storage/api/src/main/java/feast/storage/api/retriever/NativeFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ public ValueProto.Value getFeatureValue(ValueProto.ValueType.Enum valueType) {
finalValue = ValueProto.Value.newBuilder().setInt32Val((Integer) featureValue).build();
break;
case INT64:
finalValue = ValueProto.Value.newBuilder().setInt64Val((Integer) featureValue).build();
finalValue = ValueProto.Value.newBuilder().setInt64Val((Long) featureValue).build();
break;
case DOUBLE:
finalValue = ValueProto.Value.newBuilder().setDoubleVal((Double) featureValue).build();
break;
case FLOAT:
finalValue = ValueProto.Value.newBuilder().setFloatVal((Long) featureValue).build();
finalValue = ValueProto.Value.newBuilder().setFloatVal((Float) featureValue).build();
break;
case BYTES:
finalValue = ValueProto.Value.newBuilder().setBytesVal((ByteString) featureValue).build();
Expand Down
11 changes: 9 additions & 2 deletions ...le/src/main/java/feast/storage/connectors/bigtable/retriever/BigTableOnlineRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.bigtable.data.v2.models.Filters;
import com.google.cloud.bigtable.data.v2.models.Query;
import com.google.cloud.bigtable.data.v2.models.Row;
import com.google.cloud.bigtable.data.v2.models.RowCell;
import com.google.protobuf.ByteString;
import com.google.protobuf.Timestamp;
import feast.proto.serving.ServingAPIProto.FeatureReferenceV2;
Expand Down Expand Up @@ -242,9 +243,15 @@ private List<List<Feature>> convertRowToFeature(
if (!rows.containsKey(rowKey)) {
return Collections.<Feature>emptyList();
} else {
return rows.get(rowKey).getCells().stream()
Row row = rows.get(rowKey);
return featureReferences.stream()
.map(FeatureReferenceV2::getFeatureTable)
.distinct()
.map(cf -> row.getCells(cf, ""))
.filter(ls -> !ls.isEmpty())
.flatMap(
rowCell -> {
rowCells -> {
RowCell rowCell = rowCells.get(0); // Latest cell
String family = rowCell.getFamily();
ByteString value = rowCell.getValue();

Expand Down