Remove databaseURI, change subscription type, update comments

zhilingc · zhilingc · commit 09fec85082f0 · 2019-09-04T21:51:06.000+08:00
diff --git a/protos/feast/core/Source.proto b/protos/feast/core/Source.proto
@@ -36,6 +36,6 @@ message Source {
   //
   // For SourceType.KAFKA, the following key value options are accepted:
   // - bootstrapServers: [comma delimited value of host[:port]]
-  // - topics: [comma delimited value of topic names]
+  // - topics: [comma delimited value of topic names. This value is provisioned by core and should not be set by the user.]
   map<string, string> options = 2;
 }
diff --git a/protos/feast/core/Store.proto b/protos/feast/core/Store.proto
@@ -30,21 +30,46 @@ message Store {
     CASSANDRA = 3;
   }
 
+  message RedisConfig {
+    string host = 1;
+    int32 port = 2;
+  }
+
+  message BigQueryConfig {
+    string projectId = 1;
+    string datasetId = 2;
+  }
+
+  message CassandraConfig {
+    string host = 1;
+    int32 port = 2;
+  }
+
+  message Subscription {
+    // Name of featureSet to subscribe to.
+    string name = 1;
+
+    // Versions of the given featureSet that will be ingested into this store.
+    // Valid options for version:
+    //     latest: only subscribe to latest version of feature set
+    //     [version number]: pin to a specific version
+    //     >[version number]: subscribe to all versions larger than or equal to [version number]
+    string version = 2;
+  }
+
   // Name of the store.
   string name = 1;
 
   // Type of store.
   StoreType type = 2;
 
-  // URI to connect to the database. Should contain all necessary information
-  // to connect to and write/read to the store.
-  string databaseURI = 3;
-
-  // Feature sets to subscribe to. Regex strings are allowed, in the form of
-  // featureSetId:version.
-  // Valid options for version:
-  //     latest: only subscribe to latest version of feature set
-  //     [version number]: pin to a specific version
-  //     [version number]^: subscribe to all versions larger than or equal to [version number]
-  repeated string subscriptions = 4;
+  // Feature sets to subscribe to.
+  repeated Subscription subscriptions = 4;
+
+  // Configuration to connect to the store. Required.
+  oneof config {
+    RedisConfig RedisConfig = 11;
+    BigQueryConfig BigQueryConfig = 12;
+    CassandraConfig CassandraConfig = 13;
+  }
 }
diff --git a/protos/feast/types/FeatureRow.proto b/protos/feast/types/FeatureRow.proto
@@ -26,7 +26,17 @@ option java_outer_classname = "FeatureRowProto";
 option go_package = "github.com/gojek/feast/protos/generated/go/feast/types";
 
 message FeatureRow {
+
+    // Features in the feature row.
     repeated Feature features = 2;
+
+    // Timestamp of the feature row. While the actual definition of this timestamp may vary
+    // depending on the upstream feature creation pipelines, this is the timestamp that Feast
+    // will use to perform joins, determine latest values, and coalesce rows.
     google.protobuf.Timestamp eventTimestamp = 3;
+
+    // Complete reference to the featureSet this featureRow belongs to, in the form of
+    // featureSetName:version. This value will be used by the feast ingestion job to filter
+    // rows, and write the values to the correct tables.
     string featureSet = 6;
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,6 @@ message Source {`
`36`	`36`	`//`
`37`	`37`	`// For SourceType.KAFKA, the following key value options are accepted:`
`38`	`38`	`// - bootstrapServers: [comma delimited value of host[:port]]`
`39`		`- // - topics: [comma delimited value of topic names]`
	`39`	`+ // - topics: [comma delimited value of topic names. This value is provisioned by core and should not be set by the user.]`
`40`	`40`	`map<string, string> options = 2;`
`41`	`41`	`}`