vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*: replace consistent token with revision in v3 api

release-2.2
Xiang Li 2015-09-03 15:27:39 -07:00
parent 243fe519a9
commit 2ac9af4924
3 changed files with 31 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/rfc/v3api.proto
View File

@ -68,17 +68,18 @@ message RangeRequest {
bytes range_end = 2; bytes range_end = 2;
// limit the number of keys returned. // limit the number of keys returned.
int64 limit = 3; int64 limit = 3;
// the response will be consistent with previous request with same token if the token is // range over the store at the given revision.
// given and is valid. // if revision is less or equal to zero, range over the newest store.
bytes consistent_token = 4; // if the revision has been compacted, ErrCompaction will be returned in
// response.
int64 revision = 4;
} }
message RangeResponse { message RangeResponse {
ResponseHeader header = 1; ResponseHeader header = 1;
repeated storagepb.KeyValue kvs = 2; repeated storagepb.KeyValue kvs = 2;
bytes consistent_token = 3;
// more indicates if there are more keys to return in the requested range. // more indicates if there are more keys to return in the requested range.
bool more = 4; bool more = 3;
} }
message PutRequest { message PutRequest {

91
etcdserver/etcdserverpb/rpc.pb.go
View File

@ -91,9 +91,11 @@ type RangeRequest struct {
RangeEnd []byte `protobuf:"bytes,2,opt,name=range_end,proto3" json:"range_end,omitempty"` RangeEnd []byte `protobuf:"bytes,2,opt,name=range_end,proto3" json:"range_end,omitempty"`
// limit the number of keys returned. // limit the number of keys returned.
Limit int64 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"` Limit int64 `protobuf:"varint,3,opt,name=limit,proto3" json:"limit,omitempty"`
// the response will be consistent with previous request with same token if the token is // range over the store at the given revision.
// given and is valid. // if revision is less or equal to zero, range over the newest store.
ConsistentToken []byte `protobuf:"bytes,4,opt,name=consistent_token,proto3" json:"consistent_token,omitempty"` // if the revision has been compacted, ErrCompaction will be returned in
// response.
Revision int64 `protobuf:"varint,4,opt,name=revision,proto3" json:"revision,omitempty"`
} }
func (m *RangeRequest) Reset() { *m = RangeRequest{} } func (m *RangeRequest) Reset() { *m = RangeRequest{} }
@ -101,11 +103,10 @@ func (m *RangeRequest) String() string { return proto.CompactTextString(m) }
func (*RangeRequest) ProtoMessage() {} func (*RangeRequest) ProtoMessage() {}
type RangeResponse struct { type RangeResponse struct {
Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"`
Kvs []*storagepb.KeyValue `protobuf:"bytes,2,rep,name=kvs" json:"kvs,omitempty"` Kvs []*storagepb.KeyValue `protobuf:"bytes,2,rep,name=kvs" json:"kvs,omitempty"`
ConsistentToken []byte `protobuf:"bytes,3,opt,name=consistent_token,proto3" json:"consistent_token,omitempty"`
// more indicates if there are more keys to return in the requested range. // more indicates if there are more keys to return in the requested range.
More bool `protobuf:"varint,4,opt,name=more,proto3" json:"more,omitempty"` More bool `protobuf:"varint,3,opt,name=more,proto3" json:"more,omitempty"`
} }
func (m *RangeResponse) Reset() { *m = RangeResponse{} } func (m *RangeResponse) Reset() { *m = RangeResponse{} }
@ -632,13 +633,10 @@ func (m *RangeRequest) MarshalTo(data []byte) (int, error) {
i++ i++
i = encodeVarintRpc(data, i, uint64(m.Limit)) i = encodeVarintRpc(data, i, uint64(m.Limit))
} }
if m.ConsistentToken != nil { if m.Revision != 0 {
if len(m.ConsistentToken) > 0 { data[i] = 0x20
data[i] = 0x22 i++
i++ i = encodeVarintRpc(data, i, uint64(m.Revision))
i = encodeVarintRpc(data, i, uint64(len(m.ConsistentToken)))
i += copy(data[i:], m.ConsistentToken)
}
} }
return i, nil return i, nil
} }
@ -680,16 +678,8 @@ func (m *RangeResponse) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
if m.ConsistentToken != nil {
if len(m.ConsistentToken) > 0 {
data[i] = 0x1a
i++
i = encodeVarintRpc(data, i, uint64(len(m.ConsistentToken)))
i += copy(data[i:], m.ConsistentToken)
}
}
if m.More { if m.More {
data[i] = 0x20 data[i] = 0x18
i++ i++
if m.More { if m.More {
data[i] = 1 data[i] = 1
@ -1202,11 +1192,8 @@ func (m *RangeRequest) Size() (n int) {
if m.Limit != 0 { if m.Limit != 0 {
n += 1 + sovRpc(uint64(m.Limit)) n += 1 + sovRpc(uint64(m.Limit))
} }
if m.ConsistentToken != nil { if m.Revision != 0 {
l = len(m.ConsistentToken) n += 1 + sovRpc(uint64(m.Revision))
if l > 0 {
n += 1 + l + sovRpc(uint64(l))
}
} }
return n return n
} }
@ -1224,12 +1211,6 @@ func (m *RangeResponse) Size() (n int) {
n += 1 + l + sovRpc(uint64(l)) n += 1 + l + sovRpc(uint64(l))
} }
} }
if m.ConsistentToken != nil {
l = len(m.ConsistentToken)
if l > 0 {
n += 1 + l + sovRpc(uint64(l))
}
}
if m.More { if m.More {
n += 2 n += 2
} }
@ -1657,30 +1638,21 @@ func (m *RangeRequest) Unmarshal(data []byte) error {
} }
} }
case 4: case 4:
if wireType != 2 { if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field ConsistentToken", wireType) return fmt.Errorf("proto: wrong wireType = %d for field Revision", wireType)
} }
var byteLen int m.Revision = 0
for shift := uint(0); ; shift += 7 { for shift := uint(0); ; shift += 7 {
if iNdEx >= l { if iNdEx >= l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
b := data[iNdEx] b := data[iNdEx]
iNdEx++ iNdEx++
byteLen |= (int(b) & 0x7F) << shift m.Revision |= (int64(b) & 0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
} }
if byteLen < 0 {
return ErrInvalidLengthRpc
}
postIndex := iNdEx + byteLen
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConsistentToken = append([]byte{}, data[iNdEx:postIndex]...)
iNdEx = postIndex
default: default:
var sizeOfWire int var sizeOfWire int
for { for {
@ -1785,31 +1757,6 @@ func (m *RangeResponse) Unmarshal(data []byte) error {
} }
iNdEx = postIndex iNdEx = postIndex
case 3: case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field ConsistentToken", wireType)
}
var byteLen int
for shift := uint(0); ; shift += 7 {
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := data[iNdEx]
iNdEx++
byteLen |= (int(b) & 0x7F) << shift
if b < 0x80 {
break
}
}
if byteLen < 0 {
return ErrInvalidLengthRpc
}
postIndex := iNdEx + byteLen
if postIndex > l {
return io.ErrUnexpectedEOF
}
m.ConsistentToken = append([]byte{}, data[iNdEx:postIndex]...)
iNdEx = postIndex
case 4:
if wireType != 0 { if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field More", wireType) return fmt.Errorf("proto: wrong wireType = %d for field More", wireType)
} }

11
etcdserver/etcdserverpb/rpc.proto
View File

@ -50,17 +50,18 @@ message RangeRequest {
bytes range_end = 2; bytes range_end = 2;
// limit the number of keys returned. // limit the number of keys returned.
int64 limit = 3; int64 limit = 3;
// the response will be consistent with previous request with same token if the token is // range over the store at the given revision.
// given and is valid. // if revision is less or equal to zero, range over the newest store.
bytes consistent_token = 4; // if the revision has been compacted, ErrCompaction will be returned in
// response.
int64 revision = 4;
} }
message RangeResponse { message RangeResponse {
ResponseHeader header = 1; ResponseHeader header = 1;
repeated storagepb.KeyValue kvs = 2; repeated storagepb.KeyValue kvs = 2;
bytes consistent_token = 3;
// more indicates if there are more keys to return in the requested range. // more indicates if there are more keys to return in the requested range.
bool more = 4; bool more = 3;
} }
message PutRequest { message PutRequest {