*: update proto (#76)

* *: update proto * *: update proto
hstreamdb · Jul 5, 2023 · 95231b8 · 95231b8
1 parent 0136b22
commit 95231b8
Show file tree

Hide file tree

Showing 3 changed files with 1,474 additions and 366 deletions.
diff --git a/.ci/docker-compose-file/docker-compose-hstreamdb.yaml b/.ci/docker-compose-file/docker-compose-hstreamdb.yaml
@@ -2,7 +2,7 @@ version: "3.5"
 
 services:
   hserver0:
-    image: hstreamdb/hstream:v0.15.0
+    image: hstreamdb/hstream:v0.15.4
     depends_on:
       - zookeeper
       - hstore
@@ -36,7 +36,7 @@ services:
         --io-tasks-network hstream-network
 
   hserver1:
-    image: hstreamdb/hstream:v0.15.0
+    image: hstreamdb/hstream:v0.15.4
     depends_on:
       - zookeeper
       - hstore
@@ -70,7 +70,7 @@ services:
         --io-tasks-network hstream-network
 
   hserver-init:
-    image: hstreamdb/hstream:v0.15.0
+    image: hstreamdb/hstream:v0.15.4
     depends_on:
       - hserver0
       - hserver1
@@ -94,7 +94,7 @@ services:
         /usr/local/bin/hadmin server --host hserver0 init
 
   hstore:
-    image: hstreamdb/hstream:v0.15.0
+    image: hstreamdb/hstream:v0.15.4
     networks:
       hstream-network:
         ipv4_address: 10.5.0.6

diff --git a/protocol/hstreamdb_api.proto b/protocol/hstreamdb_api.proto
@@ -409,11 +409,13 @@ message Query {
   int64 createdTime = 3;
   string queryText = 4;
   repeated string sources = 5;
+  string resultName = 6;
   // type:
   //    CreateStreamAs: resultName is result stream name
   //    CreateViewAs: resultName is result view name
-  string resultName = 6;
   QueryType type = 7;
+  // Id of the node to execute the query
+  uint32 nodeId = 8;
 }
 
 message DeleteQueryRequest { string id = 1; }
@@ -466,6 +468,10 @@ message Connector {
   string status = 5;
   string config = 6;
   repeated google.protobuf.Struct offsets = 7;
+  string taskId = 8;
+  string node = 9;
+  string dockerStatus = 10;
+  string image = 11;
 }
 
 message DeleteConnectorRequest { string name = 1; }
@@ -535,16 +541,16 @@ message PerStreamTimeSeriesStatsAllRequest {
 
 message DescribeClusterResponse {
   string protocolVersion = 1;
-  string serverVersion = 2;
-  repeated ServerNode serverNodes = 3;
-  repeated ServerNodeStatus serverNodesStatus = 4;
-  uint64 clusterUpTime = 5;
+  repeated ServerNode serverNodes = 2;
+  repeated ServerNodeStatus serverNodesStatus = 3;
+  uint64 clusterUpTime = 4;
 }
 
 message ServerNode {
   uint32 id = 1;
   string host = 2;
   uint32 port = 3;
+  HStreamVersion version = 4;
 }
 
 enum NodeState {
@@ -559,6 +565,11 @@ message ServerNodeStatus {
   NodeState state = 2;
 }
 
+message HStreamVersion {
+  string version = 1;
+  string commit = 2;
+}
+
 message LookupShardRequest { uint64 shardId = 1; }
 
 message LookupShardResponse {
@@ -611,6 +622,7 @@ enum SubscriptionStats {
   ReceivedAcks = 5;
   RequestMessages = 6;
   ResponseMessages = 7;
+  ChecklistSize = 8;
 }
 
 enum ConnectorStats {