Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions proto/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ proto_library(
name = "query-proto",
srcs = ["query.proto"],
deps = [
":analyze-proto",
":answer-proto",
":concept-proto",
":error-proto",
Expand Down Expand Up @@ -111,6 +112,7 @@ proto_library(
":analyzed-conjunction-proto",
":concept-proto",
":error-proto",
":options-proto",
],
)

Expand Down
4 changes: 3 additions & 1 deletion proto/analyze.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ syntax = "proto3";
import "proto/analyzed-conjunction.proto";
import "proto/concept.proto";
import "proto/error.proto";
import "proto/options.proto";

package typedb.protocol;

message Analyze {

message Req {
string query = 1;
Options.Analyze options = 1;
string query = 2;
}

message Res {
Expand Down
2 changes: 1 addition & 1 deletion proto/answer.proto
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package typedb.protocol;

message ConceptRow {
repeated RowEntry row = 1;
bytes involved_blocks = 2;
optional bytes involved_blocks = 2;
}

message RowEntry {
Expand Down
5 changes: 5 additions & 0 deletions proto/options.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,10 @@ message Options {
message Query {
optional bool include_instance_types = 1;
optional uint64 prefetch_size = 2;
optional bool include_query_structure = 3;
}

message Analyze {
optional bool include_plan = 1;
}
}
2 changes: 2 additions & 0 deletions proto/query.proto
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

syntax = "proto3";

import "proto/analyze.proto";
import "proto/answer.proto";
import "proto/options.proto";
import "proto/error.proto";
Expand Down Expand Up @@ -51,6 +52,7 @@ message Query {
// TODO: network optimisation: replace types (== mostly constant strings) with a IDs, sending types in the header to rebuild on the client side
repeated string column_variable_names = 1;
Type query_type = 2;
optional Analyze.Res.AnalyzedQuery.Pipeline query_structure = 3;
}
}
}
Expand Down