From 39fbace0f20d92f045d01acd3317cda696e7ee7c Mon Sep 17 00:00:00 2001 From: Connor1996 Date: Fri, 13 Jul 2018 15:47:02 +0800 Subject: [PATCH 1/2] add policy for split region --- Gopkg.lock | 7 +- Gopkg.toml | 3 +- pdctl/command/operator.go | 13 +- server/api/operator.go | 7 +- server/coordinator.go | 4 +- server/handler.go | 10 +- server/schedule/operator.go | 4 +- .../pingcap/kvproto/pkg/pdpb/pdpb.pb.go | 328 +++++++++++------- 8 files changed, 232 insertions(+), 144 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 2cb8c1aef95..699908a6c46 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -259,14 +259,15 @@ revision = "1c287c953996ab3a0bf535dba9d53d809d3dc0b6" [[projects]] - branch = "master" + branch = "check-policy" name = "github.com/pingcap/kvproto" packages = [ "pkg/eraftpb", "pkg/metapb", "pkg/pdpb" ] - revision = "0d8a0ddc19cbdca796d486e25caebe2f4bf0fab7" + revision = "2bc6e19fc4be685376a7cdd3460f957c03312101" + source = "github.com/connor1996/kvproto" [[projects]] name = "github.com/prometheus/client_golang" @@ -500,6 +501,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "35a10e6b6253a569486ba0313d5234da82e6908b9e18c6c1628d8b596de5fde4" + inputs-digest = "c2252488f03fcdb5e3f77a04667575f9427441294fb0badfa3fa7fe4efef0e11" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index a60ac716d7e..2f2b8366c6b 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -26,4 +26,5 @@ [[constraint]] name = "github.com/pingcap/kvproto" - branch = "master" + source = "github.com/connor1996/kvproto" + branch = "check-policy" diff --git a/pdctl/command/operator.go b/pdctl/command/operator.go index b944e8086ce..2fcffcb89ff 100644 --- a/pdctl/command/operator.go +++ b/pdctl/command/operator.go @@ -262,10 +262,11 @@ func removePeerCommandFunc(cmd *cobra.Command, args []string) { // NewSplitRegionCommand returns a command to split a region. func NewSplitRegionCommand() *cobra.Command { c := &cobra.Command{ - Use: "split-region ", + Use: "split-region [--policy=scan|approximate]", Short: "split a region", Run: splitRegionCommandFunc, } + c.Flags().String("policy", "scan", "the policy to get region split key") return c } @@ -281,9 +282,19 @@ func splitRegionCommandFunc(cmd *cobra.Command, args []string) { return } + policy := cmd.Flags().Lookup("policy").Value.String() + switch policy { + case "scan", "approximate": + break + default: + fmt.Println("Error: unknown policy") + return + } + input := make(map[string]interface{}) input["name"] = cmd.Name() input["region_id"] = ids[0] + input["policy"] = policy postJSON(cmd, operatorsPrefix, input) } diff --git a/server/api/operator.go b/server/api/operator.go index 72daa91b812..3bc83d250a6 100644 --- a/server/api/operator.go +++ b/server/api/operator.go @@ -206,7 +206,12 @@ func (h *operatorHandler) Post(w http.ResponseWriter, r *http.Request) { h.r.JSON(w, http.StatusBadRequest, "missing region id") return } - if err := h.AddSplitRegionOperator(uint64(regionID)); err != nil { + policy, ok := input["policy"].(string) + if !ok { + h.r.JSON(w, http.StatusBadRequest, "missing split policy") + return + } + if err := h.AddSplitRegionOperator(uint64(regionID), policy); err != nil { h.r.JSON(w, http.StatusInternalServerError, err.Error()) return } diff --git a/server/coordinator.go b/server/coordinator.go index 959c6b45aa2..d83b6221446 100644 --- a/server/coordinator.go +++ b/server/coordinator.go @@ -639,7 +639,9 @@ func (c *coordinator) sendScheduleCommand(region *core.RegionInfo, step schedule c.hbStreams.sendMsg(region, cmd) case schedule.SplitRegion: cmd := &pdpb.RegionHeartbeatResponse{ - SplitRegion: &pdpb.SplitRegion{}, + SplitRegion: &pdpb.SplitRegion{ + Policy: s.Policy, + }, } c.hbStreams.sendMsg(region, cmd) default: diff --git a/server/handler.go b/server/handler.go index 0f475f4307c..d9aca720ca1 100644 --- a/server/handler.go +++ b/server/handler.go @@ -16,10 +16,12 @@ package server import ( "bytes" "strconv" + "strings" "time" "github.com/juju/errors" "github.com/pingcap/kvproto/pkg/metapb" + "github.com/pingcap/kvproto/pkg/pdpb" "github.com/pingcap/pd/server/core" "github.com/pingcap/pd/server/schedule" log "github.com/sirupsen/logrus" @@ -516,7 +518,7 @@ func (h *Handler) AddMergeRegionOperator(regionID uint64, targetID uint64) error } // AddSplitRegionOperator adds an operator to split a region. -func (h *Handler) AddSplitRegionOperator(regionID uint64) error { +func (h *Handler) AddSplitRegionOperator(regionID uint64, policy string) error { c, err := h.getCoordinator() if err != nil { return errors.Trace(err) @@ -527,7 +529,11 @@ func (h *Handler) AddSplitRegionOperator(regionID uint64) error { return ErrRegionNotFound(regionID) } - step := schedule.SplitRegion{StartKey: region.StartKey, EndKey: region.EndKey} + step := schedule.SplitRegion{ + StartKey: region.StartKey, + EndKey: region.EndKey, + Policy: pdpb.CheckPolicy(pdpb.CheckPolicy_value[strings.ToUpper(policy)]), + } op := schedule.NewOperator("adminSplitRegion", regionID, region.GetRegionEpoch(), schedule.OpAdmin, step) if ok := c.addOperator(op); !ok { return errors.Trace(errAddOperator) diff --git a/server/schedule/operator.go b/server/schedule/operator.go index 9b1d1f78229..00ce798ab3b 100644 --- a/server/schedule/operator.go +++ b/server/schedule/operator.go @@ -22,6 +22,7 @@ import ( "github.com/juju/errors" "github.com/pingcap/kvproto/pkg/metapb" + "github.com/pingcap/kvproto/pkg/pdpb" log "github.com/sirupsen/logrus" "github.com/pingcap/pd/server/core" @@ -212,10 +213,11 @@ func (mr MergeRegion) Influence(opInfluence OpInfluence, region *core.RegionInfo // SplitRegion is an OperatorStep that splits a region. type SplitRegion struct { StartKey, EndKey []byte + Policy pdpb.CheckPolicy } func (sr SplitRegion) String() string { - return "split region" + return fmt.Sprintf("split region with policy %s", sr.Policy.String()) } // IsFinish checks if current step is finished. diff --git a/vendor/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go b/vendor/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go index daa8fe3a892..163005912d6 100644 --- a/vendor/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go +++ b/vendor/github.com/pingcap/kvproto/pkg/pdpb/pdpb.pb.go @@ -118,6 +118,27 @@ func (x ErrorType) String() string { } func (ErrorType) EnumDescriptor() ([]byte, []int) { return fileDescriptorPdpb, []int{0} } +type CheckPolicy int32 + +const ( + CheckPolicy_SCAN CheckPolicy = 0 + CheckPolicy_APPROXIMATE CheckPolicy = 1 +) + +var CheckPolicy_name = map[int32]string{ + 0: "SCAN", + 1: "APPROXIMATE", +} +var CheckPolicy_value = map[string]int32{ + "SCAN": 0, + "APPROXIMATE": 1, +} + +func (x CheckPolicy) String() string { + return proto.EnumName(CheckPolicy_name, int32(x)) +} +func (CheckPolicy) EnumDescriptor() ([]byte, []int) { return fileDescriptorPdpb, []int{1} } + type RequestHeader struct { // cluster_id is the ID of the cluster which be sent to. ClusterId uint64 `protobuf:"varint,1,opt,name=cluster_id,json=clusterId,proto3" json:"cluster_id,omitempty"` @@ -980,6 +1001,7 @@ func (m *Merge) GetTarget() *metapb.Region { } type SplitRegion struct { + Policy CheckPolicy `protobuf:"varint,1,opt,name=policy,proto3,enum=pdpb.CheckPolicy" json:"policy,omitempty"` } func (m *SplitRegion) Reset() { *m = SplitRegion{} } @@ -987,6 +1009,13 @@ func (m *SplitRegion) String() string { return proto.CompactTextStrin func (*SplitRegion) ProtoMessage() {} func (*SplitRegion) Descriptor() ([]byte, []int) { return fileDescriptorPdpb, []int{33} } +func (m *SplitRegion) GetPolicy() CheckPolicy { + if m != nil { + return m.Policy + } + return CheckPolicy_SCAN +} + type RegionHeartbeatResponse struct { Header *ResponseHeader `protobuf:"bytes,1,opt,name=header" json:"header,omitempty"` // Notice, Pd only allows handling reported epoch >= current pd's. @@ -1590,6 +1619,7 @@ func init() { proto.RegisterType((*UpdateGCSafePointRequest)(nil), "pdpb.UpdateGCSafePointRequest") proto.RegisterType((*UpdateGCSafePointResponse)(nil), "pdpb.UpdateGCSafePointResponse") proto.RegisterEnum("pdpb.ErrorType", ErrorType_name, ErrorType_value) + proto.RegisterEnum("pdpb.CheckPolicy", CheckPolicy_name, CheckPolicy_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -3572,6 +3602,11 @@ func (m *SplitRegion) MarshalTo(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Policy != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintPdpb(dAtA, i, uint64(m.Policy)) + } return i, nil } @@ -4748,6 +4783,9 @@ func (m *Merge) Size() (n int) { func (m *SplitRegion) Size() (n int) { var l int _ = l + if m.Policy != 0 { + n += 1 + sovPdpb(uint64(m.Policy)) + } return n } @@ -8800,6 +8838,25 @@ func (m *SplitRegion) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: SplitRegion: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Policy", wireType) + } + m.Policy = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowPdpb + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Policy |= (CheckPolicy(b) & 0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipPdpb(dAtA[iNdEx:]) @@ -11018,138 +11075,141 @@ var ( func init() { proto.RegisterFile("pdpb.proto", fileDescriptorPdpb) } var fileDescriptorPdpb = []byte{ - // 2114 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x4b, 0x6f, 0x23, 0xc7, - 0x11, 0x16, 0x29, 0x92, 0x22, 0x8b, 0x4f, 0xb5, 0x5e, 0x5c, 0xee, 0x4a, 0x96, 0x7b, 0x37, 0x89, - 0xec, 0xd8, 0xf4, 0x5a, 0x09, 0x02, 0x03, 0x86, 0x03, 0xeb, 0xb5, 0x5a, 0x79, 0xbd, 0x22, 0xd1, - 0xe4, 0xc6, 0x30, 0x10, 0x84, 0x19, 0x71, 0x5a, 0xd4, 0x44, 0xe4, 0xcc, 0x78, 0xba, 0x25, 0x85, - 0x3e, 0xe5, 0xe4, 0x4b, 0x02, 0xe4, 0x16, 0xe4, 0x12, 0x20, 0xbf, 0x20, 0x7f, 0x21, 0xd7, 0x1c, - 0x83, 0xfc, 0x82, 0x60, 0xf3, 0x47, 0x82, 0x7e, 0xcc, 0x93, 0x94, 0x56, 0x99, 0x8d, 0x4f, 0xe2, - 0x54, 0x55, 0x7f, 0x5d, 0x55, 0x5d, 0x8f, 0xee, 0x12, 0x80, 0x6b, 0xba, 0x67, 0x6d, 0xd7, 0x73, - 0xb8, 0x83, 0x72, 0xe2, 0x77, 0xab, 0x32, 0xa1, 0xdc, 0xf0, 0x69, 0xad, 0x2a, 0xf5, 0x8c, 0x73, - 0x1e, 0x7c, 0xae, 0x8e, 0x9c, 0x91, 0x23, 0x7f, 0x7e, 0x24, 0x7e, 0x29, 0x2a, 0x6e, 0x43, 0x95, - 0xd0, 0x6f, 0xae, 0x28, 0xe3, 0xcf, 0xa9, 0x61, 0x52, 0x0f, 0x6d, 0x02, 0x0c, 0xc7, 0x57, 0x8c, - 0x53, 0x6f, 0x60, 0x99, 0xcd, 0xcc, 0x76, 0x66, 0x27, 0x47, 0x4a, 0x9a, 0x72, 0x62, 0x62, 0x02, - 0x35, 0x42, 0x99, 0xeb, 0xd8, 0x8c, 0xde, 0x6b, 0x01, 0x7a, 0x17, 0xf2, 0xd4, 0xf3, 0x1c, 0xaf, - 0x99, 0xdd, 0xce, 0xec, 0x94, 0x77, 0xcb, 0x6d, 0xa9, 0xf5, 0x91, 0x20, 0x11, 0xc5, 0xc1, 0xcf, - 0x20, 0x2f, 0xbf, 0xd1, 0x63, 0xc8, 0xf1, 0xa9, 0x4b, 0x25, 0x48, 0x6d, 0xb7, 0x1e, 0x11, 0xed, - 0x4f, 0x5d, 0x4a, 0x24, 0x13, 0x35, 0x61, 0x69, 0x42, 0x19, 0x33, 0x46, 0x54, 0x42, 0x96, 0x88, - 0xff, 0x89, 0x3b, 0x00, 0x7d, 0xe6, 0x68, 0x73, 0xd0, 0x8f, 0xa1, 0x70, 0x21, 0x35, 0x94, 0x70, - 0xe5, 0xdd, 0x15, 0x05, 0x17, 0xb3, 0x96, 0x68, 0x11, 0xb4, 0x0a, 0xf9, 0xa1, 0x73, 0x65, 0x73, - 0x09, 0x59, 0x25, 0xea, 0x03, 0xef, 0x41, 0xa9, 0x6f, 0x4d, 0x28, 0xe3, 0xc6, 0xc4, 0x45, 0x2d, - 0x28, 0xba, 0x17, 0x53, 0x66, 0x0d, 0x8d, 0xb1, 0x44, 0x5c, 0x24, 0xc1, 0xb7, 0xd0, 0x69, 0xec, - 0x8c, 0x24, 0x2b, 0x2b, 0x59, 0xfe, 0x27, 0xfe, 0x5d, 0x06, 0xca, 0x52, 0x29, 0xe5, 0x33, 0xf4, - 0x41, 0x42, 0xab, 0x55, 0x5f, 0xab, 0xa8, 0x4f, 0xef, 0x56, 0x0b, 0x7d, 0x08, 0x25, 0xee, 0xab, - 0xd5, 0x5c, 0x94, 0x30, 0xda, 0x57, 0x81, 0xb6, 0x24, 0x94, 0xc0, 0x7f, 0xc8, 0x40, 0x63, 0xdf, - 0x71, 0x38, 0xe3, 0x9e, 0xe1, 0xa6, 0xf2, 0xce, 0x63, 0xc8, 0x33, 0xee, 0x78, 0x54, 0x9f, 0x61, - 0xb5, 0xad, 0xe3, 0xac, 0x27, 0x88, 0x44, 0xf1, 0xd0, 0x0f, 0xa1, 0xe0, 0xd1, 0x91, 0xe5, 0xd8, - 0x5a, 0xa5, 0x9a, 0x2f, 0x45, 0x24, 0x95, 0x68, 0x2e, 0xde, 0x83, 0xe5, 0x88, 0x36, 0x69, 0xdc, - 0x82, 0x0f, 0x61, 0xed, 0x84, 0x05, 0x20, 0x2e, 0x35, 0xd3, 0x58, 0x85, 0x7f, 0x03, 0xeb, 0x49, - 0x94, 0x54, 0x87, 0x84, 0xa1, 0x72, 0x16, 0x41, 0x91, 0x4e, 0x2a, 0x92, 0x18, 0x0d, 0x7f, 0x06, - 0xb5, 0xbd, 0xf1, 0xd8, 0x19, 0x9e, 0x1c, 0xa6, 0x52, 0xb5, 0x03, 0xf5, 0x60, 0x79, 0x2a, 0x1d, - 0x6b, 0x90, 0xb5, 0x94, 0x66, 0x39, 0x92, 0xb5, 0x4c, 0xfc, 0x35, 0xd4, 0x8f, 0x29, 0x57, 0xe7, - 0x97, 0x26, 0x22, 0x1e, 0x40, 0x51, 0x9e, 0xfa, 0x20, 0x40, 0x5d, 0x92, 0xdf, 0x27, 0x26, 0xa6, - 0xd0, 0x08, 0xa1, 0x53, 0x29, 0x7b, 0x9f, 0x70, 0xc3, 0x43, 0xa8, 0x77, 0xaf, 0xde, 0xc2, 0x82, - 0x7b, 0x6d, 0xf2, 0x39, 0x34, 0xc2, 0x4d, 0x52, 0x85, 0xea, 0x3e, 0xac, 0x1c, 0x53, 0xbe, 0x37, - 0x1e, 0x4b, 0x10, 0x96, 0xea, 0xf4, 0x2f, 0x61, 0x35, 0x8e, 0x91, 0xca, 0xab, 0x3f, 0x80, 0x82, - 0x34, 0x8a, 0x35, 0xb3, 0xdb, 0x8b, 0xb3, 0x16, 0x6b, 0x26, 0xfe, 0x95, 0x3c, 0x3e, 0x9d, 0xb3, - 0x69, 0x1c, 0xbb, 0x09, 0xa0, 0x32, 0x7d, 0x70, 0x49, 0xa7, 0xd2, 0xbb, 0x15, 0x52, 0x52, 0x94, - 0x17, 0x74, 0x8a, 0xff, 0x98, 0x81, 0xe5, 0xc8, 0x06, 0xa9, 0x4c, 0x09, 0x4b, 0x4d, 0xf6, 0xae, - 0x52, 0x83, 0x9e, 0x40, 0x61, 0xac, 0x50, 0x55, 0x49, 0xaa, 0xf8, 0x72, 0x5d, 0x2a, 0xd0, 0x14, - 0x0f, 0xff, 0x5a, 0xba, 0x57, 0x2d, 0xdd, 0x9f, 0xa6, 0xcb, 0x50, 0xf4, 0x10, 0xb4, 0x8d, 0x61, - 0x46, 0x14, 0x15, 0xe1, 0xc4, 0xc4, 0xcf, 0x60, 0xe3, 0x98, 0xf2, 0x03, 0xd5, 0x13, 0x0f, 0x1c, - 0xfb, 0xdc, 0x1a, 0xa5, 0x0a, 0x04, 0x06, 0xcd, 0x59, 0x9c, 0x54, 0x1e, 0x7c, 0x0f, 0x96, 0x74, - 0x8b, 0xd6, 0x2e, 0xac, 0xfb, 0xae, 0xd1, 0xe8, 0xc4, 0xe7, 0xe3, 0x6f, 0x60, 0xa3, 0x7b, 0xf5, - 0xf6, 0xca, 0xff, 0x2f, 0x5b, 0x3e, 0x87, 0xe6, 0xec, 0x96, 0xa9, 0xd2, 0xef, 0xaf, 0x19, 0x28, - 0xbc, 0xa4, 0x93, 0x33, 0xea, 0x21, 0x04, 0x39, 0xdb, 0x98, 0xa8, 0xcb, 0x45, 0x89, 0xc8, 0xdf, - 0xe2, 0xd4, 0x26, 0x92, 0x1b, 0x39, 0x35, 0x45, 0x38, 0x31, 0x05, 0xd3, 0xa5, 0xd4, 0x1b, 0x5c, - 0x79, 0x63, 0xd6, 0x5c, 0xdc, 0x5e, 0xdc, 0x29, 0x91, 0xa2, 0x20, 0xbc, 0xf2, 0xc6, 0x0c, 0xbd, - 0x03, 0xe5, 0xe1, 0xd8, 0xa2, 0x36, 0x57, 0xec, 0x9c, 0x64, 0x83, 0x22, 0x49, 0x81, 0x1f, 0x41, - 0x5d, 0xc5, 0xd7, 0xc0, 0xf5, 0x2c, 0xc7, 0xb3, 0xf8, 0xb4, 0x99, 0xdf, 0xce, 0xec, 0xe4, 0x49, - 0x4d, 0x91, 0xbb, 0x9a, 0x8a, 0x3f, 0x97, 0xf9, 0xa0, 0x94, 0x4c, 0x57, 0x1f, 0xfe, 0x9e, 0x01, - 0x14, 0x85, 0x48, 0x99, 0x53, 0x4b, 0xca, 0x72, 0xbf, 0x3e, 0x54, 0x94, 0xb8, 0x42, 0x25, 0x3e, - 0x73, 0x4e, 0x4e, 0x45, 0xc5, 0x34, 0x0f, 0x7d, 0x08, 0x65, 0xca, 0x87, 0xe6, 0x40, 0x8b, 0xe6, - 0xe6, 0x88, 0x82, 0x10, 0xf8, 0x52, 0x59, 0xd0, 0x85, 0x92, 0x48, 0xc9, 0x1e, 0x37, 0x38, 0x43, - 0xdb, 0x90, 0x13, 0x6e, 0xd6, 0x5a, 0xc7, 0x73, 0x56, 0x72, 0xd0, 0xbb, 0x50, 0x31, 0x9d, 0x1b, - 0x7b, 0xc0, 0xe8, 0xd0, 0xb1, 0x4d, 0xa6, 0x4f, 0xae, 0x2c, 0x68, 0x3d, 0x45, 0xc2, 0xdf, 0xe5, - 0x60, 0x5d, 0xa5, 0xf4, 0x73, 0x6a, 0x78, 0xfc, 0x8c, 0x1a, 0x3c, 0x55, 0xd4, 0xfe, 0x5f, 0x4b, - 0x0d, 0x6a, 0x03, 0x48, 0xc5, 0x85, 0x15, 0x2a, 0x68, 0x82, 0xab, 0x5b, 0x60, 0x3f, 0x29, 0x09, - 0x11, 0xf1, 0xc9, 0xd0, 0xc7, 0x50, 0x75, 0xa9, 0x6d, 0x5a, 0xf6, 0x48, 0x2f, 0xc9, 0xeb, 0xa3, - 0x89, 0x82, 0x57, 0xb4, 0x88, 0x5a, 0xf2, 0x18, 0xaa, 0x67, 0x53, 0x4e, 0xd9, 0xe0, 0xc6, 0xb3, - 0x38, 0xa7, 0x76, 0xb3, 0x20, 0x9d, 0x53, 0x91, 0xc4, 0xaf, 0x14, 0x4d, 0xd4, 0x68, 0x25, 0xe4, - 0x51, 0xc3, 0x6c, 0x2e, 0xa9, 0x3b, 0xbb, 0xa4, 0x10, 0x6a, 0x88, 0x3b, 0x7b, 0xe5, 0x92, 0x4e, - 0x43, 0x88, 0xa2, 0xf2, 0xaf, 0xa0, 0xf9, 0x08, 0x0f, 0xa1, 0x24, 0x45, 0x24, 0x40, 0x49, 0x65, - 0x8e, 0x20, 0xc8, 0xf5, 0xef, 0x41, 0xc3, 0x70, 0x5d, 0xcf, 0xf9, 0xad, 0x35, 0x31, 0x38, 0x1d, - 0x30, 0xeb, 0x5b, 0xda, 0x04, 0x29, 0x53, 0x8f, 0xd0, 0x7b, 0xd6, 0xb7, 0x14, 0xb5, 0xa1, 0x68, - 0xd9, 0x9c, 0x7a, 0xd7, 0xc6, 0xb8, 0x59, 0x91, 0x9e, 0x43, 0xe1, 0x55, 0xf6, 0x44, 0x73, 0x48, - 0x20, 0x93, 0x84, 0x16, 0x5b, 0x36, 0xab, 0x33, 0xd0, 0x2f, 0xe8, 0x94, 0x7d, 0x91, 0x2b, 0x96, - 0x1b, 0x15, 0x7c, 0x01, 0x70, 0x70, 0x61, 0xd8, 0x23, 0x2a, 0xdc, 0x73, 0x8f, 0xd8, 0xfa, 0x04, - 0xca, 0x43, 0x29, 0x3f, 0x90, 0x4f, 0x91, 0xac, 0x7c, 0x8a, 0x6c, 0xb4, 0xfd, 0xb7, 0x94, 0xa8, - 0x46, 0x0a, 0x4f, 0x3e, 0x49, 0x60, 0x18, 0xfc, 0xc6, 0xbb, 0x50, 0xeb, 0x7b, 0x86, 0xcd, 0xce, - 0xa9, 0xa7, 0xc2, 0xfa, 0xcd, 0xbb, 0xe1, 0x8f, 0x20, 0xff, 0x92, 0x7a, 0x23, 0x79, 0x7b, 0xe6, - 0x86, 0x37, 0xa2, 0x5c, 0x0b, 0xcf, 0xc4, 0x99, 0xe2, 0xe2, 0x2a, 0x94, 0x7b, 0xee, 0xd8, 0xd2, - 0xed, 0x0a, 0xff, 0x69, 0x11, 0x36, 0x66, 0xc2, 0x3c, 0x55, 0xfe, 0x7f, 0x1c, 0xd8, 0x2d, 0x55, - 0x56, 0xd1, 0xde, 0x50, 0x4b, 0x42, 0x07, 0xfa, 0x06, 0x4b, 0x67, 0x7e, 0x06, 0x75, 0xae, 0x0d, - 0x1e, 0xc4, 0x82, 0x5f, 0xef, 0x14, 0xf7, 0x06, 0xa9, 0xf1, 0xb8, 0x77, 0x62, 0x2d, 0x33, 0x17, - 0x6f, 0x99, 0xe8, 0x67, 0x50, 0xd1, 0x4c, 0xea, 0x3a, 0xc3, 0x0b, 0x59, 0x3b, 0x45, 0xaa, 0xc6, - 0xbc, 0x72, 0x24, 0x58, 0xa4, 0xec, 0x85, 0x1f, 0xa2, 0xf0, 0x28, 0x4f, 0x29, 0x33, 0x0a, 0x73, - 0x3c, 0x0f, 0x4a, 0xa0, 0xab, 0x2a, 0x49, 0x7e, 0x22, 0xfc, 0x2f, 0x73, 0x20, 0x78, 0x9d, 0xca, - 0x23, 0x21, 0x8a, 0x83, 0x7e, 0x0a, 0x15, 0x26, 0x3c, 0x3e, 0xd0, 0x75, 0xa0, 0x28, 0x25, 0x97, - 0x95, 0x64, 0xe4, 0x2c, 0x48, 0x99, 0x45, 0x0e, 0xe6, 0x1c, 0xea, 0x7b, 0xec, 0x52, 0xb3, 0xbf, - 0xbf, 0xba, 0x83, 0xbf, 0xcb, 0x40, 0x23, 0xdc, 0x28, 0xe5, 0xfb, 0xa5, 0x6a, 0xd3, 0x9b, 0x41, - 0xf2, 0xfa, 0x52, 0xb6, 0xe9, 0x0d, 0xf1, 0x8f, 0x63, 0x1b, 0x2a, 0x42, 0x46, 0xf6, 0x43, 0xcb, - 0x54, 0xed, 0x30, 0x47, 0xc0, 0xa6, 0x37, 0xc2, 0x8d, 0x27, 0x26, 0xc3, 0xbf, 0xcf, 0x00, 0x22, - 0xd4, 0x75, 0x3c, 0x9e, 0xde, 0x68, 0x0c, 0xb9, 0x31, 0x3d, 0xe7, 0xb7, 0x98, 0x2c, 0x79, 0xe8, - 0x09, 0xe4, 0x3d, 0x6b, 0x74, 0xc1, 0x6f, 0x79, 0x65, 0x2a, 0x26, 0x3e, 0x80, 0x95, 0x98, 0x32, - 0xa9, 0x2e, 0x0f, 0xbf, 0x84, 0x4a, 0xb4, 0x0a, 0x89, 0x96, 0xce, 0xb8, 0xe1, 0xf1, 0x41, 0xf8, - 0xfa, 0x56, 0xe3, 0x8e, 0x9a, 0x24, 0x87, 0xa3, 0x82, 0xc7, 0x50, 0xa5, 0xb6, 0x19, 0x11, 0x53, - 0x1e, 0xad, 0x50, 0xdb, 0x0c, 0x84, 0xf0, 0x5f, 0x72, 0x00, 0xf2, 0xea, 0xad, 0xba, 0x5e, 0xf4, - 0x45, 0x95, 0x89, 0xbd, 0xa8, 0x50, 0x0b, 0x8a, 0x43, 0xc3, 0x35, 0x86, 0xe2, 0x0e, 0xa1, 0x2f, - 0x29, 0xfe, 0x37, 0x7a, 0x04, 0x25, 0xe3, 0xda, 0xb0, 0xc6, 0xc6, 0xd9, 0x98, 0x4a, 0x97, 0xe4, - 0x48, 0x48, 0x10, 0x85, 0x5c, 0x1f, 0xab, 0x1a, 0x23, 0xe4, 0xe4, 0x18, 0x41, 0x27, 0xcc, 0x81, - 0x1c, 0x26, 0x7c, 0x00, 0x88, 0xe9, 0x16, 0xc3, 0x6c, 0xc3, 0xd5, 0x82, 0x79, 0x29, 0xd8, 0xd0, - 0x9c, 0x9e, 0x6d, 0xb8, 0x4a, 0xfa, 0x29, 0xac, 0x7a, 0x74, 0x48, 0xad, 0xeb, 0x84, 0x7c, 0x41, - 0xca, 0xa3, 0x80, 0x17, 0xae, 0xd8, 0x04, 0x08, 0x9d, 0x26, 0xd3, 0xac, 0x4a, 0x4a, 0x81, 0xbf, - 0x50, 0x1b, 0x56, 0x0c, 0xd7, 0x1d, 0x4f, 0x13, 0x78, 0x45, 0x29, 0xb7, 0xec, 0xb3, 0x42, 0xb8, - 0x0d, 0x58, 0xb2, 0xd8, 0xe0, 0xec, 0x8a, 0x4d, 0x65, 0xd7, 0x29, 0x92, 0x82, 0xc5, 0xf6, 0xaf, - 0xd8, 0x54, 0x54, 0x93, 0x2b, 0x46, 0xcd, 0x68, 0xb3, 0x29, 0x0a, 0x82, 0xec, 0x32, 0x33, 0x4d, - 0xb1, 0x3c, 0xa7, 0x29, 0x26, 0xbb, 0x5e, 0x65, 0xb6, 0xeb, 0xc5, 0xfb, 0x66, 0x35, 0xd9, 0x37, - 0x63, 0x4d, 0xb1, 0x96, 0x68, 0x8a, 0xd1, 0x4e, 0x57, 0x7f, 0x73, 0xa7, 0xc3, 0x63, 0x58, 0x93, - 0xe1, 0xf1, 0xb6, 0xf7, 0x97, 0x3c, 0x13, 0xf1, 0x15, 0x2f, 0xe8, 0x61, 0xdc, 0x11, 0xc5, 0xc6, - 0xcf, 0x60, 0x3d, 0xb9, 0x5b, 0xaa, 0x9c, 0xf9, 0x5b, 0x06, 0x56, 0x7b, 0x43, 0x83, 0x8b, 0xfb, - 0x7c, 0xfa, 0x37, 0xe4, 0x5d, 0xaf, 0xa9, 0xfb, 0x0e, 0x9a, 0x22, 0x57, 0xb2, 0xdc, 0x1d, 0xaf, - 0xbf, 0x23, 0x58, 0x4b, 0xe8, 0x9b, 0x76, 0x24, 0x75, 0x4c, 0xf9, 0xf1, 0x41, 0xcf, 0x38, 0xa7, - 0x5d, 0xc7, 0xb2, 0x53, 0x9d, 0x16, 0xa6, 0xb0, 0x9e, 0x44, 0x49, 0x55, 0xd2, 0x45, 0xd2, 0x19, - 0xe7, 0x74, 0xe0, 0x0a, 0x0c, 0xed, 0xc0, 0x12, 0xf3, 0x41, 0xf1, 0x39, 0x34, 0x5f, 0xb9, 0xa6, - 0xc1, 0xe9, 0x5b, 0xea, 0xfb, 0xa6, 0x7d, 0x1c, 0x78, 0x30, 0x67, 0x9f, 0x54, 0x16, 0x3d, 0x81, - 0x9a, 0x68, 0x40, 0x33, 0xbb, 0x89, 0xb6, 0x14, 0x60, 0xbf, 0x4f, 0xa1, 0x14, 0x8c, 0x8b, 0x51, - 0x01, 0xb2, 0x9d, 0x17, 0x8d, 0x05, 0x54, 0x86, 0xa5, 0x57, 0xa7, 0x2f, 0x4e, 0x3b, 0x5f, 0x9d, - 0x36, 0x32, 0x68, 0x15, 0x1a, 0xa7, 0x9d, 0xfe, 0x60, 0xbf, 0xd3, 0xe9, 0xf7, 0xfa, 0x64, 0xaf, - 0xdb, 0x3d, 0x3a, 0x6c, 0x64, 0xd1, 0x0a, 0xd4, 0x7b, 0xfd, 0x0e, 0x39, 0x1a, 0xf4, 0x3b, 0x2f, - 0xf7, 0x7b, 0xfd, 0xce, 0xe9, 0x51, 0x63, 0x11, 0x35, 0x61, 0x75, 0xef, 0x4b, 0x72, 0xb4, 0x77, - 0xf8, 0x75, 0x5c, 0x3c, 0xb7, 0xfb, 0x2f, 0x80, 0x6c, 0xf7, 0x10, 0xed, 0x01, 0x84, 0xcf, 0x2e, - 0xb4, 0xa1, 0xf4, 0x9f, 0x79, 0xcb, 0xb5, 0x9a, 0xb3, 0x0c, 0x65, 0x22, 0x5e, 0x40, 0x4f, 0x61, - 0xb1, 0xcf, 0x1c, 0xa4, 0xd3, 0x32, 0x9c, 0x5e, 0xb7, 0x96, 0x23, 0x14, 0x5f, 0x7a, 0x27, 0xf3, - 0x34, 0x83, 0x7e, 0x0e, 0xa5, 0x60, 0x66, 0x89, 0xd6, 0x95, 0x54, 0x72, 0xba, 0xdb, 0xda, 0x98, - 0xa1, 0x07, 0x3b, 0xbe, 0x84, 0x5a, 0x7c, 0xea, 0x89, 0x1e, 0x2a, 0xe1, 0xb9, 0x13, 0xd5, 0xd6, - 0xa3, 0xf9, 0xcc, 0x00, 0xee, 0x13, 0x58, 0xd2, 0x93, 0x49, 0xa4, 0x0f, 0x30, 0x3e, 0xe7, 0x6c, - 0xad, 0x25, 0xa8, 0xc1, 0xca, 0x4f, 0xa1, 0xe8, 0xcf, 0x09, 0xd1, 0x5a, 0xe0, 0xa2, 0xe8, 0x40, - 0xaf, 0xb5, 0x9e, 0x24, 0x47, 0x17, 0xfb, 0x83, 0x39, 0x7f, 0x71, 0x62, 0x1a, 0xe8, 0x2f, 0x4e, - 0xce, 0xef, 0xf0, 0x02, 0x3a, 0x86, 0x4a, 0x74, 0x9e, 0x86, 0x1e, 0x04, 0xdb, 0x24, 0xe7, 0x74, - 0xad, 0xd6, 0x3c, 0x56, 0xd4, 0x97, 0xf1, 0xa2, 0xe9, 0xfb, 0x72, 0x6e, 0xe1, 0xf6, 0x7d, 0x39, - 0xbf, 0xce, 0xe2, 0x05, 0xd4, 0x87, 0x7a, 0xe2, 0x2e, 0x8f, 0x1e, 0xf9, 0x49, 0x31, 0xef, 0x25, - 0xdb, 0xda, 0xbc, 0x85, 0x9b, 0x0c, 0x98, 0x60, 0xbc, 0x85, 0x42, 0x8f, 0xc6, 0xaa, 0x73, 0x6b, - 0x63, 0x86, 0x1e, 0x68, 0xf5, 0x0c, 0xaa, 0xb1, 0xf1, 0x18, 0x6a, 0x25, 0x64, 0x23, 0x33, 0xb3, - 0xbb, 0x70, 0x3e, 0x85, 0xa2, 0x7f, 0x51, 0xf5, 0x8f, 0x2c, 0x71, 0x43, 0xf6, 0x8f, 0x2c, 0x79, - 0x9f, 0xc5, 0x0b, 0xe8, 0x10, 0xca, 0x91, 0xfb, 0x1c, 0x6a, 0xfa, 0x86, 0x27, 0xef, 0x9b, 0xad, - 0x07, 0x73, 0x38, 0x01, 0x4a, 0x4f, 0xce, 0x36, 0x63, 0x73, 0x25, 0xb4, 0x19, 0x68, 0x3c, 0x6f, - 0xc4, 0xd5, 0xda, 0xba, 0x8d, 0x1d, 0x05, 0x4d, 0x0e, 0xab, 0x7c, 0xd0, 0x5b, 0xe6, 0x66, 0x3e, - 0xe8, 0x6d, 0x33, 0x2e, 0xbc, 0x80, 0xbe, 0x80, 0x6a, 0xac, 0x2b, 0xf9, 0x4e, 0x9f, 0xd7, 0x5a, - 0x5b, 0x0f, 0xe7, 0xf2, 0xa2, 0x51, 0x1a, 0x6f, 0x2a, 0x7e, 0x94, 0xce, 0x6d, 0x58, 0x7e, 0x94, - 0xce, 0xef, 0x43, 0x78, 0x01, 0xfd, 0x02, 0x96, 0x67, 0x8a, 0x3a, 0xd2, 0x16, 0xdd, 0xd6, 0x55, - 0x5a, 0xef, 0xdc, 0xca, 0xf7, 0x71, 0xf7, 0xdf, 0xff, 0xc7, 0xeb, 0xad, 0xcc, 0x3f, 0x5f, 0x6f, - 0x65, 0xfe, 0xfd, 0x7a, 0x2b, 0xf3, 0xe7, 0xff, 0x6c, 0x2d, 0x40, 0x73, 0xe8, 0x4c, 0xda, 0xae, - 0x65, 0x8f, 0x86, 0x86, 0xdb, 0xe6, 0xd6, 0xe5, 0x75, 0xfb, 0xf2, 0x5a, 0xfe, 0xd7, 0xf2, 0xac, - 0x20, 0xff, 0xfc, 0xe4, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x62, 0x49, 0x56, 0xcf, 0x03, 0x1d, - 0x00, 0x00, + // 2168 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0x5b, 0x6f, 0x1b, 0xc7, + 0x15, 0xd6, 0x52, 0x24, 0x45, 0x1e, 0x5e, 0x35, 0x96, 0x25, 0x9a, 0x8e, 0x1d, 0x65, 0xec, 0xb6, + 0xb2, 0x9b, 0x30, 0x8e, 0x5b, 0x14, 0x06, 0x82, 0x14, 0xa1, 0x2e, 0x96, 0x15, 0xc7, 0x22, 0x31, + 0xa4, 0x9b, 0x06, 0x28, 0xca, 0xae, 0xb8, 0x23, 0x6a, 0x2b, 0x72, 0x77, 0xb3, 0x33, 0xb2, 0xcb, + 0x3c, 0xf5, 0x29, 0x2f, 0x2d, 0xd0, 0xb7, 0xa2, 0x2f, 0x05, 0xfa, 0x0b, 0xfa, 0x17, 0xfa, 0xda, + 0xc7, 0xa2, 0xbf, 0xa0, 0x70, 0xff, 0x48, 0x31, 0x97, 0xbd, 0x92, 0x92, 0xd5, 0x75, 0xfb, 0x24, + 0xee, 0x39, 0x67, 0xce, 0x9c, 0xf9, 0xce, 0x9c, 0xcb, 0x1c, 0x01, 0x78, 0x96, 0x77, 0xd2, 0xf1, + 0x7c, 0x97, 0xbb, 0x28, 0x2f, 0x7e, 0xb7, 0xab, 0x33, 0xca, 0xcd, 0x80, 0xd6, 0xae, 0x51, 0xdf, + 0x3c, 0xe5, 0xe1, 0xe7, 0xc6, 0xc4, 0x9d, 0xb8, 0xf2, 0xe7, 0xc7, 0xe2, 0x97, 0xa2, 0xe2, 0x0e, + 0xd4, 0x08, 0xfd, 0xe6, 0x82, 0x32, 0xfe, 0x8c, 0x9a, 0x16, 0xf5, 0xd1, 0x1d, 0x80, 0xf1, 0xf4, + 0x82, 0x71, 0xea, 0x8f, 0x6c, 0xab, 0x65, 0x6c, 0x1b, 0x3b, 0x79, 0x52, 0xd6, 0x94, 0x23, 0x0b, + 0x13, 0xa8, 0x13, 0xca, 0x3c, 0xd7, 0x61, 0xf4, 0x5a, 0x0b, 0xd0, 0x07, 0x50, 0xa0, 0xbe, 0xef, + 0xfa, 0xad, 0xdc, 0xb6, 0xb1, 0x53, 0x79, 0x5c, 0xe9, 0x48, 0xab, 0x0f, 0x04, 0x89, 0x28, 0x0e, + 0x7e, 0x0a, 0x05, 0xf9, 0x8d, 0xee, 0x41, 0x9e, 0xcf, 0x3d, 0x2a, 0x95, 0xd4, 0x1f, 0x37, 0x62, + 0xa2, 0xc3, 0xb9, 0x47, 0x89, 0x64, 0xa2, 0x16, 0xac, 0xcd, 0x28, 0x63, 0xe6, 0x84, 0x4a, 0x95, + 0x65, 0x12, 0x7c, 0xe2, 0x1e, 0xc0, 0x90, 0xb9, 0xfa, 0x38, 0xe8, 0x87, 0x50, 0x3c, 0x93, 0x16, + 0x4a, 0x75, 0x95, 0xc7, 0x37, 0x94, 0xba, 0xc4, 0x69, 0x89, 0x16, 0x41, 0x1b, 0x50, 0x18, 0xbb, + 0x17, 0x0e, 0x97, 0x2a, 0x6b, 0x44, 0x7d, 0xe0, 0x2e, 0x94, 0x87, 0xf6, 0x8c, 0x32, 0x6e, 0xce, + 0x3c, 0xd4, 0x86, 0x92, 0x77, 0x36, 0x67, 0xf6, 0xd8, 0x9c, 0x4a, 0x8d, 0xab, 0x24, 0xfc, 0x16, + 0x36, 0x4d, 0xdd, 0x89, 0x64, 0xe5, 0x24, 0x2b, 0xf8, 0xc4, 0xbf, 0x35, 0xa0, 0x22, 0x8d, 0x52, + 0x98, 0xa1, 0x0f, 0x53, 0x56, 0x6d, 0x04, 0x56, 0xc5, 0x31, 0xbd, 0xda, 0x2c, 0xf4, 0x11, 0x94, + 0x79, 0x60, 0x56, 0x6b, 0x55, 0xaa, 0xd1, 0x58, 0x85, 0xd6, 0x92, 0x48, 0x02, 0xff, 0xde, 0x80, + 0xe6, 0xae, 0xeb, 0x72, 0xc6, 0x7d, 0xd3, 0xcb, 0x84, 0xce, 0x3d, 0x28, 0x30, 0xee, 0xfa, 0x54, + 0xfb, 0xb0, 0xd6, 0xd1, 0xf7, 0x6c, 0x20, 0x88, 0x44, 0xf1, 0xd0, 0xf7, 0xa1, 0xe8, 0xd3, 0x89, + 0xed, 0x3a, 0xda, 0xa4, 0x7a, 0x20, 0x45, 0x24, 0x95, 0x68, 0x2e, 0xee, 0xc2, 0x7a, 0xcc, 0x9a, + 0x2c, 0xb0, 0xe0, 0x7d, 0xb8, 0x79, 0xc4, 0x42, 0x25, 0x1e, 0xb5, 0xb2, 0x9c, 0x0a, 0xff, 0x1a, + 0x36, 0xd3, 0x5a, 0x32, 0x39, 0x09, 0x43, 0xf5, 0x24, 0xa6, 0x45, 0x82, 0x54, 0x22, 0x09, 0x1a, + 0xfe, 0x0c, 0xea, 0xdd, 0xe9, 0xd4, 0x1d, 0x1f, 0xed, 0x67, 0x32, 0xb5, 0x07, 0x8d, 0x70, 0x79, + 0x26, 0x1b, 0xeb, 0x90, 0xb3, 0x95, 0x65, 0x79, 0x92, 0xb3, 0x2d, 0xfc, 0x35, 0x34, 0x0e, 0x29, + 0x57, 0xfe, 0xcb, 0x72, 0x23, 0x6e, 0x41, 0x49, 0x7a, 0x7d, 0x14, 0x6a, 0x5d, 0x93, 0xdf, 0x47, + 0x16, 0xa6, 0xd0, 0x8c, 0x54, 0x67, 0x32, 0xf6, 0x3a, 0xd7, 0x0d, 0x8f, 0xa1, 0xd1, 0xbf, 0x78, + 0x87, 0x13, 0x5c, 0x6b, 0x93, 0xcf, 0xa1, 0x19, 0x6d, 0x92, 0xe9, 0xaa, 0xee, 0xc2, 0x8d, 0x43, + 0xca, 0xbb, 0xd3, 0xa9, 0x54, 0xc2, 0x32, 0x79, 0xff, 0x1c, 0x36, 0x92, 0x3a, 0x32, 0xa1, 0xfa, + 0x3d, 0x28, 0xca, 0x43, 0xb1, 0x56, 0x6e, 0x7b, 0x75, 0xf1, 0xc4, 0x9a, 0x89, 0x7f, 0x29, 0xdd, + 0xa7, 0x63, 0x36, 0x0b, 0xb0, 0x77, 0x00, 0x54, 0xa4, 0x8f, 0xce, 0xe9, 0x5c, 0xa2, 0x5b, 0x25, + 0x65, 0x45, 0x79, 0x4e, 0xe7, 0xf8, 0x0f, 0x06, 0xac, 0xc7, 0x36, 0xc8, 0x74, 0x94, 0x28, 0xd5, + 0xe4, 0xae, 0x4a, 0x35, 0xe8, 0x3e, 0x14, 0xa7, 0x4a, 0xab, 0x4a, 0x49, 0xd5, 0x40, 0xae, 0x4f, + 0x85, 0x36, 0xc5, 0xc3, 0xbf, 0x92, 0xf0, 0xaa, 0xa5, 0xbb, 0xf3, 0x6c, 0x11, 0x8a, 0x6e, 0x83, + 0x3e, 0x63, 0x14, 0x11, 0x25, 0x45, 0x38, 0xb2, 0xf0, 0x53, 0xd8, 0x3a, 0xa4, 0x7c, 0x4f, 0xd5, + 0xc4, 0x3d, 0xd7, 0x39, 0xb5, 0x27, 0x99, 0x2e, 0x02, 0x83, 0xd6, 0xa2, 0x9e, 0x4c, 0x08, 0x3e, + 0x80, 0x35, 0x5d, 0xa2, 0x35, 0x84, 0x8d, 0x00, 0x1a, 0xad, 0x9d, 0x04, 0x7c, 0xfc, 0x0d, 0x6c, + 0xf5, 0x2f, 0xde, 0xdd, 0xf8, 0xff, 0x66, 0xcb, 0x67, 0xd0, 0x5a, 0xdc, 0x32, 0x53, 0xf8, 0xfd, + 0xc5, 0x80, 0xe2, 0x0b, 0x3a, 0x3b, 0xa1, 0x3e, 0x42, 0x90, 0x77, 0xcc, 0x99, 0x6a, 0x2e, 0xca, + 0x44, 0xfe, 0x16, 0x5e, 0x9b, 0x49, 0x6e, 0xcc, 0x6b, 0x8a, 0x70, 0x64, 0x09, 0xa6, 0x47, 0xa9, + 0x3f, 0xba, 0xf0, 0xa7, 0xac, 0xb5, 0xba, 0xbd, 0xba, 0x53, 0x26, 0x25, 0x41, 0x78, 0xe9, 0x4f, + 0x19, 0x7a, 0x1f, 0x2a, 0xe3, 0xa9, 0x4d, 0x1d, 0xae, 0xd8, 0x79, 0xc9, 0x06, 0x45, 0x92, 0x02, + 0x3f, 0x80, 0x86, 0xba, 0x5f, 0x23, 0xcf, 0xb7, 0x5d, 0xdf, 0xe6, 0xf3, 0x56, 0x61, 0xdb, 0xd8, + 0x29, 0x90, 0xba, 0x22, 0xf7, 0x35, 0x15, 0x7f, 0x2e, 0xe3, 0x41, 0x19, 0x99, 0x2d, 0x3f, 0xfc, + 0xcd, 0x00, 0x14, 0x57, 0x91, 0x31, 0xa6, 0xd6, 0xd4, 0xc9, 0x83, 0xfc, 0x50, 0x55, 0xe2, 0x4a, + 0x2b, 0x09, 0x98, 0x4b, 0x62, 0x2a, 0x2e, 0xa6, 0x79, 0xe8, 0x23, 0xa8, 0x50, 0x3e, 0xb6, 0x46, + 0x5a, 0x34, 0xbf, 0x44, 0x14, 0x84, 0xc0, 0x97, 0xea, 0x04, 0x7d, 0x28, 0x8b, 0x90, 0x1c, 0x70, + 0x93, 0x33, 0xb4, 0x0d, 0x79, 0x01, 0xb3, 0xb6, 0x3a, 0x19, 0xb3, 0x92, 0x83, 0x3e, 0x80, 0xaa, + 0xe5, 0xbe, 0x76, 0x46, 0x8c, 0x8e, 0x5d, 0xc7, 0x62, 0xda, 0x73, 0x15, 0x41, 0x1b, 0x28, 0x12, + 0xfe, 0x2e, 0x0f, 0x9b, 0x2a, 0xa4, 0x9f, 0x51, 0xd3, 0xe7, 0x27, 0xd4, 0xe4, 0x99, 0x6e, 0xed, + 0xff, 0x34, 0xd5, 0xa0, 0x0e, 0x80, 0x34, 0x5c, 0x9c, 0x42, 0x5d, 0x9a, 0xb0, 0x75, 0x0b, 0xcf, + 0x4f, 0xca, 0x42, 0x44, 0x7c, 0x32, 0xf4, 0x09, 0xd4, 0x3c, 0xea, 0x58, 0xb6, 0x33, 0xd1, 0x4b, + 0x0a, 0xda, 0x35, 0x71, 0xe5, 0x55, 0x2d, 0xa2, 0x96, 0xdc, 0x83, 0xda, 0xc9, 0x9c, 0x53, 0x36, + 0x7a, 0xed, 0xdb, 0x9c, 0x53, 0xa7, 0x55, 0x94, 0xe0, 0x54, 0x25, 0xf1, 0x2b, 0x45, 0x13, 0x39, + 0x5a, 0x09, 0xf9, 0xd4, 0xb4, 0x5a, 0x6b, 0xaa, 0x67, 0x97, 0x14, 0x42, 0x4d, 0xd1, 0xb3, 0x57, + 0xcf, 0xe9, 0x3c, 0x52, 0x51, 0x52, 0xf8, 0x0a, 0x5a, 0xa0, 0xe1, 0x36, 0x94, 0xa5, 0x88, 0x54, + 0x50, 0x56, 0x91, 0x23, 0x08, 0x72, 0xfd, 0x03, 0x68, 0x9a, 0x9e, 0xe7, 0xbb, 0xbf, 0xb1, 0x67, + 0x26, 0xa7, 0x23, 0x66, 0x7f, 0x4b, 0x5b, 0x20, 0x65, 0x1a, 0x31, 0xfa, 0xc0, 0xfe, 0x96, 0xa2, + 0x0e, 0x94, 0x6c, 0x87, 0x53, 0xff, 0x95, 0x39, 0x6d, 0x55, 0x25, 0x72, 0x28, 0x6a, 0x65, 0x8f, + 0x34, 0x87, 0x84, 0x32, 0x69, 0xd5, 0x62, 0xcb, 0x56, 0x6d, 0x41, 0xf5, 0x73, 0x3a, 0x67, 0x5f, + 0xe4, 0x4b, 0x95, 0x66, 0x15, 0x9f, 0x01, 0xec, 0x9d, 0x99, 0xce, 0x84, 0x0a, 0x78, 0xae, 0x71, + 0xb7, 0x9e, 0x40, 0x65, 0x2c, 0xe5, 0x47, 0xf2, 0x29, 0x92, 0x93, 0x4f, 0x91, 0xad, 0x4e, 0xf0, + 0x96, 0x12, 0xd9, 0x48, 0xe9, 0x93, 0x4f, 0x12, 0x18, 0x87, 0xbf, 0xf1, 0x63, 0xa8, 0x0f, 0x7d, + 0xd3, 0x61, 0xa7, 0xd4, 0x57, 0xd7, 0xfa, 0xed, 0xbb, 0xe1, 0x8f, 0xa1, 0xf0, 0x82, 0xfa, 0x13, + 0xd9, 0x3d, 0x73, 0xd3, 0x9f, 0x50, 0xae, 0x85, 0x17, 0xee, 0x99, 0xe2, 0xe2, 0x27, 0x50, 0x19, + 0x78, 0x53, 0x5b, 0x97, 0x2b, 0xf4, 0x00, 0x8a, 0x9e, 0x3b, 0xb5, 0xc7, 0x73, 0xfd, 0x66, 0x5a, + 0x57, 0xe0, 0xed, 0x9d, 0xd1, 0xf1, 0x79, 0x5f, 0x32, 0x88, 0x16, 0xc0, 0x7f, 0x5c, 0x85, 0xad, + 0x85, 0x88, 0xc8, 0x94, 0x2a, 0x3e, 0x09, 0x21, 0x92, 0xa7, 0x53, 0x81, 0xd1, 0x0c, 0x76, 0x0e, + 0xb0, 0x0e, 0xb0, 0x91, 0xb8, 0x7f, 0x06, 0x0d, 0xae, 0xb1, 0x19, 0x25, 0xe2, 0x44, 0xef, 0x94, + 0x04, 0x8e, 0xd4, 0x79, 0x12, 0xc8, 0x44, 0x75, 0xcd, 0x27, 0xab, 0x2b, 0xfa, 0x09, 0x54, 0x35, + 0x93, 0x7a, 0xee, 0xf8, 0x4c, 0xa6, 0x59, 0x11, 0xd5, 0x09, 0x00, 0x0f, 0x04, 0x8b, 0x54, 0xfc, + 0xe8, 0x43, 0xe4, 0x28, 0x05, 0xaa, 0x3a, 0x46, 0x71, 0x89, 0x93, 0x40, 0x09, 0xf4, 0x55, 0xd2, + 0x29, 0xcc, 0x84, 0xab, 0x64, 0xb8, 0x84, 0x0f, 0x59, 0xe9, 0x3d, 0xa2, 0x38, 0xe8, 0xc7, 0x50, + 0x65, 0xc2, 0x39, 0x23, 0x9d, 0x32, 0x4a, 0x52, 0x52, 0xfb, 0x24, 0xe6, 0x36, 0x52, 0x61, 0xd1, + 0x07, 0x3e, 0x85, 0x46, 0x97, 0x9d, 0x6b, 0xf6, 0xff, 0x2f, 0x45, 0xe1, 0xef, 0x0c, 0x68, 0x46, + 0x1b, 0x65, 0x7c, 0xea, 0xd4, 0x1c, 0xfa, 0x7a, 0x94, 0xee, 0x74, 0x2a, 0x0e, 0x7d, 0x4d, 0x02, + 0x77, 0x6c, 0x43, 0x55, 0xc8, 0xc8, 0xd2, 0x69, 0x5b, 0xaa, 0x72, 0xe6, 0x09, 0x38, 0xf4, 0xb5, + 0x80, 0xf1, 0xc8, 0x62, 0xf8, 0x77, 0x06, 0x20, 0x42, 0x3d, 0xd7, 0xe7, 0xd9, 0x0f, 0x8d, 0x21, + 0x3f, 0xa5, 0xa7, 0xfc, 0x92, 0x23, 0x4b, 0x1e, 0xba, 0x0f, 0x05, 0xdf, 0x9e, 0x9c, 0xf1, 0x4b, + 0x1e, 0xa4, 0x8a, 0x89, 0xf7, 0xe0, 0x46, 0xc2, 0x98, 0x4c, 0x7d, 0xc6, 0x2f, 0xa0, 0x1a, 0x4f, + 0x58, 0xa2, 0xfa, 0x33, 0x6e, 0xfa, 0x7c, 0x14, 0x3d, 0xd4, 0xd5, 0x64, 0xa4, 0x2e, 0xc9, 0xd1, + 0x54, 0xe1, 0x1e, 0xd4, 0xa8, 0x63, 0xc5, 0xc4, 0x14, 0xa2, 0x55, 0xea, 0x58, 0xa1, 0x10, 0xfe, + 0x73, 0x1e, 0x40, 0x76, 0xe9, 0xaa, 0x40, 0xc6, 0x1f, 0x5f, 0x46, 0xe2, 0xf1, 0x85, 0xda, 0x50, + 0x1a, 0x9b, 0x9e, 0x39, 0x16, 0xed, 0x86, 0xee, 0x67, 0x82, 0x6f, 0xf4, 0x1e, 0x94, 0xcd, 0x57, + 0xa6, 0x3d, 0x35, 0x4f, 0xa6, 0x54, 0x42, 0x92, 0x27, 0x11, 0x41, 0xe4, 0x7c, 0xed, 0x56, 0x35, + 0x71, 0xc8, 0xcb, 0x89, 0x83, 0x0e, 0x98, 0x3d, 0x39, 0x77, 0xf8, 0x10, 0x10, 0xd3, 0xd5, 0x88, + 0x39, 0xa6, 0xa7, 0x05, 0x0b, 0x52, 0xb0, 0xa9, 0x39, 0x03, 0xc7, 0xf4, 0x94, 0xf4, 0x23, 0xd8, + 0xf0, 0xe9, 0x98, 0xda, 0xaf, 0x52, 0xf2, 0x45, 0x29, 0x8f, 0x42, 0x5e, 0xb4, 0xe2, 0x0e, 0x40, + 0x04, 0x9a, 0x0c, 0xb3, 0x1a, 0x29, 0x87, 0x78, 0xa1, 0x0e, 0xdc, 0x30, 0x3d, 0x6f, 0x3a, 0x4f, + 0xe9, 0x2b, 0x49, 0xb9, 0xf5, 0x80, 0x15, 0xa9, 0xdb, 0x82, 0x35, 0x9b, 0x8d, 0x4e, 0x2e, 0xd8, + 0x5c, 0x16, 0xa8, 0x12, 0x29, 0xda, 0x6c, 0xf7, 0x82, 0xcd, 0x45, 0x36, 0xb9, 0x60, 0xd4, 0x8a, + 0xd7, 0xa5, 0x92, 0x20, 0xc8, 0x82, 0xb4, 0x50, 0x3f, 0x2b, 0x4b, 0xea, 0x67, 0xba, 0x40, 0x56, + 0x17, 0x0b, 0x64, 0xb2, 0xc4, 0xd6, 0xd2, 0x25, 0x36, 0x51, 0x3f, 0xeb, 0xa9, 0xfa, 0x19, 0x2f, + 0x8a, 0x8d, 0xb7, 0x17, 0x45, 0x3c, 0x85, 0x9b, 0xf2, 0x7a, 0xbc, 0x6b, 0xab, 0x53, 0x60, 0xe2, + 0x7e, 0x25, 0x13, 0x7a, 0x74, 0xef, 0x88, 0x62, 0xe3, 0xa7, 0xb0, 0x99, 0xde, 0x2d, 0x53, 0xcc, + 0xfc, 0xd5, 0x80, 0x8d, 0xc1, 0xd8, 0xe4, 0xa2, 0xf5, 0xcf, 0xfe, 0xdc, 0xbc, 0xea, 0xe1, 0x75, + 0xdd, 0x99, 0x54, 0xac, 0x7b, 0xcb, 0x5f, 0xf1, 0x50, 0x3c, 0x80, 0x9b, 0x29, 0x7b, 0xb3, 0x4e, + 0xaf, 0x0e, 0x29, 0x3f, 0xdc, 0x1b, 0x98, 0xa7, 0xb4, 0xef, 0xda, 0x4e, 0x26, 0x6f, 0x61, 0x0a, + 0x9b, 0x69, 0x2d, 0x99, 0x52, 0xba, 0x08, 0x3a, 0xf3, 0x94, 0x8e, 0x3c, 0xa1, 0x43, 0x03, 0x58, + 0x66, 0x81, 0x52, 0x7c, 0x0a, 0xad, 0x97, 0x9e, 0x65, 0x72, 0xfa, 0x8e, 0xf6, 0xbe, 0x6d, 0x1f, + 0x17, 0x6e, 0x2d, 0xd9, 0x27, 0xd3, 0x89, 0xee, 0x43, 0x5d, 0x14, 0xa0, 0x85, 0xdd, 0x44, 0x59, + 0x0a, 0x75, 0x3f, 0xa4, 0x50, 0x0e, 0x27, 0xcb, 0xa8, 0x08, 0xb9, 0xde, 0xf3, 0xe6, 0x0a, 0xaa, + 0xc0, 0xda, 0xcb, 0xe3, 0xe7, 0xc7, 0xbd, 0xaf, 0x8e, 0x9b, 0x06, 0xda, 0x80, 0xe6, 0x71, 0x6f, + 0x38, 0xda, 0xed, 0xf5, 0x86, 0x83, 0x21, 0xe9, 0xf6, 0xfb, 0x07, 0xfb, 0xcd, 0x1c, 0xba, 0x01, + 0x8d, 0xc1, 0xb0, 0x47, 0x0e, 0x46, 0xc3, 0xde, 0x8b, 0xdd, 0xc1, 0xb0, 0x77, 0x7c, 0xd0, 0x5c, + 0x45, 0x2d, 0xd8, 0xe8, 0x7e, 0x49, 0x0e, 0xba, 0xfb, 0x5f, 0x27, 0xc5, 0xf3, 0x0f, 0x77, 0xa0, + 0x12, 0x6b, 0xc6, 0x50, 0x09, 0xf2, 0x83, 0xbd, 0xee, 0x71, 0x73, 0x05, 0x35, 0xa0, 0xd2, 0xed, + 0xf7, 0x49, 0xef, 0xe7, 0x47, 0x2f, 0xba, 0xc3, 0x83, 0xa6, 0xf1, 0xf8, 0x9f, 0x00, 0xb9, 0xfe, + 0x3e, 0xea, 0x02, 0x44, 0x6f, 0x39, 0xb4, 0xa5, 0x4e, 0xba, 0xf0, 0x40, 0x6c, 0xb7, 0x16, 0x19, + 0x0a, 0x0c, 0xbc, 0x82, 0x1e, 0xc1, 0xea, 0x90, 0xb9, 0x48, 0x07, 0x70, 0x34, 0x12, 0x6f, 0xaf, + 0xc7, 0x28, 0x81, 0xf4, 0x8e, 0xf1, 0xc8, 0x40, 0x3f, 0x85, 0x72, 0x38, 0x08, 0x45, 0x9b, 0x4a, + 0x2a, 0x3d, 0x32, 0x6e, 0x6f, 0x2d, 0xd0, 0xc3, 0x1d, 0x5f, 0x40, 0x3d, 0x39, 0x4a, 0x45, 0xb7, + 0x95, 0xf0, 0xd2, 0x31, 0x6d, 0xfb, 0xbd, 0xe5, 0xcc, 0x50, 0xdd, 0x13, 0x58, 0xd3, 0xe3, 0x4e, + 0xa4, 0x5d, 0x9d, 0x1c, 0x9e, 0xb6, 0x6f, 0xa6, 0xa8, 0xe1, 0xca, 0x4f, 0xa1, 0x14, 0x0c, 0x1f, + 0xd1, 0xcd, 0x10, 0xa2, 0xf8, 0x94, 0xb0, 0xbd, 0x99, 0x26, 0xc7, 0x17, 0x07, 0xd3, 0xbe, 0x60, + 0x71, 0x6a, 0xc4, 0x18, 0x2c, 0x4e, 0x0f, 0x05, 0xf1, 0x0a, 0x3a, 0x84, 0x6a, 0x7c, 0x48, 0x87, + 0x6e, 0x85, 0xdb, 0xa4, 0x87, 0x7f, 0xed, 0xf6, 0x32, 0x56, 0x1c, 0xcb, 0x64, 0x7a, 0x0d, 0xb0, + 0x5c, 0x9a, 0xe2, 0x03, 0x2c, 0x97, 0x67, 0x64, 0xbc, 0x82, 0x86, 0xd0, 0x48, 0x75, 0xfd, 0xe8, + 0xbd, 0x20, 0x7c, 0x96, 0x3d, 0x8f, 0xdb, 0x77, 0x2e, 0xe1, 0xa6, 0x2f, 0x4c, 0x38, 0x33, 0x43, + 0x11, 0xa2, 0x89, 0x3c, 0xde, 0xde, 0x5a, 0xa0, 0x87, 0x56, 0x3d, 0x85, 0x5a, 0x62, 0xe6, 0x86, + 0xda, 0x29, 0xd9, 0xd8, 0x20, 0xee, 0x2a, 0x3d, 0x9f, 0x42, 0x29, 0x68, 0x69, 0x03, 0x97, 0xa5, + 0x7a, 0xe9, 0xc0, 0x65, 0xe9, 0xce, 0x17, 0xaf, 0xa0, 0x7d, 0xa8, 0xc4, 0x3a, 0x3f, 0xd4, 0x0a, + 0x0e, 0x9e, 0xee, 0x4c, 0xdb, 0xb7, 0x96, 0x70, 0x42, 0x2d, 0x03, 0x39, 0x30, 0x4d, 0x0c, 0xab, + 0xd0, 0x9d, 0xd0, 0xe2, 0x65, 0x73, 0xb3, 0xf6, 0xdd, 0xcb, 0xd8, 0x71, 0xa5, 0xe9, 0x09, 0x58, + 0xa0, 0xf4, 0x92, 0x61, 0x5c, 0xa0, 0xf4, 0xb2, 0xc1, 0x19, 0x5e, 0x41, 0x5f, 0x40, 0x2d, 0x51, + 0xbf, 0x02, 0xd0, 0x97, 0x15, 0xe1, 0xf6, 0xed, 0xa5, 0xbc, 0xf8, 0x2d, 0x4d, 0x96, 0x9f, 0xe0, + 0x96, 0x2e, 0x2d, 0x6d, 0xc1, 0x2d, 0x5d, 0x5e, 0xb1, 0xf0, 0x0a, 0xfa, 0x19, 0xac, 0x2f, 0xa4, + 0x7f, 0xa4, 0x4f, 0x74, 0x59, 0xfd, 0x69, 0xbf, 0x7f, 0x29, 0x3f, 0xd0, 0xbb, 0xfb, 0xf0, 0xef, + 0x6f, 0xee, 0x1a, 0xff, 0x78, 0x73, 0xd7, 0xf8, 0xd7, 0x9b, 0xbb, 0xc6, 0x9f, 0xfe, 0x7d, 0x77, + 0x05, 0x5a, 0x63, 0x77, 0xd6, 0xf1, 0x6c, 0x67, 0x32, 0x36, 0xbd, 0x0e, 0xb7, 0xcf, 0x5f, 0x75, + 0xce, 0x5f, 0xc9, 0x7f, 0x85, 0x9e, 0x14, 0xe5, 0x9f, 0x1f, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, + 0x3a, 0xf9, 0xb5, 0x77, 0x58, 0x1d, 0x00, 0x00, } From 0d8542d8365f88c4cf794c815867411474f89d23 Mon Sep 17 00:00:00 2001 From: Connor1996 Date: Wed, 18 Jul 2018 11:25:45 +0800 Subject: [PATCH 2/2] update kvproto --- Gopkg.lock | 7 +++---- Gopkg.toml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 699908a6c46..d156510b7aa 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -259,15 +259,14 @@ revision = "1c287c953996ab3a0bf535dba9d53d809d3dc0b6" [[projects]] - branch = "check-policy" + branch = "master" name = "github.com/pingcap/kvproto" packages = [ "pkg/eraftpb", "pkg/metapb", "pkg/pdpb" ] - revision = "2bc6e19fc4be685376a7cdd3460f957c03312101" - source = "github.com/connor1996/kvproto" + revision = "7f09068ced84187574699b956cf09530b54884c2" [[projects]] name = "github.com/prometheus/client_golang" @@ -501,6 +500,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "c2252488f03fcdb5e3f77a04667575f9427441294fb0badfa3fa7fe4efef0e11" + inputs-digest = "2bf7150e00a5771891754cdf0f5384ded938c1e9cefe9bc8f4822232aac736c9" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 2f2b8366c6b..870e03a4cb1 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -26,5 +26,5 @@ [[constraint]] name = "github.com/pingcap/kvproto" - source = "github.com/connor1996/kvproto" - branch = "check-policy" + branch = "master" +