From af0264d2e6dbbbb7f717c88499386c8c4e23399d Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Mon, 12 Sep 2016 14:24:25 -0700 Subject: [PATCH 1/3] etcdserver, etcdserverpb: add MinModRevision and MaxModRevision options to Range --- Documentation/dev-guide/api_reference_v3.md | 2 + .../apispec/swagger/rpc.swagger.json | 10 + etcdserver/apply.go | 22 +- etcdserver/etcdserverpb/rpc.pb.go | 482 ++++++++++-------- etcdserver/etcdserverpb/rpc.proto | 8 + 5 files changed, 313 insertions(+), 211 deletions(-) diff --git a/Documentation/dev-guide/api_reference_v3.md b/Documentation/dev-guide/api_reference_v3.md index b0a0ffd385e..4a719ad8dec 100644 --- a/Documentation/dev-guide/api_reference_v3.md +++ b/Documentation/dev-guide/api_reference_v3.md @@ -641,6 +641,8 @@ Empty field. | serializable | serializable sets the range request to use serializable member-local reads. Range requests are linearizable by default; linearizable requests have higher latency and lower throughput than serializable requests but reflect the current consensus of the cluster. For better performance, in exchange for possible stale reads, a serializable range request is served locally without needing to reach consensus with other nodes in the cluster. | bool | | keys_only | keys_only when set returns only the keys and not the values. | bool | | count_only | count_only when set returns only the count of the keys in the range. | bool | +| min_mod_revision | min_mod_revision is the lower bound for returned key mod revisions; all keys with lesser mod revisions will be filtered away. | int64 | +| max_mod_revision | max_mod_revision is the upper bound for returned key mod revisions; all keys with greater mod revisions will be filtered away. | int64 | diff --git a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json index 200394968b8..31594db5a94 100644 --- a/Documentation/dev-guide/apispec/swagger/rpc.swagger.json +++ b/Documentation/dev-guide/apispec/swagger/rpc.swagger.json @@ -1865,6 +1865,16 @@ "format": "int64", "description": "limit is a limit on the number of keys returned for the request." }, + "max_mod_revision": { + "type": "string", + "format": "int64", + "description": "max_mod_revision is the upper bound for returned key mod revisions; all keys with\ngreater mod revisions will be filtered away." + }, + "min_mod_revision": { + "type": "string", + "format": "int64", + "description": "min_mod_revision is the lower bound for returned key mod revisions; all keys with\nlesser mod revisions will be filtered away." + }, "range_end": { "type": "string", "format": "byte", diff --git a/etcdserver/apply.go b/etcdserver/apply.go index 2f1ecbf2aa3..5f20f5c07df 100644 --- a/etcdserver/apply.go +++ b/etcdserver/apply.go @@ -258,7 +258,7 @@ func (a *applierV3backend) Range(txnID int64, r *pb.RangeRequest) (*pb.RangeResp } limit := r.Limit - if r.SortOrder != pb.RangeRequest_NONE { + if r.SortOrder != pb.RangeRequest_NONE || r.MaxModRevision != 0 || r.MinModRevision != 0 { // fetch everything; sort and truncate afterwards limit = 0 } @@ -285,6 +285,15 @@ func (a *applierV3backend) Range(txnID int64, r *pb.RangeRequest) (*pb.RangeResp } } + if r.MaxModRevision != 0 { + f := func(kv *mvccpb.KeyValue) bool { return kv.ModRevision > r.MaxModRevision } + pruneKVs(rr, f) + } + if r.MinModRevision != 0 { + f := func(kv *mvccpb.KeyValue) bool { return kv.ModRevision < r.MinModRevision } + pruneKVs(rr, f) + } + if r.SortOrder != pb.RangeRequest_NONE { var sorter sort.Interface switch { @@ -795,3 +804,14 @@ func removeNeedlessRangeReqs(txn *pb.TxnRequest) { txn.Success = f(txn.Success) txn.Failure = f(txn.Failure) } + +func pruneKVs(rr *mvcc.RangeResult, isPrunable func(*mvccpb.KeyValue) bool) { + j := 0 + for i := range rr.KVs { + rr.KVs[j] = rr.KVs[i] + if !isPrunable(&rr.KVs[i]) { + j++ + } + } + rr.KVs = rr.KVs[:j] +} diff --git a/etcdserver/etcdserverpb/rpc.pb.go b/etcdserver/etcdserverpb/rpc.pb.go index 8c0bf44f336..5e800f10d77 100644 --- a/etcdserver/etcdserverpb/rpc.pb.go +++ b/etcdserver/etcdserverpb/rpc.pb.go @@ -251,6 +251,12 @@ type RangeRequest struct { KeysOnly bool `protobuf:"varint,8,opt,name=keys_only,json=keysOnly,proto3" json:"keys_only,omitempty"` // count_only when set returns only the count of the keys in the range. CountOnly bool `protobuf:"varint,9,opt,name=count_only,json=countOnly,proto3" json:"count_only,omitempty"` + // min_mod_revision is the lower bound for returned key mod revisions; all keys with + // lesser mod revisions will be filtered away. + MinModRevision int64 `protobuf:"varint,10,opt,name=min_mod_revision,json=minModRevision,proto3" json:"min_mod_revision,omitempty"` + // max_mod_revision is the upper bound for returned key mod revisions; all keys with + // greater mod revisions will be filtered away. + MaxModRevision int64 `protobuf:"varint,11,opt,name=max_mod_revision,json=maxModRevision,proto3" json:"max_mod_revision,omitempty"` } func (m *RangeRequest) Reset() { *m = RangeRequest{} } @@ -3803,6 +3809,16 @@ func (m *RangeRequest) MarshalTo(data []byte) (int, error) { } i++ } + if m.MinModRevision != 0 { + data[i] = 0x50 + i++ + i = encodeVarintRpc(data, i, uint64(m.MinModRevision)) + } + if m.MaxModRevision != 0 { + data[i] = 0x58 + i++ + i = encodeVarintRpc(data, i, uint64(m.MaxModRevision)) + } return i, nil } @@ -6508,6 +6524,12 @@ func (m *RangeRequest) Size() (n int) { if m.CountOnly { n += 2 } + if m.MinModRevision != 0 { + n += 1 + sovRpc(uint64(m.MinModRevision)) + } + if m.MaxModRevision != 0 { + n += 1 + sovRpc(uint64(m.MaxModRevision)) + } return n } @@ -7971,6 +7993,44 @@ func (m *RangeRequest) Unmarshal(data []byte) error { } } m.CountOnly = bool(v != 0) + case 10: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MinModRevision", wireType) + } + m.MinModRevision = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + m.MinModRevision |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 11: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxModRevision", wireType) + } + m.MaxModRevision = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRpc + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + m.MaxModRevision |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipRpc(data[iNdEx:]) @@ -15859,214 +15919,216 @@ var ( ) var fileDescriptorRpc = []byte{ - // 3337 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x5b, 0x4f, 0x73, 0x1b, 0xc7, - 0xb1, 0xe7, 0x02, 0x20, 0x40, 0x34, 0x40, 0x10, 0x1a, 0x52, 0x12, 0xb8, 0x92, 0x28, 0x6a, 0xf4, - 0x8f, 0x92, 0x6c, 0xd2, 0xa6, 0xfd, 0xde, 0x41, 0xcf, 0xe5, 0x2a, 0x8a, 0x84, 0x45, 0x3e, 0xd2, - 0xa4, 0xbc, 0xa4, 0x64, 0xbf, 0x2a, 0xd7, 0x63, 0x2d, 0x81, 0x11, 0xb0, 0x45, 0x60, 0x17, 0xde, - 0x5d, 0x40, 0xa2, 0x93, 0x54, 0xa5, 0x9c, 0xb8, 0x52, 0xc9, 0x31, 0x3e, 0x24, 0x71, 0x8e, 0xa9, - 0x7c, 0x84, 0xdc, 0xf2, 0x01, 0x52, 0xb9, 0xc4, 0x55, 0xf9, 0x02, 0x29, 0x27, 0x87, 0x1c, 0x72, - 0xcf, 0x29, 0x95, 0xd4, 0xfc, 0xdb, 0x9d, 0x5d, 0xec, 0x82, 0x72, 0x36, 0xbe, 0x88, 0x3b, 0x33, - 0x3d, 0xfd, 0xeb, 0xee, 0x99, 0xee, 0xe9, 0xe9, 0x81, 0xa0, 0xec, 0x0e, 0x5a, 0xab, 0x03, 0xd7, - 0xf1, 0x1d, 0x54, 0x25, 0x7e, 0xab, 0xed, 0x11, 0x77, 0x44, 0xdc, 0xc1, 0x89, 0xbe, 0xd0, 0x71, - 0x3a, 0x0e, 0x1b, 0x58, 0xa3, 0x5f, 0x9c, 0x46, 0x5f, 0xa4, 0x34, 0x6b, 0xfd, 0x51, 0xab, 0xc5, - 0xfe, 0x19, 0x9c, 0xac, 0x9d, 0x8e, 0xc4, 0xd0, 0x15, 0x36, 0x64, 0x0e, 0xfd, 0x2e, 0xfb, 0x67, - 0x70, 0xc2, 0xfe, 0x88, 0xc1, 0xab, 0x1d, 0xc7, 0xe9, 0xf4, 0xc8, 0x9a, 0x39, 0xb0, 0xd6, 0x4c, - 0xdb, 0x76, 0x7c, 0xd3, 0xb7, 0x1c, 0xdb, 0xe3, 0xa3, 0xf8, 0x73, 0x0d, 0x6a, 0x06, 0xf1, 0x06, - 0x8e, 0xed, 0x91, 0x6d, 0x62, 0xb6, 0x89, 0x8b, 0xae, 0x01, 0xb4, 0x7a, 0x43, 0xcf, 0x27, 0xee, - 0xb1, 0xd5, 0x6e, 0x68, 0xcb, 0xda, 0x4a, 0xc1, 0x28, 0x8b, 0x9e, 0x9d, 0x36, 0xba, 0x02, 0xe5, - 0x3e, 0xe9, 0x9f, 0xf0, 0xd1, 0x1c, 0x1b, 0x9d, 0xe1, 0x1d, 0x3b, 0x6d, 0xa4, 0xc3, 0x8c, 0x4b, - 0x46, 0x96, 0x67, 0x39, 0x76, 0x23, 0xbf, 0xac, 0xad, 0xe4, 0x8d, 0xa0, 0x4d, 0x27, 0xba, 0xe6, - 0x73, 0xff, 0xd8, 0x27, 0x6e, 0xbf, 0x51, 0xe0, 0x13, 0x69, 0xc7, 0x11, 0x71, 0xfb, 0xf8, 0xab, - 0x3c, 0x54, 0x0d, 0xd3, 0xee, 0x10, 0x83, 0x7c, 0x32, 0x24, 0x9e, 0x8f, 0xea, 0x90, 0x3f, 0x25, - 0x67, 0x0c, 0xbe, 0x6a, 0xd0, 0x4f, 0x3e, 0xdf, 0xee, 0x90, 0x63, 0x62, 0x73, 0xe0, 0x2a, 0x9d, - 0x6f, 0x77, 0x48, 0xd3, 0x6e, 0xa3, 0x05, 0x98, 0xee, 0x59, 0x7d, 0xcb, 0x17, 0xa8, 0xbc, 0x11, - 0x11, 0xa7, 0x10, 0x13, 0x67, 0x13, 0xc0, 0x73, 0x5c, 0xff, 0xd8, 0x71, 0xdb, 0xc4, 0x6d, 0x4c, - 0x2f, 0x6b, 0x2b, 0xb5, 0xf5, 0x5b, 0xab, 0xea, 0x42, 0xac, 0xaa, 0x02, 0xad, 0x1e, 0x3a, 0xae, - 0x7f, 0x40, 0x69, 0x8d, 0xb2, 0x27, 0x3f, 0xd1, 0x7b, 0x50, 0x61, 0x4c, 0x7c, 0xd3, 0xed, 0x10, - 0xbf, 0x51, 0x64, 0x5c, 0x6e, 0x9f, 0xc3, 0xe5, 0x88, 0x11, 0x1b, 0x0c, 0x9e, 0x7f, 0x23, 0x0c, - 0x55, 0x8f, 0xb8, 0x96, 0xd9, 0xb3, 0x3e, 0x35, 0x4f, 0x7a, 0xa4, 0x51, 0x5a, 0xd6, 0x56, 0x66, - 0x8c, 0x48, 0x1f, 0xd5, 0xff, 0x94, 0x9c, 0x79, 0xc7, 0x8e, 0xdd, 0x3b, 0x6b, 0xcc, 0x30, 0x82, - 0x19, 0xda, 0x71, 0x60, 0xf7, 0xce, 0xd8, 0xa2, 0x39, 0x43, 0xdb, 0xe7, 0xa3, 0x65, 0x36, 0x5a, - 0x66, 0x3d, 0x74, 0x18, 0xaf, 0x42, 0x39, 0x90, 0x1f, 0xcd, 0x40, 0x61, 0xff, 0x60, 0xbf, 0x59, - 0x9f, 0x42, 0x00, 0xc5, 0x8d, 0xc3, 0xcd, 0xe6, 0xfe, 0x56, 0x5d, 0x43, 0x15, 0x28, 0x6d, 0x35, - 0x79, 0x23, 0x87, 0x1f, 0x01, 0x84, 0x92, 0xa2, 0x12, 0xe4, 0x77, 0x9b, 0xff, 0x57, 0x9f, 0xa2, - 0x34, 0xcf, 0x9a, 0xc6, 0xe1, 0xce, 0xc1, 0x7e, 0x5d, 0xa3, 0x93, 0x37, 0x8d, 0xe6, 0xc6, 0x51, - 0xb3, 0x9e, 0xa3, 0x14, 0xef, 0x1f, 0x6c, 0xd5, 0xf3, 0xa8, 0x0c, 0xd3, 0xcf, 0x36, 0xf6, 0x9e, - 0x36, 0xeb, 0x05, 0xfc, 0x85, 0x06, 0xb3, 0x42, 0x77, 0xbe, 0xbf, 0xd0, 0xdb, 0x50, 0xec, 0xb2, - 0x3d, 0xc6, 0x96, 0xb5, 0xb2, 0x7e, 0x35, 0x66, 0xa8, 0xc8, 0x3e, 0x34, 0x04, 0x2d, 0xc2, 0x90, - 0x3f, 0x1d, 0x79, 0x8d, 0xdc, 0x72, 0x7e, 0xa5, 0xb2, 0x5e, 0x5f, 0xe5, 0x9b, 0x7f, 0x75, 0x97, - 0x9c, 0x3d, 0x33, 0x7b, 0x43, 0x62, 0xd0, 0x41, 0x84, 0xa0, 0xd0, 0x77, 0x5c, 0xc2, 0x56, 0x7f, - 0xc6, 0x60, 0xdf, 0x74, 0x4b, 0x30, 0x03, 0x88, 0x95, 0xe7, 0x0d, 0xdc, 0x02, 0x78, 0x32, 0xf4, - 0xd3, 0x77, 0xd9, 0x02, 0x4c, 0x8f, 0x28, 0x5f, 0xb1, 0xc3, 0x78, 0x83, 0x6d, 0x2f, 0x62, 0x7a, - 0x24, 0xd8, 0x5e, 0xb4, 0x81, 0x2e, 0x43, 0x69, 0xe0, 0x92, 0xd1, 0xf1, 0xe9, 0x88, 0x61, 0xcc, - 0x18, 0x45, 0xda, 0xdc, 0x1d, 0x61, 0x1b, 0x2a, 0x0c, 0x24, 0x93, 0xde, 0xf7, 0x42, 0xee, 0x39, - 0x36, 0x6d, 0x5c, 0x77, 0x89, 0xf7, 0x31, 0xa0, 0x2d, 0xd2, 0x23, 0x3e, 0xc9, 0xe2, 0x42, 0x8a, - 0x36, 0xf9, 0x88, 0x36, 0x3f, 0xd5, 0x60, 0x3e, 0xc2, 0x3e, 0x93, 0x5a, 0x0d, 0x28, 0xb5, 0x19, - 0x33, 0x2e, 0x41, 0xde, 0x90, 0x4d, 0xf4, 0x00, 0x66, 0x84, 0x00, 0x5e, 0x23, 0x9f, 0xb2, 0xda, - 0x25, 0x2e, 0x93, 0x87, 0xff, 0xa6, 0x41, 0x59, 0x28, 0x7a, 0x30, 0x40, 0x1b, 0x30, 0xeb, 0xf2, - 0xc6, 0x31, 0xd3, 0x47, 0x48, 0xa4, 0xa7, 0x7b, 0xe2, 0xf6, 0x94, 0x51, 0x15, 0x53, 0x58, 0x37, - 0xfa, 0x1f, 0xa8, 0x48, 0x16, 0x83, 0xa1, 0x2f, 0x4c, 0xde, 0x88, 0x32, 0x08, 0x77, 0xce, 0xf6, - 0x94, 0x01, 0x82, 0xfc, 0xc9, 0xd0, 0x47, 0x47, 0xb0, 0x20, 0x27, 0x73, 0x6d, 0x84, 0x18, 0x79, - 0xc6, 0x65, 0x39, 0xca, 0x65, 0x7c, 0xa9, 0xb6, 0xa7, 0x0c, 0x24, 0xe6, 0x2b, 0x83, 0x8f, 0xca, - 0x50, 0x12, 0xbd, 0xf8, 0xef, 0x1a, 0x80, 0x34, 0xe8, 0xc1, 0x00, 0x6d, 0x41, 0xcd, 0x15, 0xad, - 0x88, 0xc2, 0x57, 0x12, 0x15, 0x16, 0xeb, 0x30, 0x65, 0xcc, 0xca, 0x49, 0x5c, 0xe5, 0x77, 0xa1, - 0x1a, 0x70, 0x09, 0x75, 0x5e, 0x4c, 0xd0, 0x39, 0xe0, 0x50, 0x91, 0x13, 0xa8, 0xd6, 0x1f, 0xc2, - 0xc5, 0x60, 0x7e, 0x82, 0xda, 0x37, 0x26, 0xa8, 0x1d, 0x30, 0x9c, 0x97, 0x1c, 0x54, 0xc5, 0x81, - 0xc6, 0x6d, 0xde, 0x8d, 0xbf, 0xcc, 0x43, 0x69, 0xd3, 0xe9, 0x0f, 0x4c, 0x97, 0xae, 0x51, 0xd1, - 0x25, 0xde, 0xb0, 0xe7, 0x33, 0x75, 0x6b, 0xeb, 0x37, 0xa3, 0x08, 0x82, 0x4c, 0xfe, 0x35, 0x18, - 0xa9, 0x21, 0xa6, 0xd0, 0xc9, 0x22, 0x4c, 0xe7, 0x5e, 0x61, 0xb2, 0x08, 0xd2, 0x62, 0x8a, 0xf4, - 0xa5, 0x7c, 0xe8, 0x4b, 0x3a, 0x94, 0x46, 0xc4, 0x0d, 0x8f, 0x96, 0xed, 0x29, 0x43, 0x76, 0xa0, - 0x7b, 0x30, 0xd7, 0x72, 0x89, 0x49, 0xed, 0x21, 0x8f, 0x9f, 0x69, 0x41, 0x53, 0xe3, 0x03, 0x86, - 0x3c, 0x86, 0x6e, 0x42, 0xb5, 0xef, 0xb4, 0x43, 0xba, 0xa2, 0xa0, 0xab, 0xf4, 0x9d, 0x76, 0x40, - 0x74, 0x49, 0x06, 0x25, 0x7a, 0x2e, 0x54, 0xb7, 0xa7, 0x44, 0x58, 0xc2, 0x6f, 0xc2, 0x6c, 0x44, - 0x57, 0x1a, 0x7e, 0x9b, 0x1f, 0x3c, 0xdd, 0xd8, 0xe3, 0xb1, 0xfa, 0x31, 0x0b, 0xcf, 0x46, 0x5d, - 0xa3, 0x21, 0x7f, 0xaf, 0x79, 0x78, 0x58, 0xcf, 0xe1, 0x77, 0x82, 0x29, 0x22, 0xb8, 0x2b, 0x31, - 0x7d, 0x4a, 0x89, 0xe9, 0x9a, 0x8c, 0xe9, 0xb9, 0x30, 0xa6, 0xe7, 0x1f, 0xd5, 0xa0, 0xca, 0x0d, - 0x72, 0x3c, 0xb4, 0x2d, 0xc7, 0xc6, 0xbf, 0xd2, 0x00, 0x8e, 0x5e, 0xda, 0x32, 0xe2, 0xac, 0x41, - 0xa9, 0xc5, 0x99, 0x37, 0x34, 0xe6, 0xc0, 0x17, 0x13, 0x6d, 0x6c, 0x48, 0x2a, 0xf4, 0x26, 0x94, - 0xbc, 0x61, 0xab, 0x45, 0x3c, 0x19, 0xdf, 0x2f, 0xc7, 0x63, 0x88, 0xf0, 0x70, 0x43, 0xd2, 0xd1, - 0x29, 0xcf, 0x4d, 0xab, 0x37, 0x64, 0xd1, 0x7e, 0xf2, 0x14, 0x41, 0x87, 0x7f, 0xa1, 0x41, 0x85, - 0x49, 0x99, 0x29, 0x70, 0x5d, 0x85, 0x32, 0x93, 0x81, 0xb4, 0x45, 0xe8, 0x9a, 0x31, 0xc2, 0x0e, - 0xf4, 0xdf, 0x50, 0x96, 0x5b, 0x56, 0x46, 0xaf, 0x46, 0x32, 0xdb, 0x83, 0x81, 0x11, 0x92, 0xe2, - 0x5d, 0xb8, 0xc0, 0xac, 0xd2, 0xa2, 0x59, 0x99, 0xb4, 0xa3, 0x9a, 0xb7, 0x68, 0xb1, 0xbc, 0x45, - 0x87, 0x99, 0x41, 0xf7, 0xcc, 0xb3, 0x5a, 0x66, 0x4f, 0x48, 0x11, 0xb4, 0xf1, 0xff, 0x02, 0x52, - 0x99, 0x65, 0x51, 0x17, 0xcf, 0x42, 0x65, 0xdb, 0xf4, 0xba, 0x42, 0x24, 0xfc, 0x11, 0x54, 0x79, - 0x33, 0x93, 0x0d, 0x11, 0x14, 0xba, 0xa6, 0xd7, 0x65, 0x82, 0xcf, 0x1a, 0xec, 0x1b, 0x5f, 0x80, - 0xb9, 0x43, 0xdb, 0x1c, 0x78, 0x5d, 0x47, 0x06, 0x57, 0x9a, 0x95, 0xd6, 0xc3, 0xbe, 0x4c, 0x88, - 0x77, 0x61, 0xce, 0x25, 0x7d, 0xd3, 0xb2, 0x2d, 0xbb, 0x73, 0x7c, 0x72, 0xe6, 0x13, 0x4f, 0x24, - 0xad, 0xb5, 0xa0, 0xfb, 0x11, 0xed, 0xa5, 0xa2, 0x9d, 0xf4, 0x9c, 0x13, 0xe1, 0xe2, 0xec, 0x1b, - 0xff, 0x46, 0x83, 0xea, 0x87, 0xa6, 0xdf, 0x92, 0x56, 0x40, 0x3b, 0x50, 0x0b, 0x1c, 0x9b, 0xf5, - 0x08, 0x59, 0x62, 0x11, 0x9e, 0xcd, 0xd9, 0x14, 0x8e, 0x2e, 0x23, 0xfc, 0x6c, 0x4b, 0xed, 0x60, - 0xac, 0x4c, 0xbb, 0x45, 0x7a, 0x01, 0xab, 0x5c, 0x3a, 0x2b, 0x46, 0xa8, 0xb2, 0x52, 0x3b, 0x1e, - 0xcd, 0x85, 0xa7, 0x1f, 0x77, 0xcb, 0x2f, 0x73, 0x80, 0xc6, 0x65, 0xf8, 0xa6, 0x09, 0xc1, 0x6d, - 0xa8, 0x79, 0xbe, 0xe9, 0xfa, 0xc7, 0xb1, 0x94, 0x7e, 0x96, 0xf5, 0x06, 0xc1, 0xe9, 0x2e, 0xcc, - 0x0d, 0x5c, 0xa7, 0xe3, 0x12, 0xcf, 0x3b, 0xb6, 0x1d, 0xdf, 0x7a, 0x7e, 0x26, 0xb2, 0xa1, 0x9a, - 0xec, 0xde, 0x67, 0xbd, 0xa8, 0x09, 0xa5, 0xe7, 0x56, 0xcf, 0x27, 0xae, 0xd7, 0x98, 0x5e, 0xce, - 0xaf, 0xd4, 0xd6, 0x1f, 0x9c, 0x67, 0xb5, 0xd5, 0xf7, 0x18, 0xfd, 0xd1, 0xd9, 0x80, 0x18, 0x72, - 0xae, 0x9a, 0xa7, 0x14, 0x23, 0x79, 0xca, 0x6d, 0x80, 0x90, 0x9e, 0x46, 0xad, 0xfd, 0x83, 0x27, - 0x4f, 0x8f, 0xea, 0x53, 0xa8, 0x0a, 0x33, 0xfb, 0x07, 0x5b, 0xcd, 0xbd, 0x26, 0x8d, 0x6b, 0x78, - 0x4d, 0xda, 0x46, 0xb5, 0x21, 0x5a, 0x84, 0x99, 0x17, 0xb4, 0x57, 0xde, 0x79, 0xf2, 0x46, 0x89, - 0xb5, 0x77, 0xda, 0xf8, 0xaf, 0x1a, 0xcc, 0x8a, 0x5d, 0x90, 0x69, 0x2b, 0xaa, 0x10, 0xb9, 0x08, - 0x04, 0x4d, 0x8a, 0xf8, 0xee, 0x68, 0x8b, 0xdc, 0x4b, 0x36, 0xa9, 0xbb, 0xf3, 0xc5, 0x26, 0x6d, - 0x61, 0xd6, 0xa0, 0x8d, 0xee, 0x41, 0xbd, 0xc5, 0xdd, 0x3d, 0x76, 0xce, 0x18, 0x73, 0xa2, 0x3f, - 0x58, 0xa4, 0xdb, 0x50, 0x24, 0x23, 0x62, 0xfb, 0x5e, 0xa3, 0xc2, 0x62, 0xd3, 0xac, 0xcc, 0xac, - 0x9a, 0xb4, 0xd7, 0x10, 0x83, 0xf8, 0xbf, 0xe0, 0xc2, 0x1e, 0x4d, 0x6d, 0x1f, 0xbb, 0xa6, 0xad, - 0x26, 0xc9, 0x47, 0x47, 0x7b, 0xc2, 0x2a, 0x79, 0xff, 0x68, 0x0f, 0xd5, 0x20, 0xb7, 0xb3, 0x25, - 0x74, 0xc8, 0x59, 0x5b, 0xf8, 0x33, 0x0d, 0x90, 0x3a, 0x2f, 0x93, 0x99, 0x62, 0xcc, 0x25, 0x7c, - 0x3e, 0x84, 0x5f, 0x80, 0x69, 0xe2, 0xba, 0x8e, 0xcb, 0x0c, 0x52, 0x36, 0x78, 0x03, 0xdf, 0x12, - 0x32, 0x18, 0x64, 0xe4, 0x9c, 0x06, 0x7b, 0x9e, 0x73, 0xd3, 0x02, 0x51, 0x77, 0x61, 0x3e, 0x42, - 0x95, 0x29, 0x46, 0xde, 0x85, 0x8b, 0x8c, 0xd9, 0x2e, 0x21, 0x83, 0x8d, 0x9e, 0x35, 0x4a, 0x45, - 0x1d, 0xc0, 0xa5, 0x38, 0xe1, 0xb7, 0x6b, 0x23, 0xfc, 0x8e, 0x40, 0x3c, 0xb2, 0xfa, 0xe4, 0xc8, - 0xd9, 0x4b, 0x97, 0x8d, 0x06, 0x3e, 0x7a, 0x8d, 0x14, 0x87, 0x09, 0xfb, 0xc6, 0xbf, 0xd6, 0xe0, - 0xf2, 0xd8, 0xf4, 0x6f, 0x79, 0x55, 0x97, 0x00, 0x3a, 0x74, 0xfb, 0x90, 0x36, 0x1d, 0xe0, 0x97, - 0x36, 0xa5, 0x27, 0x90, 0x93, 0xc6, 0x8e, 0xaa, 0x90, 0xb3, 0x0b, 0xc5, 0xf7, 0x59, 0xed, 0x41, - 0xd1, 0xaa, 0x20, 0xb5, 0xb2, 0xcd, 0x3e, 0xbf, 0xc6, 0x95, 0x0d, 0xf6, 0xcd, 0x8e, 0x4e, 0x42, - 0xdc, 0xa7, 0xc6, 0x1e, 0x3f, 0xa2, 0xcb, 0x46, 0xd0, 0xa6, 0xe8, 0xad, 0x9e, 0x45, 0x6c, 0x9f, - 0x8d, 0x16, 0xd8, 0xa8, 0xd2, 0x83, 0x57, 0xa1, 0xce, 0x91, 0x36, 0xda, 0x6d, 0xe5, 0x98, 0x0e, - 0xf8, 0x69, 0x51, 0x7e, 0xf8, 0x05, 0x5c, 0x50, 0xe8, 0x33, 0x99, 0xee, 0x35, 0x28, 0xf2, 0x02, - 0x8b, 0x38, 0x21, 0x16, 0xa2, 0xb3, 0x38, 0x8c, 0x21, 0x68, 0xf0, 0x6d, 0x98, 0x17, 0x3d, 0xa4, - 0xef, 0x24, 0xad, 0x3a, 0xb3, 0x0f, 0xde, 0x83, 0x85, 0x28, 0x59, 0x26, 0x47, 0xd8, 0x90, 0xa0, - 0x4f, 0x07, 0x6d, 0xe5, 0xc0, 0x89, 0x2f, 0x8a, 0x6a, 0xb0, 0x5c, 0xcc, 0x60, 0x81, 0x40, 0x92, - 0x45, 0x26, 0x81, 0xe6, 0xa5, 0xf9, 0xf7, 0x2c, 0x2f, 0x48, 0x2b, 0x3e, 0x05, 0xa4, 0x76, 0x66, - 0x5a, 0x94, 0x55, 0x28, 0x71, 0x83, 0xcb, 0xcc, 0x35, 0x79, 0x55, 0x24, 0x11, 0x15, 0x68, 0x8b, - 0x3c, 0x77, 0xcd, 0x4e, 0x9f, 0x04, 0x91, 0x95, 0xe6, 0x6b, 0x6a, 0x67, 0x26, 0x8d, 0xff, 0xa0, - 0x41, 0x75, 0xa3, 0x67, 0xba, 0x7d, 0x69, 0xfc, 0x77, 0xa1, 0xc8, 0x13, 0x41, 0x71, 0x59, 0xba, - 0x13, 0x65, 0xa3, 0xd2, 0xf2, 0xc6, 0x06, 0x4f, 0x1b, 0xc5, 0x2c, 0xba, 0x58, 0xa2, 0xae, 0xb7, - 0x15, 0xab, 0xf3, 0x6d, 0xa1, 0xd7, 0x61, 0xda, 0xa4, 0x53, 0x98, 0xff, 0xd6, 0xe2, 0x29, 0x38, - 0xe3, 0xc6, 0x0e, 0x6d, 0x4e, 0x85, 0xdf, 0x86, 0x8a, 0x82, 0x40, 0x6f, 0x16, 0x8f, 0x9b, 0xe2, - 0x60, 0xde, 0xd8, 0x3c, 0xda, 0x79, 0xc6, 0x2f, 0x1c, 0x35, 0x80, 0xad, 0x66, 0xd0, 0xce, 0xe1, - 0x8f, 0xc4, 0x2c, 0xe1, 0xe1, 0xaa, 0x3c, 0x5a, 0x9a, 0x3c, 0xb9, 0x57, 0x92, 0xe7, 0x25, 0xcc, - 0x0a, 0xf5, 0x33, 0xed, 0x81, 0x37, 0xa1, 0xc8, 0xf8, 0xc9, 0x2d, 0xb0, 0x98, 0x00, 0x2b, 0xbd, - 0x93, 0x13, 0xe2, 0x39, 0x98, 0x3d, 0xf4, 0x4d, 0x7f, 0xe8, 0xc9, 0x2d, 0xf0, 0x7b, 0x0d, 0x6a, - 0xb2, 0x27, 0x6b, 0x5d, 0x45, 0xde, 0x47, 0x79, 0xcc, 0x0b, 0x6e, 0xa3, 0x97, 0xa0, 0xd8, 0x3e, - 0x39, 0xb4, 0x3e, 0x95, 0xd5, 0x2b, 0xd1, 0xa2, 0xfd, 0x3d, 0x8e, 0xc3, 0xab, 0xb1, 0xa2, 0x45, - 0x2f, 0x3a, 0xae, 0xf9, 0xdc, 0xdf, 0xb1, 0xdb, 0xe4, 0x25, 0xcb, 0x27, 0x0a, 0x46, 0xd8, 0xc1, - 0xee, 0x26, 0xa2, 0x6a, 0xcb, 0xf2, 0x2f, 0xb5, 0x8a, 0x3b, 0x0f, 0x17, 0x36, 0x86, 0x7e, 0xb7, - 0x69, 0x9b, 0x27, 0x3d, 0x19, 0x04, 0xf0, 0x02, 0x20, 0xda, 0xb9, 0x65, 0x79, 0x6a, 0x6f, 0x13, - 0xe6, 0x69, 0x2f, 0xb1, 0x7d, 0xab, 0xa5, 0x44, 0x0c, 0x19, 0xb6, 0xb5, 0x58, 0xd8, 0x36, 0x3d, - 0xef, 0x85, 0xe3, 0xb6, 0x85, 0x6a, 0x41, 0x1b, 0x6f, 0x71, 0xe6, 0x4f, 0xbd, 0x48, 0x60, 0xfe, - 0xa6, 0x5c, 0x56, 0x42, 0x2e, 0x8f, 0x89, 0x3f, 0x81, 0x0b, 0x7e, 0x00, 0x17, 0x25, 0xa5, 0x28, - 0x58, 0x4c, 0x20, 0x3e, 0x80, 0x6b, 0x92, 0x78, 0xb3, 0x4b, 0xb3, 0xea, 0x27, 0x02, 0xf0, 0xdf, - 0x95, 0xf3, 0x11, 0x34, 0x02, 0x39, 0x59, 0xa6, 0xe5, 0xf4, 0x54, 0x01, 0x86, 0x9e, 0xd8, 0x33, - 0x65, 0x83, 0x7d, 0xd3, 0x3e, 0xd7, 0xe9, 0x05, 0x87, 0x20, 0xfd, 0xc6, 0x9b, 0xb0, 0x28, 0x79, - 0x88, 0x1c, 0x28, 0xca, 0x64, 0x4c, 0xa0, 0x24, 0x26, 0xc2, 0x60, 0x74, 0xea, 0x64, 0xb3, 0xab, - 0x94, 0x51, 0xd3, 0x32, 0x9e, 0x9a, 0xc2, 0xf3, 0x22, 0xdf, 0x11, 0x54, 0x30, 0x35, 0x68, 0x8b, - 0x6e, 0xca, 0x40, 0xed, 0x16, 0x0b, 0x41, 0xbb, 0xc7, 0x16, 0x62, 0x8c, 0xf5, 0xc7, 0xb0, 0x14, - 0x08, 0x41, 0xed, 0xf6, 0x84, 0xb8, 0x7d, 0xcb, 0xf3, 0x94, 0x1b, 0x77, 0x92, 0xe2, 0x77, 0xa0, - 0x30, 0x20, 0x22, 0xa6, 0x54, 0xd6, 0xd1, 0x2a, 0x7f, 0x5b, 0x59, 0x55, 0x26, 0xb3, 0x71, 0xdc, - 0x86, 0xeb, 0x92, 0x3b, 0xb7, 0x68, 0x22, 0xfb, 0xb8, 0x50, 0xf2, 0x36, 0xc6, 0xcd, 0x3a, 0x7e, - 0x1b, 0xcb, 0xf3, 0xb5, 0x97, 0xb7, 0x31, 0x7a, 0x56, 0xa8, 0xbe, 0x95, 0xe9, 0xac, 0xd8, 0xe5, - 0x36, 0x0d, 0x5c, 0x32, 0x13, 0xb3, 0x13, 0x58, 0x88, 0x7a, 0x72, 0xa6, 0x30, 0xb6, 0x00, 0xd3, - 0xbe, 0x73, 0x4a, 0x64, 0x10, 0xe3, 0x0d, 0x29, 0x70, 0xe0, 0xe6, 0x99, 0x04, 0x36, 0x43, 0x66, - 0x6c, 0x4b, 0x66, 0x95, 0x97, 0xae, 0xa6, 0xcc, 0x67, 0x78, 0x03, 0xef, 0xc3, 0xa5, 0x78, 0x98, - 0xc8, 0x24, 0xf2, 0x33, 0xbe, 0x81, 0x93, 0x22, 0x49, 0x26, 0xbe, 0x1f, 0x84, 0xc1, 0x40, 0x09, - 0x28, 0x99, 0x58, 0x1a, 0xa0, 0x27, 0xc5, 0x97, 0xff, 0xc4, 0x7e, 0x0d, 0xc2, 0x4d, 0x26, 0x66, - 0x5e, 0xc8, 0x2c, 0xfb, 0xf2, 0x87, 0x31, 0x22, 0x3f, 0x31, 0x46, 0x08, 0x27, 0x09, 0xa3, 0xd8, - 0xb7, 0xb0, 0xe9, 0x04, 0x46, 0x18, 0x40, 0xb3, 0x62, 0xd0, 0x33, 0x24, 0xc0, 0x60, 0x0d, 0xb9, - 0xb1, 0xd5, 0xb0, 0x9b, 0x69, 0x31, 0x3e, 0x0c, 0x63, 0xe7, 0x58, 0x64, 0xce, 0xc4, 0xf8, 0x23, - 0x58, 0x4e, 0x0f, 0xca, 0x59, 0x38, 0xdf, 0xc7, 0x50, 0x0e, 0x12, 0x4a, 0xe5, 0x2d, 0xb5, 0x02, - 0xa5, 0xfd, 0x83, 0xc3, 0x27, 0x1b, 0x9b, 0xcd, 0xba, 0xb6, 0xfe, 0x8f, 0x3c, 0xe4, 0x76, 0x9f, - 0xa1, 0xff, 0x87, 0x69, 0xfe, 0xd2, 0x32, 0xe1, 0x21, 0x4a, 0x9f, 0xf4, 0x66, 0x83, 0xaf, 0x7e, - 0xf6, 0xc7, 0xbf, 0x7c, 0x91, 0xbb, 0x84, 0x2f, 0xac, 0x8d, 0xde, 0x32, 0x7b, 0x83, 0xae, 0xb9, - 0x76, 0x3a, 0x5a, 0x63, 0x67, 0xc2, 0x43, 0xed, 0x3e, 0x7a, 0x06, 0xf9, 0x27, 0x43, 0x1f, 0xa5, - 0xbe, 0x52, 0xe9, 0xe9, 0x6f, 0x39, 0x58, 0x67, 0x9c, 0x17, 0xf0, 0x9c, 0xca, 0x79, 0x30, 0xf4, - 0x29, 0xdf, 0x11, 0x54, 0x94, 0xe7, 0x18, 0x74, 0xee, 0xfb, 0x95, 0x7e, 0xfe, 0x53, 0x0f, 0xc6, - 0x0c, 0xef, 0x2a, 0xbe, 0xac, 0xe2, 0xf1, 0x57, 0x23, 0x55, 0x9f, 0xa3, 0x97, 0x76, 0x5c, 0x9f, - 0xf0, 0x81, 0x21, 0xae, 0x8f, 0x52, 0xd4, 0x4f, 0xd6, 0xc7, 0x7f, 0x69, 0x53, 0xbe, 0x8e, 0x78, - 0x42, 0x6a, 0xf9, 0xe8, 0x7a, 0xc2, 0x8b, 0x84, 0x5a, 0x7b, 0xd7, 0x97, 0xd3, 0x09, 0x04, 0xd2, - 0x0d, 0x86, 0x74, 0x05, 0x5f, 0x52, 0x91, 0x5a, 0x01, 0xdd, 0x43, 0xed, 0xfe, 0x7a, 0x17, 0xa6, - 0x59, 0xc5, 0x10, 0x1d, 0xcb, 0x0f, 0x3d, 0xa1, 0xd6, 0x99, 0xb2, 0x03, 0x22, 0xb5, 0x46, 0xbc, - 0xc8, 0xd0, 0xe6, 0x71, 0x2d, 0x40, 0x63, 0x45, 0xc3, 0x87, 0xda, 0xfd, 0x15, 0xed, 0x0d, 0x6d, - 0xfd, 0x07, 0x05, 0x98, 0x66, 0x95, 0x1a, 0x34, 0x00, 0x08, 0x6b, 0x70, 0x71, 0x3d, 0xc7, 0xaa, - 0x7a, 0x71, 0x3d, 0xc7, 0xcb, 0x77, 0xf8, 0x3a, 0x43, 0x5e, 0xc4, 0x0b, 0x01, 0x32, 0x7b, 0xf6, - 0x5e, 0x63, 0x35, 0x19, 0x6a, 0xd6, 0x17, 0x50, 0x51, 0x6a, 0x69, 0x28, 0x89, 0x63, 0xa4, 0x18, - 0x17, 0xdf, 0x26, 0x09, 0x85, 0x38, 0x7c, 0x93, 0x81, 0x5e, 0xc3, 0x0d, 0xd5, 0xb8, 0x1c, 0xd7, - 0x65, 0x94, 0x14, 0xf8, 0x87, 0x1a, 0xd4, 0xa2, 0xf5, 0x34, 0x74, 0x33, 0x81, 0x75, 0xbc, 0x2c, - 0xa7, 0xdf, 0x9a, 0x4c, 0x94, 0x2a, 0x02, 0xc7, 0x3f, 0x25, 0x64, 0x60, 0x52, 0x4a, 0x61, 0x7b, - 0xf4, 0x23, 0x0d, 0xe6, 0x62, 0x55, 0x32, 0x94, 0x04, 0x31, 0x56, 0x83, 0xd3, 0x6f, 0x9f, 0x43, - 0x25, 0x24, 0xb9, 0xcb, 0x24, 0xb9, 0x81, 0xaf, 0x8e, 0x1b, 0xc3, 0xb7, 0xfa, 0xc4, 0x77, 0x84, - 0x34, 0xeb, 0xff, 0xcc, 0x43, 0x69, 0x93, 0xff, 0x44, 0x07, 0xf9, 0x50, 0x0e, 0x2a, 0x4f, 0x68, - 0x29, 0xa9, 0x2a, 0x11, 0xa6, 0xec, 0xfa, 0xf5, 0xd4, 0x71, 0x21, 0xc2, 0x1d, 0x26, 0xc2, 0x32, - 0xbe, 0x12, 0x88, 0x20, 0x7e, 0x0a, 0xb4, 0xc6, 0x2f, 0xdf, 0x6b, 0x66, 0xbb, 0x4d, 0x97, 0xe4, - 0xfb, 0x1a, 0x54, 0xd5, 0x82, 0x12, 0xba, 0x91, 0x58, 0x0f, 0x51, 0x6b, 0x52, 0x3a, 0x9e, 0x44, - 0x22, 0xf0, 0xef, 0x31, 0xfc, 0x9b, 0x78, 0x29, 0x0d, 0xdf, 0x65, 0xf4, 0x51, 0x11, 0x78, 0x09, - 0x29, 0x59, 0x84, 0x48, 0x85, 0x2a, 0x59, 0x84, 0x68, 0x05, 0xea, 0x7c, 0x11, 0x86, 0x8c, 0x9e, - 0x8a, 0xf0, 0x12, 0x20, 0xac, 0x30, 0xa1, 0x44, 0xe3, 0x2a, 0x97, 0x98, 0xb8, 0x0f, 0x8e, 0x17, - 0xa7, 0x12, 0x76, 0x40, 0x0c, 0xbb, 0x67, 0x79, 0xd4, 0x17, 0xd7, 0x7f, 0x5b, 0x80, 0xca, 0xfb, - 0xa6, 0x65, 0xfb, 0xc4, 0x36, 0xed, 0x16, 0x41, 0x1d, 0x98, 0x66, 0xa7, 0x54, 0x3c, 0xf0, 0xa8, - 0x65, 0x9f, 0x78, 0xe0, 0x89, 0xd4, 0x44, 0xf0, 0x6d, 0x06, 0x7d, 0x1d, 0xeb, 0x01, 0x74, 0x3f, - 0xe4, 0xbf, 0xc6, 0xea, 0x19, 0x54, 0xe5, 0x53, 0x28, 0xf2, 0xfa, 0x05, 0x8a, 0x71, 0x8b, 0xd4, - 0x39, 0xf4, 0xab, 0xc9, 0x83, 0xa9, 0xbb, 0x4c, 0xc5, 0xf2, 0x18, 0x31, 0x05, 0xfb, 0x0e, 0x40, - 0x58, 0x30, 0x8b, 0xdb, 0x77, 0xac, 0xbe, 0xa6, 0x2f, 0xa7, 0x13, 0x08, 0xe0, 0xfb, 0x0c, 0xf8, - 0x16, 0xbe, 0x9e, 0x08, 0xdc, 0x0e, 0x26, 0x50, 0xf0, 0x16, 0x14, 0xb6, 0x4d, 0xaf, 0x8b, 0x62, - 0x87, 0x90, 0xf2, 0x4a, 0xaa, 0xeb, 0x49, 0x43, 0x02, 0xea, 0x16, 0x83, 0x5a, 0xc2, 0x8b, 0x89, - 0x50, 0x5d, 0xd3, 0xa3, 0x31, 0x1d, 0x0d, 0x61, 0x46, 0xbe, 0x7c, 0xa2, 0x6b, 0x31, 0x9b, 0x45, - 0x5f, 0x49, 0xf5, 0xa5, 0xb4, 0x61, 0x01, 0xb8, 0xc2, 0x00, 0x31, 0xbe, 0x96, 0x6c, 0x54, 0x41, - 0xfe, 0x50, 0xbb, 0xff, 0x86, 0xb6, 0xfe, 0x93, 0x3a, 0x14, 0x68, 0xbe, 0x44, 0x4f, 0x91, 0xf0, - 0x9a, 0x19, 0xb7, 0xf0, 0x58, 0x71, 0x27, 0x6e, 0xe1, 0xf1, 0x1b, 0x6a, 0xc2, 0x29, 0xc2, 0x7e, - 0xa8, 0x48, 0x18, 0x15, 0xd5, 0xd8, 0x87, 0x8a, 0x72, 0x19, 0x45, 0x09, 0x1c, 0xa3, 0xa5, 0xa3, - 0xf8, 0x29, 0x92, 0x70, 0x93, 0xc5, 0xcb, 0x0c, 0x54, 0xc7, 0x17, 0xa3, 0xa0, 0x6d, 0x4e, 0x46, - 0x51, 0xbf, 0x0b, 0x55, 0xf5, 0xd6, 0x8a, 0x12, 0x98, 0xc6, 0x6a, 0x53, 0xf1, 0x58, 0x91, 0x74, - 0xe9, 0x4d, 0x70, 0x9a, 0xe0, 0x67, 0x99, 0x92, 0x96, 0xa2, 0x7f, 0x02, 0x25, 0x71, 0x97, 0x4d, - 0xd2, 0x37, 0x5a, 0xcd, 0x4a, 0xd2, 0x37, 0x76, 0x11, 0x4e, 0x48, 0x49, 0x18, 0x2c, 0xcd, 0xd9, - 0x65, 0x80, 0x16, 0x90, 0x8f, 0x89, 0x9f, 0x06, 0x19, 0xd6, 0x67, 0xd2, 0x20, 0x95, 0xfb, 0xd2, - 0x44, 0xc8, 0x0e, 0xf1, 0xc5, 0x5e, 0x96, 0x97, 0x11, 0x94, 0xc2, 0x51, 0x8d, 0x86, 0x78, 0x12, - 0x49, 0x6a, 0x16, 0x19, 0xa2, 0x8a, 0x50, 0x88, 0xbe, 0x07, 0x10, 0x5e, 0xbc, 0xe3, 0x89, 0x41, - 0x62, 0xf5, 0x2e, 0x9e, 0x18, 0x24, 0xdf, 0xdd, 0x13, 0x3c, 0x38, 0x04, 0xe7, 0x99, 0x2c, 0x85, - 0xff, 0x99, 0x06, 0x68, 0xfc, 0xa2, 0x8e, 0x1e, 0x24, 0x43, 0x24, 0x16, 0x06, 0xf5, 0xd7, 0x5e, - 0x8d, 0x38, 0x35, 0x7a, 0x86, 0x72, 0xb5, 0xd8, 0x94, 0xc1, 0x0b, 0x2a, 0xd9, 0xe7, 0x1a, 0xcc, - 0x46, 0xae, 0xfa, 0xe8, 0x4e, 0xca, 0x3a, 0xc7, 0x8a, 0x8b, 0xfa, 0xdd, 0x73, 0xe9, 0x52, 0x73, - 0x27, 0x65, 0x57, 0xc8, 0xbc, 0xf1, 0xc7, 0x1a, 0xd4, 0xa2, 0xf5, 0x01, 0x94, 0x02, 0x30, 0x56, - 0xa1, 0xd4, 0x57, 0xce, 0x27, 0x7c, 0x85, 0xd5, 0x0a, 0x53, 0xc9, 0x4f, 0xa0, 0x24, 0xca, 0x0a, - 0x49, 0x6e, 0x11, 0x2d, 0x70, 0x26, 0xb9, 0x45, 0xac, 0x26, 0x91, 0xe6, 0x16, 0xf4, 0x86, 0xae, - 0x78, 0xa2, 0x28, 0x3e, 0xa4, 0x41, 0x4e, 0xf6, 0xc4, 0x58, 0xe5, 0x62, 0x22, 0x64, 0xe8, 0x89, - 0xb2, 0xf4, 0x80, 0x52, 0x38, 0x9e, 0xe3, 0x89, 0xf1, 0xca, 0x45, 0x9a, 0x27, 0x32, 0x54, 0xc5, - 0x13, 0xc3, 0x4a, 0x41, 0x92, 0x27, 0x8e, 0x95, 0x6f, 0x93, 0x3c, 0x71, 0xbc, 0xd8, 0x90, 0xb6, - 0xb6, 0x0c, 0x3c, 0xe2, 0x89, 0xf3, 0x09, 0x95, 0x05, 0xf4, 0x5a, 0x8a, 0x4d, 0x13, 0x4b, 0xc3, - 0xfa, 0xeb, 0xaf, 0x48, 0x3d, 0xd9, 0x03, 0xf8, 0x6a, 0x48, 0x0f, 0xf8, 0xa5, 0x06, 0x0b, 0x49, - 0xa5, 0x09, 0x94, 0x02, 0x96, 0x52, 0x57, 0xd6, 0x57, 0x5f, 0x95, 0xfc, 0x15, 0xec, 0x16, 0xf8, - 0xc4, 0xa3, 0xfa, 0xef, 0xbe, 0x5e, 0xd2, 0xbe, 0xfa, 0x7a, 0x49, 0xfb, 0xd3, 0xd7, 0x4b, 0xda, - 0xcf, 0xff, 0xbc, 0x34, 0x75, 0x52, 0x64, 0xff, 0x5b, 0xe0, 0xad, 0x7f, 0x05, 0x00, 0x00, 0xff, - 0xff, 0xb2, 0xe7, 0xb7, 0xba, 0xb4, 0x30, 0x00, 0x00, + // 3367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x5b, 0xcf, 0x6f, 0x1b, 0xc7, + 0xf5, 0xd7, 0x92, 0x14, 0x29, 0x3e, 0x52, 0x14, 0x3d, 0x92, 0x6d, 0x6a, 0x6d, 0xcb, 0xf2, 0xf8, + 0x97, 0x6c, 0x27, 0x52, 0xa2, 0xe4, 0xfb, 0x3d, 0xb8, 0x41, 0x00, 0x59, 0x62, 0x2c, 0x55, 0xb2, + 0xe4, 0xac, 0x64, 0x27, 0x05, 0x82, 0x0a, 0x2b, 0x72, 0x2c, 0x2e, 0x44, 0xee, 0x32, 0xbb, 0x4b, + 0x5a, 0x4a, 0x5b, 0xa0, 0x48, 0x1b, 0x14, 0xed, 0xb1, 0x39, 0xb4, 0x4d, 0x8f, 0x6d, 0xff, 0x84, + 0xde, 0xfa, 0x07, 0x14, 0xbd, 0xb4, 0x40, 0xff, 0x81, 0x22, 0xed, 0xa1, 0x87, 0xde, 0x7b, 0x2a, + 0x5a, 0xcc, 0xaf, 0xdd, 0xd9, 0xe5, 0x2e, 0xe5, 0x74, 0x9b, 0x8b, 0xb5, 0x33, 0xf3, 0xe6, 0x7d, + 0xde, 0x7b, 0x33, 0xef, 0xcd, 0x9b, 0x37, 0x34, 0x94, 0xdd, 0x7e, 0x6b, 0xb9, 0xef, 0x3a, 0xbe, + 0x83, 0xaa, 0xc4, 0x6f, 0xb5, 0x3d, 0xe2, 0x0e, 0x89, 0xdb, 0x3f, 0xd2, 0xe7, 0x8e, 0x9d, 0x63, + 0x87, 0x0d, 0xac, 0xd0, 0x2f, 0x4e, 0xa3, 0xcf, 0x53, 0x9a, 0x95, 0xde, 0xb0, 0xd5, 0x62, 0xff, + 0xf4, 0x8f, 0x56, 0x4e, 0x86, 0x62, 0xe8, 0x0a, 0x1b, 0x32, 0x07, 0x7e, 0x87, 0xfd, 0xd3, 0x3f, + 0x62, 0x7f, 0xc4, 0xe0, 0xd5, 0x63, 0xc7, 0x39, 0xee, 0x92, 0x15, 0xb3, 0x6f, 0xad, 0x98, 0xb6, + 0xed, 0xf8, 0xa6, 0x6f, 0x39, 0xb6, 0xc7, 0x47, 0xf1, 0x67, 0x1a, 0xd4, 0x0c, 0xe2, 0xf5, 0x1d, + 0xdb, 0x23, 0x9b, 0xc4, 0x6c, 0x13, 0x17, 0x5d, 0x03, 0x68, 0x75, 0x07, 0x9e, 0x4f, 0xdc, 0x43, + 0xab, 0xdd, 0xd0, 0x16, 0xb5, 0xa5, 0x82, 0x51, 0x16, 0x3d, 0x5b, 0x6d, 0x74, 0x05, 0xca, 0x3d, + 0xd2, 0x3b, 0xe2, 0xa3, 0x39, 0x36, 0x3a, 0xc5, 0x3b, 0xb6, 0xda, 0x48, 0x87, 0x29, 0x97, 0x0c, + 0x2d, 0xcf, 0x72, 0xec, 0x46, 0x7e, 0x51, 0x5b, 0xca, 0x1b, 0x41, 0x9b, 0x4e, 0x74, 0xcd, 0x17, + 0xfe, 0xa1, 0x4f, 0xdc, 0x5e, 0xa3, 0xc0, 0x27, 0xd2, 0x8e, 0x03, 0xe2, 0xf6, 0xf0, 0xaf, 0x0b, + 0x50, 0x35, 0x4c, 0xfb, 0x98, 0x18, 0xe4, 0xe3, 0x01, 0xf1, 0x7c, 0x54, 0x87, 0xfc, 0x09, 0x39, + 0x63, 0xf0, 0x55, 0x83, 0x7e, 0xf2, 0xf9, 0xf6, 0x31, 0x39, 0x24, 0x36, 0x07, 0xae, 0xd2, 0xf9, + 0xf6, 0x31, 0x69, 0xda, 0x6d, 0x34, 0x07, 0x93, 0x5d, 0xab, 0x67, 0xf9, 0x02, 0x95, 0x37, 0x22, + 0xe2, 0x14, 0x62, 0xe2, 0xac, 0x03, 0x78, 0x8e, 0xeb, 0x1f, 0x3a, 0x6e, 0x9b, 0xb8, 0x8d, 0xc9, + 0x45, 0x6d, 0xa9, 0xb6, 0x7a, 0x6b, 0x59, 0x5d, 0x88, 0x65, 0x55, 0xa0, 0xe5, 0x7d, 0xc7, 0xf5, + 0xf7, 0x28, 0xad, 0x51, 0xf6, 0xe4, 0x27, 0x7a, 0x0f, 0x2a, 0x8c, 0x89, 0x6f, 0xba, 0xc7, 0xc4, + 0x6f, 0x14, 0x19, 0x97, 0xdb, 0xe7, 0x70, 0x39, 0x60, 0xc4, 0x06, 0x83, 0xe7, 0xdf, 0x08, 0x43, + 0xd5, 0x23, 0xae, 0x65, 0x76, 0xad, 0x4f, 0xcc, 0xa3, 0x2e, 0x69, 0x94, 0x16, 0xb5, 0xa5, 0x29, + 0x23, 0xd2, 0x47, 0xf5, 0x3f, 0x21, 0x67, 0xde, 0xa1, 0x63, 0x77, 0xcf, 0x1a, 0x53, 0x8c, 0x60, + 0x8a, 0x76, 0xec, 0xd9, 0xdd, 0x33, 0xb6, 0x68, 0xce, 0xc0, 0xf6, 0xf9, 0x68, 0x99, 0x8d, 0x96, + 0x59, 0x0f, 0x1b, 0x5e, 0x82, 0x7a, 0xcf, 0xb2, 0x0f, 0x7b, 0x4e, 0xfb, 0x30, 0x30, 0x08, 0x30, + 0x83, 0xd4, 0x7a, 0x96, 0xfd, 0xc4, 0x69, 0x1b, 0xd2, 0x2c, 0x94, 0xd2, 0x3c, 0x8d, 0x52, 0x56, + 0x04, 0xa5, 0x79, 0xaa, 0x50, 0xe2, 0x65, 0x28, 0x07, 0x36, 0x41, 0x53, 0x50, 0xd8, 0xdd, 0xdb, + 0x6d, 0xd6, 0x27, 0x10, 0x40, 0x71, 0x6d, 0x7f, 0xbd, 0xb9, 0xbb, 0x51, 0xd7, 0x50, 0x05, 0x4a, + 0x1b, 0x4d, 0xde, 0xc8, 0xe1, 0x47, 0x00, 0xa1, 0xf6, 0xa8, 0x04, 0xf9, 0xed, 0xe6, 0xb7, 0xea, + 0x13, 0x94, 0xe6, 0x79, 0xd3, 0xd8, 0xdf, 0xda, 0xdb, 0xad, 0x6b, 0x74, 0xf2, 0xba, 0xd1, 0x5c, + 0x3b, 0x68, 0xd6, 0x73, 0x94, 0xe2, 0xc9, 0xde, 0x46, 0x3d, 0x8f, 0xca, 0x30, 0xf9, 0x7c, 0x6d, + 0xe7, 0x59, 0xb3, 0x5e, 0xc0, 0x9f, 0x6b, 0x30, 0x2d, 0xec, 0xc9, 0xf7, 0x2c, 0x7a, 0x1b, 0x8a, + 0x1d, 0xb6, 0x6f, 0xd9, 0x56, 0xa9, 0xac, 0x5e, 0x8d, 0x19, 0x3f, 0xb2, 0xb7, 0x0d, 0x41, 0x8b, + 0x30, 0xe4, 0x4f, 0x86, 0x5e, 0x23, 0xb7, 0x98, 0x5f, 0xaa, 0xac, 0xd6, 0x97, 0xb9, 0x43, 0x2d, + 0x6f, 0x93, 0xb3, 0xe7, 0x66, 0x77, 0x40, 0x0c, 0x3a, 0x88, 0x10, 0x14, 0x7a, 0x8e, 0x4b, 0xd8, + 0x8e, 0x9a, 0x32, 0xd8, 0x37, 0xdd, 0x66, 0xcc, 0xa8, 0x62, 0x37, 0xf1, 0x06, 0x6e, 0x01, 0x3c, + 0x1d, 0xf8, 0xe9, 0x3b, 0x77, 0x0e, 0x26, 0x87, 0x94, 0xaf, 0xd8, 0xb5, 0xbc, 0xc1, 0xb6, 0x2c, + 0x31, 0x3d, 0x12, 0x6c, 0x59, 0xda, 0x40, 0x97, 0xa1, 0xd4, 0x77, 0xc9, 0xf0, 0xf0, 0x64, 0xc8, + 0x30, 0xa6, 0x8c, 0x22, 0x6d, 0x6e, 0x0f, 0xb1, 0x0d, 0x15, 0x06, 0x92, 0x49, 0xef, 0x7b, 0x21, + 0xf7, 0x1c, 0x9b, 0x36, 0xaa, 0xbb, 0xc4, 0xfb, 0x08, 0xd0, 0x06, 0xe9, 0x12, 0x9f, 0x64, 0x71, + 0x4b, 0x45, 0x9b, 0x7c, 0x44, 0x9b, 0x9f, 0x6a, 0x30, 0x1b, 0x61, 0x9f, 0x49, 0xad, 0x06, 0x94, + 0xda, 0x8c, 0x19, 0x97, 0x20, 0x6f, 0xc8, 0x26, 0x7a, 0x00, 0x53, 0x42, 0x00, 0xaf, 0x91, 0x4f, + 0x59, 0xed, 0x12, 0x97, 0xc9, 0xc3, 0xff, 0xd0, 0xa0, 0x2c, 0x14, 0xdd, 0xeb, 0xa3, 0x35, 0x98, + 0x76, 0x79, 0xe3, 0x90, 0xe9, 0x23, 0x24, 0xd2, 0xd3, 0xbd, 0x7b, 0x73, 0xc2, 0xa8, 0x8a, 0x29, + 0xac, 0x1b, 0x7d, 0x03, 0x2a, 0x92, 0x45, 0x7f, 0xe0, 0x0b, 0x93, 0x37, 0xa2, 0x0c, 0xc2, 0x9d, + 0xb3, 0x39, 0x61, 0x80, 0x20, 0x7f, 0x3a, 0xf0, 0xd1, 0x01, 0xcc, 0xc9, 0xc9, 0x5c, 0x1b, 0x21, + 0x46, 0x9e, 0x71, 0x59, 0x8c, 0x72, 0x19, 0x5d, 0xaa, 0xcd, 0x09, 0x03, 0x89, 0xf9, 0xca, 0xe0, + 0xa3, 0x32, 0x94, 0x44, 0x2f, 0xfe, 0xa7, 0x06, 0x20, 0x0d, 0xba, 0xd7, 0x47, 0x1b, 0x50, 0x73, + 0x45, 0x2b, 0xa2, 0xf0, 0x95, 0x44, 0x85, 0xc5, 0x3a, 0x4c, 0x18, 0xd3, 0x72, 0x12, 0x57, 0xf9, + 0x5d, 0xa8, 0x06, 0x5c, 0x42, 0x9d, 0xe7, 0x13, 0x74, 0x0e, 0x38, 0x54, 0xe4, 0x04, 0xaa, 0xf5, + 0x07, 0x70, 0x31, 0x98, 0x9f, 0xa0, 0xf6, 0x8d, 0x31, 0x6a, 0x07, 0x0c, 0x67, 0x25, 0x07, 0x55, + 0x71, 0xa0, 0x67, 0x01, 0xef, 0xc6, 0x5f, 0xe4, 0xa1, 0xb4, 0xee, 0xf4, 0xfa, 0xa6, 0x4b, 0xd7, + 0xa8, 0xe8, 0x12, 0x6f, 0xd0, 0xf5, 0x99, 0xba, 0xb5, 0xd5, 0x9b, 0x51, 0x04, 0x41, 0x26, 0xff, + 0x1a, 0x8c, 0xd4, 0x10, 0x53, 0xe8, 0x64, 0x11, 0xfa, 0x73, 0xaf, 0x30, 0x59, 0x04, 0x7e, 0x31, + 0x45, 0xfa, 0x52, 0x3e, 0xf4, 0x25, 0x1d, 0x4a, 0x43, 0xe2, 0x86, 0xc7, 0xd5, 0xe6, 0x84, 0x21, + 0x3b, 0xd0, 0x3d, 0x98, 0x69, 0xb9, 0xc4, 0xa4, 0xf6, 0x90, 0x71, 0x79, 0x52, 0xd0, 0xd4, 0xf8, + 0x40, 0x10, 0xc3, 0x6f, 0x42, 0x35, 0x12, 0xbf, 0x8b, 0x82, 0xae, 0xd2, 0x53, 0x02, 0xfd, 0x25, + 0x19, 0x94, 0xe8, 0x59, 0x53, 0xdd, 0x9c, 0x10, 0x61, 0x09, 0xbf, 0x09, 0xd3, 0x11, 0x5d, 0x69, + 0xf8, 0x6d, 0xbe, 0xff, 0x6c, 0x6d, 0x87, 0xc7, 0xea, 0xc7, 0x2c, 0x3c, 0x1b, 0x75, 0x8d, 0x86, + 0xfc, 0x9d, 0xe6, 0xfe, 0x7e, 0x3d, 0x87, 0xdf, 0x09, 0xa6, 0x88, 0xe0, 0xae, 0xc4, 0xf4, 0x09, + 0x25, 0xa6, 0x6b, 0x32, 0xa6, 0xe7, 0xc2, 0x98, 0x9e, 0x7f, 0x54, 0x83, 0x2a, 0x37, 0xc8, 0xe1, + 0xc0, 0xa6, 0xe7, 0xca, 0xaf, 0x34, 0x80, 0x83, 0x53, 0x5b, 0x46, 0x9c, 0x15, 0x28, 0xb5, 0x38, + 0xf3, 0x86, 0xc6, 0x1c, 0xf8, 0x62, 0xa2, 0x8d, 0x0d, 0x49, 0x85, 0xde, 0x84, 0x92, 0x37, 0x68, + 0xb5, 0x88, 0x27, 0xe3, 0xfb, 0xe5, 0x78, 0x0c, 0x11, 0x1e, 0x6e, 0x48, 0x3a, 0x3a, 0xe5, 0x85, + 0x69, 0x75, 0x07, 0x2c, 0xda, 0x8f, 0x9f, 0x22, 0xe8, 0xf0, 0x2f, 0x34, 0xa8, 0x30, 0x29, 0x33, + 0x05, 0xae, 0xab, 0x50, 0x66, 0x32, 0x90, 0xb6, 0x08, 0x5d, 0x53, 0x46, 0xd8, 0x81, 0xfe, 0x1f, + 0xca, 0x72, 0xcb, 0xca, 0xe8, 0xd5, 0x48, 0x66, 0xbb, 0xd7, 0x37, 0x42, 0x52, 0xbc, 0x0d, 0x17, + 0x98, 0x55, 0x5a, 0x34, 0xd3, 0x93, 0x76, 0x54, 0x73, 0x21, 0x2d, 0x96, 0x0b, 0xe9, 0x30, 0xd5, + 0xef, 0x9c, 0x79, 0x56, 0xcb, 0xec, 0x0a, 0x29, 0x82, 0x36, 0xfe, 0x26, 0x20, 0x95, 0x59, 0x16, + 0x75, 0xf1, 0x34, 0x54, 0x36, 0x4d, 0xaf, 0x23, 0x44, 0xc2, 0x1f, 0x42, 0x95, 0x37, 0x33, 0xd9, + 0x10, 0x41, 0xa1, 0x63, 0x7a, 0x1d, 0x26, 0xf8, 0xb4, 0xc1, 0xbe, 0xf1, 0x05, 0x98, 0xd9, 0xb7, + 0xcd, 0xbe, 0xd7, 0x71, 0x64, 0x70, 0xa5, 0x99, 0x6e, 0x3d, 0xec, 0xcb, 0x84, 0x78, 0x17, 0x66, + 0x5c, 0xd2, 0x33, 0x2d, 0xdb, 0xb2, 0x8f, 0x0f, 0x8f, 0xce, 0x7c, 0xe2, 0x89, 0x44, 0xb8, 0x16, + 0x74, 0x3f, 0xa2, 0xbd, 0x54, 0xb4, 0xa3, 0xae, 0x73, 0x24, 0x5c, 0x9c, 0x7d, 0xe3, 0xdf, 0x6a, + 0x50, 0xfd, 0xc0, 0xf4, 0x5b, 0xd2, 0x0a, 0x68, 0x0b, 0x6a, 0x81, 0x63, 0xb3, 0x1e, 0x21, 0x4b, + 0x2c, 0xc2, 0xb3, 0x39, 0xeb, 0xc2, 0xd1, 0x65, 0x84, 0x9f, 0x6e, 0xa9, 0x1d, 0x8c, 0x95, 0x69, + 0xb7, 0x48, 0x37, 0x60, 0x95, 0x4b, 0x67, 0xc5, 0x08, 0x55, 0x56, 0x6a, 0xc7, 0xa3, 0x99, 0xf0, + 0xf4, 0xe3, 0x6e, 0xf9, 0x45, 0x0e, 0xd0, 0xa8, 0x0c, 0x5f, 0x35, 0x21, 0xb8, 0x0d, 0x35, 0xcf, + 0x37, 0x5d, 0xff, 0x30, 0x76, 0x4d, 0x98, 0x66, 0xbd, 0x41, 0x70, 0xba, 0x0b, 0x33, 0x7d, 0xd7, + 0x39, 0x76, 0x89, 0xe7, 0x1d, 0xda, 0x8e, 0x6f, 0xbd, 0x38, 0x13, 0xd9, 0x50, 0x4d, 0x76, 0xef, + 0xb2, 0x5e, 0xd4, 0x84, 0xd2, 0x0b, 0xab, 0xeb, 0x13, 0xd7, 0x6b, 0x4c, 0x2e, 0xe6, 0x97, 0x6a, + 0xab, 0x0f, 0xce, 0xb3, 0xda, 0xf2, 0x7b, 0x8c, 0xfe, 0xe0, 0xac, 0x4f, 0x0c, 0x39, 0x57, 0xcd, + 0x53, 0x8a, 0x91, 0x3c, 0xe5, 0x36, 0x40, 0x48, 0x4f, 0xa3, 0xd6, 0xee, 0xde, 0xd3, 0x67, 0x07, + 0xf5, 0x09, 0x54, 0x85, 0xa9, 0xdd, 0xbd, 0x8d, 0xe6, 0x4e, 0x93, 0xc6, 0x35, 0xbc, 0x22, 0x6d, + 0xa3, 0xda, 0x10, 0xcd, 0xc3, 0xd4, 0x4b, 0xda, 0x2b, 0xef, 0x51, 0x79, 0xa3, 0xc4, 0xda, 0x5b, + 0x6d, 0xfc, 0x77, 0x0d, 0xa6, 0xc5, 0x2e, 0xc8, 0xb4, 0x15, 0x55, 0x88, 0x5c, 0x04, 0x82, 0x26, + 0x45, 0x7c, 0x77, 0xb4, 0x45, 0xee, 0x25, 0x9b, 0xd4, 0xdd, 0xf9, 0x62, 0x93, 0xb6, 0x30, 0x6b, + 0xd0, 0x46, 0xf7, 0xa0, 0xde, 0xe2, 0xee, 0x1e, 0x3b, 0x67, 0x8c, 0x19, 0xd1, 0x1f, 0x2c, 0xd2, + 0x6d, 0x28, 0x92, 0x21, 0xb1, 0x7d, 0xaf, 0x51, 0x61, 0xb1, 0x69, 0x5a, 0x66, 0x56, 0x4d, 0xda, + 0x6b, 0x88, 0x41, 0xfc, 0x7f, 0x70, 0x61, 0x87, 0xa6, 0xb6, 0x8f, 0x5d, 0xd3, 0x56, 0x93, 0xe4, + 0x83, 0x83, 0x1d, 0x61, 0x95, 0xbc, 0x7f, 0xb0, 0x83, 0x6a, 0x90, 0xdb, 0xda, 0x10, 0x3a, 0xe4, + 0xac, 0x0d, 0xfc, 0xa9, 0x06, 0x48, 0x9d, 0x97, 0xc9, 0x4c, 0x31, 0xe6, 0x12, 0x3e, 0x1f, 0xc2, + 0xcf, 0xc1, 0x24, 0x71, 0x5d, 0xc7, 0x65, 0x06, 0x29, 0x1b, 0xbc, 0x81, 0x6f, 0x09, 0x19, 0x0c, + 0x32, 0x74, 0x4e, 0x82, 0x3d, 0xcf, 0xb9, 0x69, 0x81, 0xa8, 0xdb, 0x30, 0x1b, 0xa1, 0xca, 0x14, + 0x23, 0xef, 0xc2, 0x45, 0xc6, 0x6c, 0x9b, 0x90, 0xfe, 0x5a, 0xd7, 0x1a, 0xa6, 0xa2, 0xf6, 0xe1, + 0x52, 0x9c, 0xf0, 0xeb, 0xb5, 0x11, 0x7e, 0x47, 0x20, 0x1e, 0x58, 0x3d, 0x72, 0xe0, 0xec, 0xa4, + 0xcb, 0x46, 0x03, 0x1f, 0xbd, 0x9a, 0x8a, 0xc3, 0x84, 0x7d, 0xe3, 0xdf, 0x68, 0x70, 0x79, 0x64, + 0xfa, 0xd7, 0xbc, 0xaa, 0x0b, 0x00, 0xc7, 0x74, 0xfb, 0x90, 0x36, 0x1d, 0xe0, 0x97, 0x36, 0xa5, + 0x27, 0x90, 0x93, 0xc6, 0x8e, 0xaa, 0x90, 0xb3, 0x03, 0xc5, 0x27, 0xac, 0x9e, 0xa1, 0x68, 0x55, + 0x90, 0x5a, 0xd9, 0x66, 0x8f, 0x5f, 0xe3, 0xca, 0x06, 0xfb, 0x66, 0x47, 0x27, 0x21, 0xee, 0x33, + 0x63, 0x87, 0x1f, 0xd1, 0x65, 0x23, 0x68, 0x53, 0xf4, 0x56, 0xd7, 0x22, 0xb6, 0xcf, 0x46, 0x0b, + 0x6c, 0x54, 0xe9, 0xc1, 0xcb, 0x50, 0xe7, 0x48, 0x6b, 0xed, 0xb6, 0x72, 0x4c, 0x07, 0xfc, 0xb4, + 0x28, 0x3f, 0xfc, 0x12, 0x2e, 0x28, 0xf4, 0x99, 0x4c, 0xf7, 0x1a, 0x14, 0x79, 0xd1, 0x46, 0x9c, + 0x10, 0x73, 0xd1, 0x59, 0x1c, 0xc6, 0x10, 0x34, 0xf8, 0x36, 0xcc, 0x8a, 0x1e, 0xd2, 0x73, 0x92, + 0x56, 0x9d, 0xd9, 0x07, 0xef, 0xc0, 0x5c, 0x94, 0x2c, 0x93, 0x23, 0xac, 0x49, 0xd0, 0x67, 0xfd, + 0xb6, 0x72, 0xe0, 0xc4, 0x17, 0x45, 0x35, 0x58, 0x2e, 0x66, 0xb0, 0x40, 0x20, 0xc9, 0x22, 0x93, + 0x40, 0xb3, 0xd2, 0xfc, 0x3b, 0x96, 0x17, 0xa4, 0x15, 0x9f, 0x00, 0x52, 0x3b, 0x33, 0x2d, 0xca, + 0x32, 0x94, 0xb8, 0xc1, 0x65, 0xe6, 0x9a, 0xbc, 0x2a, 0x92, 0x88, 0x0a, 0xb4, 0x41, 0x5e, 0xb8, + 0xe6, 0x71, 0x8f, 0x04, 0x91, 0x95, 0xe6, 0x6b, 0x6a, 0x67, 0x26, 0x8d, 0xff, 0xa8, 0x41, 0x75, + 0xad, 0x6b, 0xba, 0x3d, 0x69, 0xfc, 0x77, 0xa1, 0xc8, 0x13, 0x41, 0x71, 0x59, 0xba, 0x13, 0x65, + 0xa3, 0xd2, 0xf2, 0xc6, 0x1a, 0x4f, 0x1b, 0xc5, 0x2c, 0xba, 0x58, 0xa2, 0x56, 0xb8, 0x11, 0xab, + 0x1d, 0x6e, 0xa0, 0xd7, 0x61, 0xd2, 0xa4, 0x53, 0x98, 0xff, 0xd6, 0xe2, 0x29, 0x38, 0xe3, 0xc6, + 0x0e, 0x6d, 0x4e, 0x85, 0xdf, 0x86, 0x8a, 0x82, 0x40, 0x6f, 0x16, 0x8f, 0x9b, 0xe2, 0x60, 0x5e, + 0x5b, 0x3f, 0xd8, 0x7a, 0xce, 0x2f, 0x1c, 0x35, 0x80, 0x8d, 0x66, 0xd0, 0xce, 0xe1, 0x0f, 0xc5, + 0x2c, 0xe1, 0xe1, 0xaa, 0x3c, 0x5a, 0x9a, 0x3c, 0xb9, 0x57, 0x92, 0xe7, 0x14, 0xa6, 0x85, 0xfa, + 0x99, 0xf6, 0xc0, 0x9b, 0x50, 0x64, 0xfc, 0xe4, 0x16, 0x98, 0x4f, 0x80, 0x95, 0xde, 0xc9, 0x09, + 0xf1, 0x0c, 0x4c, 0xef, 0xfb, 0xa6, 0x3f, 0xf0, 0xe4, 0x16, 0xf8, 0x83, 0x06, 0x35, 0xd9, 0x93, + 0xb5, 0xae, 0x22, 0xef, 0xa3, 0x3c, 0xe6, 0x05, 0xb7, 0xd1, 0x4b, 0x50, 0x6c, 0x1f, 0xed, 0x5b, + 0x9f, 0xc8, 0xea, 0x95, 0x68, 0xd1, 0xfe, 0x2e, 0xc7, 0xe1, 0x15, 0x5e, 0xd1, 0xa2, 0x17, 0x1d, + 0xd7, 0x7c, 0xe1, 0x6f, 0xd9, 0x6d, 0x72, 0xca, 0xf2, 0x89, 0x82, 0x11, 0x76, 0xb0, 0xbb, 0x89, + 0xa8, 0x04, 0xb3, 0xfc, 0x4b, 0xad, 0x0c, 0xcf, 0xc2, 0x85, 0xb5, 0x81, 0xdf, 0x69, 0xda, 0xe6, + 0x51, 0x57, 0x06, 0x01, 0x3c, 0x07, 0x88, 0x76, 0x6e, 0x58, 0x9e, 0xda, 0xdb, 0x84, 0x59, 0xda, + 0x4b, 0x6c, 0xdf, 0x6a, 0x29, 0x11, 0x43, 0x86, 0x6d, 0x2d, 0x16, 0xb6, 0x4d, 0xcf, 0x7b, 0xe9, + 0xb8, 0x6d, 0xa1, 0x5a, 0xd0, 0xc6, 0x1b, 0x9c, 0xf9, 0x33, 0x2f, 0x12, 0x98, 0xbf, 0x2a, 0x97, + 0xa5, 0x90, 0xcb, 0x63, 0xe2, 0x8f, 0xe1, 0x82, 0x1f, 0xc0, 0x45, 0x49, 0x29, 0x0a, 0x16, 0x63, + 0x88, 0xf7, 0xe0, 0x9a, 0x24, 0x5e, 0xef, 0xd0, 0xac, 0xfa, 0xa9, 0x00, 0xfc, 0x6f, 0xe5, 0x7c, + 0x04, 0x8d, 0x40, 0x4e, 0x96, 0x69, 0x39, 0x5d, 0x55, 0x80, 0x81, 0x27, 0xf6, 0x4c, 0xd9, 0x60, + 0xdf, 0xb4, 0xcf, 0x75, 0xba, 0xc1, 0x21, 0x48, 0xbf, 0xf1, 0x3a, 0xcc, 0x4b, 0x1e, 0x22, 0x07, + 0x8a, 0x32, 0x19, 0x11, 0x28, 0x89, 0x89, 0x30, 0x18, 0x9d, 0x3a, 0xde, 0xec, 0x2a, 0x65, 0xd4, + 0xb4, 0x8c, 0xa7, 0xa6, 0xf0, 0xbc, 0xc8, 0x77, 0x04, 0x15, 0x4c, 0x0d, 0xda, 0xa2, 0x9b, 0x32, + 0x50, 0xbb, 0xc5, 0x42, 0xd0, 0xee, 0x91, 0x85, 0x18, 0x61, 0xfd, 0x11, 0x2c, 0x04, 0x42, 0x50, + 0xbb, 0x3d, 0x25, 0x6e, 0xcf, 0xf2, 0x3c, 0xe5, 0xc6, 0x9d, 0xa4, 0xf8, 0x1d, 0x28, 0xf4, 0x89, + 0x88, 0x29, 0x95, 0x55, 0xb4, 0xcc, 0xdf, 0x6b, 0x96, 0x95, 0xc9, 0x6c, 0x1c, 0xb7, 0xe1, 0xba, + 0xe4, 0xce, 0x2d, 0x9a, 0xc8, 0x3e, 0x2e, 0x94, 0xbc, 0x8d, 0x71, 0xb3, 0x8e, 0xde, 0xc6, 0xf2, + 0x7c, 0xed, 0xe5, 0x6d, 0x8c, 0x9e, 0x15, 0xaa, 0x6f, 0x65, 0x3a, 0x2b, 0xb6, 0xb9, 0x4d, 0x03, + 0x97, 0xcc, 0xc4, 0xec, 0x08, 0xe6, 0xa2, 0x9e, 0x9c, 0x29, 0x8c, 0xcd, 0xc1, 0xa4, 0xef, 0x9c, + 0x10, 0x19, 0xc4, 0x78, 0x43, 0x0a, 0x1c, 0xb8, 0x79, 0x26, 0x81, 0xcd, 0x90, 0x19, 0xdb, 0x92, + 0x59, 0xe5, 0xa5, 0xab, 0x29, 0xf3, 0x19, 0xde, 0xc0, 0xbb, 0x70, 0x29, 0x1e, 0x26, 0x32, 0x89, + 0xfc, 0x9c, 0x6f, 0xe0, 0xa4, 0x48, 0x92, 0x89, 0xef, 0xfb, 0x61, 0x30, 0x50, 0x02, 0x4a, 0x26, + 0x96, 0x06, 0xe8, 0x49, 0xf1, 0xe5, 0x7f, 0xb1, 0x5f, 0x83, 0x70, 0x93, 0x89, 0x99, 0x17, 0x32, + 0xcb, 0xbe, 0xfc, 0x61, 0x8c, 0xc8, 0x8f, 0x8d, 0x11, 0xc2, 0x49, 0xc2, 0x28, 0xf6, 0x35, 0x6c, + 0x3a, 0x81, 0x11, 0x06, 0xd0, 0xac, 0x18, 0xf4, 0x0c, 0x09, 0x30, 0x58, 0x43, 0x6e, 0x6c, 0x35, + 0xec, 0x66, 0x5a, 0x8c, 0x0f, 0xc2, 0xd8, 0x39, 0x12, 0x99, 0x33, 0x31, 0xfe, 0x10, 0x16, 0xd3, + 0x83, 0x72, 0x16, 0xce, 0xf7, 0x31, 0x94, 0x83, 0x84, 0x52, 0x79, 0x4b, 0xad, 0x40, 0x69, 0x77, + 0x6f, 0xff, 0xe9, 0xda, 0x7a, 0xb3, 0xae, 0xad, 0xfe, 0x2b, 0x0f, 0xb9, 0xed, 0xe7, 0xe8, 0xdb, + 0x30, 0xc9, 0x5f, 0x5a, 0xc6, 0x3c, 0x44, 0xe9, 0xe3, 0xde, 0x6c, 0xf0, 0xd5, 0x4f, 0xff, 0xfc, + 0xb7, 0xcf, 0x73, 0x97, 0xf0, 0x85, 0x95, 0xe1, 0x5b, 0x66, 0xb7, 0xdf, 0x31, 0x57, 0x4e, 0x86, + 0x2b, 0xec, 0x4c, 0x78, 0xa8, 0xdd, 0x47, 0xcf, 0x21, 0xff, 0x74, 0xe0, 0xa3, 0xd4, 0x57, 0x2a, + 0x3d, 0xfd, 0x2d, 0x07, 0xeb, 0x8c, 0xf3, 0x1c, 0x9e, 0x51, 0x39, 0xf7, 0x07, 0x3e, 0xe5, 0x3b, + 0x84, 0x8a, 0xf2, 0x1c, 0x83, 0xce, 0x7d, 0xbf, 0xd2, 0xcf, 0x7f, 0xea, 0xc1, 0x98, 0xe1, 0x5d, + 0xc5, 0x97, 0x55, 0x3c, 0xfe, 0x6a, 0xa4, 0xea, 0x73, 0x70, 0x6a, 0xc7, 0xf5, 0x09, 0x1f, 0x18, + 0xe2, 0xfa, 0x28, 0x45, 0xfd, 0x64, 0x7d, 0xfc, 0x53, 0x9b, 0xf2, 0x75, 0xc4, 0x13, 0x52, 0xcb, + 0x47, 0xd7, 0x13, 0x5e, 0x24, 0xd4, 0xda, 0xbb, 0xbe, 0x98, 0x4e, 0x20, 0x90, 0x6e, 0x30, 0xa4, + 0x2b, 0xf8, 0x92, 0x8a, 0xd4, 0x0a, 0xe8, 0x1e, 0x6a, 0xf7, 0x57, 0x3b, 0x30, 0xc9, 0x2a, 0x86, + 0xe8, 0x50, 0x7e, 0xe8, 0x09, 0xb5, 0xce, 0x94, 0x1d, 0x10, 0xa9, 0x35, 0xe2, 0x79, 0x86, 0x36, + 0x8b, 0x6b, 0x01, 0x1a, 0x2b, 0x1a, 0x3e, 0xd4, 0xee, 0x2f, 0x69, 0x6f, 0x68, 0xab, 0x3f, 0x28, + 0xc0, 0x24, 0xab, 0xd4, 0xa0, 0x3e, 0x40, 0x58, 0x83, 0x8b, 0xeb, 0x39, 0x52, 0xd5, 0x8b, 0xeb, + 0x39, 0x5a, 0xbe, 0xc3, 0xd7, 0x19, 0xf2, 0x3c, 0x9e, 0x0b, 0x90, 0xd9, 0xb3, 0xf7, 0x0a, 0xab, + 0xc9, 0x50, 0xb3, 0xbe, 0x84, 0x8a, 0x52, 0x4b, 0x43, 0x49, 0x1c, 0x23, 0xc5, 0xb8, 0xf8, 0x36, + 0x49, 0x28, 0xc4, 0xe1, 0x9b, 0x0c, 0xf4, 0x1a, 0x6e, 0xa8, 0xc6, 0xe5, 0xb8, 0x2e, 0xa3, 0xa4, + 0xc0, 0x3f, 0xd4, 0xa0, 0x16, 0xad, 0xa7, 0xa1, 0x9b, 0x09, 0xac, 0xe3, 0x65, 0x39, 0xfd, 0xd6, + 0x78, 0xa2, 0x54, 0x11, 0x38, 0xfe, 0x09, 0x21, 0x7d, 0x93, 0x52, 0x0a, 0xdb, 0xa3, 0x1f, 0x69, + 0x30, 0x13, 0xab, 0x92, 0xa1, 0x24, 0x88, 0x91, 0x1a, 0x9c, 0x7e, 0xfb, 0x1c, 0x2a, 0x21, 0xc9, + 0x5d, 0x26, 0xc9, 0x0d, 0x7c, 0x75, 0xd4, 0x18, 0xbe, 0xd5, 0x23, 0xbe, 0x23, 0xa4, 0x59, 0xfd, + 0x77, 0x1e, 0x4a, 0xeb, 0xfc, 0x67, 0x3f, 0xc8, 0x87, 0x72, 0x50, 0x79, 0x42, 0x0b, 0x49, 0x55, + 0x89, 0x30, 0x65, 0xd7, 0xaf, 0xa7, 0x8e, 0x0b, 0x11, 0xee, 0x30, 0x11, 0x16, 0xf1, 0x95, 0x40, + 0x04, 0xf1, 0xf3, 0xa2, 0x15, 0x7e, 0xf9, 0x5e, 0x31, 0xdb, 0x6d, 0xba, 0x24, 0xdf, 0xd7, 0xa0, + 0xaa, 0x16, 0x94, 0xd0, 0x8d, 0xc4, 0x7a, 0x88, 0x5a, 0x93, 0xd2, 0xf1, 0x38, 0x12, 0x81, 0x7f, + 0x8f, 0xe1, 0xdf, 0xc4, 0x0b, 0x69, 0xf8, 0x2e, 0xa3, 0x8f, 0x8a, 0xc0, 0x4b, 0x48, 0xc9, 0x22, + 0x44, 0x2a, 0x54, 0xc9, 0x22, 0x44, 0x2b, 0x50, 0xe7, 0x8b, 0x30, 0x60, 0xf4, 0x54, 0x84, 0x53, + 0x80, 0xb0, 0xc2, 0x84, 0x12, 0x8d, 0xab, 0x5c, 0x62, 0xe2, 0x3e, 0x38, 0x5a, 0x9c, 0x4a, 0xd8, + 0x01, 0x31, 0xec, 0xae, 0xe5, 0x51, 0x5f, 0x5c, 0xfd, 0x5d, 0x01, 0x2a, 0x4f, 0x4c, 0xcb, 0xf6, + 0x89, 0x6d, 0xda, 0x2d, 0x82, 0x8e, 0x61, 0x92, 0x9d, 0x52, 0xf1, 0xc0, 0xa3, 0x96, 0x7d, 0xe2, + 0x81, 0x27, 0x52, 0x13, 0xc1, 0xb7, 0x19, 0xf4, 0x75, 0xac, 0x07, 0xd0, 0xbd, 0x90, 0xff, 0x0a, + 0xab, 0x67, 0x50, 0x95, 0x4f, 0xa0, 0xc8, 0xeb, 0x17, 0x28, 0xc6, 0x2d, 0x52, 0xe7, 0xd0, 0xaf, + 0x26, 0x0f, 0xa6, 0xee, 0x32, 0x15, 0xcb, 0x63, 0xc4, 0x14, 0xec, 0x3b, 0x00, 0x61, 0xc1, 0x2c, + 0x6e, 0xdf, 0x91, 0xfa, 0x9a, 0xbe, 0x98, 0x4e, 0x20, 0x80, 0xef, 0x33, 0xe0, 0x5b, 0xf8, 0x7a, + 0x22, 0x70, 0x3b, 0x98, 0x40, 0xc1, 0x5b, 0x50, 0xd8, 0x34, 0xbd, 0x0e, 0x8a, 0x1d, 0x42, 0xca, + 0x2b, 0xa9, 0xae, 0x27, 0x0d, 0x09, 0xa8, 0x5b, 0x0c, 0x6a, 0x01, 0xcf, 0x27, 0x42, 0x75, 0x4c, + 0x8f, 0xc6, 0x74, 0x34, 0x80, 0x29, 0xf9, 0xf2, 0x89, 0xae, 0xc5, 0x6c, 0x16, 0x7d, 0x25, 0xd5, + 0x17, 0xd2, 0x86, 0x05, 0xe0, 0x12, 0x03, 0xc4, 0xf8, 0x5a, 0xb2, 0x51, 0x05, 0xf9, 0x43, 0xed, + 0xfe, 0x1b, 0xda, 0xea, 0x4f, 0xea, 0x50, 0xa0, 0xf9, 0x12, 0x3d, 0x45, 0xc2, 0x6b, 0x66, 0xdc, + 0xc2, 0x23, 0xc5, 0x9d, 0xb8, 0x85, 0x47, 0x6f, 0xa8, 0x09, 0xa7, 0x08, 0xfb, 0xf1, 0x23, 0x61, + 0x54, 0x54, 0x63, 0x1f, 0x2a, 0xca, 0x65, 0x14, 0x25, 0x70, 0x8c, 0x96, 0x8e, 0xe2, 0xa7, 0x48, + 0xc2, 0x4d, 0x16, 0x2f, 0x32, 0x50, 0x1d, 0x5f, 0x8c, 0x82, 0xb6, 0x39, 0x19, 0x45, 0xfd, 0x2e, + 0x54, 0xd5, 0x5b, 0x2b, 0x4a, 0x60, 0x1a, 0xab, 0x4d, 0xc5, 0x63, 0x45, 0xd2, 0xa5, 0x37, 0xc1, + 0x69, 0x82, 0x9f, 0x7a, 0x4a, 0x5a, 0x8a, 0xfe, 0x31, 0x94, 0xc4, 0x5d, 0x36, 0x49, 0xdf, 0x68, + 0x35, 0x2b, 0x49, 0xdf, 0xd8, 0x45, 0x38, 0x21, 0x25, 0x61, 0xb0, 0x34, 0x67, 0x97, 0x01, 0x5a, + 0x40, 0x3e, 0x26, 0x7e, 0x1a, 0x64, 0x58, 0x9f, 0x49, 0x83, 0x54, 0xee, 0x4b, 0x63, 0x21, 0x8f, + 0x89, 0x2f, 0xf6, 0xb2, 0xbc, 0x8c, 0xa0, 0x14, 0x8e, 0x6a, 0x34, 0xc4, 0xe3, 0x48, 0x52, 0xb3, + 0xc8, 0x10, 0x55, 0x84, 0x42, 0xf4, 0x3d, 0x80, 0xf0, 0xe2, 0x1d, 0x4f, 0x0c, 0x12, 0xab, 0x77, + 0xf1, 0xc4, 0x20, 0xf9, 0xee, 0x9e, 0xe0, 0xc1, 0x21, 0x38, 0xcf, 0x64, 0x29, 0xfc, 0xcf, 0x34, + 0x40, 0xa3, 0x17, 0x75, 0xf4, 0x20, 0x19, 0x22, 0xb1, 0x30, 0xa8, 0xbf, 0xf6, 0x6a, 0xc4, 0xa9, + 0xd1, 0x33, 0x94, 0xab, 0xc5, 0xa6, 0xf4, 0x5f, 0x52, 0xc9, 0x3e, 0xd3, 0x60, 0x3a, 0x72, 0xd5, + 0x47, 0x77, 0x52, 0xd6, 0x39, 0x56, 0x5c, 0xd4, 0xef, 0x9e, 0x4b, 0x97, 0x9a, 0x3b, 0x29, 0xbb, + 0x42, 0xe6, 0x8d, 0x3f, 0xd6, 0xa0, 0x16, 0xad, 0x0f, 0xa0, 0x14, 0x80, 0x91, 0x0a, 0xa5, 0xbe, + 0x74, 0x3e, 0xe1, 0x2b, 0xac, 0x56, 0x98, 0x4a, 0x7e, 0x0c, 0x25, 0x51, 0x56, 0x48, 0x72, 0x8b, + 0x68, 0x81, 0x33, 0xc9, 0x2d, 0x62, 0x35, 0x89, 0x34, 0xb7, 0xa0, 0x37, 0x74, 0xc5, 0x13, 0x45, + 0xf1, 0x21, 0x0d, 0x72, 0xbc, 0x27, 0xc6, 0x2a, 0x17, 0x63, 0x21, 0x43, 0x4f, 0x94, 0xa5, 0x07, + 0x94, 0xc2, 0xf1, 0x1c, 0x4f, 0x8c, 0x57, 0x2e, 0xd2, 0x3c, 0x91, 0xa1, 0x2a, 0x9e, 0x18, 0x56, + 0x0a, 0x92, 0x3c, 0x71, 0xa4, 0x7c, 0x9b, 0xe4, 0x89, 0xa3, 0xc5, 0x86, 0xb4, 0xb5, 0x65, 0xe0, + 0x11, 0x4f, 0x9c, 0x4d, 0xa8, 0x2c, 0xa0, 0xd7, 0x52, 0x6c, 0x9a, 0x58, 0x1a, 0xd6, 0x5f, 0x7f, + 0x45, 0xea, 0xf1, 0x1e, 0xc0, 0x57, 0x43, 0x7a, 0xc0, 0x2f, 0x35, 0x98, 0x4b, 0x2a, 0x4d, 0xa0, + 0x14, 0xb0, 0x94, 0xba, 0xb2, 0xbe, 0xfc, 0xaa, 0xe4, 0xaf, 0x60, 0xb7, 0xc0, 0x27, 0x1e, 0xd5, + 0x7f, 0xff, 0xe5, 0x82, 0xf6, 0xa7, 0x2f, 0x17, 0xb4, 0xbf, 0x7c, 0xb9, 0xa0, 0xfd, 0xfc, 0xaf, + 0x0b, 0x13, 0x47, 0x45, 0xf6, 0x3f, 0x10, 0xde, 0xfa, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd1, + 0x46, 0x74, 0x5f, 0x08, 0x31, 0x00, 0x00, } diff --git a/etcdserver/etcdserverpb/rpc.proto b/etcdserver/etcdserverpb/rpc.proto index cedf6df6e64..02b340d1d06 100644 --- a/etcdserver/etcdserverpb/rpc.proto +++ b/etcdserver/etcdserverpb/rpc.proto @@ -382,6 +382,14 @@ message RangeRequest { // count_only when set returns only the count of the keys in the range. bool count_only = 9; + + // min_mod_revision is the lower bound for returned key mod revisions; all keys with + // lesser mod revisions will be filtered away. + int64 min_mod_revision = 10; + + // max_mod_revision is the upper bound for returned key mod revisions; all keys with + // greater mod revisions will be filtered away. + int64 max_mod_revision = 11; } message RangeResponse { From b0481ba858aece728a59e152b411353c6931b587 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Mon, 12 Sep 2016 15:07:11 -0700 Subject: [PATCH 2/3] clientv3: WithMinModRev and WithMaxModRev --- clientv3/kv.go | 16 +--------------- clientv3/op.go | 51 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/clientv3/kv.go b/clientv3/kv.go index a2bebe2a0d8..834b17d3413 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -141,21 +141,7 @@ func (kv *kv) do(ctx context.Context, op Op) (OpResponse, error) { // TODO: handle other ops case tRange: var resp *pb.RangeResponse - r := &pb.RangeRequest{ - Key: op.key, - RangeEnd: op.end, - Limit: op.limit, - Revision: op.rev, - Serializable: op.serializable, - KeysOnly: op.keysOnly, - CountOnly: op.countOnly, - } - if op.sort != nil { - r.SortOrder = pb.RangeRequest_SortOrder(op.sort.Order) - r.SortTarget = pb.RangeRequest_SortTarget(op.sort.Target) - } - - resp, err = kv.remote.Range(ctx, r, grpc.FailFast(false)) + resp, err = kv.remote.Range(ctx, op.toRangeRequest(), grpc.FailFast(false)) if err == nil { return OpResponse{get: (*GetResponse)(resp)}, nil } diff --git a/clientv3/op.go b/clientv3/op.go index e5796849a4e..ed6c548295c 100644 --- a/clientv3/op.go +++ b/clientv3/op.go @@ -41,6 +41,8 @@ type Op struct { serializable bool keysOnly bool countOnly bool + minModRev int64 + maxModRev int64 // for range, watch rev int64 @@ -61,23 +63,32 @@ type Op struct { leaseID LeaseID } +func (op Op) toRangeRequest() *pb.RangeRequest { + if op.t != tRange { + panic("op.t != tRange") + } + r := &pb.RangeRequest{ + Key: op.key, + RangeEnd: op.end, + Limit: op.limit, + Revision: op.rev, + Serializable: op.serializable, + KeysOnly: op.keysOnly, + CountOnly: op.countOnly, + MinModRevision: op.minModRev, + MaxModRevision: op.maxModRev, + } + if op.sort != nil { + r.SortOrder = pb.RangeRequest_SortOrder(op.sort.Order) + r.SortTarget = pb.RangeRequest_SortTarget(op.sort.Target) + } + return r +} + func (op Op) toRequestOp() *pb.RequestOp { switch op.t { case tRange: - r := &pb.RangeRequest{ - Key: op.key, - RangeEnd: op.end, - Limit: op.limit, - Revision: op.rev, - Serializable: op.serializable, - KeysOnly: op.keysOnly, - CountOnly: op.countOnly, - } - if op.sort != nil { - r.SortOrder = pb.RangeRequest_SortOrder(op.sort.Order) - r.SortTarget = pb.RangeRequest_SortTarget(op.sort.Target) - } - return &pb.RequestOp{Request: &pb.RequestOp_RequestRange{RequestRange: r}} + return &pb.RequestOp{Request: &pb.RequestOp_RequestRange{RequestRange: op.toRangeRequest()}} case tPut: r := &pb.PutRequest{Key: op.key, Value: op.val, Lease: int64(op.leaseID), PrevKv: op.prevKV} return &pb.RequestOp{Request: &pb.RequestOp_RequestPut{RequestPut: r}} @@ -115,6 +126,8 @@ func OpDelete(key string, opts ...OpOption) Op { panic("unexpected serializable in delete") case ret.countOnly: panic("unexpected countOnly in delete") + case ret.minModRev != 0, ret.maxModRev != 0: + panic("unexpected mod revision filter in delete") case ret.filterDelete, ret.filterPut: panic("unexpected filter in delete") case ret.createdNotify: @@ -139,6 +152,8 @@ func OpPut(key, val string, opts ...OpOption) Op { panic("unexpected serializable in put") case ret.countOnly: panic("unexpected countOnly in put") + case ret.minModRev != 0, ret.maxModRev != 0: + panic("unexpected mod revision filter in delete") case ret.filterDelete, ret.filterPut: panic("unexpected filter in put") case ret.createdNotify: @@ -161,6 +176,8 @@ func opWatch(key string, opts ...OpOption) Op { panic("unexpected serializable in watch") case ret.countOnly: panic("unexpected countOnly in watch") + case ret.minModRev != 0, ret.maxModRev != 0: + panic("unexpected mod revision filter in watch") } return ret } @@ -263,6 +280,12 @@ func WithCountOnly() OpOption { return func(op *Op) { op.countOnly = true } } +// WithMinModRev filters out keys for Get with modification revisions less than the given revision. +func WithMinModRev(rev int64) OpOption { return func(op *Op) { op.minModRev = rev } } + +// WithMaxModRev filters out keys for Get with modification revisions greater than the given revision. +func WithMaxModRev(rev int64) OpOption { return func(op *Op) { op.maxModRev = rev } } + // WithFirstCreate gets the key with the oldest creation revision in the request range. func WithFirstCreate() []OpOption { return withTop(SortByCreateRevision, SortAscend) } From 17e7f83212856ccd34e8ee05d114d3bd63fbb509 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Mon, 12 Sep 2016 15:14:52 -0700 Subject: [PATCH 3/3] integration: test MinModRev/MaxModRev --- integration/v3_grpc_test.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index 18bac81c435..824b0ed3162 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -865,6 +865,37 @@ func TestV3RangeRequest(t *testing.T) { }, []bool{true, true, true, true, false}, }, + // min/max mod rev + { + []string{"rev2", "rev3", "rev4", "rev5", "rev6"}, + []pb.RangeRequest{ + { + Key: []byte{0}, RangeEnd: []byte{0}, + MinModRevision: 3, + }, + { + Key: []byte{0}, RangeEnd: []byte{0}, + MaxModRevision: 3, + }, + { + Key: []byte{0}, RangeEnd: []byte{0}, + MinModRevision: 3, + MaxModRevision: 5, + }, + { + Key: []byte{0}, RangeEnd: []byte{0}, + MaxModRevision: 10, + }, + }, + + [][]string{ + {"rev3", "rev4", "rev5", "rev6"}, + {"rev2", "rev3"}, + {"rev3", "rev4", "rev5"}, + {"rev2", "rev3", "rev4", "rev5", "rev6"}, + }, + []bool{false, false, false, false}, + }, } for i, tt := range tests {