Skip to content

Commit

Permalink
doc/rft: fix up proto
Browse files Browse the repository at this point in the history
  • Loading branch information
xiang90 committed May 18, 2015
1 parent be5cb24 commit a2b7479
Showing 1 changed file with 11 additions and 13 deletions.
24 changes: 11 additions & 13 deletions Documentation/rfc/v3api.proto
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ service etcd {

// Tnx processes all the requests in one transaction.
// A tnx request increases the index of the store,
// and generates one event in the event history.
// and generates events with the same index in the event history.
rpc Tnx(TnxRequest) returns (TnxResponse) {}

// Watch watches the events happening or happened in etcd. Both input and output
Expand Down Expand Up @@ -100,20 +100,18 @@ message DeleteRangeResponse {
}

message RequestUnion {
oneof value {
oneof request {
RangeRequest request_range = 1;
PutRequest request_put = 2;
DeleteRequest request_delete = 3;
DeleteRangeRequest request_delete_range = 4;
DeleteRangeRequest request_delete_range = 3;
}
}

message ResponseUnion {
oneof value {
oneof response {
RangeResponse reponse_range = 1;
PutResponse response_put = 2;
DeleteResponse response_delete = 3;
DeleteRangeResponse response_delete_range = 4;
DeleteRangeResponse response_delete_range = 3;
}
}

Expand All @@ -126,15 +124,15 @@ message Compare {
optional CompareType type = 1;
// key path
optional bytes key = 2;
oneof {
oneof target {
// version of the given key
int64 version = 1;
int64 version = 3;
// create index of the given key
int64 create_index = 2;
int64 create_index = 4;
// last modified index of the given key
int64 mod_index = 3;
int64 mod_index = 5;
// value of the given key
bytes value = 4;
bytes value = 6;
}
}

Expand Down Expand Up @@ -174,7 +172,7 @@ message TnxResponse {
message KeyValue {
optional bytes key = 1;
// mod_index is the last modified index of the key.
optional int64 create_index = 2
optional int64 create_index = 2;
optional int64 mod_index = 3;
// version is the version of the key. A deletion resets
// the version to zero and any modification of the key
Expand Down

0 comments on commit a2b7479

Please sign in to comment.