Rework transaction options (#221)

## Release notes: usage and product changes
Reintroduce transaction options available in TypeDB 3.x. Introduce query
options for query-specific configuration.

Remove unused Logic-related messages.

## Implementation
Replace the general `Options` message with `Options.Transaction` and
`Options.Query`. Both options are mandatory, but their fields are
optional, so the parsing of these messages is straightforward, similar
to the 2.x protocol.

Only the options declared in the server's code are introduced.

Author: farost

grpc/java/BUILD

@@ -17,7 +17,6 @@ java_grpc_library(
         "//proto:concept-proto",
         "//proto:connection-proto",
         "//proto:authentication-proto",
-        "//proto:logic-proto",
         "//proto:options-proto",
         "//proto:query-proto",
         "//proto:transaction-proto",

grpc/nodejs/BUILD

@@ -33,7 +33,6 @@ ts_grpc_compile(
         "//proto:concept-proto",
         "//proto:connection-proto",
         "//proto:authentication-proto",
-        "//proto:logic-proto",
         "//proto:options-proto",
         "//proto:query-proto",
         "//proto:transaction-proto",

grpc/rust/BUILD

@@ -20,7 +20,6 @@ rust_tonic_compile(
         "//proto:concept-proto",
         "//proto:connection-proto",
         "//proto:authentication-proto",
-        "//proto:logic-proto",
         "//proto:options-proto",
         "//proto:query-proto",
         "//proto:transaction-proto",

grpc/rust/build.rs

@@ -9,7 +9,6 @@ fn main() -> std::io::Result<()> {
         "../../proto/concept.proto",
         "../../proto/connection.proto",
         "../../proto/database.proto",
-        "../../proto/logic.proto",
         "../../proto/options.proto",
         "../../proto/query.proto",
         "../../proto/server.proto",

proto/BUILD

@@ -60,12 +60,6 @@ proto_library(
     ],
 )
 
-proto_library(
-    name = "logic-proto",
-    srcs = ["logic.proto"],
-    deps = [":answer-proto"]
-)
-
 proto_library(
     name = "options-proto",
     srcs = ["options.proto"],
@@ -76,7 +70,6 @@ proto_library(
     srcs = ["query.proto"],
     deps = [
         ":answer-proto",
-        ":logic-proto",
         ":options-proto",
         ":concept-proto",
     ],
@@ -88,7 +81,6 @@ proto_library(
     deps = [
         ":answer-proto",
         ":concept-proto",
-        ":logic-proto",
         ":options-proto",
         ":query-proto",
     ]
@@ -111,7 +103,6 @@ filegroup(
         "options.proto",
         "query.proto",
         "transaction.proto",
-        "logic.proto",
         "version.proto",
     ]
 )

proto/logic.proto

@@ -7,14 +7,14 @@ syntax = "proto3";
 package typedb.protocol;
 
 message Options {
-//    optional bool infer = 1;
-//    optional bool trace_inference = 2;
-//    optional bool explain = 3;
-    optional bool parallel = 4;
-    optional uint64 prefetch_size = 5;
-    optional bool prefetch = 6;
-//    optional int32 session_idle_timeout_millis = 7;
-    optional uint64 transaction_timeout_millis = 8;
-    optional uint64 schema_lock_acquire_timeout_millis = 9;
-    optional bool read_any_replica = 10;
+    message Transaction {
+        optional bool parallel = 1;
+        optional uint64 transaction_timeout_millis = 2;
+        optional uint64 schema_lock_acquire_timeout_millis = 3;
+    }
+
+    message Query {
+        optional bool include_instance_types = 1;
+        optional uint64 prefetch_size = 2;
+    }
 }

proto/options.proto

@@ -18,7 +18,7 @@ message Query {
     }
 
     message Req {
-        Options options = 1;
+        Options.Query options = 1;
         string query = 2;
     }
 

proto/query.proto

@@ -4,7 +4,6 @@
 
 syntax = "proto3";
 
-//import "proto/logic.proto";
 import "proto/options.proto";
 import "proto/query.proto";
 
@@ -64,7 +63,7 @@ message Transaction {
         message Req {
             string database = 1;
             Type type = 2;
-            Options options = 3;
+            Options.Transaction options = 3;
             uint64 network_latency_millis = 4;
         }
         message Res {

proto/transaction.proto

@@ -7,7 +7,7 @@ syntax = "proto3";
 package typedb.protocol;
 
 enum Version {
-  reserved 1, 2, 3, 4; // add past version numbers into the reserved range
+  reserved 1, 2, 3, 4, 5; // add past version numbers into the reserved range
   UNSPECIFIED = 0;
-  VERSION = 5;
+  VERSION = 6;
 }