Skip to content

Store request IDs as bytes; add 'inferred' to Thing #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2021
Merged

Store request IDs as bytes; add 'inferred' to Thing #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8ec177
Store request IDs as bytes, not strings
Apr 7, 2021
85369fe
Upgrade Bazel and Java
Apr 7, 2021
3912211
Add inferred to Thing; delete IsInferred
Apr 7, 2021
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
3 changes: 1 addition & 2 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#

build --incompatible_strict_action_env --javacopt='--release 8'
build --incompatible_strict_action_env --java_language_version=11 --javacopt='--release 11'
Copy link
Member Author

@alexjpwalker alexjpwalker Apr 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See typedb/typedb#6281 - after installing the newest Bazel (by pulling grakn and building it locally) I was no longer able to build protocol. I fixed it by upgrading Bazel and Java in protocol.

run --incompatible_strict_action_env
test --incompatible_strict_action_env

try-import /opt/credentials/bazel-remote-cache.rc

2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
4.0.0
24 changes: 8 additions & 16 deletions common/concept.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,19 +107,19 @@ message Thing {
bytes iid = 1;
Type type = 2;
Attribute.Value value = 3;
bool inferred = 4;

message Req {
bytes iid = 1;
oneof req {
// Thing method requests
Thing.Delete.Req thing_delete_req = 100;
Thing.GetType.Req thing_get_type_req = 101;
Thing.IsInferred.Req thing_is_inferred_req = 102;
Thing.GetHas.Req thing_get_has_req = 103;
Thing.SetHas.Req thing_set_has_req = 104;
Thing.UnsetHas.Req thing_unset_has_req = 105;
Thing.GetRelations.Req thing_get_relations_req = 106;
Thing.GetPlaying.Req thing_get_playing_req = 107;
Thing.GetHas.Req thing_get_has_req = 102;
Thing.SetHas.Req thing_set_has_req = 103;
Thing.UnsetHas.Req thing_unset_has_req = 104;
Thing.GetRelations.Req thing_get_relations_req = 105;
Thing.GetPlaying.Req thing_get_playing_req = 106;
Copy link
Member Author

@alexjpwalker alexjpwalker Apr 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that moving these around breaks compatibility with older clients - maybe this is a practice we want to abolish going forward?


// Relation method requests
Relation.AddPlayer.Req relation_add_player_req = 200;
Expand All @@ -138,9 +138,8 @@ message Thing {
// Thing method responses
Thing.Delete.Res thing_delete_res = 100;
Thing.GetType.Res thing_get_type_res = 101;
Thing.IsInferred.Res thing_is_inferred_res = 102;
Thing.SetHas.Res thing_set_has_res = 103;
Thing.UnsetHas.Res thing_unset_has_res = 104;
Thing.SetHas.Res thing_set_has_res = 102;
Thing.UnsetHas.Res thing_unset_has_res = 103;

// Relation method responses
Relation.AddPlayer.Res relation_add_player_res = 200;
Expand Down Expand Up @@ -170,13 +169,6 @@ message Thing {
message Res {}
}

message IsInferred {
message Req {}
message Res {
bool inferred = 1;
}
}

message GetType {
message Req {}
message Res {
Expand Down
6 changes: 3 additions & 3 deletions common/transaction.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ message Transaction {
}

message Req {
string req_id = 1;
bytes req_id = 1;
map<string, string> metadata = 2;
oneof req {
Open.Req open_req = 3;
Expand All @@ -58,7 +58,7 @@ message Transaction {
}

message Res {
string req_id = 1;
bytes req_id = 1;
oneof res {
Open.Res open_res = 2;
Commit.Res commit_res = 3;
Expand All @@ -73,7 +73,7 @@ message Transaction {
}

message ResPart {
string req_id = 1;
bytes req_id = 1;
oneof res {
Stream.ResPart stream_res_part = 2;
QueryManager.ResPart query_manager_res_part = 3;
Expand Down
2 changes: 1 addition & 1 deletion dependencies/graknlabs/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ def graknlabs_dependencies():
git_repository(
name = "graknlabs_dependencies",
remote = "https://github.com/graknlabs/dependencies",
commit = "adb0d08bf56a64ae7d731800cfc0f85c63733cf1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies
commit = "5aca0eb4e727278182656952477f2266af551621", # sync-marker: do not remove this comment, this is used for sync-dependencies by @graknlabs_dependencies
)