From 84a487f723a060ca8b9ab9f97d4881e2c6506cb8 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Thu, 2 Jun 2016 13:43:40 -0700 Subject: [PATCH] Revert "etcdserverpb: make RangeResponse.More an int64" This reverts commit 84e1ab876539b0bcd1387d7ce6c8b07b72f398d2. --- clientv3/mirror/syncer.go | 2 +- contrib/recipes/priority_queue.go | 2 +- contrib/recipes/queue.go | 2 +- etcdserver/apply.go | 2 +- etcdserver/etcdserverpb/rpc.pb.go | 280 +++++++++++++++--------------- etcdserver/etcdserverpb/rpc.proto | 2 +- integration/v3_grpc_test.go | 12 +- 7 files changed, 154 insertions(+), 148 deletions(-) diff --git a/clientv3/mirror/syncer.go b/clientv3/mirror/syncer.go index 1edf6a96c..58aae940e 100644 --- a/clientv3/mirror/syncer.go +++ b/clientv3/mirror/syncer.go @@ -91,7 +91,7 @@ func (s *syncer) SyncBase(ctx context.Context) (<-chan clientv3.GetResponse, cha respchan <- (clientv3.GetResponse)(*resp) - if resp.More == 0 { + if !resp.More { return } // move to next key diff --git a/contrib/recipes/priority_queue.go b/contrib/recipes/priority_queue.go index 64bdf70f2..896bd15ab 100644 --- a/contrib/recipes/priority_queue.go +++ b/contrib/recipes/priority_queue.go @@ -55,7 +55,7 @@ func (q *PriorityQueue) Dequeue() (string, error) { return "", err } else if kv != nil { return string(kv.Value), nil - } else if resp.More > 0 { + } else if resp.More { // missed some items, retry to read in more return q.Dequeue() } diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index fda03643f..c02a1af5d 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -51,7 +51,7 @@ func (q *Queue) Dequeue() (string, error) { return "", err } else if kv != nil { return string(kv.Value), nil - } else if resp.More > 0 { + } else if resp.More { // missed some items, retry to read in more return q.Dequeue() } diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 410ffc42e..7668bf5c5 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -236,7 +236,7 @@ func (a *applierV3backend) Range(txnID int64, r *pb.RangeRequest) (*pb.RangeResp if r.Limit > 0 && len(kvs) > int(r.Limit) { kvs = kvs[:r.Limit] - resp.More = 1 + resp.More = true } resp.Header.Revision = rev diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 48283e317..fd99e421d 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -234,7 +234,7 @@ type RangeResponse struct { // kvs is the list of key-value pairs matched by the range request. Kvs []*mvccpb.KeyValue `protobuf:"bytes,2,rep,name=kvs" json:"kvs,omitempty"` // more indicates if there are more keys to return in the requested range. - More int64 `protobuf:"varint,3,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{} } @@ -3535,10 +3535,15 @@ func (m *RangeResponse) MarshalTo(data []byte) (int, error) { i += n } } - if m.More != 0 { + if m.More { data[i] = 0x18 i++ - i = encodeVarintRpc(data, i, uint64(m.More)) + if m.More { + data[i] = 1 + } else { + data[i] = 0 + } + i++ } return i, nil } @@ -5881,8 +5886,8 @@ func (m *RangeResponse) Size() (n int) { n += 1 + l + sovRpc(uint64(l)) } } - if m.More != 0 { - n += 1 + sovRpc(uint64(m.More)) + if m.More { + n += 2 } return n } @@ -7264,7 +7269,7 @@ func (m *RangeResponse) Unmarshal(data []byte) error { if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field More", wireType) } - m.More = 0 + var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowRpc @@ -7274,11 +7279,12 @@ func (m *RangeResponse) Unmarshal(data []byte) error { } b := data[iNdEx] iNdEx++ - m.More |= (int64(b) & 0x7F) << shift + v |= (int(b) & 0x7F) << shift if b < 0x80 { break } } + m.More = bool(v != 0) default: iNdEx = preIndex skippy, err := skipRpc(data[iNdEx:]) @@ -14087,134 +14093,134 @@ var fileDescriptorRpc = []byte{ 0x5f, 0x84, 0x08, 0xf9, 0x0c, 0x4a, 0x67, 0x3c, 0x4c, 0xb8, 0x67, 0xaa, 0xeb, 0xb7, 0x0c, 0x5d, 0x63, 0xa1, 0x64, 0x4b, 0x5c, 0x54, 0xaf, 0xf0, 0xf2, 0xdc, 0x47, 0xa7, 0x15, 0x90, 0x64, 0x69, 0x4d, 0x44, 0xe8, 0xda, 0x36, 0xbd, 0x38, 0x72, 0xfa, 0x13, 0x6a, 0xb3, 0x4d, 0x42, 0xa0, 0x38, - 0x18, 0x79, 0x54, 0x3a, 0x90, 0x7f, 0x5b, 0x5f, 0x02, 0xec, 0x4f, 0x82, 0xf4, 0x90, 0x40, 0xaf, - 0x9f, 0x33, 0x0e, 0x32, 0x1c, 0xc4, 0x82, 0xc7, 0x02, 0x75, 0x7c, 0x1a, 0xc6, 0x02, 0x5b, 0x58, - 0x9b, 0x50, 0xe5, 0xbc, 0xb2, 0x28, 0x82, 0x4c, 0x48, 0x8b, 0xf6, 0x69, 0x40, 0x33, 0xc4, 0xaa, - 0x45, 0x61, 0x39, 0xc6, 0x24, 0x93, 0x69, 0x57, 0xa1, 0xdc, 0xe3, 0xcc, 0xc4, 0x39, 0x05, 0x5b, - 0x2d, 0xad, 0x7f, 0xe5, 0xf0, 0x4a, 0x09, 0x09, 0x0f, 0x87, 0x2c, 0xe2, 0x9b, 0xb0, 0xe8, 0x89, - 0xf5, 0x31, 0x97, 0x45, 0x9e, 0xd3, 0x48, 0x0f, 0xd7, 0xa7, 0x73, 0x76, 0x4d, 0x92, 0x70, 0x30, - 0xf9, 0x29, 0x54, 0x15, 0x8b, 0xf1, 0x24, 0xe0, 0x27, 0x56, 0xd7, 0x57, 0xe3, 0x0c, 0x22, 0x8f, - 0x21, 0x39, 0x48, 0x74, 0x04, 0x92, 0x0e, 0xac, 0x28, 0x62, 0x21, 0xa3, 0x14, 0xa3, 0xc0, 0xb9, - 0xdc, 0x8d, 0x73, 0x99, 0x36, 0x33, 0x72, 0x23, 0x92, 0x5e, 0xdb, 0xdc, 0xa8, 0x40, 0x59, 0x42, - 0xad, 0x7f, 0xe7, 0x30, 0x5c, 0xa5, 0x99, 0x84, 0xca, 0x2d, 0xa8, 0x7b, 0x12, 0x10, 0xd3, 0xf9, - 0x66, 0xa2, 0xce, 0xd2, 0xc0, 0x73, 0xf6, 0xa2, 0x22, 0x12, 0x5a, 0x3f, 0x86, 0x5a, 0xc8, 0x25, - 0x52, 0xfb, 0x46, 0x82, 0xda, 0x21, 0x87, 0xaa, 0x22, 0x60, 0x8a, 0x3f, 0x87, 0x6b, 0x21, 0x7d, - 0x82, 0xe6, 0x1f, 0xcc, 0xd0, 0x3c, 0x64, 0xb8, 0xac, 0x38, 0xe8, 0xba, 0x03, 0xcb, 0x6f, 0x02, - 0x6c, 0xfd, 0xa6, 0x00, 0xe5, 0xcd, 0xd1, 0x60, 0xec, 0x78, 0xcc, 0x4d, 0x25, 0x84, 0x4f, 0xfa, - 0x01, 0x57, 0xb7, 0xbe, 0x7e, 0x2f, 0x7e, 0x82, 0x44, 0x53, 0xbf, 0x6d, 0x8e, 0x6a, 0x4b, 0x12, - 0x46, 0x2c, 0xd3, 0x59, 0xfe, 0x1d, 0x88, 0x65, 0x32, 0x93, 0x24, 0xea, 0x2a, 0x14, 0xa2, 0xab, - 0xd0, 0x80, 0x32, 0x12, 0x46, 0x29, 0x18, 0x75, 0x51, 0x00, 0xf2, 0x3d, 0xb8, 0xd2, 0xf5, 0xa8, - 0xc3, 0xec, 0xa1, 0xd2, 0xf4, 0xbc, 0xc4, 0xa9, 0x8b, 0x0d, 0x5b, 0xa5, 0xeb, 0x7b, 0x50, 0x1b, - 0x8c, 0x7a, 0x11, 0x5e, 0x49, 0xe2, 0x55, 0x11, 0x1a, 0x22, 0x5d, 0x57, 0xf9, 0x80, 0xe5, 0xcf, - 0x1a, 0xee, 0x8a, 0xa5, 0xf5, 0x29, 0x2c, 0xc6, 0x74, 0x65, 0x29, 0xae, 0xfd, 0xd5, 0x61, 0x73, - 0x47, 0xe4, 0xc3, 0x27, 0x3c, 0x05, 0xda, 0x98, 0x0f, 0x31, 0xad, 0xee, 0xb4, 0x0f, 0x0e, 0x30, - 0x7b, 0x7e, 0x1e, 0x92, 0xc8, 0x04, 0xaa, 0xe5, 0xcd, 0x39, 0x2d, 0x6f, 0xe6, 0x54, 0xde, 0xcc, - 0x47, 0x79, 0xb3, 0xb0, 0x51, 0x87, 0x9a, 0x30, 0xc8, 0xf1, 0x84, 0xc5, 0xa1, 0xf5, 0xbb, 0x1c, - 0x40, 0xe7, 0xf5, 0x50, 0x25, 0x8c, 0x47, 0x50, 0xee, 0x0a, 0xe6, 0xe8, 0x20, 0x96, 0x13, 0xaf, - 0x25, 0xda, 0xd8, 0x56, 0x58, 0x98, 0x1b, 0xca, 0xfe, 0xa4, 0xdb, 0xa5, 0xbe, 0x4a, 0xa2, 0xe6, - 0xa5, 0xd5, 0xee, 0xb9, 0xad, 0x50, 0x19, 0xd5, 0x0b, 0xc7, 0xed, 0x4f, 0x78, 0x56, 0x7d, 0x2b, - 0x95, 0x44, 0xb5, 0x7e, 0x9b, 0x83, 0x2a, 0x97, 0x35, 0x53, 0x5e, 0xba, 0x05, 0x15, 0x2e, 0x06, - 0xed, 0xc9, 0xcc, 0xb4, 0x60, 0x47, 0x00, 0xf2, 0x13, 0xcc, 0x8f, 0x92, 0xce, 0x97, 0xb2, 0xdd, - 0x4c, 0x66, 0x2b, 0x84, 0x8b, 0xb0, 0xad, 0x6d, 0xb8, 0xca, 0xcd, 0xd3, 0x0d, 0xd8, 0x86, 0x34, - 0xa8, 0xfe, 0xd0, 0xe7, 0x8c, 0x87, 0x1e, 0xf7, 0xc6, 0x67, 0x17, 0xbe, 0xdb, 0x75, 0xfa, 0x52, - 0x90, 0x70, 0x8d, 0x0f, 0x0c, 0xd1, 0x99, 0x65, 0x7a, 0x1b, 0x16, 0xa1, 0xfa, 0xd4, 0xf1, 0xcf, - 0xa4, 0x48, 0xd6, 0xcf, 0xa1, 0x26, 0x96, 0x99, 0xcc, 0x88, 0xaf, 0xe2, 0x19, 0x72, 0xe1, 0x82, - 0x2f, 0xda, 0xfc, 0xdb, 0xba, 0x0a, 0x57, 0x0e, 0x86, 0xce, 0xd8, 0x3f, 0x1b, 0xa9, 0x44, 0xcb, - 0xca, 0xb8, 0xa5, 0x08, 0x96, 0xe9, 0xc4, 0x8f, 0xe0, 0x8a, 0x47, 0x07, 0x8e, 0x3b, 0x74, 0x87, - 0xa7, 0xc7, 0x27, 0x17, 0x01, 0xf5, 0x65, 0x95, 0x57, 0x0f, 0xc1, 0x1b, 0x0c, 0xca, 0x44, 0x3b, - 0xe9, 0x8f, 0x4e, 0xe4, 0x5d, 0xe7, 0xdf, 0xd6, 0xef, 0xf1, 0xcd, 0x79, 0xee, 0x04, 0x5d, 0x65, - 0x05, 0xb2, 0x05, 0xf5, 0xf0, 0x86, 0x73, 0x88, 0x94, 0xc5, 0xc8, 0xf6, 0x9c, 0x66, 0x53, 0xde, - 0x78, 0x95, 0xed, 0x17, 0xbb, 0x3a, 0x80, 0xb3, 0x72, 0x86, 0x5d, 0xda, 0x0f, 0x59, 0xe5, 0xd3, - 0x59, 0x71, 0x44, 0x9d, 0x95, 0x0e, 0xd8, 0xb8, 0x12, 0xbd, 0x84, 0xe2, 0x7e, 0x7e, 0x9b, 0x03, - 0x32, 0x2d, 0xc3, 0x77, 0x2d, 0x42, 0x1f, 0x40, 0xdd, 0xc7, 0x6b, 0x1f, 0x1c, 0x1b, 0x35, 0xf0, - 0x22, 0x87, 0x86, 0x59, 0x0a, 0x2d, 0x8c, 0xc5, 0xf7, 0x29, 0x86, 0xb4, 0x7f, 0x3c, 0x1c, 0x05, - 0xee, 0x8b, 0x0b, 0x9e, 0x19, 0x17, 0xec, 0xba, 0x02, 0xef, 0x72, 0xa8, 0xf5, 0x48, 0x09, 0xa5, - 0x0b, 0x4f, 0x6e, 0xc0, 0xc2, 0x2b, 0x06, 0x55, 0xd5, 0x39, 0x3e, 0xf9, 0x7c, 0xbd, 0xd5, 0xb3, - 0xfe, 0x81, 0x0f, 0xa0, 0x34, 0x7f, 0xa6, 0x18, 0xd0, 0x8f, 0xc8, 0xc7, 0x8e, 0x60, 0xf5, 0x86, - 0x70, 0x4b, 0x8f, 0x2b, 0xb7, 0x60, 0xab, 0x25, 0xbb, 0x67, 0xc2, 0xca, 0xb8, 0x25, 0xf4, 0x09, - 0xd7, 0x98, 0xe8, 0x97, 0xba, 0xe2, 0x9e, 0x19, 0x99, 0xde, 0xbe, 0x22, 0xe1, 0xa1, 0x75, 0x1e, - 0x40, 0x89, 0x9e, 0xd3, 0x61, 0xe0, 0xaf, 0x56, 0x79, 0x5e, 0x58, 0x54, 0xe5, 0x62, 0x9b, 0x41, - 0x6d, 0xb9, 0x69, 0xfd, 0x18, 0xae, 0xee, 0xb0, 0xba, 0xee, 0x09, 0x5a, 0x5f, 0xaf, 0x10, 0x3b, - 0x9d, 0x1d, 0x69, 0x95, 0x42, 0xd0, 0xd9, 0x21, 0x75, 0xc8, 0x6f, 0xb5, 0xa4, 0x0e, 0x79, 0xb7, - 0x65, 0xfd, 0x12, 0x1d, 0xad, 0xd3, 0x65, 0x32, 0x93, 0xc1, 0x5c, 0x1d, 0x5f, 0x88, 0x8e, 0xc7, - 0x52, 0x94, 0x7a, 0xde, 0xc8, 0xe3, 0x06, 0xa9, 0xd8, 0x62, 0x61, 0xdd, 0x97, 0x32, 0xa0, 0xce, - 0xa3, 0x97, 0x61, 0xb0, 0x09, 0x6e, 0xb9, 0x50, 0xd4, 0x6d, 0x58, 0x8e, 0x61, 0x65, 0x4a, 0x4e, - 0x1f, 0xc1, 0x35, 0xce, 0x6c, 0x9b, 0xd2, 0x71, 0xb3, 0xef, 0x9e, 0xa7, 0x9e, 0x3a, 0x86, 0xeb, - 0x26, 0xe2, 0xff, 0xd7, 0x46, 0xd6, 0x19, 0x94, 0x9e, 0xf1, 0xfe, 0x51, 0x93, 0xa5, 0xc8, 0x71, - 0x31, 0xc3, 0x0c, 0x9d, 0x81, 0xa8, 0xee, 0x2b, 0x36, 0xff, 0xe6, 0xd9, 0x9c, 0x52, 0xef, 0xd0, - 0xde, 0x11, 0x0f, 0x47, 0xc5, 0x0e, 0xd7, 0xe4, 0x0e, 0xeb, 0x5c, 0x5d, 0x0c, 0x0f, 0xbe, 0x5b, - 0xe4, 0xbb, 0x1a, 0x04, 0x3b, 0xa8, 0x25, 0x71, 0x52, 0xb3, 0xd7, 0xd3, 0x5e, 0x8e, 0x90, 0x5f, - 0x2e, 0xce, 0xcf, 0x7a, 0x05, 0x57, 0x35, 0xfc, 0x4c, 0x66, 0xf8, 0x04, 0x4a, 0xa2, 0x49, 0x96, - 0x49, 0x6b, 0x25, 0x4e, 0x25, 0x8e, 0xb1, 0x25, 0x8e, 0xf5, 0x00, 0x96, 0x25, 0x84, 0x0e, 0x46, - 0x49, 0xbe, 0xe2, 0xf6, 0xb1, 0x76, 0x60, 0x25, 0x8e, 0x96, 0x29, 0x44, 0x9a, 0xea, 0xd0, 0xc3, - 0x71, 0x4f, 0xcb, 0x81, 0xa6, 0x53, 0x74, 0x83, 0xe5, 0x0d, 0x83, 0x85, 0x02, 0x29, 0x16, 0x99, - 0x04, 0x5a, 0x56, 0xe6, 0xdf, 0x71, 0xfd, 0xf0, 0xa5, 0x7b, 0x03, 0x44, 0x07, 0x66, 0x72, 0xca, - 0x1a, 0x94, 0x85, 0xc1, 0x55, 0x55, 0x95, 0xec, 0x15, 0x85, 0xc4, 0x04, 0x6a, 0xd1, 0x17, 0x9e, - 0x73, 0x3a, 0xa0, 0x61, 0xce, 0x61, 0x25, 0x84, 0x0e, 0xcc, 0xa4, 0xf1, 0x9f, 0xf0, 0xf9, 0x6c, - 0xf6, 0x1d, 0x6f, 0xa0, 0x8c, 0xff, 0x18, 0x4a, 0xa2, 0x36, 0x91, 0x85, 0xfc, 0x87, 0x71, 0x36, - 0x3a, 0xae, 0x58, 0x34, 0x45, 0x25, 0x23, 0xa9, 0x98, 0xb3, 0xe4, 0x6c, 0xa6, 0x65, 0xcc, 0x6a, - 0x5a, 0xe4, 0x07, 0x30, 0xef, 0x30, 0x12, 0x7e, 0x17, 0xeb, 0xeb, 0xef, 0x25, 0xb0, 0xee, 0x5c, - 0x8c, 0xa9, 0x2d, 0xb0, 0xac, 0xcf, 0xa0, 0xaa, 0x9d, 0xc0, 0xaa, 0xde, 0x27, 0xed, 0x0e, 0x96, - 0xc2, 0x35, 0x58, 0x68, 0x6e, 0x76, 0xb6, 0x8e, 0x44, 0x31, 0x5c, 0x07, 0x68, 0xb5, 0xc3, 0x75, - 0x1e, 0xab, 0x20, 0x41, 0x25, 0x6f, 0xb8, 0x2e, 0x4f, 0x2e, 0x4d, 0x9e, 0xfc, 0x3b, 0xc9, 0xf3, - 0x1a, 0x16, 0xa5, 0xfa, 0x99, 0x62, 0xe0, 0x53, 0xb4, 0x30, 0x63, 0xa3, 0x42, 0xe0, 0x46, 0xc2, - 0xb1, 0xea, 0x76, 0x0a, 0x44, 0x0b, 0xab, 0x87, 0x83, 0xc0, 0x09, 0x26, 0xbe, 0x0a, 0x81, 0x3f, - 0xe6, 0xa0, 0xae, 0x20, 0x59, 0x9b, 0x79, 0xd5, 0x2b, 0x89, 0x9c, 0x17, 0x76, 0x4a, 0xd7, 0xa1, - 0xd4, 0x3b, 0x39, 0x70, 0xdf, 0xa8, 0xa1, 0x86, 0x5c, 0x31, 0x78, 0x5f, 0x9c, 0x23, 0x26, 0x6a, - 0x72, 0xc5, 0xca, 0x6f, 0x36, 0x5b, 0xdb, 0x1a, 0xf6, 0xe8, 0x6b, 0xfe, 0xd2, 0x16, 0xed, 0x08, - 0xc0, 0xcb, 0x65, 0x39, 0x79, 0xe3, 0x8d, 0x94, 0x3e, 0x89, 0xc3, 0x20, 0x6f, 0x4e, 0x82, 0xb3, - 0xf6, 0x90, 0x0d, 0x9d, 0x94, 0x86, 0x2b, 0x40, 0x18, 0xb0, 0xe5, 0xfa, 0x3a, 0xb4, 0x0d, 0xcb, - 0x0c, 0x8a, 0x71, 0x8f, 0xc5, 0x74, 0x94, 0x31, 0x54, 0xda, 0xce, 0x19, 0x69, 0xdb, 0xf1, 0xfd, - 0x57, 0x23, 0xaf, 0x27, 0x55, 0x0b, 0xd7, 0x56, 0x4b, 0x30, 0x3f, 0xf4, 0x63, 0x89, 0xf9, 0xbb, - 0x72, 0x79, 0x18, 0x71, 0x79, 0x42, 0x83, 0x19, 0x5c, 0xac, 0x8f, 0xe1, 0x9a, 0xc2, 0x94, 0xcd, - 0xf4, 0x0c, 0xe4, 0x3d, 0xb8, 0xad, 0x90, 0x37, 0xcf, 0x58, 0xa1, 0xb7, 0x2f, 0x0f, 0xfc, 0x5f, - 0xe5, 0x7c, 0x0c, 0x2b, 0xa1, 0x9c, 0x7a, 0xed, 0x82, 0x7c, 0x26, 0xbe, 0x8c, 0x17, 0xe4, 0xc3, - 0xbe, 0x19, 0xcc, 0x1b, 0xf5, 0xc3, 0x07, 0x90, 0x7d, 0x5b, 0xef, 0x45, 0xd2, 0xc7, 0xea, 0x07, - 0x65, 0x00, 0x1b, 0x91, 0x66, 0x9b, 0x51, 0x79, 0x93, 0x61, 0x46, 0xa6, 0x52, 0x8c, 0x19, 0x34, - 0x66, 0x16, 0xcb, 0x16, 0x12, 0x73, 0x74, 0x43, 0xe2, 0x29, 0xcd, 0x3f, 0x84, 0xe2, 0x98, 0xca, - 0x3b, 0x5c, 0x5d, 0x27, 0x6b, 0x62, 0xe2, 0xbc, 0xb6, 0x8f, 0x30, 0xd7, 0x67, 0x91, 0x6c, 0xf3, - 0x7d, 0xfd, 0xb0, 0xb8, 0x16, 0x5f, 0x0a, 0xd9, 0x54, 0xf8, 0x65, 0x4a, 0xa7, 0xdb, 0x22, 0x3e, - 0xc3, 0xa8, 0xcd, 0xc4, 0xec, 0x44, 0x58, 0x21, 0x0a, 0xf6, 0x4c, 0x37, 0x1d, 0x0b, 0xc3, 0x00, - 0xb5, 0x56, 0xf7, 0x5c, 0x2c, 0x94, 0xc0, 0xe1, 0x4d, 0xc8, 0x24, 0xb0, 0x13, 0x31, 0xe3, 0x5e, - 0xce, 0x2a, 0x2f, 0x8b, 0x3e, 0xf5, 0xe4, 0x8b, 0x85, 0xb5, 0x0b, 0xd7, 0xcd, 0x9b, 0x94, 0x49, - 0xe4, 0x23, 0xb8, 0x93, 0x76, 0xd9, 0x32, 0xf1, 0x7d, 0x16, 0xdd, 0x99, 0x4b, 0xa8, 0xfb, 0x75, - 0xb5, 0x2f, 0xa5, 0x38, 0x97, 0x6e, 0x0f, 0x6f, 0xee, 0x65, 0x31, 0xcb, 0xec, 0x76, 0xa5, 0xa9, - 0x9e, 0x13, 0x2e, 0xc3, 0x11, 0x5a, 0x2a, 0xb9, 0x2c, 0xf1, 0x2e, 0xc3, 0x11, 0xdf, 0xb7, 0xa0, - 0x12, 0xd6, 0x19, 0xda, 0x9f, 0x58, 0xaa, 0x50, 0xde, 0xdd, 0x3b, 0xd8, 0x6f, 0x6e, 0x62, 0x85, - 0xb3, 0xfe, 0xcf, 0x3c, 0xe4, 0xb7, 0x8f, 0xc8, 0x06, 0xcc, 0x8b, 0xe1, 0xf0, 0x8c, 0xf1, 0x79, - 0x63, 0xd6, 0x98, 0xd9, 0x9a, 0x23, 0x9f, 0x43, 0x81, 0x8d, 0x87, 0x53, 0xe7, 0xe7, 0x8d, 0xf4, - 0x11, 0x33, 0x52, 0x77, 0xa0, 0xaa, 0xcd, 0x82, 0xc9, 0x5b, 0xe7, 0xe7, 0x8d, 0xb7, 0xcf, 0x99, - 0x85, 0x4c, 0x9d, 0xd7, 0x43, 0x53, 0xa6, 0x68, 0x76, 0x69, 0xca, 0xa4, 0x4d, 0x0a, 0x91, 0x7a, - 0x57, 0xce, 0xa0, 0xbb, 0x01, 0x79, 0x3f, 0x61, 0xa4, 0xa9, 0xcf, 0xec, 0x1a, 0x77, 0xd3, 0x11, - 0x14, 0xbf, 0xf5, 0x3d, 0x98, 0xe7, 0xf3, 0x0c, 0xf2, 0x85, 0xfa, 0x68, 0x24, 0x4c, 0x7b, 0x52, - 0xcc, 0x1d, 0x9b, 0x84, 0x58, 0x73, 0x0f, 0x73, 0x3f, 0xcc, 0xad, 0x7f, 0x9b, 0x87, 0x79, 0xde, - 0xdf, 0x92, 0xaf, 0x00, 0xa2, 0x41, 0x80, 0x29, 0xed, 0xd4, 0x68, 0xc1, 0x94, 0x76, 0x7a, 0x86, - 0x20, 0x3c, 0xa2, 0x75, 0xec, 0x24, 0x89, 0x24, 0xf6, 0xd8, 0x99, 0x1e, 0x49, 0x68, 0xf7, 0x91, - 0xab, 0x03, 0xf5, 0x78, 0x47, 0x4e, 0xee, 0x25, 0x90, 0x99, 0x8d, 0x7d, 0xe3, 0xfe, 0x6c, 0xa4, - 0x98, 0x55, 0xfe, 0x92, 0x47, 0xbf, 0x89, 0xbf, 0xf0, 0xa2, 0x0b, 0x2b, 0x61, 0xd3, 0x4b, 0xee, - 0x24, 0x35, 0x44, 0x51, 0x75, 0xd1, 0x78, 0x3f, 0x75, 0x3f, 0x14, 0xff, 0x39, 0xd4, 0xf4, 0x26, - 0x95, 0x7c, 0x90, 0xd8, 0x63, 0xe9, 0x7d, 0x6e, 0xc3, 0x9a, 0x85, 0x32, 0xcd, 0x58, 0x34, 0x9b, - 0xc9, 0x8c, 0x63, 0xbd, 0x6c, 0x32, 0xe3, 0x78, 0xaf, 0x8a, 0x8c, 0x31, 0x32, 0xa2, 0x16, 0x93, - 0x24, 0xaa, 0xa8, 0x75, 0xa4, 0x66, 0x64, 0x4c, 0x77, 0xa7, 0x18, 0xc7, 0xff, 0xc9, 0x43, 0xf5, - 0x99, 0xe3, 0x0e, 0x03, 0x3a, 0x64, 0x23, 0x31, 0x96, 0x3d, 0x78, 0xa2, 0x31, 0xc3, 0x59, 0x6f, - 0xe8, 0xcc, 0x70, 0x8e, 0x75, 0x3b, 0x28, 0x66, 0x1b, 0x4a, 0xa2, 0xe9, 0x20, 0x06, 0x62, 0xac, - 0x39, 0x69, 0xdc, 0x4a, 0xde, 0xd4, 0xb5, 0x8d, 0xfa, 0x57, 0x53, 0xdb, 0xa9, 0x76, 0xb7, 0x71, - 0x37, 0x1d, 0x21, 0x64, 0xf9, 0x33, 0x28, 0xb2, 0xd1, 0x37, 0x31, 0x52, 0x85, 0x36, 0x1d, 0x6f, - 0x34, 0x92, 0xb6, 0x42, 0x06, 0xcf, 0x60, 0x41, 0x4d, 0xb3, 0xc9, 0x6d, 0x43, 0xfe, 0xf8, 0xe4, - 0xbb, 0x71, 0x27, 0x6d, 0x5b, 0x31, 0xc3, 0xf0, 0xfe, 0x6b, 0x05, 0x8a, 0xec, 0x9d, 0x60, 0xba, - 0x46, 0xc5, 0xa5, 0xa9, 0xeb, 0x54, 0xd7, 0x63, 0xea, 0x3a, 0x5d, 0x97, 0x8a, 0x3b, 0xaf, 0xd5, - 0x98, 0x24, 0x81, 0x24, 0xde, 0x34, 0x99, 0x77, 0x3e, 0xa1, 0x40, 0x15, 0xb1, 0xad, 0x17, 0x9b, - 0x24, 0x81, 0xc8, 0xe8, 0xba, 0xcc, 0xd8, 0x4e, 0xaa, 0x55, 0x91, 0xf1, 0x3e, 0x94, 0x65, 0x75, - 0x99, 0x24, 0x6a, 0xbc, 0x05, 0x4b, 0x12, 0xd5, 0x28, 0x4d, 0x23, 0x8e, 0x58, 0x6b, 0xa4, 0x71, - 0x8c, 0x7a, 0x8c, 0x34, 0x8e, 0x5a, 0xa1, 0x82, 0x1c, 0xbf, 0x06, 0x88, 0x2a, 0x4a, 0x33, 0xd9, - 0x25, 0x76, 0x6e, 0x66, 0xb2, 0x4b, 0x2e, 0x4a, 0x91, 0xf5, 0x37, 0x40, 0xa6, 0x8b, 0x4b, 0xf2, - 0x71, 0x32, 0x75, 0x62, 0xbf, 0xd7, 0xf8, 0xe4, 0xdd, 0x90, 0xc3, 0x23, 0x8f, 0xa0, 0x12, 0xd6, - 0x9d, 0xc4, 0x4a, 0xd1, 0x5f, 0x7f, 0x69, 0xee, 0xcd, 0xc4, 0x31, 0xad, 0x24, 0xdf, 0x9a, 0x14, - 0xa2, 0xf8, 0x73, 0x73, 0x7f, 0x36, 0x92, 0xee, 0x52, 0x59, 0x8b, 0x26, 0xb9, 0x34, 0xde, 0x60, - 0x26, 0xb9, 0xd4, 0x28, 0x64, 0x23, 0x8e, 0x29, 0x41, 0x12, 0x6f, 0x44, 0xd3, 0x38, 0x4e, 0x05, - 0x49, 0x54, 0x95, 0x26, 0xa9, 0x3f, 0xd5, 0xc7, 0x26, 0xa9, 0x3f, 0x5d, 0xd8, 0x0a, 0x8f, 0x85, - 0x05, 0x6a, 0x92, 0xc7, 0xcc, 0x46, 0xb8, 0x71, 0x6f, 0x26, 0x8e, 0x29, 0x72, 0xba, 0xc7, 0xa6, - 0xba, 0xe1, 0x34, 0x91, 0x4d, 0x8f, 0x6d, 0xd4, 0xfe, 0xf0, 0xf7, 0x3b, 0xb9, 0x3f, 0xe3, 0xbf, - 0xbf, 0xe1, 0xbf, 0x93, 0x12, 0xff, 0xbf, 0x5d, 0x3f, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xce, 0x88, 0x4e, 0x6c, 0x44, 0x26, 0x00, 0x00, + 0x18, 0x79, 0x94, 0x3b, 0x70, 0xc1, 0xe6, 0xdf, 0xd6, 0x97, 0x00, 0xfb, 0x93, 0x20, 0x3d, 0x24, + 0xd0, 0xeb, 0xe7, 0x8c, 0x83, 0x0c, 0x07, 0xb1, 0xe0, 0xb1, 0x40, 0x1d, 0x9f, 0x86, 0xb1, 0xc0, + 0x16, 0xd6, 0x26, 0x54, 0x39, 0xaf, 0x2c, 0x8a, 0x20, 0x13, 0xd2, 0xa2, 0x7d, 0x1a, 0xd0, 0x0c, + 0xb1, 0x6a, 0x51, 0x58, 0x8e, 0x31, 0xc9, 0x64, 0xda, 0x55, 0x28, 0xf7, 0x38, 0x33, 0x71, 0x4e, + 0xc1, 0x56, 0x4b, 0xeb, 0x5f, 0x39, 0xbc, 0x52, 0x42, 0xc2, 0xc3, 0x21, 0x8b, 0xf8, 0x26, 0x2c, + 0x7a, 0x62, 0x7d, 0xcc, 0x65, 0x91, 0xe7, 0x34, 0xd2, 0xc3, 0xf5, 0xe9, 0x9c, 0x5d, 0x93, 0x24, + 0x1c, 0x4c, 0x7e, 0x0a, 0x55, 0xc5, 0x62, 0x3c, 0x09, 0xf8, 0x89, 0xd5, 0xf5, 0xd5, 0x38, 0x83, + 0xc8, 0x63, 0x48, 0x0e, 0x12, 0x1d, 0x81, 0xa4, 0x03, 0x2b, 0x8a, 0x58, 0xc8, 0x28, 0xc5, 0x28, + 0x70, 0x2e, 0x77, 0xe3, 0x5c, 0xa6, 0xcd, 0x8c, 0xdc, 0x88, 0xa4, 0xd7, 0x36, 0x37, 0x2a, 0x50, + 0x96, 0x50, 0xeb, 0xdf, 0x39, 0x0c, 0x57, 0x69, 0x26, 0xa1, 0x72, 0x0b, 0xea, 0x9e, 0x04, 0xc4, + 0x74, 0xbe, 0x99, 0xa8, 0xb3, 0x34, 0xf0, 0x9c, 0xbd, 0xa8, 0x88, 0x84, 0xd6, 0x8f, 0xa1, 0x16, + 0x72, 0x89, 0xd4, 0xbe, 0x91, 0xa0, 0x76, 0xc8, 0xa1, 0xaa, 0x08, 0x98, 0xe2, 0xcf, 0xe1, 0x5a, + 0x48, 0x9f, 0xa0, 0xf9, 0x07, 0x33, 0x34, 0x0f, 0x19, 0x2e, 0x2b, 0x0e, 0xba, 0xee, 0xc0, 0xf2, + 0x9b, 0x00, 0x5b, 0xbf, 0x29, 0x40, 0x79, 0x73, 0x34, 0x18, 0x3b, 0x1e, 0x73, 0x53, 0x09, 0xe1, + 0x93, 0x7e, 0xc0, 0xd5, 0xad, 0xaf, 0xdf, 0x8b, 0x9f, 0x20, 0xd1, 0xd4, 0x6f, 0x9b, 0xa3, 0xda, + 0x92, 0x84, 0x11, 0xcb, 0x74, 0x96, 0x7f, 0x07, 0x62, 0x99, 0xcc, 0x24, 0x89, 0xba, 0x0a, 0x85, + 0xe8, 0x2a, 0x34, 0xa0, 0x8c, 0x84, 0x51, 0x0a, 0x46, 0x5d, 0x14, 0x80, 0x7c, 0x0f, 0xae, 0x74, + 0x3d, 0xea, 0x30, 0x7b, 0xa8, 0x34, 0x3d, 0x2f, 0x71, 0xea, 0x62, 0xc3, 0x56, 0xe9, 0xfa, 0x1e, + 0xd4, 0x06, 0xa3, 0x5e, 0x84, 0x57, 0x92, 0x78, 0x55, 0x84, 0x86, 0x48, 0xd7, 0x55, 0x3e, 0x60, + 0xf9, 0xb3, 0x86, 0xbb, 0x62, 0x69, 0x7d, 0x0a, 0x8b, 0x31, 0x5d, 0x59, 0x8a, 0x6b, 0x7f, 0x75, + 0xd8, 0xdc, 0x11, 0xf9, 0xf0, 0x09, 0x4f, 0x81, 0x36, 0xe6, 0x43, 0x4c, 0xab, 0x3b, 0xed, 0x83, + 0x03, 0xcc, 0x9e, 0x9f, 0x87, 0x24, 0x32, 0x81, 0x6a, 0x79, 0x73, 0x4e, 0xcb, 0x9b, 0x39, 0x95, + 0x37, 0xf3, 0x51, 0xde, 0x2c, 0x6c, 0xd4, 0xa1, 0x26, 0x0c, 0x72, 0x3c, 0x61, 0x71, 0x68, 0xfd, + 0x2e, 0x07, 0xd0, 0x79, 0x3d, 0x54, 0x09, 0xe3, 0x11, 0x94, 0xbb, 0x82, 0x39, 0x3a, 0x88, 0xe5, + 0xc4, 0x6b, 0x89, 0x36, 0xb6, 0x15, 0x16, 0xe6, 0x86, 0xb2, 0x3f, 0xe9, 0x76, 0xa9, 0xaf, 0x92, + 0xa8, 0x79, 0x69, 0xb5, 0x7b, 0x6e, 0x2b, 0x54, 0x46, 0xf5, 0xc2, 0x71, 0xfb, 0x13, 0x9e, 0x55, + 0xdf, 0x4a, 0x25, 0x51, 0xad, 0xdf, 0xe6, 0xa0, 0xca, 0x65, 0xcd, 0x94, 0x97, 0x6e, 0x41, 0x85, + 0x8b, 0x41, 0x7b, 0x32, 0x33, 0x2d, 0xd8, 0x11, 0x80, 0xfc, 0x04, 0xf3, 0xa3, 0xa4, 0xf3, 0xa5, + 0x6c, 0x37, 0x93, 0xd9, 0x0a, 0xe1, 0x22, 0x6c, 0x6b, 0x1b, 0xae, 0x72, 0xf3, 0x74, 0x03, 0xb6, + 0x21, 0x0d, 0xaa, 0x3f, 0xf4, 0x39, 0xe3, 0xa1, 0xc7, 0xbd, 0xf1, 0xd9, 0x85, 0xef, 0x76, 0x9d, + 0xbe, 0x14, 0x24, 0x5c, 0xe3, 0x03, 0x43, 0x74, 0x66, 0x99, 0xde, 0x86, 0x45, 0xa8, 0x3e, 0x75, + 0xfc, 0x33, 0x29, 0x92, 0xf5, 0x73, 0xa8, 0x89, 0x65, 0x26, 0x33, 0xe2, 0xab, 0x78, 0x86, 0x5c, + 0xb8, 0xe0, 0x8b, 0x36, 0xff, 0xb6, 0xae, 0xc2, 0x95, 0x83, 0xa1, 0x33, 0xf6, 0xcf, 0x46, 0x2a, + 0xd1, 0xb2, 0x32, 0x6e, 0x29, 0x82, 0x65, 0x3a, 0xf1, 0x23, 0xb8, 0xe2, 0xd1, 0x81, 0xe3, 0x0e, + 0xdd, 0xe1, 0xe9, 0xf1, 0xc9, 0x45, 0x40, 0x7d, 0x59, 0xe5, 0xd5, 0x43, 0xf0, 0x06, 0x83, 0x32, + 0xd1, 0x4e, 0xfa, 0xa3, 0x13, 0x79, 0xd7, 0xf9, 0xb7, 0xf5, 0x7b, 0x7c, 0x73, 0x9e, 0x3b, 0x41, + 0x57, 0x59, 0x81, 0x6c, 0x41, 0x3d, 0xbc, 0xe1, 0x1c, 0x22, 0x65, 0x31, 0xb2, 0x3d, 0xa7, 0xd9, + 0x94, 0x37, 0x5e, 0x65, 0xfb, 0xc5, 0xae, 0x0e, 0xe0, 0xac, 0x9c, 0x61, 0x97, 0xf6, 0x43, 0x56, + 0xf9, 0x74, 0x56, 0x1c, 0x51, 0x67, 0xa5, 0x03, 0x36, 0xae, 0x44, 0x2f, 0xa1, 0xb8, 0x9f, 0xdf, + 0xe6, 0x80, 0x4c, 0xcb, 0xf0, 0x5d, 0x8b, 0xd0, 0x07, 0x50, 0xf7, 0xf1, 0xda, 0x07, 0xc7, 0x46, + 0x0d, 0xbc, 0xc8, 0xa1, 0x61, 0x96, 0x42, 0x0b, 0x63, 0xf1, 0x7d, 0x8a, 0x21, 0xed, 0x1f, 0x0f, + 0x47, 0x81, 0xfb, 0xe2, 0x82, 0x67, 0xc6, 0x05, 0xbb, 0xae, 0xc0, 0xbb, 0x1c, 0x6a, 0x3d, 0x52, + 0x42, 0xe9, 0xc2, 0x93, 0x1b, 0xb0, 0xf0, 0x8a, 0x41, 0x55, 0x75, 0x8e, 0x4f, 0x3e, 0x5f, 0x6f, + 0xf5, 0xac, 0x7f, 0xe0, 0x03, 0x28, 0xcd, 0x9f, 0x29, 0x06, 0xf4, 0x23, 0xf2, 0xb1, 0x23, 0x58, + 0xbd, 0x21, 0xdc, 0xd2, 0x93, 0x95, 0x9a, 0x5a, 0xb2, 0x7b, 0x26, 0xac, 0x8c, 0x5b, 0x42, 0x9f, + 0x70, 0x8d, 0x89, 0x7e, 0xa9, 0x2b, 0xee, 0x99, 0x91, 0xe9, 0xed, 0x2b, 0x12, 0x1e, 0x5a, 0xe7, + 0x01, 0x94, 0xe8, 0x39, 0x1d, 0x06, 0xfe, 0x6a, 0x95, 0xe7, 0x85, 0x45, 0x55, 0x2e, 0xb6, 0x19, + 0xd4, 0x96, 0x9b, 0xd6, 0x8f, 0xe1, 0xea, 0x0e, 0xab, 0xeb, 0x9e, 0xa0, 0xf5, 0xf5, 0x0a, 0xb1, + 0xd3, 0xd9, 0x91, 0x56, 0x29, 0x04, 0x9d, 0x1d, 0x52, 0x87, 0xfc, 0x56, 0x4b, 0xea, 0x90, 0x77, + 0x5b, 0xd6, 0x2f, 0xd1, 0xd1, 0x3a, 0x5d, 0x26, 0x33, 0x19, 0xcc, 0xd5, 0xf1, 0x85, 0xe8, 0x78, + 0x2c, 0x45, 0xa9, 0xe7, 0x8d, 0x3c, 0x6e, 0x90, 0x8a, 0x2d, 0x16, 0xd6, 0x7d, 0x29, 0x03, 0xea, + 0x3c, 0x7a, 0x19, 0x06, 0x9b, 0xe0, 0x96, 0x0b, 0x45, 0xdd, 0x86, 0xe5, 0x18, 0x56, 0xa6, 0xe4, + 0xf4, 0x11, 0x5c, 0xe3, 0xcc, 0xb6, 0x29, 0x1d, 0x37, 0xfb, 0xee, 0x79, 0xea, 0xa9, 0x63, 0xb8, + 0x6e, 0x22, 0xfe, 0x7f, 0x6d, 0x64, 0x9d, 0x41, 0xe9, 0x19, 0xef, 0x1f, 0x35, 0x59, 0x8a, 0x1c, + 0x17, 0x33, 0xcc, 0xd0, 0x19, 0x88, 0xea, 0xbe, 0x62, 0xf3, 0x6f, 0x9e, 0xcd, 0x29, 0xf5, 0x0e, + 0xed, 0x1d, 0xf1, 0x70, 0x54, 0xec, 0x70, 0x4d, 0xee, 0xb0, 0xce, 0xd5, 0xc5, 0xf0, 0xe0, 0xbb, + 0x45, 0xbe, 0xab, 0x41, 0xb0, 0x83, 0x5a, 0x12, 0x27, 0x35, 0x7b, 0x3d, 0xed, 0xe5, 0x08, 0xf9, + 0xe5, 0xe2, 0xfc, 0xac, 0x57, 0x70, 0x55, 0xc3, 0xcf, 0x64, 0x86, 0x4f, 0xa0, 0x24, 0x9a, 0x64, + 0x99, 0xb4, 0x56, 0xe2, 0x54, 0xe2, 0x18, 0x5b, 0xe2, 0x58, 0x0f, 0x60, 0x59, 0x42, 0xe8, 0x60, + 0x94, 0xe4, 0x2b, 0x6e, 0x1f, 0x6b, 0x07, 0x56, 0xe2, 0x68, 0x99, 0x42, 0xa4, 0xa9, 0x0e, 0x3d, + 0x1c, 0xf7, 0xb4, 0x1c, 0x68, 0x3a, 0x45, 0x37, 0x58, 0xde, 0x30, 0x58, 0x28, 0x90, 0x62, 0x91, + 0x49, 0xa0, 0x65, 0x65, 0xfe, 0x1d, 0xd7, 0x0f, 0x5f, 0xba, 0x37, 0x40, 0x74, 0x60, 0x26, 0xa7, + 0xac, 0x41, 0x59, 0x18, 0x5c, 0x55, 0x55, 0xc9, 0x5e, 0x51, 0x48, 0x4c, 0xa0, 0x16, 0x7d, 0xe1, + 0x39, 0xa7, 0x03, 0x1a, 0xe6, 0x1c, 0x56, 0x42, 0xe8, 0xc0, 0x4c, 0x1a, 0xff, 0x09, 0x9f, 0xcf, + 0x66, 0xdf, 0xf1, 0x06, 0xca, 0xf8, 0x8f, 0xa1, 0x24, 0x6a, 0x13, 0x59, 0xc8, 0x7f, 0x18, 0x67, + 0xa3, 0xe3, 0x8a, 0x45, 0x53, 0x54, 0x32, 0x92, 0x8a, 0x39, 0x4b, 0xce, 0x66, 0x5a, 0xc6, 0xac, + 0xa6, 0x45, 0x7e, 0x00, 0xf3, 0x0e, 0x23, 0xe1, 0x77, 0xb1, 0xbe, 0xfe, 0x5e, 0x02, 0xeb, 0xce, + 0xc5, 0x98, 0xda, 0x02, 0xcb, 0xfa, 0x0c, 0xaa, 0xda, 0x09, 0xac, 0xea, 0x7d, 0xd2, 0xee, 0x60, + 0x29, 0x5c, 0x83, 0x85, 0xe6, 0x66, 0x67, 0xeb, 0x48, 0x14, 0xc3, 0x75, 0x80, 0x56, 0x3b, 0x5c, + 0xe7, 0xb1, 0x0a, 0x12, 0x54, 0xf2, 0x86, 0xeb, 0xf2, 0xe4, 0xd2, 0xe4, 0xc9, 0xbf, 0x93, 0x3c, + 0xaf, 0x61, 0x51, 0xaa, 0x9f, 0x29, 0x06, 0x3e, 0x45, 0x0b, 0x33, 0x36, 0x2a, 0x04, 0x6e, 0x24, + 0x1c, 0xab, 0x6e, 0xa7, 0x40, 0xb4, 0xb0, 0x7a, 0x38, 0x08, 0x9c, 0x60, 0xe2, 0xab, 0x10, 0xf8, + 0x63, 0x0e, 0xea, 0x0a, 0x92, 0xb5, 0x99, 0x57, 0xbd, 0x92, 0xc8, 0x79, 0x61, 0xa7, 0x74, 0x1d, + 0x4a, 0xbd, 0x93, 0x03, 0xf7, 0x8d, 0x1a, 0x6a, 0xc8, 0x15, 0x83, 0xf7, 0xc5, 0x39, 0x62, 0xa2, + 0x26, 0x57, 0xac, 0xfc, 0x66, 0xb3, 0xb5, 0xad, 0x61, 0x8f, 0xbe, 0xe6, 0x2f, 0x6d, 0xd1, 0x8e, + 0x00, 0xbc, 0x5c, 0x96, 0x93, 0x37, 0xde, 0x48, 0xe9, 0x93, 0x38, 0x0c, 0xf2, 0xe6, 0x24, 0x38, + 0x6b, 0x0f, 0xd9, 0xd0, 0x49, 0x69, 0xb8, 0x02, 0x84, 0x01, 0x5b, 0xae, 0xaf, 0x43, 0xdb, 0xb0, + 0xcc, 0xa0, 0x18, 0xf7, 0x58, 0x4c, 0x47, 0x19, 0x43, 0xa5, 0xed, 0x9c, 0x91, 0xb6, 0x1d, 0xdf, + 0x7f, 0x35, 0xf2, 0x7a, 0x52, 0xb5, 0x70, 0x6d, 0xb5, 0x04, 0xf3, 0x43, 0x3f, 0x96, 0x98, 0xbf, + 0x2b, 0x97, 0x87, 0x11, 0x97, 0x27, 0x34, 0x98, 0xc1, 0xc5, 0xfa, 0x18, 0xae, 0x29, 0x4c, 0xd9, + 0x4c, 0xcf, 0x40, 0xde, 0x83, 0xdb, 0x0a, 0x79, 0xf3, 0x8c, 0x15, 0x7a, 0xfb, 0xf2, 0xc0, 0xff, + 0x55, 0xce, 0xc7, 0xb0, 0x12, 0xca, 0xa9, 0xd7, 0x2e, 0xc8, 0x67, 0xe2, 0xcb, 0x78, 0x41, 0x3e, + 0xec, 0x9b, 0xc1, 0xbc, 0x51, 0x3f, 0x7c, 0x00, 0xd9, 0xb7, 0xf5, 0x5e, 0x24, 0x7d, 0xac, 0x7e, + 0x50, 0x06, 0xb0, 0x11, 0x69, 0xb6, 0x19, 0x95, 0x37, 0x19, 0x66, 0x64, 0x2a, 0xc5, 0x98, 0x41, + 0x63, 0x66, 0xb1, 0x6c, 0x21, 0x31, 0x47, 0x37, 0x24, 0x9e, 0xd2, 0xfc, 0x43, 0x28, 0x8e, 0xa9, + 0xbc, 0xc3, 0xd5, 0x75, 0xb2, 0x26, 0x26, 0xce, 0x6b, 0xfb, 0x08, 0x73, 0x7d, 0x16, 0xc9, 0x36, + 0xdf, 0xd7, 0x0f, 0x8b, 0x6b, 0xf1, 0xa5, 0x90, 0x4d, 0x85, 0x5f, 0xa6, 0x74, 0xba, 0x2d, 0xe2, + 0x33, 0x8c, 0xda, 0x4c, 0xcc, 0x4e, 0x84, 0x15, 0xa2, 0x60, 0xcf, 0x74, 0xd3, 0xb1, 0x30, 0x0c, + 0x50, 0x6b, 0x75, 0xcf, 0xc5, 0x42, 0x09, 0x1c, 0xde, 0x84, 0x4c, 0x02, 0x3b, 0x11, 0x33, 0xee, + 0xe5, 0xac, 0xf2, 0xb2, 0xe8, 0x53, 0x4f, 0xbe, 0x58, 0x58, 0xbb, 0x70, 0xdd, 0xbc, 0x49, 0x99, + 0x44, 0x3e, 0x82, 0x3b, 0x69, 0x97, 0x2d, 0x13, 0xdf, 0x67, 0xd1, 0x9d, 0xb9, 0x84, 0xba, 0x5f, + 0x57, 0xfb, 0x52, 0x8a, 0x73, 0xe9, 0xf6, 0xf0, 0xe6, 0x5e, 0x16, 0xb3, 0xcc, 0x6e, 0x57, 0x9a, + 0xea, 0x39, 0xe1, 0x32, 0x1c, 0xa1, 0xa5, 0x92, 0xcb, 0x12, 0xef, 0x32, 0x1c, 0xf1, 0x7d, 0x0b, + 0x2a, 0x61, 0x9d, 0xa1, 0xfd, 0x89, 0xa5, 0x0a, 0xe5, 0xdd, 0xbd, 0x83, 0xfd, 0xe6, 0x26, 0x56, + 0x38, 0xeb, 0xff, 0xcc, 0x43, 0x7e, 0xfb, 0x88, 0x6c, 0xc0, 0xbc, 0x18, 0x0e, 0xcf, 0x18, 0x9f, + 0x37, 0x66, 0x8d, 0x99, 0xad, 0x39, 0xf2, 0x39, 0x14, 0xd8, 0x78, 0x38, 0x75, 0x7e, 0xde, 0x48, + 0x1f, 0x31, 0x23, 0x75, 0x07, 0xaa, 0xda, 0x2c, 0x98, 0xbc, 0x75, 0x7e, 0xde, 0x78, 0xfb, 0x9c, + 0x59, 0xc8, 0xd4, 0x79, 0x3d, 0x34, 0x65, 0x8a, 0x66, 0x97, 0xa6, 0x4c, 0xda, 0xa4, 0x10, 0xa9, + 0x77, 0xe5, 0x0c, 0xba, 0x1b, 0x90, 0xf7, 0x13, 0x46, 0x9a, 0xfa, 0xcc, 0xae, 0x71, 0x37, 0x1d, + 0x41, 0xf1, 0x5b, 0xdf, 0x83, 0x79, 0x3e, 0xcf, 0x20, 0x5f, 0xa8, 0x8f, 0x46, 0xc2, 0xb4, 0x27, + 0xc5, 0xdc, 0xb1, 0x49, 0x88, 0x35, 0xf7, 0x30, 0xf7, 0xc3, 0xdc, 0xfa, 0xb7, 0x79, 0x98, 0xe7, + 0xfd, 0x2d, 0xf9, 0x0a, 0x20, 0x1a, 0x04, 0x98, 0xd2, 0x4e, 0x8d, 0x16, 0x4c, 0x69, 0xa7, 0x67, + 0x08, 0xc2, 0x23, 0x5a, 0xc7, 0x4e, 0x92, 0x48, 0x62, 0x8f, 0x9d, 0xe9, 0x91, 0x84, 0x76, 0x1f, + 0xb9, 0x3a, 0x50, 0x8f, 0x77, 0xe4, 0xe4, 0x5e, 0x02, 0x99, 0xd9, 0xd8, 0x37, 0xee, 0xcf, 0x46, + 0x8a, 0x59, 0xe5, 0x2f, 0x79, 0xf4, 0x9b, 0xf8, 0x0b, 0x2f, 0xba, 0xb0, 0x12, 0x36, 0xbd, 0xe4, + 0x4e, 0x52, 0x43, 0x14, 0x55, 0x17, 0x8d, 0xf7, 0x53, 0xf7, 0x43, 0xf1, 0x9f, 0x43, 0x4d, 0x6f, + 0x52, 0xc9, 0x07, 0x89, 0x3d, 0x96, 0xde, 0xe7, 0x36, 0xac, 0x59, 0x28, 0xd3, 0x8c, 0x45, 0xb3, + 0x99, 0xcc, 0x38, 0xd6, 0xcb, 0x26, 0x33, 0x8e, 0xf7, 0xaa, 0xc8, 0x18, 0x23, 0x23, 0x6a, 0x31, + 0x49, 0xa2, 0x8a, 0x5a, 0x47, 0x6a, 0x46, 0xc6, 0x74, 0x77, 0x8a, 0x71, 0xfc, 0x9f, 0x3c, 0x54, + 0x9f, 0x39, 0xee, 0x30, 0xa0, 0x43, 0x36, 0x12, 0x63, 0xd9, 0x83, 0x27, 0x1a, 0x33, 0x9c, 0xf5, + 0x86, 0xce, 0x0c, 0xe7, 0x58, 0xb7, 0x83, 0x62, 0xb6, 0xa1, 0x24, 0x9a, 0x0e, 0x62, 0x20, 0xc6, + 0x9a, 0x93, 0xc6, 0xad, 0xe4, 0x4d, 0x5d, 0xdb, 0xa8, 0x7f, 0x35, 0xb5, 0x9d, 0x6a, 0x77, 0x1b, + 0x77, 0xd3, 0x11, 0x42, 0x96, 0x3f, 0x83, 0x22, 0x1b, 0x7d, 0x13, 0x23, 0x55, 0x68, 0xd3, 0xf1, + 0x46, 0x23, 0x69, 0x2b, 0x64, 0xf0, 0x0c, 0x16, 0xd4, 0x34, 0x9b, 0xdc, 0x36, 0xe4, 0x8f, 0x4f, + 0xbe, 0x1b, 0x77, 0xd2, 0xb6, 0x15, 0x33, 0x0c, 0xef, 0xbf, 0x56, 0xa0, 0xc8, 0xde, 0x09, 0xa6, + 0x6b, 0x54, 0x5c, 0x9a, 0xba, 0x4e, 0x75, 0x3d, 0xa6, 0xae, 0xd3, 0x75, 0xa9, 0xb8, 0xf3, 0x5a, + 0x8d, 0x49, 0x12, 0x48, 0xe2, 0x4d, 0x93, 0x79, 0xe7, 0x13, 0x0a, 0x54, 0x11, 0xdb, 0x7a, 0xb1, + 0x49, 0x12, 0x88, 0x8c, 0xae, 0xcb, 0x8c, 0xed, 0xa4, 0x5a, 0x15, 0x19, 0xef, 0x43, 0x59, 0x56, + 0x97, 0x49, 0xa2, 0xc6, 0x5b, 0xb0, 0x24, 0x51, 0x8d, 0xd2, 0x34, 0xe2, 0x88, 0xb5, 0x46, 0x1a, + 0xc7, 0xa8, 0xc7, 0x48, 0xe3, 0xa8, 0x15, 0x2a, 0xc8, 0xf1, 0x6b, 0x80, 0xa8, 0xa2, 0x34, 0x93, + 0x5d, 0x62, 0xe7, 0x66, 0x26, 0xbb, 0xe4, 0xa2, 0x14, 0x59, 0x7f, 0x03, 0x64, 0xba, 0xb8, 0x24, + 0x1f, 0x27, 0x53, 0x27, 0xf6, 0x7b, 0x8d, 0x4f, 0xde, 0x0d, 0x39, 0x3c, 0xf2, 0x08, 0x2a, 0x61, + 0xdd, 0x49, 0xac, 0x14, 0xfd, 0xf5, 0x97, 0xe6, 0xde, 0x4c, 0x1c, 0xd3, 0x4a, 0xf2, 0xad, 0x49, + 0x21, 0x8a, 0x3f, 0x37, 0xf7, 0x67, 0x23, 0xe9, 0x2e, 0x95, 0xb5, 0x68, 0x92, 0x4b, 0xe3, 0x0d, + 0x66, 0x92, 0x4b, 0x8d, 0x42, 0x36, 0xe2, 0x98, 0x12, 0x24, 0xf1, 0x46, 0x34, 0x8d, 0xe3, 0x54, + 0x90, 0x44, 0x55, 0x69, 0x92, 0xfa, 0x53, 0x7d, 0x6c, 0x92, 0xfa, 0xd3, 0x85, 0xad, 0xf0, 0x58, + 0x58, 0xa0, 0x26, 0x79, 0xcc, 0x6c, 0x84, 0x1b, 0xf7, 0x66, 0xe2, 0x98, 0x22, 0xa7, 0x7b, 0x6c, + 0xaa, 0x1b, 0x4e, 0x13, 0xd9, 0xf4, 0xd8, 0x46, 0xed, 0x0f, 0x7f, 0xbf, 0x93, 0xfb, 0x33, 0xfe, + 0xfb, 0x1b, 0xfe, 0x3b, 0x29, 0xf1, 0xff, 0xdb, 0xf5, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, + 0xf5, 0x43, 0xe6, 0x66, 0x44, 0x26, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index 71fffce11..ee3d91f42 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -197,7 +197,7 @@ message RangeResponse { // kvs is the list of key-value pairs matched by the range request. repeated mvccpb.KeyValue kvs = 2; // more indicates if there are more keys to return in the requested range. - int64 more = 3; + bool more = 3; } message PutRequest { diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index 3977c5c3e..d90d592b0 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -715,7 +715,7 @@ func TestV3RangeRequest(t *testing.T) { reqs []pb.RangeRequest wresps [][]string - wmores []int64 + wmores []bool }{ // single key { @@ -731,7 +731,7 @@ func TestV3RangeRequest(t *testing.T) { {"foo"}, {}, }, - []int64{0, 0}, + []bool{false, false}, }, // multi-key { @@ -759,7 +759,7 @@ func TestV3RangeRequest(t *testing.T) { {}, {"a", "b", "c", "d", "e"}, }, - []int64{0, 0, 0, 0, 0, 0}, + []bool{false, false, false, false, false, false}, }, // revision { @@ -777,7 +777,7 @@ func TestV3RangeRequest(t *testing.T) { {"a"}, {"a", "b"}, }, - []int64{0, 0, 0, 0}, + []bool{false, false, false, false}, }, // limit { @@ -793,7 +793,7 @@ func TestV3RangeRequest(t *testing.T) { {"bar"}, {"bar", "foo"}, }, - []int64{1, 0}, + []bool{true, false}, }, // sort { @@ -838,7 +838,7 @@ func TestV3RangeRequest(t *testing.T) { {"c"}, {}, }, - []int64{1, 1, 1, 1, 0}, + []bool{true, true, true, true, false}, }, }