Skip to content

Commit 42f980f

Browse files
author
Ganeshwara Hananda
authored
Revert "Add prefilling of various response methods (#27)" (#28)
Reverts #27.
1 parent 19ef115 commit 42f980f

File tree

2 files changed

+44
-29
lines changed

2 files changed

+44
-29
lines changed

‎session/Concept.proto‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,24 @@ message Method {
107107
SchemaConcept.SetLabel.Res schemaConcept_setLabel_res = 202;
108108
SchemaConcept.GetSup.Res schemaConcept_getSup_res = 203;
109109
SchemaConcept.SetSup.Res schemaConcept_setSup_res = 204;
110+
SchemaConcept.Sups.Iter schemaConcept_sups_iter = 205;
111+
SchemaConcept.Subs.Iter schemaConcept_subs_iter = 206;
110112

111113
// Rule method responses
112114
Rule.When.Res rule_when_res = 300;
113115
Rule.Then.Res rule_then_res = 301;
114116

117+
// Role method responses
118+
Role.Relations.Iter role_relations_iter = 401;
119+
Role.Players.Iter role_players_iter = 402;
120+
115121
// Type method responses
116122
Type.IsAbstract.Res type_isAbstract_res = 500;
117123
Type.SetAbstract.Res type_setAbstract_res = 501;
124+
Type.Instances.Iter type_instances_iter = 502;
125+
Type.Keys.Iter type_keys_iter = 503;
126+
Type.Attributes.Iter type_attributes_iter = 504;
127+
Type.Playing.Iter type_playing_iter = 505;
118128
Type.Has.Res type_has_res = 506;
119129
Type.Key.Res type_key_res = 507;
120130
Type.Plays.Res type_plays_res = 508;
@@ -127,6 +137,7 @@ message Method {
127137

128138
// RelationType method responses
129139
RelationType.Create.Res relationType_create_res = 700;
140+
RelationType.Roles.Iter relationType_roles_iter = 701;
130141
RelationType.Relates.Res relationType_relates_res = 702;
131142
RelationType.Unrelate.Res relationType_unrelate_res = 703;
132143

@@ -140,15 +151,22 @@ message Method {
140151
// Thing method responses
141152
Thing.Type.Res thing_type_res = 900;
142153
Thing.IsInferred.Res thing_isInferred_res = 901;
154+
Thing.Keys.Iter thing_keys_iter = 902;
155+
Thing.Attributes.Iter thing_attributes_iter = 903;
156+
Thing.Relations.Iter thing_relations_iter = 904;
157+
Thing.Roles.Iter thing_roles_iter = 905;
143158
Thing.Relhas.Res thing_relhas_res = 906;
144159
Thing.Unhas.Res thing_unhas_res = 907;
145160

146161
// Relation method responses
162+
Relation.RolePlayersMap.Iter relation_rolePlayersMap_iter = 1000;
163+
Relation.RolePlayers.Iter relation_rolePlayers_iter = 1001;
147164
Relation.Assign.Res relation_assign_res = 1002;
148165
Relation.Unassign.Res relation_unassign_res = 1003;
149166

150167
// Attribute method responses
151168
Attribute.Value.Res attribute_value_res = 1100;
169+
Attribute.Owners.Iter attribute_owners_iter = 1101;
152170
}
153171
}
154172

@@ -195,14 +213,6 @@ message Concept {
195213
string id = 1;
196214
BASE_TYPE baseType = 2;
197215

198-
// Pre-filled responses:
199-
Thing.Type.Res type_res = 5;
200-
Thing.IsInferred.Res inferred_res = 6;
201-
Attribute.Value.Res value_res = 7;
202-
AttributeType.DataType.Res dataType_res = 8;
203-
SchemaConcept.GetLabel.Res label_res = 9;
204-
SchemaConcept.IsImplicit.Res isImplicit_res = 10;
205-
206216
enum BASE_TYPE {
207217
META_TYPE = 0;
208218
ENTITY_TYPE = 1;
@@ -266,6 +276,7 @@ message SchemaConcept {
266276
message Sups {
267277
message Req {}
268278
message Iter {
279+
int32 id = 1;
269280
message Res {
270281
Concept schemaConcept = 1;
271282
}
@@ -275,6 +286,7 @@ message SchemaConcept {
275286
message Subs {
276287
message Req {}
277288
message Iter {
289+
int32 id = 1;
278290
message Res {
279291
Concept schemaConcept = 1;
280292
}
@@ -316,6 +328,7 @@ message Role {
316328
message Relations {
317329
message Req {}
318330
message Iter {
331+
int32 id = 1;
319332
message Res {
320333
Concept relationType = 1;
321334
}
@@ -325,6 +338,7 @@ message Role {
325338
message Players {
326339
message Req {}
327340
message Iter {
341+
int32 id = 1;
328342
message Res {
329343
Concept type = 1;
330344
}
@@ -354,6 +368,7 @@ message Type {
354368
message Instances {
355369
message Req {}
356370
message Iter {
371+
int32 id = 1;
357372
message Res {
358373
Concept thing = 1;
359374
}
@@ -363,6 +378,7 @@ message Type {
363378
message Attributes {
364379
message Req {}
365380
message Iter {
381+
int32 id = 1;
366382
message Res {
367383
Concept attributeType = 1;
368384
}
@@ -372,6 +388,7 @@ message Type {
372388
message Keys {
373389
message Req {}
374390
message Iter {
391+
int32 id = 1;
375392
message Res {
376393
Concept attributeType = 1;
377394
}
@@ -381,6 +398,7 @@ message Type {
381398
message Playing {
382399
message Req {}
383400
message Iter {
401+
int32 id = 1;
384402
message Res {
385403
Concept role = 1;
386404
}
@@ -458,6 +476,7 @@ message RelationType {
458476
message Roles {
459477
message Req {}
460478
message Iter {
479+
int32 id = 1;
461480
message Res {
462481
Concept role = 1;
463482
}
@@ -564,6 +583,7 @@ message Thing {
564583
repeated Concept attributeTypes = 1;
565584
}
566585
message Iter {
586+
int32 id = 1;
567587
message Res {
568588
Concept attribute = 1;
569589
}
@@ -575,6 +595,7 @@ message Thing {
575595
repeated Concept attributeTypes = 1;
576596
}
577597
message Iter {
598+
int32 id = 1;
578599
message Res {
579600
Concept attribute = 1;
580601
}
@@ -586,6 +607,7 @@ message Thing {
586607
repeated Concept roles = 1;
587608
}
588609
message Iter {
610+
int32 id = 1;
589611
message Res {
590612
Concept relation = 1;
591613
}
@@ -595,6 +617,7 @@ message Thing {
595617
message Roles {
596618
message Req {}
597619
message Iter {
620+
int32 id = 1;
598621
message Res {
599622
Concept role = 1;
600623
}
@@ -626,6 +649,7 @@ message Relation {
626649
message RolePlayersMap {
627650
message Req {}
628651
message Iter {
652+
int32 id = 1;
629653
message Res {
630654
Concept role = 1;
631655
Concept player = 2;
@@ -638,6 +662,7 @@ message Relation {
638662
repeated Concept roles = 1;
639663
}
640664
message Iter {
665+
int32 id = 1;
641666
message Res {
642667
Concept thing = 1;
643668
}
@@ -675,6 +700,7 @@ message Attribute {
675700
message Owners {
676701
message Req {}
677702
message Iter {
703+
int32 id = 1;
678704
message Res {
679705
Concept thing = 1;
680706
}

‎session/Session.proto‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ message Transaction {
6565
Open.Req open_req = 1;
6666
Commit.Req commit_req = 2;
6767
Query.Req query_req = 3;
68-
Batch.Req batch_req = 4;
68+
Iter.Req iterate_req = 4;
6969
GetSchemaConcept.Req getSchemaConcept_req = 5;
7070
GetConcept.Req getConcept_req = 6;
7171
GetAttributes.Req getAttributes_req = 7;
@@ -82,9 +82,11 @@ message Transaction {
8282
oneof res {
8383
Open.Res open_res = 1;
8484
Commit.Res commit_res = 2;
85+
Query.Iter query_iter = 3;
8586
Iter.Res iterate_res = 4;
8687
GetSchemaConcept.Res getSchemaConcept_res = 5;
8788
GetConcept.Res getConcept_res = 6;
89+
GetAttributes.Iter getAttributes_iter = 7;
8890
PutEntityType.Res putEntityType_res = 8;
8991
PutAttributeType.Res putAttributeType_res = 9;
9092
PutRelationType.Res putRelationType_res = 10;
@@ -96,34 +98,20 @@ message Transaction {
9698
}
9799

98100
message Iter {
101+
message Req {
102+
int32 id = 1;
103+
bool all = 2;
104+
}
99105
message Res {
100106
oneof res {
101107
bool done = 1;
102-
Batch.Res batch_res = 5;
103-
104108
Query.Iter.Res query_iter_res = 2;
105109
GetAttributes.Iter.Res getAttributes_iter_res = 3;
106110
Method.Iter.Res conceptMethod_iter_res = 4;
107111
}
108112
}
109113
}
110114

111-
message Batch {
112-
message Options {
113-
oneof batch_size {
114-
int32 number = 1;
115-
bool all = 2;
116-
}
117-
}
118-
message Req {
119-
int32 id = 1;
120-
Options batch_options = 2;
121-
}
122-
message Res {
123-
int32 id = 1;
124-
}
125-
}
126-
127115
enum Type {
128116
READ = 0;
129117
WRITE = 1;
@@ -136,6 +124,7 @@ message Transaction {
136124
Type type = 2;
137125
}
138126
message Res {}
127+
139128
}
140129

141130
message Commit {
@@ -149,10 +138,9 @@ message Transaction {
149138
INFER infer = 2;
150139
// We cannot use bool for `infer` because GRPC's default value for bool is FALSE
151140
// We use enum INFER instead, because the default value is index 0 (TRUE)
152-
153-
Batch.Options batch_options = 3;
154141
}
155142
message Iter {
143+
int32 id = 1;
156144
message Res {
157145
Answer answer = 1;
158146
}
@@ -193,6 +181,7 @@ message Transaction {
193181
ValueObject value = 1;
194182
}
195183
message Iter {
184+
int32 id = 1;
196185
message Res {
197186
Concept attribute = 1;
198187
}

0 commit comments

Comments
 (0)