From 12bf1a3382ace4c21b00198b60dea4886cf82794 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Tue, 5 Jul 2016 16:48:16 -0700 Subject: [PATCH] *: rename preserveKVs to prevKv --- .../apispec/swagger/rpc.swagger.json | 27 +- clientv3/kv.go | 2 +- clientv3/op.go | 15 +- etcdctl/ctlv3/command/del_command.go | 8 +- etcdctl/ctlv3/command/printer.go | 2 +- etcdserver/apply.go | 4 +- etcdserver/apply_auth.go | 4 +- etcdserver/etcdserverpb/rpc.pb.go | 720 ++++++++++-------- etcdserver/etcdserverpb/rpc.proto | 17 +- integration/v3_grpc_test.go | 20 +- 10 files changed, 457 insertions(+), 362 deletions(-) diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json index 001270fa2..3aabd8f1d 100644 --- a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json @@ -671,10 +671,10 @@ "format": "byte", "description": "key is the first key to delete in the range." }, - "preserveKVs": { + "prev_kv": { "type": "boolean", "format": "boolean", - "description": "If preserveKVs is set, the deleted KVs will be preserved for delete events\nThe preserved KVs will be returned as response.\nIt requires read permission to read the deleted KVs." + "description": "If prev_kv is set, etcd gets the previous key-value pairs before deleting it.\nThe previous key-value pairs will be returned in the delte response." }, "range_end": { "type": "string", @@ -686,13 +686,6 @@ "etcdserverpbDeleteRangeResponse": { "type": "object", "properties": { - "KVs": { - "type": "array", - "items": { - "$ref": "#/definitions/mvccpbKeyValue" - }, - "description": "if preserveKVs is set in the request, the deleted KVs will be returned." - }, "deleted": { "type": "string", "format": "int64", @@ -700,6 +693,13 @@ }, "header": { "$ref": "#/definitions/etcdserverpbResponseHeader" + }, + "prev_kvs": { + "type": "array", + "items": { + "$ref": "#/definitions/mvccpbKeyValue" + }, + "description": "if prev_kv is set in the request, the previous key-value pairs will be returned." } } }, @@ -933,6 +933,11 @@ "format": "int64", "description": "lease is the lease ID to associate with the key in the key-value store. A lease\nvalue of 0 indicates no lease." }, + "prev_kv": { + "type": "boolean", + "format": "boolean", + "description": "If prev_kv is set, etcd gets the previous key-value pair before changing it.\nThe previous key-value pair will be returned in the put response." + }, "value": { "type": "string", "format": "byte", @@ -945,6 +950,10 @@ "properties": { "header": { "$ref": "#/definitions/etcdserverpbResponseHeader" + }, + "prev_kv": { + "$ref": "#/definitions/mvccpbKeyValue", + "description": "if prev_kv is set in the request, the previous key-value pair will be returned." } } }, diff --git a/clientv3/kv.go b/clientv3/kv.go index ee1a094bf..a481ed9fc 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -163,7 +163,7 @@ func (kv *kv) do(ctx context.Context, op Op) (OpResponse, error) { } case tDeleteRange: var resp *pb.DeleteRangeResponse - r := &pb.DeleteRangeRequest{Key: op.key, RangeEnd: op.end, PreserveKVs: op.preserveKVs} + r := &pb.DeleteRangeRequest{Key: op.key, RangeEnd: op.end, PrevKv: op.prevKV} resp, err = kv.remote.DeleteRange(ctx, r) if err == nil { return OpResponse{del: (*DeleteResponse)(resp)}, nil diff --git a/clientv3/op.go b/clientv3/op.go index 6da82b02c..8a56b854c 100644 --- a/clientv3/op.go +++ b/clientv3/op.go @@ -45,11 +45,9 @@ type Op struct { // for range, watch rev int64 + // for watch, put, delete prevKV bool - // for delete - preserveKVs bool - // progressNotify is for progress updates. progressNotify bool @@ -79,7 +77,7 @@ func (op Op) toRequestOp() *pb.RequestOp { r := &pb.PutRequest{Key: op.key, Value: op.val, Lease: int64(op.leaseID)} return &pb.RequestOp{Request: &pb.RequestOp_RequestPut{RequestPut: r}} case tDeleteRange: - r := &pb.DeleteRangeRequest{Key: op.key, RangeEnd: op.end, PreserveKVs: op.preserveKVs} + r := &pb.DeleteRangeRequest{Key: op.key, RangeEnd: op.end, PrevKv: op.prevKV} return &pb.RequestOp{Request: &pb.RequestOp_RequestDeleteRange{RequestDeleteRange: r}} default: @@ -133,8 +131,6 @@ func OpPut(key, val string, opts ...OpOption) Op { panic("unexpected serializable in put") case ret.countOnly: panic("unexpected countOnly in put") - case ret.preserveKVs: - panic("unexpected preserveKVs in put") } return ret } @@ -153,8 +149,6 @@ func opWatch(key string, opts ...OpOption) Op { panic("unexpected serializable in watch") case ret.countOnly: panic("unexpected countOnly in watch") - case ret.preserveKVs: - panic("unexpected preserveKVs in watch") } return ret } @@ -266,11 +260,6 @@ func withTop(target SortTarget, order SortOrder) []OpOption { return []OpOption{WithPrefix(), WithSort(target, order), WithLimit(1)} } -// WithPreserveKVs preserves the deleted KVs for attaching in responses. -func WithPreserveKVs() OpOption { - return func(op *Op) { op.preserveKVs = true } -} - // WithProgressNotify makes watch server send periodic progress updates. // Progress updates have zero events in WatchResponse. func WithProgressNotify() OpOption { diff --git a/etcdctl/ctlv3/command/del_command.go b/etcdctl/ctlv3/command/del_command.go index 0ede38a67..ceeeb8d74 100644 --- a/etcdctl/ctlv3/command/del_command.go +++ b/etcdctl/ctlv3/command/del_command.go @@ -23,7 +23,7 @@ import ( var ( delPrefix bool - delKVs bool + delPrevKV bool ) // NewDelCommand returns the cobra command for "del". @@ -35,7 +35,7 @@ func NewDelCommand() *cobra.Command { } cmd.Flags().BoolVar(&delPrefix, "prefix", false, "delete keys with matching prefix") - cmd.Flags().BoolVar(&delKVs, "preserve-kvs", false, "preserve and return deleted key-value pairs") + cmd.Flags().BoolVar(&delPrevKV, "prev-kv", false, "return deleted key-value pairs") return cmd } @@ -68,8 +68,8 @@ func getDelOp(cmd *cobra.Command, args []string) (string, []clientv3.OpOption) { if delPrefix { opts = append(opts, clientv3.WithPrefix()) } - if delKVs { - opts = append(opts, clientv3.WithPreserveKVs()) + if delPrevKV { + opts = append(opts, clientv3.WithPrevKV()) } return key, opts diff --git a/etcdctl/ctlv3/command/printer.go b/etcdctl/ctlv3/command/printer.go index 69fb37eb0..318ec6e4b 100644 --- a/etcdctl/ctlv3/command/printer.go +++ b/etcdctl/ctlv3/command/printer.go @@ -108,7 +108,7 @@ type simplePrinter struct { func (s *simplePrinter) Del(resp v3.DeleteResponse) { fmt.Println(resp.Deleted) - for _, kv := range resp.KVs { + for _, kv := range resp.PrevKvs { printKV(s.isHex, kv) } } diff --git a/etcdserver/apply.go b/etcdserver/apply.go index f1d373505..be7213e11 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -192,7 +192,7 @@ func (a *applierV3backend) DeleteRange(txnID int64, dr *pb.DeleteRangeRequest) ( } var rr *mvcc.RangeResult - if dr.PreserveKVs { + if dr.PrevKv { if txnID != noTxn { rr, err = a.s.KV().TxnRange(txnID, dr.Key, dr.RangeEnd, mvcc.RangeOptions{}) if err != nil { @@ -218,7 +218,7 @@ func (a *applierV3backend) DeleteRange(txnID int64, dr *pb.DeleteRangeRequest) ( resp.Deleted = n if rr != nil { for i := range rr.KVs { - resp.KVs = append(resp.KVs, &rr.KVs[i]) + resp.PrevKvs = append(resp.PrevKvs, &rr.KVs[i]) } } resp.Header.Revision = rev diff --git a/etcdserver/apply_auth.go b/etcdserver/apply_auth.go index 89cd7ec04..0745fbd06 100644 --- a/etcdserver/apply_auth.go +++ b/etcdserver/apply_auth.go @@ -70,7 +70,7 @@ func (aa *authApplierV3) DeleteRange(txnID int64, r *pb.DeleteRangeRequest) (*pb if !aa.as.IsDeleteRangePermitted(aa.user, r.Key, r.RangeEnd) { return nil, auth.ErrPermissionDenied } - if r.PreserveKVs && !aa.as.IsRangePermitted(aa.user, r.Key, r.RangeEnd) { + if r.PrevKv && !aa.as.IsRangePermitted(aa.user, r.Key, r.RangeEnd) { return nil, auth.ErrPermissionDenied } @@ -103,7 +103,7 @@ func (aa *authApplierV3) checkTxnReqsPermission(reqs []*pb.RequestOp) bool { continue } - if tv.RequestDeleteRange.PreserveKVs && !aa.as.IsRangePermitted(aa.user, tv.RequestDeleteRange.Key, tv.RequestDeleteRange.RangeEnd) { + if tv.RequestDeleteRange.PrevKv && !aa.as.IsRangePermitted(aa.user, tv.RequestDeleteRange.Key, tv.RequestDeleteRange.RangeEnd) { return false } diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 3a113a8e5..ad07392ee 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -296,6 +296,9 @@ type PutRequest struct { // lease is the lease ID to associate with the key in the key-value store. A lease // value of 0 indicates no lease. Lease int64 `protobuf:"varint,3,opt,name=lease,proto3" json:"lease,omitempty"` + // If prev_kv is set, etcd gets the previous key-value pair before changing it. + // The previous key-value pair will be returned in the put response. + PrevKv bool `protobuf:"varint,4,opt,name=prev_kv,json=prevKv,proto3" json:"prev_kv,omitempty"` } func (m *PutRequest) Reset() { *m = PutRequest{} } @@ -305,6 +308,8 @@ func (*PutRequest) Descriptor() ([]byte, []int) { return fileDescriptorRpc, []in type PutResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` + // if prev_kv is set in the request, the previous key-value pair will be returned. + PrevKv *mvccpb.KeyValue `protobuf:"bytes,2,opt,name=prev_kv,json=prevKv" json:"prev_kv,omitempty"` } func (m *PutResponse) Reset() { *m = PutResponse{} } @@ -319,6 +324,13 @@ func (m *PutResponse) GetHeader() *ResponseHeader { return nil } +func (m *PutResponse) GetPrevKv() *mvccpb.KeyValue { + if m != nil { + return m.PrevKv + } + return nil +} + type DeleteRangeRequest struct { // key is the first key to delete in the range. Key []byte `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` @@ -326,10 +338,9 @@ type DeleteRangeRequest struct { // If range_end is not given, the range is defined to contain only the key argument. // If range_end is '\0', the range is all keys greater than or equal to the key argument. RangeEnd []byte `protobuf:"bytes,2,opt,name=range_end,json=rangeEnd,proto3" json:"range_end,omitempty"` - // If preserveKVs is set, the deleted KVs will be preserved for delete events - // The preserved KVs will be returned as response. - // It requires read permission to read the deleted KVs. - PreserveKVs bool `protobuf:"varint,3,opt,name=preserveKVs,proto3" json:"preserveKVs,omitempty"` + // If prev_kv is set, etcd gets the previous key-value pairs before deleting it. + // The previous key-value pairs will be returned in the delte response. + PrevKv bool `protobuf:"varint,3,opt,name=prev_kv,json=prevKv,proto3" json:"prev_kv,omitempty"` } func (m *DeleteRangeRequest) Reset() { *m = DeleteRangeRequest{} } @@ -341,8 +352,8 @@ type DeleteRangeResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` // deleted is the number of keys deleted by the delete range request. Deleted int64 `protobuf:"varint,2,opt,name=deleted,proto3" json:"deleted,omitempty"` - // if preserveKVs is set in the request, the deleted KVs will be returned. - KVs []*mvccpb.KeyValue `protobuf:"bytes,3,rep,name=KVs,json=kVs" json:"KVs,omitempty"` + // if prev_kv is set in the request, the previous key-value pairs will be returned. + PrevKvs []*mvccpb.KeyValue `protobuf:"bytes,3,rep,name=prev_kvs,json=prevKvs" json:"prev_kvs,omitempty"` } func (m *DeleteRangeResponse) Reset() { *m = DeleteRangeResponse{} } @@ -357,9 +368,9 @@ func (m *DeleteRangeResponse) GetHeader() *ResponseHeader { return nil } -func (m *DeleteRangeResponse) GetKVs() []*mvccpb.KeyValue { +func (m *DeleteRangeResponse) GetPrevKvs() []*mvccpb.KeyValue { if m != nil { - return m.KVs + return m.PrevKvs } return nil } @@ -3809,6 +3820,16 @@ func (m *PutRequest) MarshalTo(data []byte) (int, error) { i++ i = encodeVarintRpc(data, i, uint64(m.Lease)) } + if m.PrevKv { + data[i] = 0x20 + i++ + if m.PrevKv { + data[i] = 1 + } else { + data[i] = 0 + } + i++ + } return i, nil } @@ -3837,6 +3858,16 @@ func (m *PutResponse) MarshalTo(data []byte) (int, error) { } i += n2 } + if m.PrevKv != nil { + data[i] = 0x12 + i++ + i = encodeVarintRpc(data, i, uint64(m.PrevKv.Size())) + n3, err := m.PrevKv.MarshalTo(data[i:]) + if err != nil { + return 0, err + } + i += n3 + } return i, nil } @@ -3867,10 +3898,10 @@ func (m *DeleteRangeRequest) MarshalTo(data []byte) (int, error) { i = encodeVarintRpc(data, i, uint64(len(m.RangeEnd))) i += copy(data[i:], m.RangeEnd) } - if m.PreserveKVs { + if m.PrevKv { data[i] = 0x18 i++ - if m.PreserveKVs { + if m.PrevKv { data[i] = 1 } else { data[i] = 0 @@ -3899,19 +3930,19 @@ func (m *DeleteRangeResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n3, err := m.Header.MarshalTo(data[i:]) + n4, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n3 + i += n4 } if m.Deleted != 0 { data[i] = 0x10 i++ i = encodeVarintRpc(data, i, uint64(m.Deleted)) } - if len(m.KVs) > 0 { - for _, msg := range m.KVs { + if len(m.PrevKvs) > 0 { + for _, msg := range m.PrevKvs { data[i] = 0x1a i++ i = encodeVarintRpc(data, i, uint64(msg.Size())) @@ -3941,11 +3972,11 @@ func (m *RequestOp) MarshalTo(data []byte) (int, error) { var l int _ = l if m.Request != nil { - nn4, err := m.Request.MarshalTo(data[i:]) + nn5, err := m.Request.MarshalTo(data[i:]) if err != nil { return 0, err } - i += nn4 + i += nn5 } return i, nil } @@ -3956,11 +3987,11 @@ func (m *RequestOp_RequestRange) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.RequestRange.Size())) - n5, err := m.RequestRange.MarshalTo(data[i:]) + n6, err := m.RequestRange.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n5 + i += n6 } return i, nil } @@ -3970,11 +4001,11 @@ func (m *RequestOp_RequestPut) MarshalTo(data []byte) (int, error) { data[i] = 0x12 i++ i = encodeVarintRpc(data, i, uint64(m.RequestPut.Size())) - n6, err := m.RequestPut.MarshalTo(data[i:]) + n7, err := m.RequestPut.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n6 + i += n7 } return i, nil } @@ -3984,11 +4015,11 @@ func (m *RequestOp_RequestDeleteRange) MarshalTo(data []byte) (int, error) { data[i] = 0x1a i++ i = encodeVarintRpc(data, i, uint64(m.RequestDeleteRange.Size())) - n7, err := m.RequestDeleteRange.MarshalTo(data[i:]) + n8, err := m.RequestDeleteRange.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n7 + i += n8 } return i, nil } @@ -4008,11 +4039,11 @@ func (m *ResponseOp) MarshalTo(data []byte) (int, error) { var l int _ = l if m.Response != nil { - nn8, err := m.Response.MarshalTo(data[i:]) + nn9, err := m.Response.MarshalTo(data[i:]) if err != nil { return 0, err } - i += nn8 + i += nn9 } return i, nil } @@ -4023,11 +4054,11 @@ func (m *ResponseOp_ResponseRange) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.ResponseRange.Size())) - n9, err := m.ResponseRange.MarshalTo(data[i:]) + n10, err := m.ResponseRange.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n9 + i += n10 } return i, nil } @@ -4037,11 +4068,11 @@ func (m *ResponseOp_ResponsePut) MarshalTo(data []byte) (int, error) { data[i] = 0x12 i++ i = encodeVarintRpc(data, i, uint64(m.ResponsePut.Size())) - n10, err := m.ResponsePut.MarshalTo(data[i:]) + n11, err := m.ResponsePut.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n10 + i += n11 } return i, nil } @@ -4051,11 +4082,11 @@ func (m *ResponseOp_ResponseDeleteRange) MarshalTo(data []byte) (int, error) { data[i] = 0x1a i++ i = encodeVarintRpc(data, i, uint64(m.ResponseDeleteRange.Size())) - n11, err := m.ResponseDeleteRange.MarshalTo(data[i:]) + n12, err := m.ResponseDeleteRange.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n11 + i += n12 } return i, nil } @@ -4091,11 +4122,11 @@ func (m *Compare) MarshalTo(data []byte) (int, error) { i += copy(data[i:], m.Key) } if m.TargetUnion != nil { - nn12, err := m.TargetUnion.MarshalTo(data[i:]) + nn13, err := m.TargetUnion.MarshalTo(data[i:]) if err != nil { return 0, err } - i += nn12 + i += nn13 } return i, nil } @@ -4204,11 +4235,11 @@ func (m *TxnResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n13, err := m.Header.MarshalTo(data[i:]) + n14, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n13 + i += n14 } if m.Succeeded { data[i] = 0x10 @@ -4287,11 +4318,11 @@ func (m *CompactionResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n14, err := m.Header.MarshalTo(data[i:]) + n15, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n14 + i += n15 } return i, nil } @@ -4333,11 +4364,11 @@ func (m *HashResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n15, err := m.Header.MarshalTo(data[i:]) + n16, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n15 + i += n16 } if m.Hash != 0 { data[i] = 0x10 @@ -4384,11 +4415,11 @@ func (m *SnapshotResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n16, err := m.Header.MarshalTo(data[i:]) + n17, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n16 + i += n17 } if m.RemainingBytes != 0 { data[i] = 0x10 @@ -4420,11 +4451,11 @@ func (m *WatchRequest) MarshalTo(data []byte) (int, error) { var l int _ = l if m.RequestUnion != nil { - nn17, err := m.RequestUnion.MarshalTo(data[i:]) + nn18, err := m.RequestUnion.MarshalTo(data[i:]) if err != nil { return 0, err } - i += nn17 + i += nn18 } return i, nil } @@ -4435,11 +4466,11 @@ func (m *WatchRequest_CreateRequest) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.CreateRequest.Size())) - n18, err := m.CreateRequest.MarshalTo(data[i:]) + n19, err := m.CreateRequest.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n18 + i += n19 } return i, nil } @@ -4449,11 +4480,11 @@ func (m *WatchRequest_CancelRequest) MarshalTo(data []byte) (int, error) { data[i] = 0x12 i++ i = encodeVarintRpc(data, i, uint64(m.CancelRequest.Size())) - n19, err := m.CancelRequest.MarshalTo(data[i:]) + n20, err := m.CancelRequest.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n19 + i += n20 } return i, nil } @@ -4561,11 +4592,11 @@ func (m *WatchResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n20, err := m.Header.MarshalTo(data[i:]) + n21, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n20 + i += n21 } if m.WatchId != 0 { data[i] = 0x10 @@ -4659,11 +4690,11 @@ func (m *LeaseGrantResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n21, err := m.Header.MarshalTo(data[i:]) + n22, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n21 + i += n22 } if m.ID != 0 { data[i] = 0x10 @@ -4726,11 +4757,11 @@ func (m *LeaseRevokeResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n22, err := m.Header.MarshalTo(data[i:]) + n23, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n22 + i += n23 } return i, nil } @@ -4777,11 +4808,11 @@ func (m *LeaseKeepAliveResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n23, err := m.Header.MarshalTo(data[i:]) + n24, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n23 + i += n24 } if m.ID != 0 { data[i] = 0x10 @@ -4907,21 +4938,21 @@ func (m *MemberAddResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n24, err := m.Header.MarshalTo(data[i:]) + n25, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n24 + i += n25 } if m.Member != nil { data[i] = 0x12 i++ i = encodeVarintRpc(data, i, uint64(m.Member.Size())) - n25, err := m.Member.MarshalTo(data[i:]) + n26, err := m.Member.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n25 + i += n26 } return i, nil } @@ -4968,11 +4999,11 @@ func (m *MemberRemoveResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n26, err := m.Header.MarshalTo(data[i:]) + n27, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n26 + i += n27 } return i, nil } @@ -5034,11 +5065,11 @@ func (m *MemberUpdateResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n27, err := m.Header.MarshalTo(data[i:]) + n28, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n27 + i += n28 } return i, nil } @@ -5080,11 +5111,11 @@ func (m *MemberListResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n28, err := m.Header.MarshalTo(data[i:]) + n29, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n28 + i += n29 } if len(m.Members) > 0 { for _, msg := range m.Members { @@ -5138,11 +5169,11 @@ func (m *DefragmentResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n29, err := m.Header.MarshalTo(data[i:]) + n30, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n29 + i += n30 } return i, nil } @@ -5227,11 +5258,11 @@ func (m *AlarmResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n30, err := m.Header.MarshalTo(data[i:]) + n31, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n30 + i += n31 } if len(m.Alarms) > 0 { for _, msg := range m.Alarms { @@ -5285,11 +5316,11 @@ func (m *StatusResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n31, err := m.Header.MarshalTo(data[i:]) + n32, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n31 + i += n32 } if len(m.Version) > 0 { data[i] = 0x12 @@ -5687,11 +5718,11 @@ func (m *AuthRoleGrantPermissionRequest) MarshalTo(data []byte) (int, error) { data[i] = 0x12 i++ i = encodeVarintRpc(data, i, uint64(m.Perm.Size())) - n32, err := m.Perm.MarshalTo(data[i:]) + n33, err := m.Perm.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n32 + i += n33 } return i, nil } @@ -5751,11 +5782,11 @@ func (m *AuthEnableResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n33, err := m.Header.MarshalTo(data[i:]) + n34, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n33 + i += n34 } return i, nil } @@ -5779,11 +5810,11 @@ func (m *AuthDisableResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n34, err := m.Header.MarshalTo(data[i:]) + n35, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n34 + i += n35 } return i, nil } @@ -5807,11 +5838,11 @@ func (m *AuthenticateResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n35, err := m.Header.MarshalTo(data[i:]) + n36, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n35 + i += n36 } if len(m.Token) > 0 { data[i] = 0x12 @@ -5841,11 +5872,11 @@ func (m *AuthUserAddResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n36, err := m.Header.MarshalTo(data[i:]) + n37, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n36 + i += n37 } return i, nil } @@ -5869,11 +5900,11 @@ func (m *AuthUserGetResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n37, err := m.Header.MarshalTo(data[i:]) + n38, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n37 + i += n38 } if len(m.Roles) > 0 { for _, s := range m.Roles { @@ -5912,11 +5943,11 @@ func (m *AuthUserDeleteResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n38, err := m.Header.MarshalTo(data[i:]) + n39, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n38 + i += n39 } return i, nil } @@ -5940,11 +5971,11 @@ func (m *AuthUserChangePasswordResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n39, err := m.Header.MarshalTo(data[i:]) + n40, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n39 + i += n40 } return i, nil } @@ -5968,11 +5999,11 @@ func (m *AuthUserGrantRoleResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n40, err := m.Header.MarshalTo(data[i:]) + n41, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n40 + i += n41 } return i, nil } @@ -5996,11 +6027,11 @@ func (m *AuthUserRevokeRoleResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n41, err := m.Header.MarshalTo(data[i:]) + n42, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n41 + i += n42 } return i, nil } @@ -6024,11 +6055,11 @@ func (m *AuthRoleAddResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n42, err := m.Header.MarshalTo(data[i:]) + n43, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n42 + i += n43 } return i, nil } @@ -6052,11 +6083,11 @@ func (m *AuthRoleGetResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n43, err := m.Header.MarshalTo(data[i:]) + n44, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n43 + i += n44 } if len(m.Perm) > 0 { for _, msg := range m.Perm { @@ -6092,11 +6123,11 @@ func (m *AuthRoleListResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n44, err := m.Header.MarshalTo(data[i:]) + n45, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n44 + i += n45 } if len(m.Roles) > 0 { for _, s := range m.Roles { @@ -6135,11 +6166,11 @@ func (m *AuthUserListResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n45, err := m.Header.MarshalTo(data[i:]) + n46, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n45 + i += n46 } if len(m.Users) > 0 { for _, s := range m.Users { @@ -6178,11 +6209,11 @@ func (m *AuthRoleDeleteResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n46, err := m.Header.MarshalTo(data[i:]) + n47, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n46 + i += n47 } return i, nil } @@ -6206,11 +6237,11 @@ func (m *AuthRoleGrantPermissionResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n47, err := m.Header.MarshalTo(data[i:]) + n48, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n47 + i += n48 } return i, nil } @@ -6234,11 +6265,11 @@ func (m *AuthRoleRevokePermissionResponse) MarshalTo(data []byte) (int, error) { data[i] = 0xa i++ i = encodeVarintRpc(data, i, uint64(m.Header.Size())) - n48, err := m.Header.MarshalTo(data[i:]) + n49, err := m.Header.MarshalTo(data[i:]) if err != nil { return 0, err } - i += n48 + i += n49 } return i, nil } @@ -6359,6 +6390,9 @@ func (m *PutRequest) Size() (n int) { if m.Lease != 0 { n += 1 + sovRpc(uint64(m.Lease)) } + if m.PrevKv { + n += 2 + } return n } @@ -6369,6 +6403,10 @@ func (m *PutResponse) Size() (n int) { l = m.Header.Size() n += 1 + l + sovRpc(uint64(l)) } + if m.PrevKv != nil { + l = m.PrevKv.Size() + n += 1 + l + sovRpc(uint64(l)) + } return n } @@ -6383,7 +6421,7 @@ func (m *DeleteRangeRequest) Size() (n int) { if l > 0 { n += 1 + l + sovRpc(uint64(l)) } - if m.PreserveKVs { + if m.PrevKv { n += 2 } return n @@ -6399,8 +6437,8 @@ func (m *DeleteRangeResponse) Size() (n int) { if m.Deleted != 0 { n += 1 + sovRpc(uint64(m.Deleted)) } - if len(m.KVs) > 0 { - for _, e := range m.KVs { + if len(m.PrevKvs) > 0 { + for _, e := range m.PrevKvs { l = e.Size() n += 1 + l + sovRpc(uint64(l)) } @@ -8023,6 +8061,26 @@ func (m *PutRequest) Unmarshal(data []byte) error { break } } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field PrevKv", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + v |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.PrevKv = bool(v != 0) default: iNdEx = preIndex skippy, err := skipRpc(data[iNdEx:]) @@ -8106,6 +8164,39 @@ func (m *PutResponse) Unmarshal(data []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PrevKv", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRpc + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PrevKv == nil { + m.PrevKv = &mvccpb.KeyValue{} + } + if err := m.PrevKv.Unmarshal(data[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRpc(data[iNdEx:]) @@ -8220,7 +8311,7 @@ func (m *DeleteRangeRequest) Unmarshal(data []byte) error { iNdEx = postIndex case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field PreserveKVs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrevKv", wireType) } var v int for shift := uint(0); ; shift += 7 { @@ -8237,7 +8328,7 @@ func (m *DeleteRangeRequest) Unmarshal(data []byte) error { break } } - m.PreserveKVs = bool(v != 0) + m.PrevKv = bool(v != 0) default: iNdEx = preIndex skippy, err := skipRpc(data[iNdEx:]) @@ -8342,7 +8433,7 @@ func (m *DeleteRangeResponse) Unmarshal(data []byte) error { } case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field KVs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrevKvs", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8366,8 +8457,8 @@ func (m *DeleteRangeResponse) Unmarshal(data []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.KVs = append(m.KVs, &mvccpb.KeyValue{}) - if err := m.KVs[len(m.KVs)-1].Unmarshal(data[iNdEx:postIndex]); err != nil { + m.PrevKvs = append(m.PrevKvs, &mvccpb.KeyValue{}) + if err := m.PrevKvs[len(m.PrevKvs)-1].Unmarshal(data[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -15316,206 +15407,207 @@ var ( ) var fileDescriptorRpc = []byte{ - // 3207 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x1a, 0x4d, 0x73, 0x23, 0x57, - 0x71, 0x47, 0xb2, 0x25, 0xab, 0x25, 0x6b, 0xbd, 0xcf, 0xde, 0x8d, 0x3c, 0xeb, 0xf5, 0x7a, 0xdf, - 0x7e, 0xe6, 0xcb, 0x22, 0x4e, 0xe0, 0x00, 0x54, 0xaa, 0x64, 0x4b, 0xd9, 0x18, 0x3b, 0xf6, 0x66, - 0xac, 0x75, 0x42, 0x15, 0x85, 0x6b, 0x2c, 0xcd, 0xda, 0x2a, 0xeb, 0x2b, 0x33, 0x23, 0xed, 0x7a, - 0x81, 0x2a, 0x2a, 0x45, 0x0e, 0xe1, 0x9a, 0x03, 0x45, 0x38, 0xf2, 0x1b, 0xb8, 0xf1, 0x03, 0x28, - 0x2e, 0xa4, 0x8a, 0x23, 0x17, 0x8a, 0xe2, 0xc0, 0x81, 0x3b, 0xc5, 0x09, 0xde, 0xe7, 0xcc, 0x9b, - 0xd1, 0x1b, 0xd9, 0x61, 0xc8, 0x61, 0xd7, 0xf3, 0xfa, 0xf5, 0xeb, 0xee, 0xd7, 0xaf, 0xbb, 0x5f, - 0x77, 0x3f, 0x41, 0xc1, 0x1d, 0xb6, 0xd6, 0x87, 0xee, 0xc0, 0x1f, 0xa0, 0x92, 0xe3, 0xb7, 0xda, - 0x9e, 0xe3, 0x8e, 0x1d, 0x77, 0x78, 0x6c, 0x2e, 0x9d, 0x0c, 0x4e, 0x06, 0x6c, 0xa2, 0x4a, 0xbf, - 0x38, 0x8e, 0xb9, 0x4c, 0x71, 0xaa, 0xbd, 0x71, 0xab, 0xc5, 0xfe, 0x1b, 0x1e, 0x57, 0xcf, 0xc6, - 0x62, 0xea, 0x26, 0x9b, 0xb2, 0x47, 0xfe, 0x29, 0xfb, 0x8f, 0x4c, 0xd1, 0x3f, 0x62, 0x72, 0xe5, - 0x64, 0x30, 0x38, 0xe9, 0x3a, 0x55, 0x7b, 0xd8, 0xa9, 0xda, 0xfd, 0xfe, 0xc0, 0xb7, 0xfd, 0xce, - 0xa0, 0xef, 0xf1, 0x59, 0xfc, 0x99, 0x01, 0x65, 0xcb, 0xf1, 0x86, 0x04, 0xe2, 0xbc, 0xef, 0xd8, - 0x6d, 0xc7, 0x45, 0xb7, 0x00, 0x5a, 0xdd, 0x91, 0xe7, 0x3b, 0xee, 0x51, 0xa7, 0x5d, 0x31, 0xd6, - 0x8c, 0x47, 0x33, 0x56, 0x41, 0x40, 0xb6, 0xdb, 0xe8, 0x26, 0x14, 0x7a, 0x4e, 0xef, 0x98, 0xcf, - 0x66, 0xd8, 0xec, 0x1c, 0x07, 0x90, 0x49, 0x13, 0xe6, 0x5c, 0x67, 0xdc, 0xf1, 0x08, 0x87, 0x4a, - 0x96, 0xcc, 0x65, 0xad, 0x60, 0x4c, 0x17, 0xba, 0xf6, 0x33, 0xff, 0x88, 0x90, 0xe9, 0x55, 0x66, - 0xf8, 0x42, 0x0a, 0x68, 0x92, 0x31, 0xfe, 0x2a, 0x0b, 0x25, 0xcb, 0xee, 0x9f, 0x38, 0x96, 0xf3, - 0xc9, 0xc8, 0xf1, 0x7c, 0xb4, 0x00, 0xd9, 0x33, 0xe7, 0x9c, 0xb1, 0x2f, 0x59, 0xf4, 0x93, 0xaf, - 0x27, 0x18, 0x47, 0x4e, 0x9f, 0x33, 0x2e, 0xd1, 0xf5, 0x04, 0xd0, 0xe8, 0xb7, 0xd1, 0x12, 0xcc, - 0x76, 0x3b, 0xbd, 0x8e, 0x2f, 0xb8, 0xf2, 0x41, 0x44, 0x9c, 0x99, 0x98, 0x38, 0x5b, 0x00, 0xde, - 0xc0, 0xf5, 0x8f, 0x06, 0x2e, 0xd9, 0x74, 0x65, 0x96, 0xcc, 0x96, 0x37, 0xee, 0xad, 0xab, 0x07, - 0xb1, 0xae, 0x0a, 0xb4, 0x7e, 0x40, 0x90, 0xf7, 0x29, 0xae, 0x55, 0xf0, 0xe4, 0x27, 0x7a, 0x0f, - 0x8a, 0x8c, 0x88, 0x6f, 0xbb, 0x27, 0x8e, 0x5f, 0xc9, 0x31, 0x2a, 0xf7, 0x2f, 0xa0, 0xd2, 0x64, - 0xc8, 0x16, 0x63, 0xcf, 0xbf, 0x11, 0x86, 0x12, 0xc1, 0xef, 0xd8, 0xdd, 0xce, 0x4b, 0xfb, 0xb8, - 0xeb, 0x54, 0xf2, 0x84, 0xd0, 0x9c, 0x15, 0x81, 0xd1, 0xfd, 0x13, 0x35, 0x78, 0x47, 0x83, 0x7e, - 0xf7, 0xbc, 0x32, 0xc7, 0x10, 0xe6, 0x28, 0x60, 0x9f, 0x8c, 0xd9, 0xa1, 0x0d, 0x46, 0x7d, 0x9f, - 0xcf, 0x16, 0xd8, 0x6c, 0x81, 0x41, 0xe8, 0x34, 0x5e, 0x87, 0x42, 0x20, 0x3f, 0x9a, 0x83, 0x99, - 0xbd, 0xfd, 0xbd, 0xc6, 0xc2, 0x15, 0x04, 0x90, 0xab, 0x1d, 0x6c, 0x35, 0xf6, 0xea, 0x0b, 0x06, - 0x2a, 0x42, 0xbe, 0xde, 0xe0, 0x83, 0x0c, 0xde, 0x04, 0x08, 0x25, 0x45, 0x79, 0xc8, 0xee, 0x34, - 0x7e, 0x48, 0xf0, 0x09, 0xce, 0x61, 0xc3, 0x3a, 0xd8, 0xde, 0xdf, 0x23, 0x0b, 0xc8, 0xe2, 0x2d, - 0xab, 0x51, 0x6b, 0x36, 0x16, 0x32, 0x14, 0xe3, 0x83, 0xfd, 0xfa, 0x42, 0x16, 0x15, 0x60, 0xf6, - 0xb0, 0xb6, 0xfb, 0xb4, 0xb1, 0x30, 0x83, 0xbf, 0x30, 0x60, 0x5e, 0xec, 0x9d, 0xdb, 0x17, 0x7a, - 0x07, 0x72, 0xa7, 0xcc, 0xc6, 0xd8, 0xb1, 0x16, 0x37, 0x56, 0x62, 0x8a, 0x8a, 0xd8, 0xa1, 0x25, - 0x70, 0x89, 0x6e, 0xb2, 0x67, 0x63, 0x8f, 0x9c, 0x78, 0x96, 0x2c, 0x59, 0x58, 0xe7, 0xc6, 0xbf, - 0xbe, 0xe3, 0x9c, 0x1f, 0xda, 0xdd, 0x91, 0x63, 0xd1, 0x49, 0x84, 0x60, 0xa6, 0x37, 0x70, 0x1d, - 0x76, 0xfa, 0x73, 0x16, 0xfb, 0xa6, 0x26, 0xc1, 0x14, 0x20, 0x4e, 0x9e, 0x0f, 0xf0, 0x0f, 0x00, - 0x9e, 0x8c, 0xfc, 0x64, 0x2b, 0x23, 0xab, 0xc6, 0x94, 0xae, 0xb0, 0x30, 0x3e, 0x60, 0xe6, 0xe5, - 0xd8, 0x9e, 0x13, 0x98, 0x17, 0x1d, 0xe0, 0x2d, 0x28, 0x32, 0x5a, 0x69, 0xb6, 0x87, 0x1d, 0x40, - 0x75, 0xa7, 0xeb, 0xf8, 0x4e, 0x1a, 0xf3, 0x5f, 0x83, 0xe2, 0xd0, 0x75, 0x18, 0xab, 0x9d, 0x43, - 0x4f, 0xa8, 0x41, 0x05, 0xe1, 0xcf, 0x0d, 0x58, 0x8c, 0xf0, 0x49, 0x75, 0x26, 0x15, 0xc8, 0xb7, - 0x19, 0x31, 0x2e, 0x4a, 0xd6, 0x92, 0x43, 0x7a, 0x5a, 0x5c, 0x82, 0xa4, 0xd3, 0x22, 0xb2, 0xfc, - 0xd3, 0x80, 0x82, 0xd8, 0xe8, 0xfe, 0x10, 0xd5, 0x60, 0xde, 0xe5, 0x83, 0x23, 0xb6, 0x1f, 0x21, - 0x88, 0x99, 0xec, 0x45, 0xef, 0x5f, 0xb1, 0x4a, 0x62, 0x09, 0x03, 0xa3, 0xef, 0x41, 0x51, 0x92, - 0x18, 0x8e, 0x7c, 0x26, 0x52, 0x71, 0xa3, 0x12, 0x25, 0x10, 0x9e, 0x3a, 0x59, 0x0e, 0x02, 0x9d, - 0x00, 0x51, 0x13, 0x96, 0xe4, 0x62, 0xbe, 0x09, 0x21, 0x46, 0x96, 0x51, 0x59, 0x8b, 0x52, 0x99, - 0x3c, 0x2a, 0x42, 0x0d, 0x89, 0xf5, 0xca, 0xe4, 0x66, 0x01, 0xf2, 0x02, 0x8a, 0xff, 0x65, 0x00, - 0x48, 0x3d, 0x92, 0xfd, 0xd6, 0xa1, 0xec, 0x8a, 0x51, 0x64, 0xc3, 0x37, 0xb5, 0x1b, 0x16, 0xea, - 0xbf, 0x62, 0xcd, 0xcb, 0x45, 0x7c, 0xcb, 0xef, 0x42, 0x29, 0xa0, 0x12, 0xee, 0x79, 0x59, 0xb3, - 0xe7, 0x80, 0x42, 0x51, 0x2e, 0xa0, 0xbb, 0xfe, 0x08, 0xae, 0x07, 0xeb, 0x35, 0xdb, 0xbe, 0x33, - 0x65, 0xdb, 0x01, 0xc1, 0x45, 0x49, 0x41, 0xdd, 0x38, 0xd0, 0x98, 0xcb, 0xc1, 0xf8, 0xcb, 0x2c, - 0xe4, 0xb7, 0x06, 0xbd, 0xa1, 0xed, 0xd2, 0x33, 0xca, 0x11, 0xf8, 0xa8, 0xeb, 0xb3, 0xed, 0x96, - 0x37, 0xee, 0x46, 0x39, 0x08, 0x34, 0xf9, 0xd7, 0x62, 0xa8, 0x96, 0x58, 0x42, 0x17, 0x8b, 0x10, - 0x9b, 0xb9, 0xc4, 0x62, 0x11, 0x60, 0xc5, 0x12, 0xe9, 0x4b, 0xd9, 0xd0, 0x97, 0x4c, 0xc8, 0x93, - 0x85, 0xe1, 0xb5, 0x40, 0xf6, 0x22, 0x01, 0xe8, 0x55, 0xb8, 0xda, 0x72, 0x1d, 0x9b, 0xea, 0x43, - 0x5e, 0x1d, 0xb3, 0x02, 0xa7, 0xcc, 0x27, 0x2c, 0x79, 0x85, 0xdc, 0x85, 0x52, 0x6f, 0xd0, 0x0e, - 0xf1, 0x72, 0x02, 0xaf, 0x48, 0xa0, 0x01, 0xd2, 0x0d, 0x19, 0x50, 0x68, 0x4c, 0x2f, 0x91, 0x59, - 0x3e, 0xc4, 0x6f, 0xc1, 0x7c, 0x64, 0xaf, 0x34, 0x74, 0x36, 0x3e, 0x7c, 0x5a, 0xdb, 0xe5, 0x71, - 0xf6, 0x31, 0x0b, 0xad, 0x16, 0x89, 0xb3, 0x24, 0x5c, 0xef, 0x36, 0x0e, 0x0e, 0x48, 0x54, 0xfe, - 0x7e, 0xb0, 0x44, 0x04, 0x66, 0x25, 0x1e, 0x5f, 0x51, 0xe2, 0xb1, 0x21, 0xe3, 0x71, 0x26, 0x8c, - 0xc7, 0xd9, 0xcd, 0x32, 0x94, 0xb8, 0x42, 0x8e, 0x46, 0x7d, 0x22, 0x18, 0xfe, 0x2d, 0x31, 0xcb, - 0xe6, 0x8b, 0xbe, 0x8c, 0x38, 0x55, 0xc8, 0xb7, 0x38, 0x71, 0x72, 0x40, 0xd4, 0x79, 0xaf, 0x6b, - 0x75, 0x6c, 0x49, 0x2c, 0xf4, 0x16, 0xe4, 0xbd, 0x51, 0xab, 0xe5, 0x78, 0x32, 0x36, 0xbf, 0x12, - 0x0f, 0x1d, 0xc2, 0xc3, 0x2d, 0x89, 0x47, 0x97, 0x3c, 0xb3, 0x3b, 0xdd, 0x11, 0x8b, 0xd4, 0xd3, - 0x97, 0x08, 0x3c, 0xfc, 0x6b, 0x03, 0x8a, 0x4c, 0xca, 0x54, 0xf1, 0x6a, 0x05, 0x0a, 0x4c, 0x06, - 0xa7, 0x2d, 0x22, 0x16, 0xb9, 0x1d, 0x03, 0x00, 0xfa, 0x0e, 0x09, 0xad, 0x62, 0x9d, 0x8c, 0x5c, - 0x15, 0x3d, 0x59, 0x22, 0x59, 0x88, 0x8a, 0x77, 0xe0, 0x1a, 0xd3, 0x4a, 0x8b, 0x66, 0x54, 0x52, - 0x8f, 0x6a, 0xce, 0x61, 0xc4, 0x72, 0x0e, 0x32, 0x37, 0x3c, 0x3d, 0xf7, 0x3a, 0x2d, 0xbb, 0x2b, - 0xa4, 0x08, 0xc6, 0xe4, 0x62, 0x42, 0x2a, 0xb1, 0x54, 0x77, 0xca, 0x3c, 0x14, 0xdf, 0xb7, 0xbd, - 0x53, 0x21, 0x12, 0xfe, 0x18, 0x4a, 0x7c, 0x98, 0x4a, 0x87, 0xe4, 0x8e, 0x3d, 0x25, 0x54, 0x98, - 0xe0, 0xf3, 0x16, 0xfb, 0xc6, 0xd7, 0xe0, 0xea, 0x41, 0xdf, 0x1e, 0x7a, 0xa7, 0x03, 0x19, 0x5c, - 0x69, 0x46, 0xb9, 0x10, 0xc2, 0x52, 0x71, 0x7c, 0x08, 0x57, 0x5d, 0xa7, 0x67, 0x77, 0xfa, 0x9d, - 0xfe, 0xc9, 0xd1, 0xf1, 0xb9, 0xef, 0x78, 0x22, 0xe1, 0x2c, 0x07, 0xe0, 0x4d, 0x0a, 0xa5, 0xa2, - 0x1d, 0x77, 0x07, 0xc7, 0xc2, 0xc5, 0xd9, 0x37, 0xfe, 0x9d, 0x01, 0xa5, 0x8f, 0x6c, 0xbf, 0x25, - 0xb5, 0x80, 0xb6, 0xa1, 0x1c, 0x38, 0x36, 0x83, 0x08, 0x59, 0x62, 0x11, 0x9e, 0xad, 0xd9, 0x12, - 0x8e, 0x2e, 0x23, 0xfc, 0x7c, 0x4b, 0x05, 0x30, 0x52, 0x76, 0xbf, 0xe5, 0x74, 0x03, 0x52, 0x99, - 0x64, 0x52, 0x0c, 0x51, 0x25, 0xa5, 0x02, 0x36, 0xaf, 0x86, 0xb7, 0x1f, 0x77, 0xcb, 0x2f, 0x33, - 0x80, 0x26, 0x65, 0xf8, 0xba, 0x09, 0xc1, 0x7d, 0x28, 0x7b, 0xc4, 0xdb, 0xfd, 0xa3, 0x58, 0x3a, - 0x3e, 0xcf, 0xa0, 0x41, 0x70, 0x22, 0x1a, 0x26, 0x75, 0xc0, 0x09, 0x31, 0x69, 0xef, 0x88, 0x94, - 0x06, 0x9d, 0x67, 0xe7, 0x2c, 0x20, 0xce, 0x59, 0x65, 0x09, 0xde, 0x63, 0x50, 0xd4, 0x20, 0x9e, - 0xdb, 0xe9, 0x92, 0xd4, 0xdd, 0x23, 0xd1, 0x30, 0x4b, 0x22, 0xf0, 0xeb, 0x17, 0x69, 0x6d, 0xfd, - 0x3d, 0x86, 0xdf, 0x3c, 0x1f, 0x92, 0x98, 0x21, 0xd6, 0xa2, 0x57, 0x20, 0x4f, 0x92, 0x92, 0xf1, - 0xd1, 0xd9, 0x98, 0x05, 0xcb, 0x39, 0x2b, 0x47, 0x87, 0x3b, 0x63, 0x7c, 0x1f, 0x20, 0xc4, 0xa7, - 0x51, 0x6b, 0x6f, 0xff, 0xc9, 0xd3, 0x26, 0x89, 0x6a, 0x25, 0x98, 0xdb, 0xdb, 0xaf, 0x37, 0x76, - 0x1b, 0x34, 0xae, 0xe1, 0xaa, 0xd4, 0x8d, 0xaa, 0x43, 0xb4, 0x0c, 0x73, 0xcf, 0x29, 0x54, 0xd6, - 0x2b, 0x24, 0x1d, 0x61, 0xe3, 0xed, 0x36, 0xfe, 0x07, 0x49, 0x42, 0x85, 0x15, 0xa4, 0x32, 0x45, - 0x95, 0x45, 0x26, 0xc2, 0x82, 0xe6, 0x42, 0xdc, 0x3a, 0xda, 0x22, 0xef, 0x92, 0x43, 0xea, 0xee, - 0xfc, 0xb0, 0xc9, 0x14, 0x57, 0x6b, 0x30, 0x26, 0xd7, 0xcc, 0x42, 0x8b, 0xbb, 0x7b, 0xec, 0x9e, - 0xb1, 0xae, 0x0a, 0x78, 0x70, 0x48, 0xf7, 0x21, 0xe7, 0x8c, 0x9d, 0xbe, 0xef, 0x55, 0x8a, 0x2c, - 0x36, 0xcd, 0xcb, 0xac, 0xaa, 0x41, 0xa1, 0x96, 0x98, 0xc4, 0xdf, 0x86, 0x6b, 0xbb, 0x34, 0x2d, - 0x7d, 0x4c, 0x8c, 0x40, 0x4d, 0x70, 0x9b, 0xcd, 0x5d, 0xa1, 0x95, 0xac, 0xdf, 0xdc, 0x45, 0x65, - 0xc8, 0x6c, 0xd7, 0xc5, 0x1e, 0x32, 0x9d, 0x3a, 0xfe, 0xd4, 0x00, 0xa4, 0xae, 0x4b, 0xa5, 0xa6, - 0x18, 0x71, 0xc9, 0x3e, 0x1b, 0xb2, 0x27, 0x99, 0xb4, 0xe3, 0xba, 0x03, 0x97, 0x29, 0xa4, 0x60, - 0xf1, 0x01, 0xbe, 0x27, 0x64, 0x20, 0x7b, 0x1e, 0x9c, 0x05, 0x36, 0xcf, 0xa9, 0x19, 0x81, 0xa8, - 0x3b, 0xb0, 0x18, 0xc1, 0x4a, 0x15, 0x23, 0x1f, 0xc2, 0x75, 0x46, 0x6c, 0xc7, 0x71, 0x86, 0xb5, - 0x6e, 0x67, 0x9c, 0xc8, 0x75, 0x08, 0x37, 0xe2, 0x88, 0xdf, 0xac, 0x8e, 0xf0, 0x29, 0xe4, 0x3e, - 0x60, 0x15, 0xb5, 0x22, 0xcb, 0x0c, 0xc3, 0x25, 0x81, 0xae, 0x6f, 0xf7, 0x78, 0x71, 0x52, 0xb0, - 0xd8, 0x37, 0xbb, 0x54, 0x1c, 0xc7, 0x7d, 0x6a, 0xed, 0xf2, 0xcb, 0xab, 0x60, 0x05, 0x63, 0xb4, - 0x4a, 0x6b, 0xf9, 0x0e, 0x31, 0x0f, 0x36, 0x3b, 0xc3, 0x66, 0x15, 0x08, 0xa9, 0x0b, 0x17, 0x38, - 0xa7, 0x5a, 0xbb, 0xad, 0x5c, 0x60, 0x01, 0x3d, 0x23, 0x4a, 0x0f, 0x3f, 0x87, 0x6b, 0x0a, 0x7e, - 0x2a, 0x35, 0xbc, 0x01, 0x39, 0xde, 0x36, 0x10, 0xb1, 0x73, 0x29, 0xba, 0x8a, 0xb3, 0xb1, 0x04, - 0x0e, 0x89, 0x0f, 0x8b, 0x02, 0xe2, 0xf4, 0x06, 0xba, 0xb3, 0x62, 0xfa, 0xc1, 0xbb, 0xb0, 0x14, - 0x45, 0x4b, 0x65, 0x22, 0x35, 0xc9, 0xf4, 0xe9, 0xb0, 0xad, 0x84, 0xe2, 0xf8, 0xa1, 0xa8, 0x0a, - 0xcb, 0xc4, 0x14, 0x16, 0x08, 0x24, 0x49, 0xa4, 0x12, 0x68, 0x51, 0xaa, 0x7f, 0xb7, 0xe3, 0x05, - 0x17, 0xee, 0x4b, 0x40, 0x2a, 0x30, 0xd5, 0xa1, 0xac, 0x43, 0x9e, 0x2b, 0x5c, 0xe6, 0x74, 0xfa, - 0x53, 0x91, 0x48, 0x54, 0xa0, 0xba, 0xf3, 0xcc, 0xb5, 0x4f, 0x7a, 0x4e, 0x10, 0x73, 0x68, 0x26, - 0xa3, 0x02, 0x53, 0xed, 0xf8, 0x4f, 0xe4, 0x16, 0xaf, 0x75, 0x6d, 0xb7, 0x27, 0x95, 0xff, 0x2e, - 0xe4, 0x78, 0x8a, 0x24, 0xca, 0x88, 0x07, 0x51, 0x32, 0x2a, 0x2e, 0x1f, 0xd4, 0x78, 0x42, 0x25, - 0x56, 0xd1, 0xc3, 0x12, 0xdd, 0xaa, 0x7a, 0xac, 0x7b, 0x55, 0x47, 0x6f, 0xc2, 0xac, 0x4d, 0x97, - 0x30, 0x5f, 0x2c, 0xc7, 0x93, 0x53, 0x46, 0x8d, 0x5d, 0x67, 0x1c, 0x0b, 0xbf, 0x03, 0x45, 0x85, - 0x03, 0xcd, 0xb9, 0x1f, 0x37, 0xc4, 0x95, 0x55, 0xdb, 0x6a, 0x6e, 0x1f, 0xf2, 0x54, 0xbc, 0x0c, - 0x50, 0x6f, 0x04, 0xe3, 0x0c, 0x49, 0xc6, 0xf8, 0x2a, 0xe1, 0xe1, 0xaa, 0x3c, 0x46, 0x92, 0x3c, - 0x99, 0x4b, 0xc9, 0xf3, 0x02, 0xe6, 0xc5, 0xf6, 0x53, 0xd9, 0xc0, 0x5b, 0x44, 0xc3, 0x94, 0x8c, - 0x34, 0x81, 0x65, 0x0d, 0x5b, 0xe9, 0x9d, 0x1c, 0x11, 0x93, 0x24, 0xe6, 0xc0, 0xb7, 0xfd, 0x91, - 0x27, 0x4d, 0xe0, 0x8f, 0x06, 0x94, 0x25, 0x24, 0x6d, 0xa3, 0x41, 0x56, 0x6a, 0x3c, 0xe6, 0x05, - 0x75, 0xda, 0x0d, 0xc8, 0xb5, 0x8f, 0x0f, 0x3a, 0x2f, 0x65, 0x4f, 0x46, 0x8c, 0x28, 0xbc, 0xcb, - 0xf9, 0xf0, 0x1e, 0xa3, 0x18, 0xd1, 0x12, 0x80, 0x76, 0x1b, 0xb7, 0xfb, 0x6d, 0xe7, 0x05, 0xbb, - 0x69, 0x67, 0xac, 0x10, 0xc0, 0xb2, 0x76, 0xd1, 0x8b, 0x64, 0x99, 0x89, 0xda, 0x9b, 0x24, 0x46, - 0x5e, 0x1b, 0xf9, 0xa7, 0x8d, 0x3e, 0x6d, 0xc3, 0xc9, 0x1d, 0x2e, 0x01, 0xa2, 0xc0, 0x7a, 0xc7, - 0x53, 0xa1, 0x0d, 0x58, 0xa4, 0x50, 0x62, 0xf7, 0x24, 0xa7, 0x0f, 0x23, 0x86, 0x0c, 0xdb, 0x46, - 0x2c, 0x6c, 0xdb, 0x9e, 0xf7, 0x7c, 0xe0, 0xb6, 0xc5, 0xd6, 0x82, 0x31, 0xae, 0x73, 0xe2, 0x4f, - 0xbd, 0x48, 0x60, 0xfe, 0xba, 0x54, 0x1e, 0x85, 0x54, 0x1e, 0x3b, 0xfe, 0x14, 0x2a, 0xf8, 0x75, - 0xb8, 0x2e, 0x31, 0x45, 0x29, 0x3f, 0x05, 0x79, 0x1f, 0x6e, 0x49, 0xe4, 0xad, 0x53, 0x9a, 0x6f, - 0x3e, 0x11, 0x0c, 0xff, 0x57, 0x39, 0x37, 0xa1, 0x12, 0xc8, 0xc9, 0x72, 0x90, 0x41, 0x57, 0x15, - 0x60, 0xe4, 0x09, 0x9b, 0x21, 0xb4, 0xe8, 0x37, 0x85, 0xb9, 0x04, 0x45, 0x5e, 0x82, 0xf4, 0x1b, - 0x6f, 0xc1, 0xb2, 0xa4, 0x21, 0xb2, 0x83, 0x28, 0x91, 0x09, 0x81, 0x74, 0x44, 0x84, 0xc2, 0xe8, - 0xd2, 0xe9, 0x6a, 0x57, 0x31, 0xa3, 0xaa, 0x65, 0x34, 0x0d, 0x85, 0xe6, 0x75, 0x6e, 0x11, 0x54, - 0x30, 0x35, 0x68, 0x0b, 0x30, 0x25, 0xa0, 0x82, 0xc5, 0x41, 0x50, 0xf0, 0xc4, 0x41, 0x4c, 0x90, - 0xfe, 0x11, 0xac, 0x06, 0x42, 0x50, 0xbd, 0x3d, 0x21, 0xc6, 0xda, 0xf1, 0x3c, 0xa5, 0x16, 0xd5, - 0x6d, 0xfc, 0x01, 0xcc, 0x0c, 0x1d, 0x11, 0x53, 0x8a, 0x1b, 0x68, 0x9d, 0xbf, 0x18, 0xac, 0x2b, - 0x8b, 0xd9, 0x3c, 0x6e, 0xc3, 0x6d, 0x49, 0x9d, 0x6b, 0x54, 0x4b, 0x3e, 0x2e, 0x94, 0xac, 0x53, - 0xb8, 0x5a, 0x27, 0xeb, 0x94, 0x2c, 0x3f, 0x7b, 0x59, 0xa7, 0xd0, 0xbb, 0x42, 0xf5, 0xad, 0x54, - 0x77, 0xc5, 0x0e, 0xd7, 0x69, 0xe0, 0x92, 0xa9, 0x88, 0x1d, 0xc3, 0x52, 0xd4, 0x93, 0x53, 0x85, - 0x31, 0x92, 0xf5, 0xfa, 0x44, 0x85, 0x32, 0x88, 0xf1, 0x81, 0x14, 0x38, 0x70, 0xf3, 0x54, 0x02, - 0xdb, 0x21, 0x31, 0x66, 0x92, 0x69, 0xe5, 0xa5, 0xa7, 0x29, 0xf3, 0x19, 0x3e, 0xc0, 0x7b, 0x70, - 0x23, 0x1e, 0x26, 0x52, 0x89, 0x7c, 0xc8, 0x0d, 0x58, 0x17, 0x49, 0x52, 0xd1, 0xfd, 0x30, 0x0c, - 0x06, 0x4a, 0x40, 0x49, 0x45, 0xd2, 0x02, 0x53, 0x17, 0x5f, 0xfe, 0x1f, 0xf6, 0x1a, 0x84, 0x9b, - 0x54, 0xc4, 0xbc, 0x90, 0x58, 0xfa, 0xe3, 0x0f, 0x63, 0x44, 0x76, 0x6a, 0x8c, 0x10, 0x4e, 0x12, - 0x46, 0xb1, 0x6f, 0xc0, 0xe8, 0x04, 0x8f, 0x30, 0x80, 0xa6, 0xe5, 0x41, 0xef, 0x90, 0x80, 0x07, - 0x1b, 0x48, 0xc3, 0x56, 0xc3, 0x6e, 0xaa, 0xc3, 0xf8, 0x28, 0x8c, 0x9d, 0x13, 0x91, 0x39, 0x15, - 0xe1, 0x8f, 0x61, 0x2d, 0x39, 0x28, 0xa7, 0xa1, 0xfc, 0x1a, 0x86, 0x42, 0x90, 0x50, 0x2a, 0x2f, - 0x84, 0x45, 0xc8, 0xef, 0xed, 0x1f, 0x3c, 0xa9, 0x6d, 0x91, 0x54, 0x76, 0xe3, 0x2f, 0x59, 0xc8, - 0xec, 0x1c, 0xa2, 0x1f, 0xc3, 0x2c, 0x7f, 0x83, 0x98, 0xf2, 0x44, 0x63, 0x4e, 0x7b, 0xcd, 0xc0, - 0x2b, 0x9f, 0xfe, 0xf9, 0xef, 0x5f, 0x64, 0x6e, 0xe0, 0x6b, 0xd5, 0xf1, 0xdb, 0x76, 0x77, 0x78, - 0x6a, 0x57, 0xcf, 0xc6, 0x55, 0x76, 0x27, 0x7c, 0xd7, 0x78, 0x0d, 0x1d, 0x42, 0x96, 0xbe, 0x50, - 0x24, 0xbe, 0xdf, 0x98, 0xc9, 0xaf, 0x1c, 0xd8, 0x64, 0x94, 0x97, 0xf0, 0x55, 0x95, 0xf2, 0x70, - 0xe4, 0x53, 0xba, 0x4d, 0x28, 0x2a, 0x0f, 0x15, 0xe8, 0xc2, 0x97, 0x1d, 0xf3, 0xe2, 0x47, 0x10, - 0x7c, 0x85, 0x4a, 0xdb, 0x7c, 0xd1, 0x8f, 0x4b, 0x1b, 0x36, 0xd6, 0xe3, 0xd2, 0x2a, 0xcd, 0x6c, - 0xbd, 0xb4, 0xfe, 0x8b, 0x3e, 0x95, 0x76, 0x20, 0x9e, 0x4e, 0x5a, 0x3e, 0xba, 0xad, 0xe9, 0xc4, - 0xab, 0x3d, 0x67, 0x73, 0x2d, 0x19, 0x41, 0x70, 0xba, 0xc3, 0x38, 0xdd, 0xc4, 0x37, 0x54, 0x4e, - 0xad, 0x00, 0x8f, 0x30, 0xdc, 0x38, 0x85, 0x59, 0xd6, 0x29, 0x43, 0x47, 0xf2, 0xc3, 0xd4, 0xf4, - 0xf8, 0x12, 0xce, 0x37, 0xd2, 0x63, 0xc3, 0xcb, 0x8c, 0xdb, 0x22, 0x2e, 0x07, 0xdc, 0x58, 0xb3, - 0x8c, 0x70, 0x79, 0x64, 0x7c, 0xcb, 0xd8, 0xf8, 0x77, 0x06, 0x66, 0x59, 0x4b, 0x05, 0x0d, 0x01, - 0xc2, 0xde, 0x53, 0x7c, 0x9f, 0x13, 0xdd, 0xac, 0xf8, 0x3e, 0x27, 0xdb, 0x56, 0xf8, 0x36, 0xe3, - 0xbc, 0x8c, 0x97, 0x02, 0xce, 0xec, 0xa9, 0xb6, 0x7a, 0x42, 0xb1, 0xa8, 0x5a, 0x9f, 0x43, 0x51, - 0xe9, 0x21, 0x21, 0x1d, 0xc5, 0x48, 0x13, 0x2a, 0x6e, 0x04, 0x9a, 0x06, 0x14, 0xbe, 0xcb, 0x98, - 0xde, 0xc2, 0x15, 0x55, 0xb9, 0x9c, 0xaf, 0xcb, 0x30, 0x29, 0xe3, 0x5f, 0x90, 0x92, 0x28, 0xda, - 0x47, 0x42, 0x77, 0x35, 0xa4, 0xe3, 0xed, 0x28, 0xf3, 0xde, 0x74, 0xa4, 0x44, 0x11, 0x38, 0xff, - 0x33, 0x82, 0x69, 0x53, 0x4c, 0xa9, 0xfb, 0xff, 0xd0, 0x27, 0x39, 0xfe, 0x63, 0x0e, 0xe4, 0x43, - 0x21, 0xe8, 0xe6, 0xa0, 0x55, 0x5d, 0xa5, 0x1f, 0xa6, 0xc1, 0xe6, 0xed, 0xc4, 0x79, 0x21, 0xc2, - 0x03, 0x26, 0xc2, 0x1a, 0xbe, 0x19, 0x88, 0x20, 0x7e, 0x34, 0x52, 0xe5, 0x05, 0x6d, 0xd5, 0x6e, - 0xb7, 0xa9, 0x22, 0x7e, 0x4e, 0x4a, 0x7a, 0xb5, 0x49, 0x83, 0xee, 0x68, 0x7b, 0x0c, 0x6a, 0x9f, - 0xc7, 0xc4, 0xd3, 0x50, 0x04, 0xff, 0x57, 0x19, 0xff, 0xbb, 0x78, 0x35, 0x89, 0xbf, 0xcb, 0xf0, - 0xa3, 0x22, 0xf0, 0xb6, 0x8c, 0x5e, 0x84, 0x48, 0xd7, 0x47, 0x2f, 0x42, 0xb4, 0xab, 0x73, 0xb1, - 0x08, 0x23, 0x86, 0x4f, 0x45, 0x78, 0x01, 0x10, 0x76, 0x6d, 0x90, 0x56, 0xb9, 0x4a, 0x61, 0x10, - 0xb7, 0xfc, 0xc9, 0x86, 0x0f, 0x7e, 0xc8, 0x78, 0xdf, 0xc1, 0x2b, 0x49, 0xbc, 0xbb, 0x04, 0x9b, - 0xfa, 0xf9, 0xef, 0x67, 0xa0, 0xf8, 0x81, 0xdd, 0xe9, 0xfb, 0x4e, 0x9f, 0x36, 0xa3, 0xd1, 0x09, - 0xcc, 0xb2, 0xc8, 0x1f, 0x77, 0x77, 0xb5, 0x95, 0x12, 0x77, 0xf7, 0x48, 0x9f, 0x01, 0xdf, 0x67, - 0xac, 0x6f, 0x63, 0x33, 0x60, 0xdd, 0x0b, 0xe9, 0x57, 0x59, 0x8f, 0x80, 0x6e, 0xf9, 0x0c, 0x72, - 0xbc, 0x27, 0x80, 0x62, 0xd4, 0x22, 0xbd, 0x03, 0x73, 0x45, 0x3f, 0x99, 0x68, 0x65, 0x2a, 0x2f, - 0x8f, 0x21, 0x53, 0x66, 0x3f, 0x01, 0x08, 0x9b, 0x50, 0x71, 0xfd, 0x4e, 0xf4, 0xac, 0xcc, 0xb5, - 0x64, 0x04, 0xc1, 0xf8, 0x35, 0xc6, 0xf8, 0x1e, 0xbe, 0xad, 0x65, 0xdc, 0x0e, 0x16, 0x50, 0xe6, - 0x2d, 0x98, 0xa1, 0x0f, 0x6e, 0x28, 0x16, 0xfa, 0x95, 0x37, 0x39, 0xd3, 0xd4, 0x4d, 0x09, 0x56, - 0xf7, 0x18, 0xab, 0x55, 0xbc, 0xac, 0x65, 0x45, 0x1f, 0xde, 0x28, 0x93, 0x11, 0xcc, 0xc9, 0x77, - 0x36, 0x74, 0x2b, 0xa6, 0xb3, 0xe8, 0x9b, 0x9c, 0xb9, 0x9a, 0x34, 0x2d, 0x18, 0x3e, 0x62, 0x0c, - 0x31, 0xbe, 0xa5, 0x57, 0xaa, 0x40, 0x27, 0x4c, 0x49, 0x00, 0xf9, 0xe5, 0x02, 0xcc, 0xd0, 0x1c, - 0x84, 0xc6, 0xee, 0xb0, 0x74, 0x8b, 0x6b, 0x78, 0xa2, 0x61, 0x12, 0xd7, 0xf0, 0x64, 0xd5, 0xa7, - 0x89, 0xdd, 0xec, 0x27, 0x6d, 0x0e, 0xc3, 0xa2, 0x3b, 0xf6, 0xa1, 0xa8, 0x14, 0x78, 0x48, 0x43, - 0x31, 0xda, 0x8e, 0x89, 0xc7, 0x6e, 0x4d, 0x75, 0x88, 0xd7, 0x18, 0x53, 0x13, 0x5f, 0x8f, 0x32, - 0x6d, 0x73, 0x34, 0xca, 0xf5, 0xa7, 0x50, 0x52, 0x2b, 0x41, 0xa4, 0x21, 0x1a, 0xeb, 0xf7, 0xc4, - 0x63, 0x85, 0xae, 0x90, 0xd4, 0x38, 0x4d, 0xf0, 0x03, 0x3e, 0x89, 0x4b, 0xb9, 0x7f, 0x02, 0x79, - 0x51, 0x1f, 0xea, 0xf6, 0x1b, 0xed, 0x10, 0xe9, 0xf6, 0x1b, 0x2b, 0x2e, 0x35, 0x89, 0x00, 0x63, - 0x4b, 0xf3, 0x60, 0x19, 0xa0, 0x05, 0x4b, 0x52, 0x46, 0x24, 0xb1, 0x0c, 0x7b, 0x1e, 0x49, 0x2c, - 0x95, 0x1a, 0x64, 0x2a, 0xcb, 0x13, 0xc7, 0x17, 0xb6, 0x2c, 0x13, 0x7c, 0x94, 0x40, 0x51, 0x8d, - 0x86, 0x78, 0x1a, 0x8a, 0xe0, 0x8a, 0x19, 0xd7, 0x15, 0xfc, 0x8a, 0x86, 0xab, 0x08, 0x85, 0xe8, - 0x67, 0x00, 0x61, 0x31, 0x1b, 0xbf, 0x8e, 0xb5, 0x1d, 0xb1, 0xf8, 0x75, 0xac, 0xaf, 0x87, 0x35, - 0x1e, 0x1c, 0x32, 0xe7, 0xbf, 0xb6, 0xa1, 0xec, 0x7f, 0x65, 0x00, 0x9a, 0x2c, 0x7e, 0xd1, 0xeb, - 0x7a, 0x16, 0xda, 0x66, 0x9b, 0xf9, 0xc6, 0xe5, 0x90, 0x13, 0xa3, 0x67, 0x28, 0x57, 0x8b, 0x2d, - 0x19, 0x3e, 0xa7, 0x92, 0x7d, 0x66, 0xc0, 0x7c, 0xa4, 0x7c, 0x46, 0x0f, 0x12, 0xce, 0x39, 0xd6, - 0xb0, 0x33, 0x1f, 0x5e, 0x88, 0x97, 0x98, 0xb1, 0x28, 0x56, 0x21, 0xb3, 0xb5, 0xcf, 0x49, 0xd2, - 0x14, 0xad, 0xb9, 0x51, 0x02, 0x83, 0x89, 0xae, 0x9f, 0xf9, 0xe8, 0x62, 0xc4, 0x4b, 0x9c, 0x56, - 0x98, 0xc0, 0x11, 0xb7, 0x10, 0xa5, 0xba, 0xce, 0x2d, 0xa2, 0x4d, 0x43, 0x9d, 0x5b, 0xc4, 0xea, - 0xfc, 0x24, 0xb7, 0xa0, 0x55, 0xaf, 0xe2, 0x89, 0xa2, 0xa0, 0x4f, 0x62, 0x39, 0xdd, 0x13, 0x63, - 0xdd, 0x80, 0xa9, 0x2c, 0x43, 0x4f, 0x94, 0xe5, 0x3c, 0x4a, 0xa0, 0x78, 0x81, 0x27, 0xc6, 0xbb, - 0x01, 0x49, 0x9e, 0xc8, 0xb8, 0x2a, 0x9e, 0x18, 0x56, 0xdf, 0x3a, 0x4f, 0x9c, 0x68, 0x89, 0xea, - 0x3c, 0x71, 0xb2, 0x80, 0x4f, 0x3a, 0x5b, 0xc6, 0x3c, 0xe2, 0x89, 0x8b, 0x9a, 0x6a, 0x1d, 0xbd, - 0x91, 0xa0, 0x53, 0x6d, 0xbb, 0xd5, 0x7c, 0xf3, 0x92, 0xd8, 0xd3, 0x3d, 0x80, 0x9f, 0x86, 0xf4, - 0x80, 0xdf, 0x18, 0xb0, 0xa4, 0x2b, 0xf7, 0x51, 0x02, 0xb3, 0x84, 0x5e, 0xad, 0xb9, 0x7e, 0x59, - 0xf4, 0x4b, 0xe8, 0x2d, 0xf0, 0x89, 0xcd, 0xd2, 0x1f, 0xfe, 0xb6, 0x6a, 0x7c, 0x45, 0xfe, 0xfd, - 0x95, 0xfc, 0x3b, 0xce, 0xb1, 0xdf, 0x94, 0xbf, 0xfd, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, - 0x32, 0x55, 0x3b, 0xda, 0x2e, 0x00, 0x00, + // 3218 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x3a, 0xcd, 0x6f, 0x1b, 0xd7, + 0xf1, 0x5e, 0x92, 0x22, 0xc5, 0x21, 0x45, 0xcb, 0x4f, 0xb2, 0x43, 0xad, 0x65, 0x59, 0x7e, 0xfe, + 0x4c, 0x9c, 0x88, 0xbf, 0x28, 0xf9, 0xf5, 0xd0, 0x16, 0x01, 0x28, 0x91, 0x71, 0x54, 0x29, 0x92, + 0xb3, 0xa2, 0x95, 0x14, 0x08, 0x2a, 0xac, 0xc8, 0xb5, 0x44, 0x88, 0x5f, 0xd9, 0x5d, 0xca, 0x56, + 0xda, 0x02, 0x45, 0xd0, 0x1c, 0xda, 0x63, 0x73, 0x28, 0x9a, 0x1e, 0xfb, 0x37, 0xf4, 0xd6, 0x3f, + 0xa0, 0xe8, 0xa5, 0x01, 0x7a, 0xec, 0xa5, 0x28, 0x7a, 0xe8, 0xa1, 0xf7, 0xa2, 0xa7, 0xf6, 0x7d, + 0xee, 0xbe, 0x5d, 0xbe, 0xa5, 0x94, 0x6e, 0x73, 0xb0, 0xb5, 0x6f, 0xde, 0xbc, 0x99, 0x79, 0xf3, + 0x66, 0xe6, 0xcd, 0xcc, 0x23, 0x14, 0xdd, 0x51, 0x7b, 0x6d, 0xe4, 0x0e, 0xfd, 0x21, 0x2a, 0x3b, + 0x7e, 0xbb, 0xe3, 0x39, 0xee, 0x99, 0xe3, 0x8e, 0x8e, 0xcc, 0xc5, 0xe3, 0xe1, 0xf1, 0x90, 0x4d, + 0xd4, 0xe8, 0x17, 0xc7, 0x31, 0x97, 0x28, 0x4e, 0xad, 0x7f, 0xd6, 0x6e, 0xb3, 0xff, 0x46, 0x47, + 0xb5, 0xd3, 0x33, 0x31, 0x75, 0x93, 0x4d, 0xd9, 0x63, 0xff, 0x84, 0xfd, 0x47, 0xa6, 0xe8, 0x1f, + 0x31, 0xb9, 0x7c, 0x3c, 0x1c, 0x1e, 0xf7, 0x9c, 0x9a, 0x3d, 0xea, 0xd6, 0xec, 0xc1, 0x60, 0xe8, + 0xdb, 0x7e, 0x77, 0x38, 0xf0, 0xf8, 0x2c, 0xfe, 0xdc, 0x80, 0x8a, 0xe5, 0x78, 0x23, 0x02, 0x71, + 0xde, 0x73, 0xec, 0x8e, 0xe3, 0xa2, 0x5b, 0x00, 0xed, 0xde, 0xd8, 0xf3, 0x1d, 0xf7, 0xb0, 0xdb, + 0xa9, 0x1a, 0xab, 0xc6, 0xa3, 0x9c, 0x55, 0x14, 0x90, 0xad, 0x0e, 0xba, 0x09, 0xc5, 0xbe, 0xd3, + 0x3f, 0xe2, 0xb3, 0x19, 0x36, 0x3b, 0xcb, 0x01, 0x64, 0xd2, 0x84, 0x59, 0xd7, 0x39, 0xeb, 0x7a, + 0x84, 0x43, 0x35, 0x4b, 0xe6, 0xb2, 0x56, 0x30, 0xa6, 0x0b, 0x5d, 0xfb, 0xb9, 0x7f, 0x48, 0xc8, + 0xf4, 0xab, 0x39, 0xbe, 0x90, 0x02, 0x5a, 0x64, 0x8c, 0xbf, 0xca, 0x42, 0xd9, 0xb2, 0x07, 0xc7, + 0x8e, 0xe5, 0x7c, 0x32, 0x76, 0x3c, 0x1f, 0xcd, 0x43, 0xf6, 0xd4, 0x39, 0x67, 0xec, 0xcb, 0x16, + 0xfd, 0xe4, 0xeb, 0x09, 0xc6, 0xa1, 0x33, 0xe0, 0x8c, 0xcb, 0x74, 0x3d, 0x01, 0x34, 0x07, 0x1d, + 0xb4, 0x08, 0x33, 0xbd, 0x6e, 0xbf, 0xeb, 0x0b, 0xae, 0x7c, 0x10, 0x11, 0x27, 0x17, 0x13, 0x67, + 0x13, 0xc0, 0x1b, 0xba, 0xfe, 0xe1, 0xd0, 0x25, 0x9b, 0xae, 0xce, 0x90, 0xd9, 0xca, 0xfa, 0xbd, + 0x35, 0xf5, 0x20, 0xd6, 0x54, 0x81, 0xd6, 0xf6, 0x09, 0xf2, 0x1e, 0xc5, 0xb5, 0x8a, 0x9e, 0xfc, + 0x44, 0xef, 0x42, 0x89, 0x11, 0xf1, 0x6d, 0xf7, 0xd8, 0xf1, 0xab, 0x79, 0x46, 0xe5, 0xfe, 0x05, + 0x54, 0x5a, 0x0c, 0xd9, 0x62, 0xec, 0xf9, 0x37, 0xc2, 0x50, 0x26, 0xf8, 0x5d, 0xbb, 0xd7, 0xfd, + 0xd4, 0x3e, 0xea, 0x39, 0xd5, 0x02, 0x21, 0x34, 0x6b, 0x45, 0x60, 0x74, 0xff, 0x44, 0x0d, 0xde, + 0xe1, 0x70, 0xd0, 0x3b, 0xaf, 0xce, 0x32, 0x84, 0x59, 0x0a, 0xd8, 0x23, 0x63, 0x76, 0x68, 0xc3, + 0xf1, 0xc0, 0xe7, 0xb3, 0x45, 0x36, 0x5b, 0x64, 0x10, 0x3a, 0x8d, 0xd7, 0xa0, 0x18, 0xc8, 0x8f, + 0x66, 0x21, 0xb7, 0xbb, 0xb7, 0xdb, 0x9c, 0xbf, 0x82, 0x00, 0xf2, 0xf5, 0xfd, 0xcd, 0xe6, 0x6e, + 0x63, 0xde, 0x40, 0x25, 0x28, 0x34, 0x9a, 0x7c, 0x90, 0xc1, 0x1b, 0x00, 0xa1, 0xa4, 0xa8, 0x00, + 0xd9, 0xed, 0xe6, 0xf7, 0x09, 0x3e, 0xc1, 0x39, 0x68, 0x5a, 0xfb, 0x5b, 0x7b, 0xbb, 0x64, 0x01, + 0x59, 0xbc, 0x69, 0x35, 0xeb, 0xad, 0xe6, 0x7c, 0x86, 0x62, 0xbc, 0xbf, 0xd7, 0x98, 0xcf, 0xa2, + 0x22, 0xcc, 0x1c, 0xd4, 0x77, 0x9e, 0x35, 0xe7, 0x73, 0xf8, 0x0b, 0x03, 0xe6, 0xc4, 0xde, 0xb9, + 0x7d, 0xa1, 0xb7, 0x21, 0x7f, 0xc2, 0x6c, 0x8c, 0x1d, 0x6b, 0x69, 0x7d, 0x39, 0xa6, 0xa8, 0x88, + 0x1d, 0x5a, 0x02, 0x97, 0xe8, 0x26, 0x7b, 0x7a, 0xe6, 0x91, 0x13, 0xcf, 0x92, 0x25, 0xf3, 0x6b, + 0xdc, 0xf8, 0xd7, 0xb6, 0x9d, 0xf3, 0x03, 0xbb, 0x37, 0x76, 0x2c, 0x3a, 0x89, 0x10, 0xe4, 0xfa, + 0x43, 0xd7, 0x61, 0xa7, 0x3f, 0x6b, 0xb1, 0x6f, 0x6a, 0x12, 0x4c, 0x01, 0xe2, 0xe4, 0xf9, 0x00, + 0xb7, 0x01, 0x9e, 0x8e, 0xfd, 0x64, 0x2b, 0x23, 0xab, 0xce, 0x28, 0x5d, 0x61, 0x61, 0x7c, 0xc0, + 0xcc, 0xcb, 0xb1, 0x3d, 0x27, 0x30, 0x2f, 0x3a, 0x40, 0xaf, 0x40, 0x61, 0x44, 0xec, 0xe9, 0xf0, + 0xf4, 0x8c, 0xf1, 0x98, 0xb5, 0xf2, 0x74, 0xb8, 0x7d, 0x86, 0x07, 0x50, 0x62, 0x4c, 0x52, 0xed, + 0xfb, 0xd5, 0x90, 0x7a, 0x86, 0x2d, 0x9b, 0xdc, 0xbb, 0xe4, 0xf7, 0x31, 0xa0, 0x86, 0xd3, 0x73, + 0x7c, 0x27, 0x8d, 0x0b, 0x29, 0xbb, 0xc9, 0x46, 0x76, 0xf3, 0x0b, 0x03, 0x16, 0x22, 0xe4, 0x53, + 0x6d, 0xab, 0x0a, 0x85, 0x0e, 0x23, 0xc6, 0x25, 0xc8, 0x5a, 0x72, 0x88, 0x1e, 0xc3, 0xac, 0x10, + 0xc0, 0x23, 0x12, 0xe8, 0x4f, 0xbb, 0xc0, 0x65, 0xf2, 0xf0, 0x3f, 0x0c, 0x28, 0x8a, 0x8d, 0xee, + 0x8d, 0x50, 0x1d, 0xe6, 0x5c, 0x3e, 0x38, 0x64, 0xfb, 0x11, 0x12, 0x99, 0xc9, 0x9e, 0xf8, 0xde, + 0x15, 0xab, 0x2c, 0x96, 0x30, 0x30, 0xfa, 0x0e, 0x94, 0x24, 0x89, 0xd1, 0xd8, 0x17, 0x2a, 0xaf, + 0x46, 0x09, 0x84, 0x96, 0x43, 0x96, 0x83, 0x40, 0x27, 0x40, 0xd4, 0x82, 0x45, 0xb9, 0x98, 0xef, + 0x46, 0x88, 0x91, 0x65, 0x54, 0x56, 0xa3, 0x54, 0x26, 0x8f, 0x8a, 0x50, 0x43, 0x62, 0xbd, 0x32, + 0xb9, 0x51, 0x84, 0x82, 0x80, 0xe2, 0x7f, 0x1a, 0x00, 0x52, 0xa1, 0x64, 0xbf, 0x0d, 0xa8, 0xb8, + 0x62, 0x14, 0xd9, 0xf0, 0x4d, 0xed, 0x86, 0xc5, 0x39, 0x5c, 0xb1, 0xe6, 0xe4, 0x22, 0xbe, 0xe5, + 0x77, 0xa0, 0x1c, 0x50, 0x09, 0xf7, 0xbc, 0xa4, 0xd9, 0x73, 0x40, 0xa1, 0x24, 0x17, 0xd0, 0x5d, + 0x7f, 0x08, 0xd7, 0x83, 0xf5, 0x9a, 0x6d, 0xdf, 0x99, 0xb2, 0xed, 0x80, 0xe0, 0x82, 0xa4, 0xa0, + 0x6e, 0x1c, 0x68, 0xdc, 0xe6, 0x60, 0xfc, 0x65, 0x16, 0x0a, 0x9b, 0xc3, 0xfe, 0xc8, 0x76, 0xe9, + 0x19, 0xe5, 0x09, 0x7c, 0xdc, 0xf3, 0xd9, 0x76, 0x2b, 0xeb, 0x77, 0xa3, 0x1c, 0x04, 0x9a, 0xfc, + 0x6b, 0x31, 0x54, 0x4b, 0x2c, 0xa1, 0x8b, 0x45, 0x98, 0xce, 0x5c, 0x62, 0xb1, 0x08, 0xd2, 0x62, + 0x89, 0xf4, 0xa5, 0x6c, 0xe8, 0x4b, 0x26, 0x14, 0xc8, 0xc2, 0xf0, 0x6a, 0x21, 0x7b, 0x91, 0x00, + 0xe2, 0xba, 0x57, 0xdb, 0xae, 0x63, 0x53, 0x7d, 0xc8, 0xeb, 0x67, 0x46, 0xe0, 0x54, 0xf8, 0x84, + 0x25, 0xaf, 0xa1, 0xbb, 0x50, 0xee, 0x0f, 0x3b, 0x21, 0x5e, 0x5e, 0xe0, 0x95, 0x08, 0x34, 0x40, + 0xba, 0x21, 0x83, 0x12, 0xbd, 0x17, 0xca, 0x64, 0x96, 0x0f, 0xf1, 0x9b, 0x30, 0x17, 0xd9, 0x2b, + 0x0d, 0xbf, 0xcd, 0x0f, 0x9e, 0xd5, 0x77, 0x78, 0xac, 0x7e, 0xc2, 0xc2, 0xb3, 0x45, 0x62, 0x35, + 0x09, 0xf9, 0x3b, 0xcd, 0xfd, 0x7d, 0x12, 0xd9, 0xbf, 0x1b, 0x2c, 0x11, 0xc1, 0x5d, 0x89, 0xe9, + 0x57, 0x94, 0x98, 0x6e, 0xc8, 0x98, 0x9e, 0x09, 0x63, 0x7a, 0x76, 0xa3, 0x02, 0x65, 0xae, 0x90, + 0xc3, 0xf1, 0x80, 0x08, 0x86, 0x7f, 0x43, 0xcc, 0xb2, 0xf5, 0x72, 0x20, 0x23, 0x4e, 0x0d, 0x0a, + 0x6d, 0x4e, 0x9c, 0x1c, 0x10, 0x75, 0xe0, 0xeb, 0x5a, 0x1d, 0x5b, 0x12, 0x0b, 0xbd, 0x09, 0x05, + 0x6f, 0xdc, 0x6e, 0x3b, 0x9e, 0x8c, 0xef, 0xaf, 0xc4, 0x63, 0x88, 0xf0, 0x70, 0x4b, 0xe2, 0xd1, + 0x25, 0xcf, 0xed, 0x6e, 0x6f, 0xcc, 0xa2, 0xfd, 0xf4, 0x25, 0x02, 0x0f, 0xff, 0xca, 0x80, 0x12, + 0x93, 0x32, 0x55, 0xe0, 0x5a, 0x86, 0x22, 0x93, 0xc1, 0xe9, 0x88, 0xd0, 0x45, 0x6e, 0xd8, 0x00, + 0x80, 0xbe, 0x45, 0x42, 0xab, 0x58, 0x27, 0xa3, 0x57, 0x55, 0x4f, 0x96, 0x48, 0x16, 0xa2, 0xe2, + 0x6d, 0xb8, 0xc6, 0xb4, 0xd2, 0xa6, 0x59, 0x99, 0xd4, 0xa3, 0x9a, 0xb7, 0x18, 0xb1, 0xbc, 0x85, + 0xcc, 0x8d, 0x4e, 0xce, 0xbd, 0x6e, 0xdb, 0xee, 0x09, 0x29, 0x82, 0x31, 0xfe, 0x1e, 0x20, 0x95, + 0x58, 0x9a, 0xed, 0xe2, 0x39, 0x28, 0xbd, 0x67, 0x7b, 0x27, 0x42, 0x24, 0xfc, 0x11, 0x94, 0xf9, + 0x30, 0x95, 0x0e, 0xc9, 0x3d, 0x7d, 0x42, 0xa8, 0x30, 0xc1, 0xe7, 0x2c, 0xf6, 0x8d, 0xaf, 0xc1, + 0xd5, 0xfd, 0x81, 0x3d, 0xf2, 0x4e, 0x86, 0x32, 0xb8, 0xd2, 0xac, 0x74, 0x3e, 0x84, 0xa5, 0xe2, + 0xf8, 0x10, 0xae, 0xba, 0x4e, 0xdf, 0xee, 0x0e, 0xba, 0x83, 0xe3, 0xc3, 0xa3, 0x73, 0xdf, 0xf1, + 0x44, 0xd2, 0x5a, 0x09, 0xc0, 0x1b, 0x14, 0x4a, 0x45, 0x3b, 0xea, 0x0d, 0x8f, 0x84, 0x8b, 0xb3, + 0x6f, 0xfc, 0x5b, 0x03, 0xca, 0x1f, 0xda, 0x7e, 0x5b, 0x6a, 0x01, 0x6d, 0x41, 0x25, 0x70, 0x6c, + 0x06, 0x11, 0xb2, 0xc4, 0x22, 0x3c, 0x5b, 0xb3, 0x29, 0x1c, 0x5d, 0x46, 0xf8, 0xb9, 0xb6, 0x0a, + 0x60, 0xa4, 0xec, 0x41, 0xdb, 0xe9, 0x05, 0xa4, 0x32, 0xc9, 0xa4, 0x18, 0xa2, 0x4a, 0x4a, 0x05, + 0x6c, 0x5c, 0x0d, 0x6f, 0x3f, 0xee, 0x96, 0x5f, 0x66, 0x00, 0x4d, 0xca, 0xf0, 0x75, 0x13, 0x82, + 0xfb, 0x50, 0xf1, 0x88, 0xb7, 0xfb, 0x87, 0xb1, 0x94, 0x7e, 0x8e, 0x41, 0x83, 0xe0, 0x44, 0x34, + 0x4c, 0x6a, 0x89, 0x63, 0x62, 0xd2, 0xde, 0x21, 0x29, 0x2f, 0xba, 0xcf, 0xcf, 0x45, 0x36, 0x54, + 0x91, 0xe0, 0x5d, 0x06, 0x45, 0x4d, 0xe2, 0xb9, 0xdd, 0x1e, 0x49, 0xff, 0x3d, 0x12, 0x0d, 0xb3, + 0x24, 0x02, 0x3f, 0xbe, 0x48, 0x6b, 0x6b, 0xef, 0x32, 0xfc, 0xd6, 0xf9, 0x88, 0xc4, 0x0c, 0xb1, + 0x56, 0xcd, 0x53, 0xf2, 0x91, 0x3c, 0xe5, 0x3e, 0x40, 0x88, 0x4f, 0xa3, 0xd6, 0xee, 0xde, 0xd3, + 0x67, 0x2d, 0x12, 0xd5, 0xca, 0x30, 0xbb, 0xbb, 0xd7, 0x68, 0xee, 0x34, 0x69, 0x5c, 0xc3, 0x35, + 0xa9, 0x1b, 0x55, 0x87, 0x68, 0x09, 0x66, 0x5f, 0x50, 0xa8, 0xac, 0x79, 0x48, 0x5e, 0xc2, 0xc6, + 0x5b, 0x1d, 0xfc, 0x77, 0x92, 0xc8, 0x0a, 0x2b, 0x48, 0x65, 0x8a, 0x2a, 0x8b, 0x4c, 0x84, 0x05, + 0x4d, 0x8a, 0xb8, 0x75, 0x74, 0x44, 0xee, 0x25, 0x87, 0xd4, 0xdd, 0xf9, 0x61, 0x93, 0x29, 0xae, + 0xd6, 0x60, 0x4c, 0xae, 0x99, 0xf9, 0x36, 0x77, 0xf7, 0xd8, 0x3d, 0x63, 0x5d, 0x15, 0xf0, 0xe0, + 0x90, 0xee, 0x43, 0xde, 0x39, 0x73, 0x06, 0xbe, 0x57, 0x2d, 0xb1, 0xd8, 0x34, 0x27, 0x33, 0xab, + 0x26, 0x85, 0x5a, 0x62, 0x12, 0xff, 0x3f, 0x5c, 0xdb, 0xa1, 0xa9, 0xed, 0x13, 0x62, 0x04, 0x6a, + 0x92, 0xdc, 0x6a, 0xed, 0x08, 0xad, 0x64, 0xfd, 0xd6, 0x0e, 0xaa, 0x40, 0x66, 0xab, 0x21, 0xf6, + 0x90, 0xe9, 0x36, 0xf0, 0x67, 0x06, 0x20, 0x75, 0x5d, 0x2a, 0x35, 0xc5, 0x88, 0x4b, 0xf6, 0xd9, + 0x90, 0x3d, 0xc9, 0xc6, 0x1d, 0xd7, 0x1d, 0xba, 0x4c, 0x21, 0x45, 0x8b, 0x0f, 0xf0, 0x3d, 0x21, + 0x03, 0xd9, 0xf3, 0xf0, 0x34, 0xb0, 0x79, 0x4e, 0xcd, 0x08, 0x44, 0xdd, 0x86, 0x85, 0x08, 0x56, + 0xaa, 0x18, 0xf9, 0x10, 0xae, 0x33, 0x62, 0xdb, 0x8e, 0x33, 0xaa, 0xf7, 0xba, 0x67, 0x89, 0x5c, + 0x47, 0x70, 0x23, 0x8e, 0xf8, 0xcd, 0xea, 0x08, 0x9f, 0x40, 0xfe, 0x7d, 0x56, 0x95, 0x2b, 0xb2, + 0xe4, 0x18, 0x2e, 0x09, 0x74, 0x03, 0xbb, 0xcf, 0x0b, 0x9c, 0xa2, 0xc5, 0xbe, 0xd9, 0xa5, 0xe2, + 0x38, 0xee, 0x33, 0x6b, 0x87, 0x5f, 0x5e, 0x45, 0x2b, 0x18, 0xa3, 0x15, 0xda, 0x0f, 0xe8, 0x12, + 0xf3, 0x60, 0xb3, 0x39, 0x36, 0xab, 0x40, 0x48, 0x6d, 0x39, 0xcf, 0x39, 0xd5, 0x3b, 0x1d, 0xe5, + 0x02, 0x0b, 0xe8, 0x19, 0x51, 0x7a, 0xf8, 0x05, 0x5c, 0x53, 0xf0, 0x53, 0xa9, 0xe1, 0x75, 0xc8, + 0xf3, 0xd6, 0x83, 0x88, 0x9d, 0x8b, 0xd1, 0x55, 0x9c, 0x8d, 0x25, 0x70, 0x48, 0x7c, 0x58, 0x10, + 0x10, 0xa7, 0x3f, 0xd4, 0x9d, 0x15, 0xd3, 0x0f, 0xde, 0x81, 0xc5, 0x28, 0x5a, 0x2a, 0x13, 0xa9, + 0x4b, 0xa6, 0xcf, 0x46, 0x1d, 0x25, 0x14, 0xc7, 0x0f, 0x45, 0x55, 0x58, 0x26, 0xa6, 0xb0, 0x40, + 0x20, 0x49, 0x22, 0x95, 0x40, 0x0b, 0x52, 0xfd, 0x3b, 0x5d, 0x2f, 0xb8, 0x70, 0x3f, 0x05, 0xa4, + 0x02, 0x53, 0x1d, 0xca, 0x1a, 0x14, 0xb8, 0xc2, 0x65, 0x4e, 0xa7, 0x3f, 0x15, 0x89, 0x44, 0x05, + 0x6a, 0x38, 0xcf, 0x5d, 0xfb, 0xb8, 0xef, 0x04, 0x31, 0x87, 0x66, 0x32, 0x2a, 0x30, 0xd5, 0x8e, + 0xff, 0x48, 0x6e, 0xf1, 0x7a, 0xcf, 0x76, 0xfb, 0x52, 0xf9, 0xef, 0x40, 0x9e, 0xa7, 0x48, 0xa2, + 0x8c, 0x78, 0x10, 0x25, 0xa3, 0xe2, 0xf2, 0x41, 0x9d, 0x27, 0x54, 0x62, 0x15, 0x3d, 0x2c, 0xd1, + 0xf1, 0x6a, 0xc4, 0x3a, 0x60, 0x0d, 0xf4, 0x06, 0xcc, 0xd8, 0x74, 0x09, 0xf3, 0xc5, 0x4a, 0x3c, + 0x39, 0x65, 0xd4, 0xd8, 0x75, 0xc6, 0xb1, 0xf0, 0xdb, 0x50, 0x52, 0x38, 0xd0, 0x9c, 0xfb, 0x49, + 0x53, 0x5c, 0x59, 0xf5, 0xcd, 0xd6, 0xd6, 0x01, 0x4f, 0xc5, 0x2b, 0x00, 0x8d, 0x66, 0x30, 0xce, + 0x90, 0x64, 0x8c, 0xaf, 0x12, 0x1e, 0xae, 0xca, 0x63, 0x24, 0xc9, 0x93, 0xb9, 0x94, 0x3c, 0x2f, + 0x61, 0x4e, 0x6c, 0x3f, 0x95, 0x0d, 0xbc, 0x49, 0x34, 0x4c, 0xc9, 0x48, 0x13, 0x58, 0xd2, 0xb0, + 0x95, 0xde, 0xc9, 0x11, 0x31, 0x49, 0x62, 0xf6, 0x7d, 0xdb, 0x1f, 0x7b, 0xd2, 0x04, 0xfe, 0x60, + 0x40, 0x45, 0x42, 0xd2, 0x76, 0x1c, 0x64, 0xa5, 0xc6, 0x63, 0x5e, 0x50, 0xa7, 0xdd, 0x80, 0x7c, + 0xe7, 0x68, 0xbf, 0xfb, 0xa9, 0xec, 0xeb, 0x88, 0x11, 0x85, 0xf7, 0x38, 0x1f, 0xde, 0xa7, 0x14, + 0x23, 0x5a, 0x02, 0xd0, 0x8e, 0xe5, 0xd6, 0xa0, 0xe3, 0xbc, 0x64, 0x37, 0x6d, 0xce, 0x0a, 0x01, + 0x2c, 0x6b, 0x17, 0xfd, 0x4c, 0x96, 0x99, 0xa8, 0xfd, 0x4d, 0x62, 0xe4, 0xf5, 0xb1, 0x7f, 0xd2, + 0x1c, 0xd0, 0x56, 0x9e, 0xdc, 0xe1, 0x22, 0x20, 0x0a, 0x6c, 0x74, 0x3d, 0x15, 0xda, 0x84, 0x05, + 0x0a, 0x25, 0x76, 0x4f, 0x72, 0xfa, 0x30, 0x62, 0xc8, 0xb0, 0x6d, 0xc4, 0xc2, 0xb6, 0xed, 0x79, + 0x2f, 0x86, 0x6e, 0x47, 0x6c, 0x2d, 0x18, 0xe3, 0x06, 0x27, 0xfe, 0xcc, 0x8b, 0x04, 0xe6, 0xaf, + 0x4b, 0xe5, 0x51, 0x48, 0xe5, 0x89, 0xe3, 0x4f, 0xa1, 0x82, 0x1f, 0xc3, 0x75, 0x89, 0x29, 0x4a, + 0xf9, 0x29, 0xc8, 0x7b, 0x70, 0x4b, 0x22, 0x6f, 0x9e, 0xd0, 0x7c, 0xf3, 0xa9, 0x60, 0xf8, 0xdf, + 0xca, 0xb9, 0x01, 0xd5, 0x40, 0x4e, 0x96, 0x83, 0x0c, 0x7b, 0xaa, 0x00, 0x63, 0x4f, 0xd8, 0x0c, + 0xa1, 0x45, 0xbf, 0x29, 0xcc, 0x25, 0x28, 0xf2, 0x12, 0xa4, 0xdf, 0x78, 0x13, 0x96, 0x24, 0x0d, + 0x91, 0x1d, 0x44, 0x89, 0x4c, 0x08, 0xa4, 0x23, 0x22, 0x14, 0x46, 0x97, 0x4e, 0x57, 0xbb, 0x8a, + 0x19, 0x55, 0x2d, 0xa3, 0x69, 0x28, 0x34, 0xaf, 0x73, 0x8b, 0xa0, 0x82, 0xa9, 0x41, 0x5b, 0x80, + 0x29, 0x01, 0x15, 0x2c, 0x0e, 0x82, 0x82, 0x27, 0x0e, 0x62, 0x82, 0xf4, 0xc7, 0xb0, 0x12, 0x08, + 0x41, 0xf5, 0xf6, 0x94, 0x18, 0x6b, 0xd7, 0xf3, 0x94, 0x5a, 0x54, 0xb7, 0xf1, 0x07, 0x90, 0x1b, + 0x39, 0x22, 0xa6, 0x94, 0xd6, 0xd1, 0x1a, 0x7f, 0x75, 0x58, 0x53, 0x16, 0xb3, 0x79, 0xdc, 0x81, + 0xdb, 0x92, 0x3a, 0xd7, 0xa8, 0x96, 0x7c, 0x5c, 0x28, 0x59, 0xa7, 0x70, 0xb5, 0x4e, 0xd6, 0x29, + 0x59, 0x7e, 0xf6, 0xb2, 0x4e, 0xa1, 0x77, 0x85, 0xea, 0x5b, 0xa9, 0xee, 0x8a, 0x6d, 0xae, 0xd3, + 0xc0, 0x25, 0x53, 0x11, 0x3b, 0x82, 0xc5, 0xa8, 0x27, 0xa7, 0x0a, 0x63, 0x24, 0xeb, 0xf5, 0x89, + 0x0a, 0x65, 0x10, 0xe3, 0x03, 0x29, 0x70, 0xe0, 0xe6, 0xa9, 0x04, 0xb6, 0x43, 0x62, 0xcc, 0x24, + 0xd3, 0xca, 0x4b, 0x4f, 0x53, 0xe6, 0x33, 0x7c, 0x80, 0x77, 0xe1, 0x46, 0x3c, 0x4c, 0xa4, 0x12, + 0xf9, 0x80, 0x1b, 0xb0, 0x2e, 0x92, 0xa4, 0xa2, 0xfb, 0x41, 0x18, 0x0c, 0x94, 0x80, 0x92, 0x8a, + 0xa4, 0x05, 0xa6, 0x2e, 0xbe, 0xfc, 0x2f, 0xec, 0x35, 0x08, 0x37, 0xa9, 0x88, 0x79, 0x21, 0xb1, + 0xf4, 0xc7, 0x1f, 0xc6, 0x88, 0xec, 0xd4, 0x18, 0x21, 0x9c, 0x24, 0x8c, 0x62, 0xdf, 0x80, 0xd1, + 0x09, 0x1e, 0x61, 0x00, 0x4d, 0xcb, 0x83, 0xde, 0x21, 0x01, 0x0f, 0x36, 0x90, 0x86, 0xad, 0x86, + 0xdd, 0x54, 0x87, 0xf1, 0x61, 0x18, 0x3b, 0x27, 0x22, 0x73, 0x2a, 0xc2, 0x1f, 0xc1, 0x6a, 0x72, + 0x50, 0x4e, 0x43, 0xf9, 0x35, 0x0c, 0xc5, 0x20, 0xa1, 0x54, 0x5e, 0x19, 0x4b, 0x50, 0xd8, 0xdd, + 0xdb, 0x7f, 0x5a, 0xdf, 0x24, 0xa9, 0xec, 0xfa, 0x9f, 0xb3, 0x90, 0xd9, 0x3e, 0x40, 0x3f, 0x80, + 0x19, 0xfe, 0x06, 0x31, 0xe5, 0x89, 0xc6, 0x9c, 0xf6, 0x9a, 0x81, 0x97, 0x3f, 0xfb, 0xd3, 0xdf, + 0xbe, 0xc8, 0xdc, 0xc0, 0xd7, 0x6a, 0x67, 0x6f, 0xd9, 0xbd, 0xd1, 0x89, 0x5d, 0x3b, 0x3d, 0xab, + 0xb1, 0x3b, 0xe1, 0xdb, 0xc6, 0x6b, 0xe8, 0x00, 0xb2, 0xf4, 0x85, 0x22, 0xf1, 0xfd, 0xc6, 0x4c, + 0x7e, 0xe5, 0xc0, 0x26, 0xa3, 0xbc, 0x88, 0xaf, 0xaa, 0x94, 0x47, 0x63, 0x9f, 0xd2, 0x6d, 0x41, + 0x49, 0x79, 0xa8, 0x40, 0x17, 0xbe, 0xec, 0x98, 0x17, 0x3f, 0x82, 0xe0, 0x2b, 0x54, 0xda, 0xd6, + 0xcb, 0x41, 0x5c, 0xda, 0xb0, 0xb1, 0x1e, 0x97, 0x56, 0x69, 0x66, 0xeb, 0xa5, 0xf5, 0x5f, 0x0e, + 0xa8, 0xb4, 0x43, 0xf1, 0x74, 0xd2, 0xf6, 0xd1, 0x6d, 0x4d, 0x27, 0x5e, 0xed, 0x39, 0x9b, 0xab, + 0xc9, 0x08, 0x82, 0xd3, 0x1d, 0xc6, 0xe9, 0x26, 0xbe, 0xa1, 0x72, 0x6a, 0x07, 0x78, 0x84, 0xe1, + 0xfa, 0x09, 0xcc, 0xb0, 0x4e, 0x19, 0x3a, 0x94, 0x1f, 0xa6, 0xa6, 0xc7, 0x97, 0x70, 0xbe, 0x91, + 0x1e, 0x1b, 0x5e, 0x62, 0xdc, 0x16, 0x70, 0x25, 0xe0, 0xc6, 0x9a, 0x65, 0x84, 0xcb, 0x23, 0xe3, + 0xff, 0x8c, 0xf5, 0x7f, 0x65, 0x60, 0x86, 0xb5, 0x54, 0xd0, 0x08, 0x20, 0xec, 0x3d, 0xc5, 0xf7, + 0x39, 0xd1, 0xcd, 0x8a, 0xef, 0x73, 0xb2, 0x6d, 0x85, 0x6f, 0x33, 0xce, 0x4b, 0x78, 0x31, 0xe0, + 0xcc, 0x9e, 0x7b, 0x6b, 0xc7, 0x14, 0x8b, 0xaa, 0xf5, 0x05, 0x94, 0x94, 0x1e, 0x12, 0xd2, 0x51, + 0x8c, 0x34, 0xa1, 0xe2, 0x46, 0xa0, 0x69, 0x40, 0xe1, 0xbb, 0x8c, 0xe9, 0x2d, 0x5c, 0x55, 0x95, + 0xcb, 0xf9, 0xba, 0x0c, 0x93, 0x32, 0xfe, 0x29, 0x29, 0x89, 0xa2, 0x7d, 0x24, 0x74, 0x57, 0x43, + 0x3a, 0xde, 0x8e, 0x32, 0xef, 0x4d, 0x47, 0x4a, 0x14, 0x81, 0xf3, 0x3f, 0x25, 0x98, 0x36, 0xc5, + 0x94, 0xba, 0xff, 0x37, 0x7d, 0x92, 0xe3, 0x3f, 0x08, 0x41, 0x3e, 0x14, 0x83, 0x6e, 0x0e, 0x5a, + 0xd1, 0x55, 0xfa, 0x61, 0x1a, 0x6c, 0xde, 0x4e, 0x9c, 0x17, 0x22, 0x3c, 0x60, 0x22, 0xac, 0xe2, + 0x9b, 0x81, 0x08, 0xe2, 0x87, 0x27, 0x35, 0x5e, 0xd0, 0xd6, 0xec, 0x4e, 0x87, 0x2a, 0xe2, 0x27, + 0xa4, 0xa4, 0x57, 0x9b, 0x34, 0xe8, 0x8e, 0xb6, 0xc7, 0xa0, 0xf6, 0x79, 0x4c, 0x3c, 0x0d, 0x45, + 0xf0, 0x7f, 0x95, 0xf1, 0xbf, 0x8b, 0x57, 0x92, 0xf8, 0xbb, 0x0c, 0x3f, 0x2a, 0x02, 0x6f, 0xcb, + 0xe8, 0x45, 0x88, 0x74, 0x7d, 0xf4, 0x22, 0x44, 0xbb, 0x3a, 0x17, 0x8b, 0x30, 0x66, 0xf8, 0x54, + 0x84, 0x97, 0x00, 0x61, 0xd7, 0x06, 0x69, 0x95, 0xab, 0x14, 0x06, 0x71, 0xcb, 0x9f, 0x6c, 0xf8, + 0xe0, 0x87, 0x8c, 0xf7, 0x1d, 0xbc, 0x9c, 0xc4, 0xbb, 0x47, 0xb0, 0xa9, 0x9f, 0xff, 0x2e, 0x07, + 0xa5, 0xf7, 0xed, 0xee, 0xc0, 0x77, 0x06, 0xb4, 0x19, 0x8d, 0x8e, 0x61, 0x86, 0x45, 0xfe, 0xb8, + 0xbb, 0xab, 0xad, 0x94, 0xb8, 0xbb, 0x47, 0xfa, 0x0c, 0xf8, 0x3e, 0x63, 0x7d, 0x1b, 0x9b, 0x01, + 0xeb, 0x7e, 0x48, 0xbf, 0xc6, 0x7a, 0x04, 0x74, 0xcb, 0xa7, 0x90, 0xe7, 0x3d, 0x01, 0x14, 0xa3, + 0x16, 0xe9, 0x1d, 0x98, 0xcb, 0xfa, 0xc9, 0x44, 0x2b, 0x53, 0x79, 0x79, 0x0c, 0x99, 0x32, 0xfb, + 0x21, 0x40, 0xd8, 0x84, 0x8a, 0xeb, 0x77, 0xa2, 0x67, 0x65, 0xae, 0x26, 0x23, 0x08, 0xc6, 0xaf, + 0x31, 0xc6, 0xf7, 0xf0, 0x6d, 0x2d, 0xe3, 0x4e, 0xb0, 0x80, 0x32, 0x6f, 0x43, 0x8e, 0x3e, 0xb8, + 0xa1, 0x58, 0xe8, 0x57, 0xde, 0xe4, 0x4c, 0x53, 0x37, 0x25, 0x58, 0xdd, 0x63, 0xac, 0x56, 0xf0, + 0x92, 0x96, 0x15, 0x7d, 0x78, 0xa3, 0x4c, 0xc6, 0x30, 0x2b, 0xdf, 0xd9, 0xd0, 0xad, 0x98, 0xce, + 0xa2, 0x6f, 0x72, 0xe6, 0x4a, 0xd2, 0xb4, 0x60, 0xf8, 0x88, 0x31, 0xc4, 0xf8, 0x96, 0x5e, 0xa9, + 0x02, 0x9d, 0x30, 0x25, 0x01, 0xe4, 0xe7, 0xf3, 0x90, 0xa3, 0x39, 0x08, 0x8d, 0xdd, 0x61, 0xe9, + 0x16, 0xd7, 0xf0, 0x44, 0xc3, 0x24, 0xae, 0xe1, 0xc9, 0xaa, 0x4f, 0x13, 0xbb, 0xd9, 0xcf, 0xe2, + 0x1c, 0x86, 0x45, 0x77, 0xec, 0x43, 0x49, 0x29, 0xf0, 0x90, 0x86, 0x62, 0xb4, 0x1d, 0x13, 0x8f, + 0xdd, 0x9a, 0xea, 0x10, 0xaf, 0x32, 0xa6, 0x26, 0xbe, 0x1e, 0x65, 0xda, 0xe1, 0x68, 0x94, 0xeb, + 0x8f, 0xa0, 0xac, 0x56, 0x82, 0x48, 0x43, 0x34, 0xd6, 0xef, 0x89, 0xc7, 0x0a, 0x5d, 0x21, 0xa9, + 0x71, 0x9a, 0xe0, 0x47, 0x80, 0x12, 0x97, 0x72, 0xff, 0x04, 0x0a, 0xa2, 0x3e, 0xd4, 0xed, 0x37, + 0xda, 0x21, 0xd2, 0xed, 0x37, 0x56, 0x5c, 0x6a, 0x12, 0x01, 0xc6, 0x96, 0xe6, 0xc1, 0x32, 0x40, + 0x0b, 0x96, 0xa4, 0x8c, 0x48, 0x62, 0x19, 0xf6, 0x3c, 0x92, 0x58, 0x2a, 0x35, 0xc8, 0x54, 0x96, + 0xc7, 0x8e, 0x2f, 0x6c, 0x59, 0x26, 0xf8, 0x28, 0x81, 0xa2, 0x1a, 0x0d, 0xf1, 0x34, 0x14, 0xc1, + 0x15, 0x33, 0xae, 0xcb, 0xf8, 0x15, 0x0d, 0x57, 0x11, 0x0a, 0xd1, 0x8f, 0x01, 0xc2, 0x62, 0x36, + 0x7e, 0x1d, 0x6b, 0x3b, 0x62, 0xf1, 0xeb, 0x58, 0x5f, 0x0f, 0x6b, 0x3c, 0x38, 0x64, 0xce, 0x7f, + 0x6d, 0x43, 0xd9, 0xff, 0xd2, 0x00, 0x34, 0x59, 0xfc, 0xa2, 0xc7, 0x7a, 0x16, 0xda, 0x66, 0x9b, + 0xf9, 0xfa, 0xe5, 0x90, 0x13, 0xa3, 0x67, 0x28, 0x57, 0x9b, 0x2d, 0x19, 0xbd, 0xa0, 0x92, 0x7d, + 0x6e, 0xc0, 0x5c, 0xa4, 0x7c, 0x46, 0x0f, 0x12, 0xce, 0x39, 0xd6, 0xb0, 0x33, 0x1f, 0x5e, 0x88, + 0x97, 0x98, 0xb1, 0x28, 0x56, 0x21, 0xb3, 0xb5, 0x9f, 0x91, 0xa4, 0x29, 0x5a, 0x73, 0xa3, 0x04, + 0x06, 0x13, 0x5d, 0x3f, 0xf3, 0xd1, 0xc5, 0x88, 0x97, 0x38, 0xad, 0x30, 0x81, 0x23, 0x6e, 0x21, + 0x4a, 0x75, 0x9d, 0x5b, 0x44, 0x9b, 0x86, 0x3a, 0xb7, 0x88, 0xd5, 0xf9, 0x49, 0x6e, 0x41, 0xab, + 0x5e, 0xc5, 0x13, 0x45, 0x41, 0x9f, 0xc4, 0x72, 0xba, 0x27, 0xc6, 0xba, 0x01, 0x53, 0x59, 0x86, + 0x9e, 0x28, 0xcb, 0x79, 0x94, 0x40, 0xf1, 0x02, 0x4f, 0x8c, 0x77, 0x03, 0x92, 0x3c, 0x91, 0x71, + 0x55, 0x3c, 0x31, 0xac, 0xbe, 0x75, 0x9e, 0x38, 0xd1, 0x12, 0xd5, 0x79, 0xe2, 0x64, 0x01, 0x9f, + 0x74, 0xb6, 0x8c, 0x79, 0xc4, 0x13, 0x17, 0x34, 0xd5, 0x3a, 0x7a, 0x3d, 0x41, 0xa7, 0xda, 0x76, + 0xab, 0xf9, 0xc6, 0x25, 0xb1, 0xa7, 0x7b, 0x00, 0x3f, 0x0d, 0xe9, 0x01, 0xbf, 0x36, 0x60, 0x51, + 0x57, 0xee, 0xa3, 0x04, 0x66, 0x09, 0xbd, 0x5a, 0x73, 0xed, 0xb2, 0xe8, 0x97, 0xd0, 0x5b, 0xe0, + 0x13, 0x1b, 0xe5, 0xdf, 0xff, 0x75, 0xc5, 0xf8, 0x8a, 0xfc, 0xfb, 0x0b, 0xf9, 0x77, 0x94, 0x67, + 0xbf, 0x4b, 0x7f, 0xeb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6f, 0xc2, 0x22, 0x9e, 0x1e, 0x2f, + 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index ce70c5fc5..bb68fe82e 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -391,10 +391,16 @@ message PutRequest { // lease is the lease ID to associate with the key in the key-value store. A lease // value of 0 indicates no lease. int64 lease = 3; + + // If prev_kv is set, etcd gets the previous key-value pair before changing it. + // The previous key-value pair will be returned in the put response. + bool prev_kv = 4; } message PutResponse { ResponseHeader header = 1; + // if prev_kv is set in the request, the previous key-value pair will be returned. + mvccpb.KeyValue prev_kv = 2; } message DeleteRangeRequest { @@ -405,18 +411,17 @@ message DeleteRangeRequest { // If range_end is '\0', the range is all keys greater than or equal to the key argument. bytes range_end = 2; - // If preserveKVs is set, the deleted KVs will be preserved for delete events - // The preserved KVs will be returned as response. - // It requires read permission to read the deleted KVs. - bool preserveKVs = 3; + // If prev_kv is set, etcd gets the previous key-value pairs before deleting it. + // The previous key-value pairs will be returned in the delte response. + bool prev_kv = 3; } message DeleteRangeResponse { ResponseHeader header = 1; // deleted is the number of keys deleted by the delete range request. int64 deleted = 2; - // if preserveKVs is set in the request, the deleted KVs will be returned. - repeated mvccpb.KeyValue KVs = 3; + // if prev_kv is set in the request, the previous key-value pairs will be returned. + repeated mvccpb.KeyValue prev_kvs = 3; } message RequestOp { diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index 24ae7bed4..08fff89da 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -376,10 +376,10 @@ func TestV3PutMissingLease(t *testing.T) { func TestV3DeleteRange(t *testing.T) { defer testutil.AfterTest(t) tests := []struct { - keySet []string - begin string - end string - preserveKVs bool + keySet []string + begin string + end string + prevKV bool wantSet [][]byte deleted int64 @@ -442,9 +442,9 @@ func TestV3DeleteRange(t *testing.T) { } dreq := &pb.DeleteRangeRequest{ - Key: []byte(tt.begin), - RangeEnd: []byte(tt.end), - PreserveKVs: tt.preserveKVs, + Key: []byte(tt.begin), + RangeEnd: []byte(tt.end), + PrevKv: tt.prevKV, } dresp, err := kvc.DeleteRange(context.TODO(), dreq) if err != nil { @@ -453,9 +453,9 @@ func TestV3DeleteRange(t *testing.T) { if tt.deleted != dresp.Deleted { t.Errorf("expected %d on test %v, got %d", tt.deleted, i, dresp.Deleted) } - if tt.preserveKVs { - if len(dresp.KVs) != int(dresp.Deleted) { - t.Errorf("preserve %d keys, want %d", len(dresp.KVs), dresp.Deleted) + if tt.prevKV { + if len(dresp.PrevKvs) != int(dresp.Deleted) { + t.Errorf("preserve %d keys, want %d", len(dresp.PrevKvs), dresp.Deleted) } }