Refactor initial query responses

Author: flyingsilverfin

proto/query.proto

@@ -17,7 +17,7 @@ message Query {
         string query = 2;
     }
 
-    message Res {
+    message InitialRes {
         oneof res {
             Error error = 1;
             Ok ok = 2;
@@ -26,7 +26,6 @@ message Query {
         message Ok {
             oneof ok {
                 Empty empty = 1;
-                Values values = 2;
                 ReadableConceptTreeStream readable_concept_tree_stream = 3;
                 AnswerRowStream concept_row_stream = 4;
             }
@@ -35,15 +34,6 @@ message Query {
 
             }
 
-            message Values {
-                // note: we could use this first response to record debug info, type annotations, warnings, etc
-                repeated OptionalValue values = 1;
-
-                message OptionalValue {
-                    optional Value value = 1;
-                }
-            }
-
             message ReadableConceptTreeStream {
                 // note: we could use this first response to record debug info, type annotations, warnings, etc
             }
@@ -55,13 +45,17 @@ message Query {
     }
 
     message ResPart {
-        repeated Res res = 1;
+        oneof res {
+            ReadableConceptTreesRes trees_res = 1;
+            AnswerRowsRes rows_res = 2;
+        }
 
-        message Res {
-            oneof res {
-                ReadableConceptTree tree = 2;
-                AnswerRow answer_row = 3;
-            }
+        message ReadableConceptTreesRes {
+            repeated ReadableConceptTree trees = 1;
+        }
+
+        message AnswerRowsRes {
+            repeated AnswerRow rows = 1;
         }
     }
 }

proto/transaction.proto

@@ -40,7 +40,7 @@ message Transaction {
         bytes req_id = 1;
         oneof res {
             Open.Res open_res = 2;
-            Query.Res query_res = 3;
+            Query.InitialRes query_res = 3;
             Commit.Res commit_res = 5;
             Rollback.Res rollback_res = 6;
         }