diff --git a/agent/agent_consul.go b/agent/agent_consul.go index dda1a5a1..563d4c16 100644 --- a/agent/agent_consul.go +++ b/agent/agent_consul.go @@ -81,7 +81,7 @@ func startConsul(fs *flags, t *transporterServer) error { } } - case dbtesterpb.DatabaseID_consul__v0_8_3: + case dbtesterpb.DatabaseID_consul__v0_8_4: switch t.req.IPIndex { case 0: // leader flags = []string{ diff --git a/agent/server.go b/agent/server.go index 60bd0421..0c7a3ad9 100644 --- a/agent/server.go +++ b/agent/server.go @@ -114,7 +114,7 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques case dbtesterpb.DatabaseID_consul__v0_7_5, dbtesterpb.DatabaseID_consul__v0_8_0, - dbtesterpb.DatabaseID_consul__v0_8_3: + dbtesterpb.DatabaseID_consul__v0_8_4: plog.Infof("Consul executable binary path: %q", globalFlags.consulExec) plog.Infof("Consul data directory: %q", globalFlags.consulDataDir) @@ -186,7 +186,7 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques } case dbtesterpb.DatabaseID_consul__v0_7_5, dbtesterpb.DatabaseID_consul__v0_8_0, - dbtesterpb.DatabaseID_consul__v0_8_3: + dbtesterpb.DatabaseID_consul__v0_8_4: if err := startConsul(&globalFlags, t); err != nil { plog.Errorf("startConsul error %v", err) return nil, err @@ -303,7 +303,7 @@ func measureDatabasSize(flg flags, rdb dbtesterpb.DatabaseID) (int64, error) { return fileinspect.Size(flg.consulDataDir) case dbtesterpb.DatabaseID_consul__v0_8_0: return fileinspect.Size(flg.consulDataDir) - case dbtesterpb.DatabaseID_consul__v0_8_3: + case dbtesterpb.DatabaseID_consul__v0_8_4: return fileinspect.Size(flg.consulDataDir) case dbtesterpb.DatabaseID_cetcd__beta: return fileinspect.Size(flg.etcdDataDir) diff --git a/config_dbtester.go b/config_dbtester.go index 7b44325f..b7b64bc7 100644 --- a/config_dbtester.go +++ b/config_dbtester.go @@ -303,14 +303,14 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) { } cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_0.String()] = v } - if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_3.String()]; ok { + if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_4.String()]; ok { if v.AgentPortToConnect == 0 { v.AgentPortToConnect = defaultAgentPort } if v.DatabasePortToConnect == 0 { v.DatabasePortToConnect = defaultConsulClientPort } - cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_3.String()] = v + cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_4.String()] = v } // need etcd configs since it's backed by etcd @@ -453,7 +453,7 @@ func (cfg *Config) ToRequest(databaseID string, op dbtesterpb.Operation, idx int case dbtesterpb.DatabaseID_consul__v0_7_5: case dbtesterpb.DatabaseID_consul__v0_8_0: - case dbtesterpb.DatabaseID_consul__v0_8_3: + case dbtesterpb.DatabaseID_consul__v0_8_4: case dbtesterpb.DatabaseID_zetcd__beta: case dbtesterpb.DatabaseID_cetcd__beta: diff --git a/dbtesterpb/config_analyze_machine.pb.go b/dbtesterpb/config_analyze_machine.pb.go index 29b21d66..d2c8b96d 100644 --- a/dbtesterpb/config_analyze_machine.pb.go +++ b/dbtesterpb/config_analyze_machine.pb.go @@ -28,7 +28,7 @@ Flag_Cetcd_Beta Flag_Consul_V0_7_5 Flag_Consul_V0_8_0 - Flag_Consul_V0_8_3 + Flag_Consul_V0_8_4 Flag_Etcd_V2_3 Flag_Etcd_V3_1 Flag_Etcd_V3_2 diff --git a/dbtesterpb/config_client_machine.pb.go b/dbtesterpb/config_client_machine.pb.go index dc1ccc5a..6d6f4916 100644 --- a/dbtesterpb/config_client_machine.pb.go +++ b/dbtesterpb/config_client_machine.pb.go @@ -97,7 +97,7 @@ type ConfigClientMachineAgentControl struct { Flag_Zookeeper_R3_5_3Beta *Flag_Zookeeper_R3_5_3Beta `protobuf:"bytes,202,opt,name=flag__zookeeper__r3_5_3_beta,json=flagZookeeperR353Beta" json:"flag__zookeeper__r3_5_3_beta,omitempty" yaml:"zookeeper__r3_5_3_beta"` Flag_Consul_V0_7_5 *Flag_Consul_V0_7_5 `protobuf:"bytes,300,opt,name=flag__consul__v0_7_5,json=flagConsulV075" json:"flag__consul__v0_7_5,omitempty" yaml:"consul__v0_7_5"` Flag_Consul_V0_8_0 *Flag_Consul_V0_8_0 `protobuf:"bytes,301,opt,name=flag__consul__v0_8_0,json=flagConsulV080" json:"flag__consul__v0_8_0,omitempty" yaml:"consul__v0_8_0"` - Flag_Consul_V0_8_3 *Flag_Consul_V0_8_3 `protobuf:"bytes,302,opt,name=flag__consul__v0_8_3,json=flagConsulV083" json:"flag__consul__v0_8_3,omitempty" yaml:"consul__v0_8_3"` + Flag_Consul_V0_8_4 *Flag_Consul_V0_8_4 `protobuf:"bytes,302,opt,name=flag__consul__v0_8_4,json=flagConsulV084" json:"flag__consul__v0_8_4,omitempty" yaml:"consul__v0_8_4"` Flag_Cetcd_Beta *Flag_Cetcd_Beta `protobuf:"bytes,400,opt,name=flag__cetcd__beta,json=flagCetcdBeta" json:"flag__cetcd__beta,omitempty" yaml:"cetcd__beta"` Flag_Zetcd_Beta *Flag_Zetcd_Beta `protobuf:"bytes,500,opt,name=flag__zetcd__beta,json=flagZetcdBeta" json:"flag__zetcd__beta,omitempty" yaml:"zetcd__beta"` ConfigClientMachineBenchmarkOptions *ConfigClientMachineBenchmarkOptions `protobuf:"bytes,1000,opt,name=ConfigClientMachineBenchmarkOptions" json:"ConfigClientMachineBenchmarkOptions,omitempty" yaml:"benchmark_options"` @@ -587,13 +587,13 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { } i += n11 } - if m.Flag_Consul_V0_8_3 != nil { + if m.Flag_Consul_V0_8_4 != nil { dAtA[i] = 0xf2 i++ dAtA[i] = 0x12 i++ - i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Consul_V0_8_3.Size())) - n12, err := m.Flag_Consul_V0_8_3.MarshalTo(dAtA[i:]) + i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Consul_V0_8_4.Size())) + n12, err := m.Flag_Consul_V0_8_4.MarshalTo(dAtA[i:]) if err != nil { return 0, err } @@ -881,8 +881,8 @@ func (m *ConfigClientMachineAgentControl) Size() (n int) { l = m.Flag_Consul_V0_8_0.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) } - if m.Flag_Consul_V0_8_3 != nil { - l = m.Flag_Consul_V0_8_3.Size() + if m.Flag_Consul_V0_8_4 != nil { + l = m.Flag_Consul_V0_8_4.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) } if m.Flag_Cetcd_Beta != nil { @@ -2396,7 +2396,7 @@ func (m *ConfigClientMachineAgentControl) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 302: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_3", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_4", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2420,10 +2420,10 @@ func (m *ConfigClientMachineAgentControl) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Flag_Consul_V0_8_3 == nil { - m.Flag_Consul_V0_8_3 = &Flag_Consul_V0_8_3{} + if m.Flag_Consul_V0_8_4 == nil { + m.Flag_Consul_V0_8_4 = &Flag_Consul_V0_8_4{} } - if err := m.Flag_Consul_V0_8_3.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Flag_Consul_V0_8_4.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2693,116 +2693,116 @@ var fileDescriptorConfigClientMachine = []byte{ // 1811 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x6d, 0x6f, 0x1b, 0x49, 0x1d, 0x3f, 0x37, 0xed, 0x35, 0x99, 0xf4, 0x29, 0xd3, 0xa6, 0x71, 0xd3, 0x34, 0x93, 0x6e, 0x5a, - 0x2e, 0xd5, 0xd1, 0x3c, 0x78, 0xd3, 0xbb, 0x16, 0x81, 0xa0, 0x4e, 0x0e, 0xa8, 0x9a, 0xbb, 0x0b, - 0xeb, 0x5c, 0x11, 0x15, 0x62, 0x18, 0xaf, 0x27, 0xeb, 0xbd, 0xac, 0x77, 0x96, 0x9d, 0x71, 0x84, - 0xc3, 0x5b, 0x24, 0x04, 0x12, 0xd2, 0xbd, 0xbc, 0x97, 0x7c, 0x00, 0xe0, 0x63, 0xa0, 0xc2, 0x2b, - 0xbe, 0x00, 0x2b, 0x68, 0xdf, 0xc0, 0xdb, 0x15, 0x1f, 0xe0, 0x34, 0xff, 0x59, 0xdb, 0x6b, 0x7b, - 0xed, 0xf8, 0x9d, 0x77, 0xfe, 0xbf, 0xa7, 0x99, 0x9d, 0xa7, 0x35, 0xfa, 0x56, 0xa3, 0xae, 0xb8, - 0x54, 0x3c, 0x8e, 0xea, 0x5b, 0xae, 0x08, 0x8f, 0x7d, 0x8f, 0xba, 0x81, 0xcf, 0x43, 0x45, 0x5b, - 0xcc, 0x6d, 0xfa, 0x21, 0xdf, 0x8c, 0x62, 0xa1, 0x04, 0x46, 0x7d, 0xdc, 0xf2, 0x63, 0xcf, 0x57, - 0xcd, 0x76, 0x7d, 0xd3, 0x15, 0xad, 0x2d, 0x4f, 0x78, 0x62, 0x0b, 0x20, 0xf5, 0xf6, 0x31, 0x3c, - 0xc1, 0x03, 0xfc, 0x32, 0xd4, 0xe5, 0xe5, 0x9c, 0xc5, 0x71, 0xc0, 0x3c, 0xca, 0x95, 0xdb, 0xc8, - 0x6a, 0x64, 0xb8, 0x76, 0x26, 0xc4, 0x09, 0xe7, 0x11, 0x8f, 0x33, 0xc0, 0xca, 0x30, 0xc0, 0x15, - 0xa1, 0x6c, 0x07, 0x59, 0xf5, 0xee, 0x08, 0x3d, 0xa7, 0x3d, 0x52, 0x74, 0xfb, 0x45, 0xeb, 0xdd, - 0x15, 0xb4, 0xbc, 0x07, 0xfd, 0xdd, 0x83, 0xee, 0x7e, 0x6a, 0x7a, 0xfb, 0x22, 0xf4, 0x95, 0xcf, - 0x02, 0xfc, 0x11, 0x42, 0x87, 0x4c, 0x35, 0x0f, 0x63, 0x7e, 0xec, 0xff, 0xba, 0x5c, 0x5a, 0x2b, - 0x6d, 0xcc, 0x55, 0x6f, 0xa7, 0x09, 0xc1, 0x1d, 0xd6, 0x0a, 0xbe, 0x63, 0x45, 0x4c, 0x35, 0x69, - 0x04, 0x45, 0xcb, 0xc9, 0x21, 0xf1, 0x63, 0x74, 0xf9, 0x40, 0x78, 0xba, 0xa1, 0x7c, 0x01, 0x48, - 0x37, 0xd3, 0x84, 0x5c, 0x37, 0xa4, 0x40, 0x78, 0x54, 0x13, 0x2d, 0xa7, 0x8b, 0xc1, 0x14, 0x2d, - 0x19, 0xfb, 0x5a, 0x47, 0x2a, 0xde, 0xfa, 0x94, 0xab, 0xd8, 0x77, 0x25, 0xd0, 0x67, 0x80, 0xfe, - 0x30, 0x4d, 0xc8, 0x7d, 0x43, 0xcf, 0x5e, 0x8b, 0x04, 0x24, 0x6d, 0x19, 0x68, 0x26, 0x38, 0x4e, - 0x05, 0xff, 0xb6, 0x84, 0xd6, 0x0b, 0x6a, 0x2f, 0x42, 0x3d, 0x2c, 0x22, 0x60, 0x8a, 0x37, 0xc0, - 0xed, 0x22, 0xb8, 0x55, 0xd2, 0x84, 0x6c, 0x4e, 0x72, 0xf3, 0x73, 0xbc, 0xcc, 0x7a, 0x1a, 0x79, - 0xfc, 0x87, 0x12, 0x7a, 0x68, 0x70, 0x07, 0x4c, 0xf1, 0xd0, 0xed, 0x1c, 0x35, 0x63, 0xd1, 0xf6, - 0x9a, 0x51, 0x5b, 0x1d, 0xf9, 0x2d, 0x2e, 0x79, 0xec, 0x73, 0xd3, 0xed, 0x4b, 0x10, 0x64, 0x37, - 0x4d, 0xc8, 0xf6, 0x40, 0x90, 0xc0, 0xf0, 0xa8, 0xea, 0x11, 0xa9, 0xea, 0x31, 0xb3, 0x28, 0xd3, - 0x59, 0xe0, 0xdf, 0xa0, 0xb5, 0x01, 0xe0, 0xbe, 0x2f, 0x55, 0xec, 0xd7, 0xdb, 0xca, 0x17, 0xe1, - 0xf3, 0x20, 0x80, 0x18, 0xef, 0x43, 0x8c, 0xad, 0x34, 0x21, 0x1f, 0x16, 0xc6, 0x68, 0xe4, 0x38, - 0x94, 0x05, 0x41, 0x96, 0xe0, 0x5c, 0x61, 0xfc, 0x55, 0x09, 0x7d, 0x30, 0x16, 0x74, 0xc8, 0x63, - 0x97, 0x87, 0xca, 0x0f, 0x38, 0x84, 0xb8, 0x0c, 0x21, 0x3e, 0x4a, 0x13, 0x52, 0x39, 0x3f, 0x44, - 0xd4, 0xe3, 0x66, 0x59, 0xa6, 0xb5, 0xc1, 0xbf, 0x2b, 0xa1, 0x07, 0x63, 0xb1, 0xb5, 0x76, 0xab, - 0xc5, 0xe2, 0x0e, 0xe4, 0x99, 0x85, 0x3c, 0x76, 0x9a, 0x90, 0xad, 0xf3, 0xf3, 0x48, 0x43, 0xcc, - 0xc2, 0x4c, 0x65, 0x80, 0x23, 0xb4, 0x32, 0x80, 0xab, 0x76, 0x5e, 0xf2, 0xce, 0x67, 0xed, 0x56, - 0x9d, 0xc7, 0x10, 0x60, 0x0e, 0x02, 0x7c, 0x3b, 0x4d, 0xc8, 0x46, 0x61, 0x80, 0x7a, 0x87, 0x9e, - 0xf0, 0x0e, 0x0d, 0x81, 0x91, 0x39, 0x4f, 0x54, 0xc4, 0x1d, 0x44, 0x6a, 0x3c, 0x3e, 0xe5, 0xf1, - 0xbe, 0x2f, 0x4f, 0x6a, 0x11, 0x73, 0xf9, 0x17, 0x92, 0x79, 0x3c, 0xdf, 0x6b, 0x34, 0x3c, 0x15, - 0x24, 0x10, 0x74, 0x6f, 0x4f, 0xa8, 0xd4, 0x14, 0xda, 0xd6, 0x9c, 0xa1, 0x1e, 0x9f, 0xa7, 0x8b, - 0x7f, 0x8e, 0x6e, 0xff, 0x48, 0x08, 0x2f, 0xe0, 0x7b, 0x81, 0x68, 0x37, 0x0e, 0x63, 0xf1, 0x25, - 0x77, 0xd5, 0x67, 0xac, 0xc5, 0xcb, 0x0d, 0x70, 0x7c, 0x90, 0x26, 0x64, 0xcd, 0x38, 0x7a, 0x80, - 0xa3, 0xae, 0x06, 0xd2, 0xc8, 0x20, 0x69, 0xc8, 0x5a, 0xdc, 0x72, 0xc6, 0x68, 0xe0, 0x63, 0x74, - 0x27, 0x57, 0xa9, 0x29, 0x11, 0x33, 0x8f, 0xbf, 0xe4, 0xa6, 0x4b, 0x1c, 0x0c, 0x36, 0xd2, 0x84, - 0x3c, 0x28, 0x30, 0x90, 0x06, 0x0c, 0x43, 0x69, 0xfa, 0x32, 0x5e, 0x0a, 0xef, 0xa2, 0xc5, 0xc2, - 0x62, 0xf9, 0x58, 0x7b, 0x38, 0xc5, 0x45, 0x2c, 0xd0, 0xca, 0x68, 0xa1, 0xda, 0x76, 0x4f, 0xb8, - 0x19, 0x01, 0x0f, 0x02, 0x7e, 0x98, 0x26, 0xe4, 0x83, 0x09, 0x01, 0xeb, 0x40, 0xc8, 0x06, 0x62, - 0xa2, 0x20, 0x6e, 0xa3, 0xd5, 0xd1, 0x7a, 0xad, 0x5d, 0xdf, 0xf7, 0x63, 0xee, 0x2a, 0x11, 0x77, - 0xca, 0x4d, 0xb0, 0x7c, 0x9c, 0x26, 0xe4, 0xd1, 0x04, 0x4b, 0xd9, 0xae, 0xd3, 0x46, 0x97, 0x63, - 0x39, 0xe7, 0x88, 0x5a, 0x7f, 0xbb, 0x84, 0xd6, 0x0b, 0x4e, 0x99, 0x2a, 0x0f, 0xdd, 0x66, 0x8b, - 0xc5, 0x27, 0x9f, 0x47, 0x7a, 0x09, 0x48, 0xbc, 0x8e, 0x2e, 0x1e, 0x75, 0x22, 0x9e, 0x1d, 0x34, - 0xd7, 0xd3, 0x84, 0xcc, 0x9b, 0x10, 0xaa, 0x13, 0x71, 0xcb, 0x81, 0x22, 0xfe, 0x3e, 0xba, 0xea, - 0xf0, 0x5f, 0xb5, 0xb9, 0x54, 0x66, 0x02, 0xc3, 0x09, 0x33, 0x53, 0xbd, 0x93, 0x26, 0x64, 0xd1, - 0xa0, 0x63, 0x53, 0xce, 0x16, 0x80, 0xe5, 0x0c, 0xe2, 0xf1, 0x8f, 0xd1, 0x8d, 0x3d, 0x11, 0x86, - 0xdc, 0xd5, 0xa6, 0x99, 0xc6, 0x0c, 0x68, 0xac, 0xa4, 0x09, 0x29, 0x67, 0x4b, 0xaa, 0x87, 0xe8, - 0xc9, 0x8c, 0xb0, 0xf0, 0x77, 0xd1, 0x15, 0xd3, 0xa1, 0x4c, 0xe5, 0x22, 0xa8, 0x94, 0xd3, 0x84, - 0xdc, 0x1a, 0x58, 0x98, 0x5d, 0x85, 0x01, 0x34, 0xfe, 0x05, 0x5a, 0xea, 0x2b, 0xe6, 0x2b, 0xb2, - 0x7c, 0x69, 0x6d, 0x66, 0x63, 0x26, 0x3f, 0xf5, 0x73, 0x71, 0x06, 0x34, 0xa5, 0x3e, 0xf4, 0x8a, - 0x45, 0xb0, 0x8f, 0x96, 0x1d, 0xa6, 0xf8, 0x81, 0xdf, 0xf2, 0x55, 0x36, 0x02, 0xf2, 0x90, 0xc7, - 0x35, 0xee, 0x8a, 0xb0, 0x01, 0x5b, 0xfb, 0x4c, 0xf5, 0x51, 0x9a, 0x90, 0x87, 0xd9, 0xa8, 0x31, - 0xc5, 0x69, 0xa0, 0xc1, 0x34, 0x1b, 0x40, 0xa9, 0x77, 0x53, 0x2a, 0x01, 0x6f, 0x39, 0x13, 0xc4, - 0xf4, 0x79, 0x5f, 0x63, 0x2d, 0x98, 0xf0, 0x7a, 0xb7, 0x9e, 0xcd, 0x9f, 0xf7, 0x92, 0xb5, 0x60, - 0x11, 0x59, 0x4e, 0x17, 0x83, 0xbf, 0x87, 0xae, 0xbc, 0xe4, 0x9d, 0x9a, 0x7f, 0xc6, 0xab, 0x1d, - 0xc5, 0x25, 0xec, 0xa8, 0x03, 0x6f, 0x50, 0xaf, 0x39, 0xe9, 0x9f, 0x71, 0x5a, 0xd7, 0x75, 0xcb, - 0x19, 0x80, 0xe3, 0x3d, 0x74, 0xed, 0x15, 0x0b, 0xda, 0xbc, 0x2f, 0x30, 0x07, 0x02, 0x77, 0xd3, - 0x84, 0x2c, 0x19, 0x81, 0x53, 0x5d, 0x1f, 0x90, 0x18, 0xa2, 0x60, 0x1b, 0xcd, 0xd5, 0x14, 0x0b, - 0xb8, 0xc3, 0x59, 0x03, 0x36, 0xb7, 0xd9, 0xea, 0x62, 0x9a, 0x90, 0x85, 0x2c, 0xb4, 0x2e, 0xd1, - 0x98, 0xb3, 0x86, 0xe5, 0xf4, 0x71, 0x56, 0x72, 0x01, 0xdd, 0x9f, 0x34, 0x91, 0x6b, 0x8a, 0x47, - 0x12, 0x7f, 0x8e, 0xb0, 0xfe, 0xb1, 0x53, 0x53, 0x2c, 0x56, 0xfb, 0x4c, 0xb1, 0x3a, 0x93, 0x66, - 0x52, 0xcf, 0x56, 0x49, 0x9a, 0x90, 0xbb, 0x5d, 0x0f, 0x1e, 0xed, 0x50, 0xa9, 0x41, 0xb4, 0x91, - 0xa1, 0x2c, 0xa7, 0x80, 0x8a, 0x1d, 0x74, 0x53, 0xb7, 0x56, 0x6a, 0x2a, 0xe6, 0x52, 0xf6, 0x14, - 0x2f, 0x80, 0xe2, 0x5a, 0x9a, 0x90, 0x95, 0xbe, 0x62, 0x85, 0x4a, 0x40, 0xe5, 0x24, 0x8b, 0xc8, - 0xf8, 0x00, 0x2d, 0xe8, 0x66, 0xbb, 0xa6, 0x44, 0xd4, 0x53, 0x9c, 0x01, 0xc5, 0xd5, 0x34, 0x21, - 0xcb, 0x7d, 0x45, 0x5b, 0x2f, 0xfb, 0x28, 0xa7, 0x37, 0x4a, 0xc4, 0x3f, 0x44, 0xd7, 0x75, 0xe3, - 0xee, 0x17, 0x51, 0x20, 0x58, 0xe3, 0x40, 0x78, 0x12, 0x16, 0xc3, 0x6c, 0x7e, 0x49, 0x69, 0xad, - 0x5d, 0xda, 0x06, 0x04, 0x0d, 0x84, 0x27, 0x2d, 0x67, 0x98, 0x64, 0xfd, 0x6b, 0x01, 0x91, 0x82, - 0x01, 0x7e, 0xee, 0xf1, 0x50, 0xed, 0x89, 0x50, 0xc5, 0x02, 0x2e, 0xa5, 0x5d, 0xdf, 0x17, 0xfb, - 0xa3, 0x97, 0xd2, 0x6e, 0x4e, 0xea, 0x37, 0x2c, 0x27, 0x87, 0xc4, 0x3f, 0x41, 0x37, 0xbb, 0x4f, - 0xfb, 0x5c, 0xba, 0xb1, 0x0f, 0xbb, 0x4e, 0x76, 0x41, 0xcd, 0xbd, 0x97, 0x9e, 0x40, 0xa3, 0x8f, - 0xb2, 0x9c, 0x22, 0x2e, 0x7e, 0x86, 0xe6, 0xbb, 0xcd, 0x47, 0xcc, 0xcb, 0x2e, 0xab, 0x4b, 0x69, - 0x42, 0x6e, 0x0e, 0x49, 0x29, 0xe6, 0x59, 0x4e, 0x1e, 0xab, 0x97, 0xcc, 0x21, 0xe7, 0xf1, 0x8b, - 0x43, 0x3d, 0x52, 0x33, 0x83, 0x57, 0xe4, 0x88, 0xf3, 0x98, 0xfa, 0x91, 0xb4, 0x9c, 0x2e, 0x06, - 0xff, 0x00, 0x5d, 0xcd, 0x7e, 0xd6, 0x54, 0xec, 0x87, 0x5e, 0x76, 0x43, 0x5c, 0x4e, 0x13, 0x72, - 0x7b, 0x90, 0xa4, 0xdf, 0xbf, 0x1f, 0x7a, 0x96, 0x33, 0x48, 0xc0, 0x87, 0x08, 0xc3, 0x30, 0x1e, - 0x8a, 0x58, 0x1d, 0x89, 0x6c, 0xd3, 0xc8, 0xb6, 0x81, 0xdc, 0x1c, 0x62, 0x1a, 0x43, 0x23, 0x11, - 0x2b, 0xaa, 0x04, 0xcd, 0xf6, 0x1d, 0xcb, 0x29, 0xe0, 0xe2, 0x2a, 0xba, 0x06, 0xad, 0x9f, 0x84, - 0x8d, 0x48, 0xf8, 0xa1, 0x92, 0xe5, 0xcb, 0xd0, 0x93, 0x5c, 0x28, 0xa3, 0xc6, 0xbb, 0x00, 0xcb, - 0x19, 0x62, 0xe0, 0x9f, 0xa1, 0xc5, 0xee, 0xa8, 0x0c, 0x06, 0x33, 0x7b, 0xc2, 0x7a, 0x9a, 0x10, - 0x32, 0x34, 0x96, 0x23, 0xd9, 0x8a, 0x15, 0xf0, 0x4b, 0xb4, 0xd0, 0x2d, 0xf4, 0x13, 0xce, 0x41, - 0xc2, 0x7b, 0x69, 0x42, 0xee, 0x0c, 0xc9, 0xe6, 0x42, 0x8e, 0xf2, 0xf0, 0x6b, 0x74, 0x03, 0x3e, - 0x9e, 0xe0, 0xab, 0x8d, 0xd2, 0xd3, 0x0a, 0xb5, 0xe1, 0x82, 0x32, 0x5f, 0x59, 0xd9, 0xec, 0x7f, - 0x60, 0x6d, 0x0e, 0x63, 0xf2, 0x7b, 0x4a, 0xbf, 0xd5, 0x72, 0xe6, 0x35, 0xf0, 0x13, 0xe5, 0x36, - 0x5e, 0x55, 0xec, 0x11, 0x6d, 0x9b, 0xee, 0xc0, 0xdd, 0x64, 0x92, 0xb6, 0x4d, 0x77, 0x0a, 0xb4, - 0x6d, 0xba, 0x93, 0xd7, 0xb6, 0x77, 0x0a, 0xb4, 0x2b, 0x70, 0x27, 0x99, 0xac, 0x5d, 0x29, 0xd4, - 0xae, 0x0c, 0x68, 0x57, 0xf0, 0x4f, 0xd1, 0xf5, 0x3c, 0x4f, 0xf9, 0x11, 0xdc, 0x58, 0xe6, 0x2b, - 0x77, 0xc7, 0x49, 0x2b, 0x3f, 0xaa, 0xde, 0x4a, 0x13, 0x72, 0x23, 0xaf, 0xac, 0xfc, 0x28, 0x27, - 0x7c, 0xe4, 0x47, 0xf8, 0x14, 0x2d, 0x19, 0x56, 0xef, 0x33, 0x98, 0xd2, 0xd8, 0xa6, 0xbb, 0xf4, - 0x59, 0xf9, 0x4d, 0x09, 0x1c, 0xd6, 0x47, 0x1d, 0x46, 0xb0, 0xf9, 0xbd, 0x67, 0xa4, 0x68, 0x39, - 0x0b, 0x9a, 0xf6, 0xba, 0xdb, 0xee, 0xd8, 0xbb, 0xcf, 0xf0, 0x1f, 0x4b, 0xe8, 0x5e, 0x91, 0xd8, - 0x13, 0x5a, 0xa1, 0x2c, 0x88, 0x9a, 0xac, 0xfc, 0x77, 0x63, 0xff, 0xe8, 0x3c, 0xfb, 0x1e, 0xa3, - 0x6a, 0xa5, 0x09, 0x59, 0x2d, 0x0a, 0xd1, 0x83, 0x58, 0xce, 0xed, 0xa1, 0x28, 0x4f, 0x2a, 0xcf, - 0x75, 0x01, 0xff, 0xbe, 0x84, 0x56, 0x8a, 0xd5, 0x6d, 0x5a, 0xe7, 0x8a, 0x95, 0xff, 0x61, 0xe2, - 0x6c, 0x9c, 0x1f, 0xc7, 0x10, 0xaa, 0xf7, 0xd3, 0x84, 0xdc, 0x2b, 0x4e, 0x63, 0x10, 0x96, 0xb3, - 0x38, 0x1c, 0xc6, 0xae, 0x72, 0xc5, 0xf0, 0x97, 0xe8, 0x96, 0x51, 0x36, 0xff, 0x3c, 0x50, 0x7a, - 0xba, 0x4d, 0x3f, 0xa6, 0x4f, 0xca, 0x7f, 0xbe, 0x00, 0x11, 0xd6, 0x46, 0x23, 0x0c, 0x02, 0xf3, - 0xc7, 0xfb, 0x60, 0xc5, 0x72, 0xae, 0x69, 0xc2, 0x1e, 0x34, 0xbe, 0xda, 0xfe, 0xf8, 0x49, 0xa1, - 0xd7, 0x53, 0xba, 0x5d, 0xfe, 0xcb, 0x34, 0x5e, 0x4f, 0xe9, 0xf6, 0x18, 0xaf, 0xa7, 0x74, 0x7b, - 0xc8, 0xeb, 0xe9, 0xf6, 0x18, 0x2f, 0xbb, 0xfc, 0xd7, 0xe9, 0xbc, 0xec, 0xb1, 0x5e, 0xf6, 0xb0, - 0x97, 0x8d, 0x7f, 0x89, 0x16, 0x32, 0x09, 0x33, 0xf3, 0xe1, 0x1d, 0x7e, 0x35, 0x03, 0x46, 0xf7, - 0x0a, 0x8c, 0xfa, 0xa8, 0xfc, 0x01, 0x97, 0x6b, 0xb6, 0x9c, 0xab, 0x60, 0xa1, 0x5b, 0xe0, 0x2d, - 0xf5, 0x1c, 0xce, 0x72, 0x0e, 0xff, 0x1f, 0xeb, 0x70, 0x56, 0xec, 0x70, 0x36, 0xe2, 0xf0, 0xba, - 0xe7, 0xf0, 0xa7, 0xd2, 0x54, 0x77, 0xf9, 0xf2, 0x7f, 0x2f, 0x83, 0xe9, 0x56, 0xde, 0x74, 0x0a, - 0x5e, 0x7e, 0xd1, 0xd6, 0xbb, 0x35, 0x2a, 0x4c, 0xd1, 0x72, 0xa6, 0xfa, 0x8c, 0xf8, 0xba, 0x34, - 0xc5, 0x2d, 0xad, 0xfc, 0x3f, 0x13, 0xf0, 0xf1, 0xb4, 0x01, 0x81, 0x95, 0x3f, 0xdb, 0xfa, 0xf1, - 0xf4, 0xcd, 0x46, 0x5a, 0xce, 0xf9, 0xa6, 0xd5, 0x5b, 0x6f, 0xfe, 0xb3, 0xfa, 0xde, 0x9b, 0xb7, - 0xab, 0xa5, 0x7f, 0xbe, 0x5d, 0x2d, 0xfd, 0xfb, 0xed, 0x6a, 0xe9, 0xeb, 0x77, 0xab, 0xef, 0xd5, - 0xdf, 0x87, 0x3f, 0xe3, 0xec, 0x6f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0d, 0xf3, 0x12, 0x33, 0x86, + 0x2e, 0xd5, 0xd1, 0x3c, 0xd8, 0xee, 0x5d, 0x8b, 0x40, 0x50, 0x27, 0x07, 0x54, 0xcd, 0xdd, 0x99, + 0x75, 0xae, 0x88, 0x0a, 0x31, 0x8c, 0xd7, 0x93, 0xf5, 0x5e, 0xd6, 0x3b, 0xcb, 0xce, 0x38, 0xc2, + 0xe1, 0x2d, 0x12, 0x02, 0x09, 0xe9, 0x5e, 0xde, 0x4b, 0x3e, 0x00, 0xf0, 0x31, 0x50, 0xe1, 0x15, + 0x5f, 0x80, 0x15, 0xb4, 0x6f, 0xe0, 0xed, 0x8a, 0x0f, 0x70, 0x9a, 0xff, 0xac, 0xed, 0xb5, 0xbd, + 0x76, 0xfc, 0xce, 0x3b, 0xff, 0xdf, 0xd3, 0xcc, 0xce, 0xd3, 0x1a, 0x7d, 0xab, 0xd9, 0x50, 0x5c, + 0x2a, 0x1e, 0x85, 0x8d, 0x1d, 0x47, 0x04, 0xc7, 0x9e, 0x4b, 0x1d, 0xdf, 0xe3, 0x81, 0xa2, 0x6d, + 0xe6, 0xb4, 0xbc, 0x80, 0x6f, 0x87, 0x91, 0x50, 0x02, 0xa3, 0x01, 0x6e, 0xf5, 0xb1, 0xeb, 0xa9, + 0x56, 0xa7, 0xb1, 0xed, 0x88, 0xf6, 0x8e, 0x2b, 0x5c, 0xb1, 0x03, 0x90, 0x46, 0xe7, 0x18, 0x9e, + 0xe0, 0x01, 0x7e, 0x19, 0xea, 0xea, 0x6a, 0xc6, 0xe2, 0xd8, 0x67, 0x2e, 0xe5, 0xca, 0x69, 0xa6, + 0x35, 0x32, 0x5a, 0x3b, 0x13, 0xe2, 0x84, 0xf3, 0x90, 0x47, 0x29, 0x60, 0x6d, 0x14, 0xe0, 0x88, + 0x40, 0x76, 0xfc, 0xb4, 0x7a, 0x77, 0x8c, 0x9e, 0xd1, 0x1e, 0x2b, 0x3a, 0x83, 0xa2, 0xf5, 0xee, + 0x0a, 0x5a, 0xdd, 0x87, 0xfe, 0xee, 0x43, 0x77, 0x3f, 0x35, 0xbd, 0x7d, 0x11, 0x78, 0xca, 0x63, + 0x3e, 0xfe, 0x08, 0xa1, 0x1a, 0x53, 0xad, 0x5a, 0xc4, 0x8f, 0xbd, 0x5f, 0x17, 0x0b, 0x1b, 0x85, + 0xad, 0x85, 0xea, 0xed, 0x24, 0x26, 0xb8, 0xcb, 0xda, 0xfe, 0x77, 0xac, 0x90, 0xa9, 0x16, 0x0d, + 0xa1, 0x68, 0xd9, 0x19, 0x24, 0x7e, 0x8c, 0x2e, 0x1f, 0x0a, 0x57, 0x37, 0x14, 0x2f, 0x00, 0xe9, + 0x66, 0x12, 0x93, 0xeb, 0x86, 0xe4, 0x0b, 0x97, 0x6a, 0xa2, 0x65, 0xf7, 0x30, 0x98, 0xa2, 0x15, + 0x63, 0x5f, 0xef, 0x4a, 0xc5, 0xdb, 0x9f, 0x72, 0x15, 0x79, 0x8e, 0x04, 0xfa, 0x1c, 0xd0, 0x1f, + 0x26, 0x31, 0xb9, 0x6f, 0xe8, 0xe9, 0x6b, 0x91, 0x80, 0xa4, 0x6d, 0x03, 0x4d, 0x05, 0x27, 0xa9, + 0xe0, 0xdf, 0x16, 0xd0, 0x66, 0x4e, 0xed, 0x45, 0xa0, 0x87, 0x45, 0xf8, 0x4c, 0xf1, 0x26, 0xb8, + 0x5d, 0x04, 0xb7, 0x52, 0x12, 0x93, 0xed, 0x69, 0x6e, 0x5e, 0x86, 0x97, 0x5a, 0xcf, 0x22, 0x8f, + 0xff, 0x50, 0x40, 0x0f, 0x0d, 0xee, 0x90, 0x29, 0x1e, 0x38, 0xdd, 0xa3, 0x56, 0x24, 0x3a, 0x6e, + 0x2b, 0xec, 0xa8, 0x23, 0xaf, 0xcd, 0x25, 0x8f, 0x3c, 0x6e, 0xba, 0x7d, 0x09, 0x82, 0x54, 0x92, + 0x98, 0xec, 0x0e, 0x05, 0xf1, 0x0d, 0x8f, 0xaa, 0x3e, 0x91, 0xaa, 0x3e, 0x33, 0x8d, 0x32, 0x9b, + 0x05, 0xfe, 0x0d, 0xda, 0x18, 0x02, 0x1e, 0x78, 0x52, 0x45, 0x5e, 0xa3, 0xa3, 0x3c, 0x11, 0x3c, + 0xf7, 0x7d, 0x88, 0xf1, 0x3e, 0xc4, 0xd8, 0x49, 0x62, 0xf2, 0x61, 0x6e, 0x8c, 0x66, 0x86, 0x43, + 0x99, 0xef, 0xa7, 0x09, 0xce, 0x15, 0xc6, 0x5f, 0x15, 0xd0, 0x07, 0x13, 0x41, 0x35, 0x1e, 0x39, + 0x3c, 0x50, 0x9e, 0xcf, 0x21, 0xc4, 0x65, 0x08, 0xf1, 0x51, 0x12, 0x93, 0xd2, 0xf9, 0x21, 0xc2, + 0x3e, 0x37, 0xcd, 0x32, 0xab, 0x0d, 0xfe, 0x5d, 0x01, 0x3d, 0x98, 0x88, 0xad, 0x77, 0xda, 0x6d, + 0x16, 0x75, 0x21, 0xcf, 0x3c, 0xe4, 0x29, 0x27, 0x31, 0xd9, 0x39, 0x3f, 0x8f, 0x34, 0xc4, 0x34, + 0xcc, 0x4c, 0x06, 0x38, 0x44, 0x6b, 0x43, 0xb8, 0x6a, 0xf7, 0x25, 0xef, 0x7e, 0xd6, 0x69, 0x37, + 0x78, 0x04, 0x01, 0x16, 0x20, 0xc0, 0xb7, 0x93, 0x98, 0x6c, 0xe5, 0x06, 0x68, 0x74, 0xe9, 0x09, + 0xef, 0xd2, 0x00, 0x18, 0xa9, 0xf3, 0x54, 0x45, 0xdc, 0x45, 0xa4, 0xce, 0xa3, 0x53, 0x1e, 0x1d, + 0x78, 0xf2, 0xa4, 0x1e, 0x32, 0x87, 0x7f, 0x21, 0x99, 0xcb, 0xb3, 0xbd, 0x46, 0xa3, 0x53, 0x41, + 0x02, 0x41, 0xf7, 0xf6, 0x84, 0x4a, 0x4d, 0xa1, 0x1d, 0xcd, 0x19, 0xe9, 0xf1, 0x79, 0xba, 0xf8, + 0xe7, 0xe8, 0xf6, 0x8f, 0x84, 0x70, 0x7d, 0xbe, 0xef, 0x8b, 0x4e, 0xb3, 0x16, 0x89, 0x2f, 0xb9, + 0xa3, 0x3e, 0x63, 0x6d, 0x5e, 0x6c, 0x82, 0xe3, 0x83, 0x24, 0x26, 0x1b, 0xc6, 0xd1, 0x05, 0x1c, + 0x75, 0x34, 0x90, 0x86, 0x06, 0x49, 0x03, 0xd6, 0xe6, 0x96, 0x3d, 0x41, 0x03, 0x1f, 0xa3, 0x3b, + 0x99, 0x4a, 0x5d, 0x89, 0x88, 0xb9, 0xfc, 0x25, 0x37, 0x5d, 0xe2, 0x60, 0xb0, 0x95, 0xc4, 0xe4, + 0x41, 0x8e, 0x81, 0x34, 0x60, 0x18, 0x4a, 0xd3, 0x97, 0xc9, 0x52, 0xb8, 0x82, 0x96, 0x73, 0x8b, + 0xc5, 0x63, 0xed, 0x61, 0xe7, 0x17, 0xb1, 0x40, 0x6b, 0xe3, 0x85, 0x6a, 0xc7, 0x39, 0xe1, 0x66, + 0x04, 0x5c, 0x08, 0xf8, 0x61, 0x12, 0x93, 0x0f, 0xa6, 0x04, 0x6c, 0x00, 0x21, 0x1d, 0x88, 0xa9, + 0x82, 0xb8, 0x83, 0xd6, 0xc7, 0xeb, 0xf5, 0x4e, 0xe3, 0xc0, 0x8b, 0xb8, 0xa3, 0x44, 0xd4, 0x2d, + 0xb6, 0xc0, 0xf2, 0x71, 0x12, 0x93, 0x47, 0x53, 0x2c, 0x65, 0xa7, 0x41, 0x9b, 0x3d, 0x8e, 0x65, + 0x9f, 0x23, 0x6a, 0xfd, 0xed, 0x12, 0xda, 0xcc, 0x39, 0x65, 0xaa, 0x3c, 0x70, 0x5a, 0x6d, 0x16, + 0x9d, 0x7c, 0x1e, 0xea, 0x25, 0x20, 0xf1, 0x26, 0xba, 0x78, 0xd4, 0x0d, 0x79, 0x7a, 0xd0, 0x5c, + 0x4f, 0x62, 0xb2, 0x68, 0x42, 0xa8, 0x6e, 0xc8, 0x2d, 0x1b, 0x8a, 0xf8, 0xfb, 0xe8, 0xaa, 0xcd, + 0x7f, 0xd5, 0xe1, 0x52, 0x99, 0x09, 0x0c, 0x27, 0xcc, 0x5c, 0xf5, 0x4e, 0x12, 0x93, 0x65, 0x83, + 0x8e, 0x4c, 0x39, 0x5d, 0x00, 0x96, 0x3d, 0x8c, 0xc7, 0x3f, 0x46, 0x37, 0xf6, 0x45, 0x10, 0x70, + 0x47, 0x9b, 0xa6, 0x1a, 0x73, 0xa0, 0xb1, 0x96, 0xc4, 0xa4, 0x98, 0x2e, 0xa9, 0x3e, 0xa2, 0x2f, + 0x33, 0xc6, 0xc2, 0xdf, 0x45, 0x57, 0x4c, 0x87, 0x52, 0x95, 0x8b, 0xa0, 0x52, 0x4c, 0x62, 0x72, + 0x6b, 0x68, 0x61, 0xf6, 0x14, 0x86, 0xd0, 0xf8, 0x17, 0x68, 0x65, 0xa0, 0x98, 0xad, 0xc8, 0xe2, + 0xa5, 0x8d, 0xb9, 0xad, 0xb9, 0xec, 0xd4, 0xcf, 0xc4, 0x19, 0xd2, 0x94, 0xfa, 0xd0, 0xcb, 0x17, + 0xc1, 0x1e, 0x5a, 0xb5, 0x99, 0xe2, 0x87, 0x5e, 0xdb, 0x53, 0xe9, 0x08, 0xc8, 0x1a, 0x8f, 0xea, + 0xdc, 0x11, 0x41, 0x13, 0xb6, 0xf6, 0xb9, 0xea, 0xa3, 0x24, 0x26, 0x0f, 0xd3, 0x51, 0x63, 0x8a, + 0x53, 0x5f, 0x83, 0x69, 0x3a, 0x80, 0x52, 0xef, 0xa6, 0x54, 0x02, 0xde, 0xb2, 0xa7, 0x88, 0xe9, + 0xf3, 0xbe, 0xce, 0xda, 0x30, 0xe1, 0xf5, 0x6e, 0x3d, 0x9f, 0x3d, 0xef, 0x25, 0x6b, 0xc3, 0x22, + 0xb2, 0xec, 0x1e, 0x06, 0x7f, 0x0f, 0x5d, 0x79, 0xc9, 0xbb, 0x75, 0xef, 0x8c, 0x57, 0xbb, 0x8a, + 0x4b, 0xd8, 0x51, 0x87, 0xde, 0xa0, 0x5e, 0x73, 0xd2, 0x3b, 0xe3, 0xb4, 0xa1, 0xeb, 0x96, 0x3d, + 0x04, 0xc7, 0xfb, 0xe8, 0xda, 0x2b, 0xe6, 0x77, 0xf8, 0x40, 0x60, 0x01, 0x04, 0xee, 0x26, 0x31, + 0x59, 0x31, 0x02, 0xa7, 0xba, 0x3e, 0x24, 0x31, 0x42, 0xc1, 0x65, 0xb4, 0x50, 0x57, 0xcc, 0xe7, + 0x36, 0x67, 0x4d, 0xd8, 0xdc, 0xe6, 0xab, 0xcb, 0x49, 0x4c, 0x96, 0xd2, 0xd0, 0xba, 0x44, 0x23, + 0xce, 0x9a, 0x96, 0x3d, 0xc0, 0x59, 0xf1, 0x05, 0x74, 0x7f, 0xda, 0x44, 0xae, 0x2b, 0x1e, 0x4a, + 0xfc, 0x39, 0xc2, 0xfa, 0xc7, 0x5e, 0x5d, 0xb1, 0x48, 0x1d, 0x30, 0xc5, 0x1a, 0x4c, 0x9a, 0x49, + 0x3d, 0x5f, 0x25, 0x49, 0x4c, 0xee, 0xf6, 0x3c, 0x78, 0xb8, 0x47, 0xa5, 0x06, 0xd1, 0x66, 0x8a, + 0xb2, 0xec, 0x1c, 0x2a, 0xb6, 0xd1, 0x4d, 0xdd, 0x5a, 0xaa, 0xab, 0x88, 0x4b, 0xd9, 0x57, 0xbc, + 0x00, 0x8a, 0x1b, 0x49, 0x4c, 0xd6, 0x06, 0x8a, 0x25, 0x2a, 0x01, 0x95, 0x91, 0xcc, 0x23, 0xe3, + 0x43, 0xb4, 0xa4, 0x9b, 0xcb, 0x75, 0x25, 0xc2, 0xbe, 0xe2, 0x1c, 0x28, 0xae, 0x27, 0x31, 0x59, + 0x1d, 0x28, 0x96, 0xf5, 0xb2, 0x0f, 0x33, 0x7a, 0xe3, 0x44, 0xfc, 0x43, 0x74, 0x5d, 0x37, 0x56, + 0xbe, 0x08, 0x7d, 0xc1, 0x9a, 0x87, 0xc2, 0x95, 0xb0, 0x18, 0xe6, 0xb3, 0x4b, 0x4a, 0x6b, 0x55, + 0x68, 0x07, 0x10, 0xd4, 0x17, 0xae, 0xb4, 0xec, 0x51, 0x92, 0xf5, 0xaf, 0x25, 0x44, 0x72, 0x06, + 0xf8, 0xb9, 0xcb, 0x03, 0xb5, 0x2f, 0x02, 0x15, 0x09, 0xb8, 0x94, 0xf6, 0x7c, 0x5f, 0x1c, 0x8c, + 0x5f, 0x4a, 0x7b, 0x39, 0xa9, 0xd7, 0xb4, 0xec, 0x0c, 0x12, 0xff, 0x04, 0xdd, 0xec, 0x3d, 0x1d, + 0x70, 0xe9, 0x44, 0x1e, 0xec, 0x3a, 0xe9, 0x05, 0x35, 0xf3, 0x5e, 0xfa, 0x02, 0xcd, 0x01, 0xca, + 0xb2, 0xf3, 0xb8, 0xf8, 0x19, 0x5a, 0xec, 0x35, 0x1f, 0x31, 0x37, 0xbd, 0xac, 0xae, 0x24, 0x31, + 0xb9, 0x39, 0x22, 0xa5, 0x98, 0x6b, 0xd9, 0x59, 0xac, 0x5e, 0x32, 0x35, 0xce, 0xa3, 0x17, 0x35, + 0x3d, 0x52, 0x73, 0xc3, 0x57, 0xe4, 0x90, 0xf3, 0x88, 0x7a, 0xa1, 0xb4, 0xec, 0x1e, 0x06, 0xff, + 0x00, 0x5d, 0x4d, 0x7f, 0xd6, 0x55, 0xe4, 0x05, 0x6e, 0x7a, 0x43, 0x5c, 0x4d, 0x62, 0x72, 0x7b, + 0x98, 0xa4, 0xdf, 0xbf, 0x17, 0xb8, 0x96, 0x3d, 0x4c, 0xc0, 0x35, 0x84, 0x61, 0x18, 0x6b, 0x22, + 0x52, 0x47, 0x22, 0xdd, 0x34, 0xd2, 0x6d, 0x20, 0x33, 0x87, 0x98, 0xc6, 0xd0, 0x50, 0x44, 0x8a, + 0x2a, 0x41, 0xd3, 0x7d, 0xc7, 0xb2, 0x73, 0xb8, 0xb8, 0x8a, 0xae, 0x41, 0xeb, 0x27, 0x41, 0x33, + 0x14, 0x5e, 0xa0, 0x64, 0xf1, 0x32, 0xf4, 0x24, 0x13, 0xca, 0xa8, 0xf1, 0x1e, 0xc0, 0xb2, 0x47, + 0x18, 0xf8, 0x67, 0x68, 0xb9, 0x37, 0x2a, 0xc3, 0xc1, 0xcc, 0x9e, 0xb0, 0x99, 0xc4, 0x84, 0x8c, + 0x8c, 0xe5, 0x58, 0xb6, 0x7c, 0x05, 0xfc, 0x12, 0x2d, 0xf5, 0x0a, 0x83, 0x84, 0x0b, 0x90, 0xf0, + 0x5e, 0x12, 0x93, 0x3b, 0x23, 0xb2, 0x99, 0x90, 0xe3, 0x3c, 0xfc, 0x1a, 0xdd, 0x80, 0x8f, 0x27, + 0xf8, 0x6a, 0xa3, 0xf4, 0xb4, 0x44, 0xcb, 0x70, 0x41, 0x59, 0x2c, 0xad, 0x6d, 0x0f, 0x3e, 0xb0, + 0xb6, 0x47, 0x31, 0xd9, 0x3d, 0x65, 0xd0, 0x6a, 0xd9, 0x8b, 0x1a, 0xf8, 0x89, 0x72, 0x9a, 0xaf, + 0x4a, 0xe5, 0x31, 0xed, 0x32, 0xdd, 0x83, 0xbb, 0xc9, 0x34, 0xed, 0x32, 0xdd, 0xcb, 0xd1, 0x2e, + 0xd3, 0xbd, 0xac, 0x76, 0x79, 0x2f, 0x47, 0xbb, 0x04, 0x77, 0x92, 0xe9, 0xda, 0xa5, 0x5c, 0xed, + 0xd2, 0x90, 0x76, 0x09, 0xff, 0x14, 0x5d, 0xcf, 0xf2, 0x94, 0x17, 0xc2, 0x8d, 0x65, 0xb1, 0x74, + 0x77, 0x92, 0xb4, 0xf2, 0xc2, 0xea, 0xad, 0x24, 0x26, 0x37, 0xb2, 0xca, 0xca, 0x0b, 0x33, 0xc2, + 0x47, 0x5e, 0x88, 0x4f, 0xd1, 0x8a, 0x61, 0xf5, 0x3f, 0x83, 0x29, 0x8d, 0xca, 0xb4, 0x42, 0x9f, + 0x15, 0xdf, 0x14, 0xc0, 0x61, 0x73, 0xdc, 0x61, 0x0c, 0x9b, 0xdd, 0x7b, 0xc6, 0x8a, 0x96, 0xbd, + 0xa4, 0x69, 0xaf, 0x7b, 0xed, 0x76, 0xb9, 0xf2, 0x0c, 0xff, 0xb1, 0x80, 0xee, 0xe5, 0x89, 0x3d, + 0xa1, 0x25, 0xca, 0xfc, 0xb0, 0xc5, 0x8a, 0x7f, 0x37, 0xf6, 0x8f, 0xce, 0xb3, 0xef, 0x33, 0xaa, + 0x56, 0x12, 0x93, 0xf5, 0xbc, 0x10, 0x7d, 0x88, 0x65, 0xdf, 0x1e, 0x89, 0xf2, 0xa4, 0xf4, 0x5c, + 0x17, 0xf0, 0xef, 0x0b, 0x68, 0x2d, 0x5f, 0xbd, 0x4c, 0x1b, 0x5c, 0xb1, 0xe2, 0x3f, 0x4c, 0x9c, + 0xad, 0xf3, 0xe3, 0x18, 0x42, 0xf5, 0x7e, 0x12, 0x93, 0x7b, 0xf9, 0x69, 0x0c, 0xc2, 0xb2, 0x97, + 0x47, 0xc3, 0x94, 0xab, 0x5c, 0x31, 0xfc, 0x25, 0xba, 0x65, 0x94, 0xcd, 0x3f, 0x0f, 0x94, 0x9e, + 0xee, 0xd2, 0x8f, 0xe9, 0x93, 0xe2, 0x9f, 0x2f, 0x40, 0x84, 0x8d, 0xf1, 0x08, 0xc3, 0xc0, 0xec, + 0xf1, 0x3e, 0x5c, 0xb1, 0xec, 0x6b, 0x9a, 0xb0, 0x0f, 0x8d, 0xaf, 0x76, 0x3f, 0x7e, 0x92, 0xeb, + 0xf5, 0x94, 0xee, 0x16, 0xff, 0x32, 0x8b, 0xd7, 0x53, 0xba, 0x3b, 0xc1, 0xeb, 0x29, 0xdd, 0x1d, + 0xf1, 0x7a, 0xba, 0x3b, 0xc1, 0xab, 0x52, 0xfc, 0xeb, 0x6c, 0x5e, 0x95, 0x89, 0x5e, 0x95, 0x51, + 0xaf, 0x0a, 0xfe, 0x25, 0x5a, 0x4a, 0x25, 0xcc, 0xcc, 0x87, 0x77, 0xf8, 0xd5, 0x1c, 0x18, 0xdd, + 0xcb, 0x31, 0x1a, 0xa0, 0xb2, 0x07, 0x5c, 0xa6, 0xd9, 0xb2, 0xaf, 0x82, 0x85, 0x6e, 0x81, 0xb7, + 0xd4, 0x77, 0x38, 0xcb, 0x38, 0xfc, 0x7f, 0xa2, 0xc3, 0x59, 0xbe, 0xc3, 0xd9, 0x98, 0xc3, 0xeb, + 0xbe, 0xc3, 0x9f, 0x0a, 0x33, 0xdd, 0xe5, 0x8b, 0xff, 0xbd, 0x0c, 0xa6, 0x3b, 0x59, 0xd3, 0x19, + 0x78, 0xd9, 0x45, 0xdb, 0xe8, 0xd5, 0xa8, 0x30, 0x45, 0xcb, 0x9e, 0xe9, 0x33, 0xe2, 0xeb, 0xc2, + 0x0c, 0xb7, 0xb4, 0xe2, 0xff, 0x4c, 0xc0, 0xc7, 0xb3, 0x06, 0x04, 0x56, 0xf6, 0x6c, 0x1b, 0xc4, + 0xd3, 0x37, 0x1b, 0x69, 0xd9, 0xe7, 0x9b, 0x56, 0x6f, 0xbd, 0xf9, 0xcf, 0xfa, 0x7b, 0x6f, 0xde, + 0xae, 0x17, 0xfe, 0xf9, 0x76, 0xbd, 0xf0, 0xef, 0xb7, 0xeb, 0x85, 0xaf, 0xdf, 0xad, 0xbf, 0xd7, + 0x78, 0x1f, 0xfe, 0x8c, 0x2b, 0x7f, 0x13, 0x00, 0x00, 0xff, 0xff, 0x5e, 0xbd, 0x27, 0x38, 0x86, 0x14, 0x00, 0x00, } diff --git a/dbtesterpb/config_client_machine.proto b/dbtesterpb/config_client_machine.proto index 1f3b6cb2..19609736 100644 --- a/dbtesterpb/config_client_machine.proto +++ b/dbtesterpb/config_client_machine.proto @@ -84,7 +84,7 @@ message ConfigClientMachineAgentControl { flag__consul__v0_7_5 flag__consul__v0_7_5 = 300 [(gogoproto.moretags) = "yaml:\"consul__v0_7_5\""]; flag__consul__v0_8_0 flag__consul__v0_8_0 = 301 [(gogoproto.moretags) = "yaml:\"consul__v0_8_0\""]; - flag__consul__v0_8_3 flag__consul__v0_8_3 = 302 [(gogoproto.moretags) = "yaml:\"consul__v0_8_3\""]; + flag__consul__v0_8_4 flag__consul__v0_8_4 = 302 [(gogoproto.moretags) = "yaml:\"consul__v0_8_4\""]; flag__cetcd__beta flag__cetcd__beta = 400 [(gogoproto.moretags) = "yaml:\"cetcd__beta\""]; flag__zetcd__beta flag__zetcd__beta = 500 [(gogoproto.moretags) = "yaml:\"zetcd__beta\""]; diff --git a/dbtesterpb/database_id.pb.go b/dbtesterpb/database_id.pb.go index 6bf65ef7..87069e1e 100644 --- a/dbtesterpb/database_id.pb.go +++ b/dbtesterpb/database_id.pb.go @@ -28,7 +28,7 @@ const ( DatabaseID_zookeeper__r3_5_3_beta DatabaseID = 12 DatabaseID_consul__v0_7_5 DatabaseID = 20 DatabaseID_consul__v0_8_0 DatabaseID = 21 - DatabaseID_consul__v0_8_3 DatabaseID = 22 + DatabaseID_consul__v0_8_4 DatabaseID = 22 DatabaseID_zetcd__beta DatabaseID = 30 DatabaseID_cetcd__beta DatabaseID = 40 ) @@ -43,7 +43,7 @@ var DatabaseID_name = map[int32]string{ 12: "zookeeper__r3_5_3_beta", 20: "consul__v0_7_5", 21: "consul__v0_8_0", - 22: "consul__v0_8_3", + 22: "consul__v0_8_4", 30: "zetcd__beta", 40: "cetcd__beta", } @@ -57,7 +57,7 @@ var DatabaseID_value = map[string]int32{ "zookeeper__r3_5_3_beta": 12, "consul__v0_7_5": 20, "consul__v0_8_0": 21, - "consul__v0_8_3": 22, + "consul__v0_8_4": 22, "zetcd__beta": 30, "cetcd__beta": 40, } @@ -74,22 +74,22 @@ func init() { func init() { proto.RegisterFile("dbtesterpb/database_id.proto", fileDescriptorDatabaseId) } var fileDescriptorDatabaseId = []byte{ - // 261 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xc1, 0x4a, 0x03, 0x31, - 0x10, 0x86, 0x37, 0x0a, 0x82, 0x53, 0xad, 0x63, 0x68, 0x2b, 0x54, 0xc9, 0x59, 0x04, 0xbb, 0x75, - 0x63, 0x51, 0xaf, 0xd2, 0x8b, 0x4f, 0x31, 0x24, 0xbb, 0x71, 0xbb, 0x58, 0x4d, 0xd8, 0xcd, 0xf6, - 0xd0, 0x27, 0xf1, 0x91, 0x7a, 0xf4, 0x11, 0x74, 0x7d, 0x0a, 0x6f, 0x62, 0x56, 0xb0, 0xad, 0xb7, - 0x7c, 0xdf, 0x9f, 0xf9, 0x19, 0x06, 0xce, 0x32, 0xed, 0x4d, 0xe5, 0x4d, 0xe9, 0x74, 0x9c, 0x29, - 0xaf, 0xb4, 0xaa, 0x0c, 0x15, 0xd9, 0xc8, 0x95, 0xd6, 0x5b, 0x0e, 0x7f, 0xe9, 0xf0, 0x32, 0x2f, - 0xfc, 0xac, 0xd6, 0xa3, 0xd4, 0x3e, 0xc7, 0xb9, 0xcd, 0x6d, 0x1c, 0xbe, 0xe8, 0xfa, 0x31, 0x50, - 0x80, 0xf0, 0x6a, 0x47, 0x2f, 0xbe, 0x18, 0xc0, 0xf4, 0xb7, 0xf0, 0x61, 0xca, 0xbb, 0x00, 0xc6, - 0xa7, 0x19, 0xd1, 0x22, 0x21, 0x89, 0xd1, 0x1a, 0x4b, 0xba, 0x42, 0xb6, 0xc1, 0x09, 0xee, 0xf0, - 0x43, 0xd8, 0x6f, 0xd9, 0x17, 0x0e, 0x77, 0x79, 0x1f, 0x8e, 0x97, 0xd6, 0x3e, 0x19, 0xe3, 0x4c, - 0x49, 0x54, 0x4a, 0xba, 0xa6, 0x3b, 0x04, 0x7e, 0x0a, 0x27, 0x9b, 0x7a, 0x42, 0x09, 0xa9, 0xb9, - 0x9b, 0x29, 0xec, 0xf0, 0x21, 0x0c, 0xb6, 0x43, 0x49, 0xda, 0x78, 0x85, 0x07, 0x9c, 0x43, 0x37, - 0xb5, 0x2f, 0x55, 0x3d, 0x27, 0x5a, 0x8c, 0xe9, 0x86, 0x26, 0xd8, 0xdb, 0x72, 0xb7, 0x34, 0xc6, - 0xfe, 0x3f, 0x27, 0x71, 0xc0, 0x8f, 0xa0, 0xb3, 0x6c, 0x77, 0x0b, 0x65, 0xe2, 0x47, 0xa4, 0x6b, - 0xe2, 0xfc, 0xbe, 0xb7, 0xfa, 0x10, 0xd1, 0xaa, 0x11, 0xec, 0xad, 0x11, 0xec, 0xbd, 0x11, 0xec, - 0xf5, 0x53, 0x44, 0x7a, 0x2f, 0x1c, 0x46, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xf2, 0x67, - 0x53, 0x73, 0x01, 0x00, 0x00, + // 263 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x41, 0x4e, 0xeb, 0x30, + 0x10, 0x86, 0xe3, 0xf7, 0x24, 0x24, 0xa6, 0x50, 0x06, 0xab, 0x2d, 0x52, 0x41, 0x5e, 0x23, 0x24, + 0x9a, 0x12, 0xb7, 0x02, 0xb6, 0xa8, 0x1b, 0x4e, 0x31, 0xb2, 0x13, 0x93, 0x46, 0x14, 0x6c, 0x25, + 0x4e, 0x17, 0x3d, 0x09, 0x47, 0xea, 0x92, 0x23, 0x40, 0x38, 0x05, 0x3b, 0x84, 0x83, 0x44, 0x5b, + 0x76, 0xfe, 0xbe, 0xdf, 0xf3, 0x6b, 0x34, 0x70, 0x96, 0x69, 0x6f, 0x2a, 0x6f, 0x4a, 0xa7, 0xe3, + 0x4c, 0x79, 0xa5, 0x55, 0x65, 0xa8, 0xc8, 0x46, 0xae, 0xb4, 0xde, 0x72, 0xf8, 0x4d, 0x87, 0x97, + 0x79, 0xe1, 0xe7, 0xb5, 0x1e, 0xa5, 0xf6, 0x29, 0xce, 0x6d, 0x6e, 0xe3, 0xf0, 0x45, 0xd7, 0x0f, + 0x81, 0x02, 0x84, 0x57, 0x3b, 0x7a, 0xf1, 0xc9, 0x00, 0x66, 0x3f, 0x85, 0xf7, 0x33, 0xde, 0x05, + 0x30, 0x3e, 0xcd, 0x88, 0x96, 0x09, 0x49, 0x8c, 0x36, 0x58, 0xd2, 0x15, 0xb2, 0x2d, 0x4e, 0xf0, + 0x1f, 0x3f, 0x84, 0xfd, 0x96, 0x7d, 0xe1, 0xf0, 0x3f, 0xef, 0xc3, 0xf1, 0xca, 0xda, 0x47, 0x63, + 0x9c, 0x29, 0x89, 0x4a, 0x49, 0x13, 0xba, 0x45, 0xe0, 0xa7, 0x70, 0xb2, 0xad, 0xa7, 0x94, 0x90, + 0x5a, 0xb8, 0xb9, 0xc2, 0x0e, 0x1f, 0xc2, 0x60, 0x37, 0x94, 0xa4, 0x8d, 0x57, 0x78, 0xc0, 0x39, + 0x74, 0x53, 0xfb, 0x5c, 0xd5, 0x0b, 0xa2, 0xe5, 0x98, 0xae, 0x69, 0x8a, 0xbd, 0x1d, 0x77, 0x43, + 0x63, 0xec, 0xff, 0x71, 0x13, 0x1c, 0xf0, 0x23, 0xe8, 0xac, 0xda, 0xdd, 0x42, 0x99, 0xf8, 0x16, + 0xe9, 0x86, 0x38, 0xbf, 0xeb, 0xad, 0xdf, 0x45, 0xb4, 0x6e, 0x04, 0x7b, 0x6d, 0x04, 0x7b, 0x6b, + 0x04, 0x7b, 0xf9, 0x10, 0x91, 0xde, 0x0b, 0x87, 0x91, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x27, + 0x43, 0x40, 0x47, 0x73, 0x01, 0x00, 0x00, } diff --git a/dbtesterpb/database_id.proto b/dbtesterpb/database_id.proto index 78800b1d..0377d451 100644 --- a/dbtesterpb/database_id.proto +++ b/dbtesterpb/database_id.proto @@ -23,7 +23,7 @@ enum DatabaseID { consul__v0_7_5 = 20; consul__v0_8_0 = 21; - consul__v0_8_3 = 22; + consul__v0_8_4 = 22; zetcd__beta = 30; cetcd__beta = 40; diff --git a/dbtesterpb/flag_consul.pb.go b/dbtesterpb/flag_consul.pb.go index 069fc799..c5e69db8 100644 --- a/dbtesterpb/flag_consul.pb.go +++ b/dbtesterpb/flag_consul.pb.go @@ -34,18 +34,18 @@ func (*Flag_Consul_V0_8_0) ProtoMessage() {} func (*Flag_Consul_V0_8_0) Descriptor() ([]byte, []int) { return fileDescriptorFlagConsul, []int{1} } // See https://github.com/hashicorp/consul for more. -type Flag_Consul_V0_8_3 struct { +type Flag_Consul_V0_8_4 struct { } -func (m *Flag_Consul_V0_8_3) Reset() { *m = Flag_Consul_V0_8_3{} } -func (m *Flag_Consul_V0_8_3) String() string { return proto.CompactTextString(m) } -func (*Flag_Consul_V0_8_3) ProtoMessage() {} -func (*Flag_Consul_V0_8_3) Descriptor() ([]byte, []int) { return fileDescriptorFlagConsul, []int{2} } +func (m *Flag_Consul_V0_8_4) Reset() { *m = Flag_Consul_V0_8_4{} } +func (m *Flag_Consul_V0_8_4) String() string { return proto.CompactTextString(m) } +func (*Flag_Consul_V0_8_4) ProtoMessage() {} +func (*Flag_Consul_V0_8_4) Descriptor() ([]byte, []int) { return fileDescriptorFlagConsul, []int{2} } func init() { proto.RegisterType((*Flag_Consul_V0_7_5)(nil), "dbtesterpb.flag__consul__v0_7_5") proto.RegisterType((*Flag_Consul_V0_8_0)(nil), "dbtesterpb.flag__consul__v0_8_0") - proto.RegisterType((*Flag_Consul_V0_8_3)(nil), "dbtesterpb.flag__consul__v0_8_3") + proto.RegisterType((*Flag_Consul_V0_8_4)(nil), "dbtesterpb.flag__consul__v0_8_4") } func (m *Flag_Consul_V0_7_5) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -83,7 +83,7 @@ func (m *Flag_Consul_V0_8_0) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *Flag_Consul_V0_8_3) Marshal() (dAtA []byte, err error) { +func (m *Flag_Consul_V0_8_4) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -93,7 +93,7 @@ func (m *Flag_Consul_V0_8_3) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Flag_Consul_V0_8_3) MarshalTo(dAtA []byte) (int, error) { +func (m *Flag_Consul_V0_8_4) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -140,7 +140,7 @@ func (m *Flag_Consul_V0_8_0) Size() (n int) { return n } -func (m *Flag_Consul_V0_8_3) Size() (n int) { +func (m *Flag_Consul_V0_8_4) Size() (n int) { var l int _ = l return n @@ -259,7 +259,7 @@ func (m *Flag_Consul_V0_8_0) Unmarshal(dAtA []byte) error { } return nil } -func (m *Flag_Consul_V0_8_3) Unmarshal(dAtA []byte) error { +func (m *Flag_Consul_V0_8_4) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -282,10 +282,10 @@ func (m *Flag_Consul_V0_8_3) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: flag__consul__v0_8_3: wiretype end group for non-group") + return fmt.Errorf("proto: flag__consul__v0_8_4: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: flag__consul__v0_8_3: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: flag__consul__v0_8_4: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -424,7 +424,7 @@ var fileDescriptorFlagConsul = []byte{ 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x95, 0x24, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xaa, 0x24, 0xc6, 0x25, 0x02, 0x36, 0x0f, 0x6a, 0x60, 0x7c, 0x7c, 0x99, 0x41, 0xbc, 0x79, 0xbc, 0x29, 0x56, 0x71, 0x8b, 0x78, 0x03, - 0x1c, 0xe2, 0xc6, 0x4e, 0x22, 0x27, 0x1e, 0xca, 0x31, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, + 0x1c, 0xe2, 0x26, 0x4e, 0x22, 0x27, 0x1e, 0xca, 0x31, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x33, 0x1e, 0xcb, 0x31, 0x24, 0xb1, 0x81, 0x2d, 0x31, 0x06, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x06, 0x4b, 0x2e, 0x7f, 0xbf, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0xff, 0xff, 0x31, 0xd1, 0x99, 0x57, 0xbf, 0x00, 0x00, 0x00, } diff --git a/dbtesterpb/flag_consul.proto b/dbtesterpb/flag_consul.proto index 3f3d1e0f..1cc99813 100644 --- a/dbtesterpb/flag_consul.proto +++ b/dbtesterpb/flag_consul.proto @@ -17,5 +17,5 @@ message flag__consul__v0_8_0 { } // See https://github.com/hashicorp/consul for more. -message flag__consul__v0_8_3 { +message flag__consul__v0_8_4 { } diff --git a/dbtesterpb/message.pb.go b/dbtesterpb/message.pb.go index 6236fbc0..02de5c16 100644 --- a/dbtesterpb/message.pb.go +++ b/dbtesterpb/message.pb.go @@ -65,7 +65,7 @@ type Request struct { Flag_Zookeeper_R3_5_3Beta *Flag_Zookeeper_R3_5_3Beta `protobuf:"bytes,202,opt,name=flag__zookeeper__r3_5_3_beta,json=flagZookeeperR353Beta" json:"flag__zookeeper__r3_5_3_beta,omitempty"` Flag_Consul_V0_7_5 *Flag_Consul_V0_7_5 `protobuf:"bytes,300,opt,name=flag__consul__v0_7_5,json=flagConsulV075" json:"flag__consul__v0_7_5,omitempty"` Flag_Consul_V0_8_0 *Flag_Consul_V0_8_0 `protobuf:"bytes,301,opt,name=flag__consul__v0_8_0,json=flagConsulV080" json:"flag__consul__v0_8_0,omitempty"` - Flag_Consul_V0_8_3 *Flag_Consul_V0_8_3 `protobuf:"bytes,302,opt,name=flag__consul__v0_8_3,json=flagConsulV083" json:"flag__consul__v0_8_3,omitempty"` + Flag_Consul_V0_8_4 *Flag_Consul_V0_8_4 `protobuf:"bytes,302,opt,name=flag__consul__v0_8_4,json=flagConsulV084" json:"flag__consul__v0_8_4,omitempty"` Flag_Cetcd_Beta *Flag_Cetcd_Beta `protobuf:"bytes,400,opt,name=flag__cetcd__beta,json=flagCetcdBeta" json:"flag__cetcd__beta,omitempty"` Flag_Zetcd_Beta *Flag_Zetcd_Beta `protobuf:"bytes,500,opt,name=flag__zetcd__beta,json=flagZetcdBeta" json:"flag__zetcd__beta,omitempty"` } @@ -340,13 +340,13 @@ func (m *Request) MarshalTo(dAtA []byte) (int, error) { } i += n10 } - if m.Flag_Consul_V0_8_3 != nil { + if m.Flag_Consul_V0_8_4 != nil { dAtA[i] = 0xf2 i++ dAtA[i] = 0x12 i++ - i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Consul_V0_8_3.Size())) - n11, err := m.Flag_Consul_V0_8_3.MarshalTo(dAtA[i:]) + i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Consul_V0_8_4.Size())) + n11, err := m.Flag_Consul_V0_8_4.MarshalTo(dAtA[i:]) if err != nil { return 0, err } @@ -505,8 +505,8 @@ func (m *Request) Size() (n int) { l = m.Flag_Consul_V0_8_0.Size() n += 2 + l + sovMessage(uint64(l)) } - if m.Flag_Consul_V0_8_3 != nil { - l = m.Flag_Consul_V0_8_3.Size() + if m.Flag_Consul_V0_8_4 != nil { + l = m.Flag_Consul_V0_8_4.Size() n += 2 + l + sovMessage(uint64(l)) } if m.Flag_Cetcd_Beta != nil { @@ -1060,7 +1060,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 302: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_3", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_4", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1084,10 +1084,10 @@ func (m *Request) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Flag_Consul_V0_8_3 == nil { - m.Flag_Consul_V0_8_3 = &Flag_Consul_V0_8_3{} + if m.Flag_Consul_V0_8_4 == nil { + m.Flag_Consul_V0_8_4 = &Flag_Consul_V0_8_4{} } - if err := m.Flag_Consul_V0_8_3.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Flag_Consul_V0_8_4.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1375,55 +1375,55 @@ var ( func init() { proto.RegisterFile("dbtesterpb/message.proto", fileDescriptorMessage) } var fileDescriptorMessage = []byte{ - // 786 bytes of a gzipped FileDescriptorProto + // 787 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0x5f, 0x4e, 0xeb, 0x46, - 0x14, 0xc6, 0x63, 0x72, 0xef, 0x25, 0x99, 0x28, 0xb7, 0x61, 0xf8, 0xd3, 0x51, 0x80, 0xd4, 0xa2, - 0x15, 0x4a, 0x91, 0x9a, 0x04, 0x9b, 0x14, 0x78, 0x84, 0xd0, 0x8a, 0x48, 0x6d, 0x41, 0x93, 0x80, - 0x2a, 0x5e, 0x46, 0x63, 0x67, 0x62, 0x2c, 0x12, 0xdb, 0x1d, 0x4f, 0x50, 0xcb, 0x2a, 0xfa, 0xd8, - 0x45, 0xb4, 0x5d, 0x07, 0xed, 0x53, 0x97, 0xd0, 0xd2, 0x2e, 0xa1, 0x0b, 0xa8, 0x3c, 0xce, 0x9f, - 0x49, 0xe2, 0x34, 0xbc, 0x71, 0xbe, 0xef, 0x3b, 0xbf, 0x23, 0x1f, 0x9c, 0x63, 0x80, 0x3a, 0x96, - 0x60, 0xa1, 0x60, 0x3c, 0xb0, 0xaa, 0x7d, 0x16, 0x86, 0xd4, 0x61, 0x95, 0x80, 0xfb, 0xc2, 0x87, - 0x60, 0xe2, 0x14, 0x3f, 0x73, 0x5c, 0x71, 0x3f, 0xb0, 0x2a, 0xb6, 0xdf, 0xaf, 0x3a, 0xbe, 0xe3, - 0x57, 0x65, 0xc4, 0x1a, 0x74, 0x65, 0x25, 0x0b, 0xf9, 0x57, 0xdc, 0x5a, 0xdc, 0x51, 0xa0, 0x1d, - 0x2a, 0xa8, 0x45, 0x43, 0x46, 0xdc, 0xce, 0xd0, 0x2d, 0x2a, 0x6e, 0xb7, 0x47, 0x1d, 0xc2, 0x84, - 0x3d, 0xf2, 0x3e, 0x9a, 0xf5, 0x9e, 0x7c, 0xff, 0x81, 0xb1, 0x80, 0xf1, 0x04, 0xb4, 0x0c, 0xd8, - 0xbe, 0x17, 0x0e, 0x7a, 0x43, 0x77, 0x7b, 0xae, 0x5d, 0x61, 0xcf, 0x99, 0xb6, 0x62, 0xee, 0x2b, - 0xa6, 0xed, 0x7b, 0x5d, 0xd7, 0x21, 0x76, 0xcf, 0x65, 0x9e, 0x20, 0x7d, 0x6a, 0xdf, 0xbb, 0xde, - 0x70, 0x2b, 0x7b, 0xff, 0x00, 0xb0, 0x8a, 0xd9, 0x77, 0x03, 0x16, 0x0a, 0x68, 0x82, 0xec, 0x55, - 0xc0, 0x38, 0x15, 0xae, 0xef, 0x21, 0x4d, 0xd7, 0xca, 0xef, 0x8d, 0xcd, 0xca, 0x84, 0x53, 0x19, - 0x9b, 0x78, 0x92, 0x83, 0x07, 0xa0, 0xd0, 0xe6, 0xae, 0xe3, 0x30, 0xfe, 0x95, 0xef, 0xdc, 0x04, - 0x3d, 0x9f, 0x76, 0xd0, 0x8a, 0xae, 0x95, 0x33, 0x78, 0x4e, 0x87, 0x9f, 0x03, 0x70, 0x31, 0x5c, - 0x5f, 0xf3, 0x02, 0xa5, 0xe5, 0x84, 0x2d, 0x75, 0xc2, 0xc4, 0xc5, 0x4a, 0x12, 0xea, 0x20, 0x37, - 0xaa, 0xda, 0xd4, 0x41, 0x6f, 0x74, 0xad, 0x9c, 0xc5, 0xaa, 0x04, 0x3f, 0x01, 0xf9, 0x6b, 0xc6, - 0x78, 0xf3, 0x3a, 0x6c, 0x09, 0xee, 0x7a, 0x0e, 0x7a, 0x2b, 0x33, 0xd3, 0x22, 0x44, 0x60, 0xb5, - 0x79, 0xdd, 0xf4, 0x3a, 0xec, 0x7b, 0xf4, 0x4e, 0xd7, 0xca, 0x79, 0x3c, 0x2a, 0x61, 0x0d, 0xac, - 0x37, 0x06, 0x9c, 0x33, 0x4f, 0x34, 0xe4, 0x96, 0xbe, 0x19, 0xf4, 0x2d, 0xc6, 0xd1, 0xaa, 0xae, - 0x95, 0xd3, 0x38, 0xc9, 0x82, 0x5d, 0x50, 0x6c, 0xc8, 0xbd, 0xc6, 0xea, 0xd7, 0xf1, 0x56, 0x9b, - 0x9e, 0x2b, 0x5c, 0xda, 0x43, 0x19, 0x5d, 0x2b, 0xe7, 0x8c, 0x7d, 0xf5, 0xd9, 0x16, 0xa7, 0xf1, - 0xff, 0x90, 0x60, 0x03, 0x14, 0xe4, 0x3f, 0x57, 0xbe, 0x55, 0x84, 0x3c, 0x1a, 0xc4, 0x44, 0x1d, - 0x49, 0xdf, 0x51, 0xe9, 0xb3, 0x19, 0x9c, 0x8b, 0x94, 0x2f, 0x84, 0xdd, 0xb9, 0x35, 0xcc, 0x39, - 0x88, 0x49, 0x0e, 0x11, 0x5b, 0x02, 0x31, 0xc9, 0xa1, 0x02, 0x31, 0x0f, 0x13, 0x20, 0x06, 0xea, - 0x2e, 0x85, 0x18, 0x2a, 0xc4, 0x80, 0x67, 0xe0, 0x03, 0x35, 0x20, 0xdc, 0x00, 0x39, 0x92, 0xb1, - 0xbd, 0x88, 0x21, 0xdc, 0x60, 0x82, 0x68, 0xbb, 0x01, 0xfc, 0x16, 0x7c, 0x18, 0xfb, 0xe3, 0xdf, - 0x12, 0x21, 0xdc, 0x24, 0x47, 0xe4, 0x14, 0x3d, 0x6b, 0x92, 0xf5, 0xf1, 0x3c, 0x6b, 0x2e, 0x8b, - 0xd7, 0x22, 0xe3, 0x6e, 0x24, 0x63, 0xf3, 0xe8, 0x14, 0xba, 0x60, 0x37, 0x29, 0x5d, 0x27, 0x06, - 0xa1, 0xbd, 0xe0, 0x9e, 0xa2, 0xdf, 0x62, 0xfe, 0xa7, 0xcb, 0xf8, 0xe3, 0x0e, 0xbc, 0x35, 0x33, - 0xa5, 0x6e, 0x9c, 0x45, 0x3a, 0xec, 0x82, 0x9d, 0xe4, 0x46, 0x93, 0x58, 0x4c, 0x50, 0xf4, 0x7b, - 0x3c, 0xa9, 0xbc, 0x7c, 0x52, 0xdc, 0x80, 0x37, 0x67, 0x07, 0x99, 0xe7, 0x4c, 0x50, 0x78, 0x05, - 0x36, 0xe2, 0xb6, 0xf8, 0xae, 0x10, 0xf2, 0x58, 0x23, 0xc7, 0xa4, 0x8e, 0x7e, 0x5e, 0x91, 0x7c, - 0x7d, 0x9e, 0x3f, 0x1d, 0xc4, 0xef, 0x23, 0xb5, 0x21, 0xb5, 0xdb, 0xda, 0x71, 0x3d, 0x11, 0x78, - 0x42, 0x6a, 0xe8, 0x97, 0xd7, 0x00, 0x4f, 0x48, 0x6d, 0x1a, 0x78, 0x52, 0x5b, 0x00, 0x34, 0xd1, - 0xaf, 0xaf, 0x03, 0x9a, 0x33, 0x40, 0x13, 0x5e, 0x82, 0xb5, 0x61, 0x2e, 0x7e, 0x81, 0xe4, 0x3e, - 0x7f, 0x4c, 0x4b, 0xda, 0x6e, 0x02, 0x6d, 0x92, 0xc2, 0x79, 0x89, 0x8a, 0x04, 0xb9, 0xbc, 0x31, - 0xe9, 0x49, 0x21, 0xfd, 0xbb, 0x90, 0xf4, 0x34, 0x4b, 0xba, 0x1b, 0x91, 0xf6, 0x6e, 0x41, 0x06, - 0xb3, 0x30, 0xf0, 0xbd, 0x90, 0x45, 0x57, 0xa8, 0x35, 0xb0, 0x6d, 0x16, 0x86, 0xf2, 0xc8, 0x66, - 0xf0, 0xa8, 0x8c, 0xae, 0xd0, 0x85, 0x1b, 0x3e, 0xb4, 0x02, 0x6a, 0xb3, 0x9b, 0xe8, 0xd3, 0x75, - 0xfe, 0x83, 0x60, 0xa1, 0x3c, 0xa7, 0x69, 0x9c, 0x64, 0x1d, 0x54, 0x95, 0x93, 0x0d, 0xb3, 0xe0, - 0x6d, 0x4b, 0x50, 0x2e, 0x0a, 0x29, 0x98, 0x01, 0x6f, 0x5a, 0xc2, 0x0f, 0x0a, 0x1a, 0xcc, 0x83, - 0xec, 0x25, 0xa3, 0x5c, 0x58, 0x8c, 0x8a, 0xc2, 0x8a, 0xf1, 0x25, 0xc8, 0xb5, 0x39, 0xf5, 0xc2, - 0xc0, 0xe7, 0x82, 0x71, 0x78, 0x0c, 0x32, 0xb2, 0xec, 0x32, 0x0e, 0xd7, 0xd5, 0x27, 0x1a, 0x7e, - 0x13, 0x8a, 0x1b, 0xd3, 0x62, 0xfc, 0x08, 0x7b, 0xa9, 0xf3, 0x8d, 0xe7, 0xbf, 0x4a, 0xa9, 0xe7, - 0x97, 0x92, 0xf6, 0xc7, 0x4b, 0x49, 0xfb, 0xf3, 0xa5, 0xa4, 0xfd, 0xf4, 0x77, 0x29, 0x65, 0xbd, - 0x93, 0x1f, 0x15, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xdf, 0x47, 0xa0, 0x86, 0x07, - 0x00, 0x00, + 0x14, 0xc6, 0x63, 0x72, 0xef, 0x25, 0x99, 0x28, 0xb7, 0xb9, 0x73, 0x81, 0x8e, 0x02, 0xa4, 0x16, + 0xad, 0x50, 0x8a, 0xd4, 0x24, 0xd8, 0x49, 0x81, 0x47, 0x08, 0xad, 0x88, 0xd4, 0x16, 0x34, 0x09, + 0xa8, 0xe2, 0x65, 0x34, 0x76, 0x26, 0xc6, 0x22, 0xb1, 0xdd, 0xf1, 0x04, 0xb5, 0xac, 0xa2, 0x8f, + 0x5d, 0x44, 0xdb, 0x75, 0xd0, 0x3e, 0x75, 0x09, 0x2d, 0xed, 0x12, 0xba, 0x80, 0xca, 0xe3, 0xfc, + 0x99, 0x24, 0x4e, 0xc3, 0x1b, 0xe7, 0xfb, 0xbe, 0xf3, 0x3b, 0xf2, 0xc1, 0x39, 0x06, 0xa8, 0x6b, + 0x09, 0x16, 0x0a, 0xc6, 0x03, 0xab, 0x3a, 0x60, 0x61, 0x48, 0x1d, 0x56, 0x09, 0xb8, 0x2f, 0x7c, + 0x08, 0xa6, 0x4e, 0xf1, 0x33, 0xc7, 0x15, 0x77, 0x43, 0xab, 0x62, 0xfb, 0x83, 0xaa, 0xe3, 0x3b, + 0x7e, 0x55, 0x46, 0xac, 0x61, 0x4f, 0x56, 0xb2, 0x90, 0x7f, 0xc5, 0xad, 0xc5, 0x1d, 0x05, 0xda, + 0xa5, 0x82, 0x5a, 0x34, 0x64, 0xc4, 0xed, 0x8e, 0xdc, 0xa2, 0xe2, 0xf6, 0xfa, 0xd4, 0x21, 0x4c, + 0xd8, 0x63, 0xef, 0xa3, 0x79, 0xef, 0xd1, 0xf7, 0xef, 0x19, 0x0b, 0x18, 0x4f, 0x40, 0xcb, 0x80, + 0xed, 0x7b, 0xe1, 0xb0, 0x3f, 0x72, 0xb7, 0x17, 0xda, 0x15, 0xf6, 0x82, 0x69, 0x2b, 0xe6, 0xbe, + 0x62, 0xda, 0xbe, 0xd7, 0x73, 0x1d, 0x62, 0xf7, 0x5d, 0xe6, 0x09, 0x32, 0xa0, 0xf6, 0x9d, 0xeb, + 0x8d, 0xb6, 0xb2, 0xf7, 0x0f, 0x00, 0xeb, 0x98, 0x7d, 0x37, 0x64, 0xa1, 0x80, 0x26, 0xc8, 0x5e, + 0x06, 0x8c, 0x53, 0xe1, 0xfa, 0x1e, 0xd2, 0x74, 0xad, 0xfc, 0xd6, 0xd8, 0xac, 0x4c, 0x39, 0x95, + 0x89, 0x89, 0xa7, 0x39, 0x78, 0x00, 0x0a, 0x1d, 0xee, 0x3a, 0x0e, 0xe3, 0x5f, 0xf9, 0xce, 0x75, + 0xd0, 0xf7, 0x69, 0x17, 0xad, 0xe9, 0x5a, 0x39, 0x83, 0x17, 0x74, 0xf8, 0x39, 0x00, 0xe7, 0xa3, + 0xf5, 0xb5, 0xce, 0x51, 0x5a, 0x4e, 0xd8, 0x52, 0x27, 0x4c, 0x5d, 0xac, 0x24, 0xa1, 0x0e, 0x72, + 0xe3, 0xaa, 0x43, 0x1d, 0xf4, 0x4a, 0xd7, 0xca, 0x59, 0xac, 0x4a, 0xf0, 0x13, 0x90, 0xbf, 0x62, + 0x8c, 0xb7, 0xae, 0xc2, 0xb6, 0xe0, 0xae, 0xe7, 0xa0, 0xd7, 0x32, 0x33, 0x2b, 0x42, 0x04, 0xd6, + 0x5b, 0x57, 0x2d, 0xaf, 0xcb, 0xbe, 0x47, 0x6f, 0x74, 0xad, 0x9c, 0xc7, 0xe3, 0x12, 0xd6, 0xc0, + 0xfb, 0xe6, 0x90, 0x73, 0xe6, 0x89, 0xa6, 0xdc, 0xd2, 0x37, 0xc3, 0x81, 0xc5, 0x38, 0x5a, 0xd7, + 0xb5, 0x72, 0x1a, 0x27, 0x59, 0xb0, 0x07, 0x8a, 0x4d, 0xb9, 0xd7, 0x58, 0xfd, 0x3a, 0xde, 0x6a, + 0xcb, 0x73, 0x85, 0x4b, 0xfb, 0x28, 0xa3, 0x6b, 0xe5, 0x9c, 0xb1, 0xaf, 0x3e, 0xdb, 0xf2, 0x34, + 0xfe, 0x1f, 0x12, 0x6c, 0x82, 0x82, 0xfc, 0xe7, 0xca, 0xb7, 0x8a, 0x90, 0x07, 0x83, 0x98, 0xa8, + 0x2b, 0xe9, 0x3b, 0x2a, 0x7d, 0x3e, 0x83, 0x73, 0x91, 0xf2, 0x85, 0xb0, 0xbb, 0x37, 0x86, 0xb9, + 0x00, 0x31, 0xc9, 0x21, 0x62, 0x2b, 0x20, 0x26, 0x39, 0x54, 0x20, 0xe6, 0x61, 0x02, 0xc4, 0x40, + 0xbd, 0x95, 0x10, 0x43, 0x85, 0x18, 0xf0, 0x14, 0x7c, 0xa0, 0x06, 0x84, 0x1b, 0x20, 0x47, 0x32, + 0xb6, 0x97, 0x31, 0x84, 0x1b, 0x4c, 0x11, 0x1d, 0x37, 0x80, 0xdf, 0x82, 0x0f, 0x63, 0x7f, 0xf2, + 0x5b, 0x22, 0x84, 0x9b, 0xa4, 0x4e, 0x4e, 0xd0, 0x93, 0x26, 0x59, 0x1f, 0x2f, 0xb2, 0x16, 0xb2, + 0xf8, 0x5d, 0x64, 0xdc, 0x8e, 0x65, 0x6c, 0xd6, 0x4f, 0xa0, 0x0b, 0x76, 0x93, 0xd2, 0x0d, 0x62, + 0x10, 0xda, 0x0f, 0xee, 0x28, 0xfa, 0x2d, 0xe6, 0x7f, 0xba, 0x8a, 0x3f, 0xe9, 0xc0, 0x5b, 0x73, + 0x53, 0x1a, 0xc6, 0x69, 0xa4, 0xc3, 0x1e, 0xd8, 0x49, 0x6e, 0x34, 0x89, 0xc5, 0x04, 0x45, 0xbf, + 0xc7, 0x93, 0xca, 0xab, 0x27, 0xc5, 0x0d, 0x78, 0x73, 0x7e, 0x90, 0x79, 0xc6, 0x04, 0x85, 0x97, + 0x60, 0x23, 0x6e, 0x8b, 0xef, 0x0a, 0x21, 0x0f, 0x35, 0x72, 0x44, 0x1a, 0xe8, 0xe7, 0x35, 0xc9, + 0xd7, 0x17, 0xf9, 0xb3, 0x41, 0xfc, 0x36, 0x52, 0x9b, 0x52, 0xbb, 0xa9, 0x1d, 0x35, 0x12, 0x81, + 0xc7, 0xa4, 0x86, 0x7e, 0x79, 0x09, 0xf0, 0x98, 0xd4, 0x66, 0x81, 0xc7, 0xb5, 0x25, 0xc0, 0x3a, + 0xfa, 0xf5, 0x65, 0xc0, 0xfa, 0x1c, 0xb0, 0x0e, 0x2f, 0xc0, 0xbb, 0x51, 0x2e, 0x7e, 0x81, 0xe4, + 0x3e, 0x7f, 0x4c, 0x4b, 0xda, 0x6e, 0x02, 0x6d, 0x9a, 0xc2, 0x79, 0x89, 0x8a, 0x04, 0xb9, 0xbc, + 0x09, 0xe9, 0x51, 0x21, 0xfd, 0xbb, 0x94, 0xf4, 0x38, 0x4f, 0xba, 0x1d, 0x93, 0xf6, 0x6e, 0x40, + 0x06, 0xb3, 0x30, 0xf0, 0xbd, 0x90, 0x45, 0x57, 0xa8, 0x3d, 0xb4, 0x6d, 0x16, 0x86, 0xf2, 0xc8, + 0x66, 0xf0, 0xb8, 0x8c, 0xae, 0xd0, 0xb9, 0x1b, 0xde, 0xb7, 0x03, 0x6a, 0xb3, 0xeb, 0xe8, 0xd3, + 0x75, 0xf6, 0x83, 0x60, 0xa1, 0x3c, 0xa7, 0x69, 0x9c, 0x64, 0x1d, 0x54, 0x95, 0x93, 0x0d, 0xb3, + 0xe0, 0x75, 0x5b, 0x50, 0x2e, 0x0a, 0x29, 0x98, 0x01, 0xaf, 0xda, 0xc2, 0x0f, 0x0a, 0x1a, 0xcc, + 0x83, 0xec, 0x05, 0xa3, 0x5c, 0x58, 0x8c, 0x8a, 0xc2, 0x9a, 0xf1, 0x25, 0xc8, 0x75, 0x38, 0xf5, + 0xc2, 0xc0, 0xe7, 0x82, 0x71, 0x78, 0x04, 0x32, 0xb2, 0xec, 0x31, 0x0e, 0xdf, 0xab, 0x4f, 0x34, + 0xfa, 0x26, 0x14, 0x37, 0x66, 0xc5, 0xf8, 0x11, 0xf6, 0x52, 0x67, 0x1b, 0x4f, 0x7f, 0x95, 0x52, + 0x4f, 0xcf, 0x25, 0xed, 0x8f, 0xe7, 0x92, 0xf6, 0xe7, 0x73, 0x49, 0xfb, 0xe9, 0xef, 0x52, 0xca, + 0x7a, 0x23, 0x3f, 0x2a, 0xe6, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x57, 0x68, 0x8f, 0x9f, 0x86, + 0x07, 0x00, 0x00, } diff --git a/dbtesterpb/message.proto b/dbtesterpb/message.proto index 408d9538..fd2b2492 100644 --- a/dbtesterpb/message.proto +++ b/dbtesterpb/message.proto @@ -56,7 +56,7 @@ message Request { flag__consul__v0_7_5 flag__consul__v0_7_5 = 300; flag__consul__v0_8_0 flag__consul__v0_8_0 = 301; - flag__consul__v0_8_3 flag__consul__v0_8_3 = 302; + flag__consul__v0_8_4 flag__consul__v0_8_4 = 302; flag__cetcd__beta flag__cetcd__beta = 400; flag__zetcd__beta flag__zetcd__beta = 500; diff --git a/dbtesterpb/util.go b/dbtesterpb/util.go index c0d98922..811186cd 100644 --- a/dbtesterpb/util.go +++ b/dbtesterpb/util.go @@ -53,7 +53,7 @@ func GetRGBI(databaseID string, i int) color.Color { return color.RGBA{198, 53, 53, 255} // red case "consul__v0_8_0": return color.RGBA{212, 88, 102, 255} // red - case "consul__v0_8_3": + case "consul__v0_8_4": return color.RGBA{254, 25, 102, 255} // red case "zetcd__beta": return color.RGBA{251, 206, 0, 255} // yellow @@ -79,7 +79,7 @@ func GetRGBII(databaseID string, i int) color.Color { return color.RGBA{247, 156, 156, 255} // light-red case "consul__v0_8_0": return color.RGBA{238, 148, 178, 255} // light-red - case "consul__v0_8_3": + case "consul__v0_8_4": return color.RGBA{255, 202, 178, 255} // light-red case "zetcd__beta": return color.RGBA{245, 247, 166, 255} // light-yellow @@ -105,7 +105,7 @@ func GetRGBIII(databaseID string, i int) color.Color { return color.RGBA{212, 8, 46, 255} // deep-red case "consul__v0_8_0": return color.RGBA{251, 110, 84, 255} // deep-red - case "consul__v0_8_3": + case "consul__v0_8_4": return color.RGBA{245, 144, 84, 255} // deep-red case "zetcd__beta": return color.RGBA{229, 255, 0, 255} // deep-yellow diff --git a/stress.go b/stress.go index 67355f25..0d64b03d 100644 --- a/stress.go +++ b/stress.go @@ -180,7 +180,7 @@ func (cfg *Config) Stress(databaseID string) error { totalKeysFunc = getTotalKeysEtcdv3 case "zookeeper__r3_4_9", "zookeeper__r3_5_2_alpha", "zookeeper__r3_5_3_beta", "zetcd__beta": totalKeysFunc = getTotalKeysZk - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": totalKeysFunc = getTotalKeysConsul default: plog.Panicf("%q is unknown database ID", gcfg.DatabaseID) @@ -251,7 +251,7 @@ func (cfg *Config) Stress(databaseID string) error { os.Exit(1) } - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": plog.Infof("write started [request: PUT | key: %q | database: %q]", key, gcfg.DatabaseID) var err error for i := 0; i < 7; i++ { @@ -299,7 +299,7 @@ func (cfg *Config) Stress(databaseID string) error { _, err = conns[0].Create("/"+key, vals.bytes[0], zkCreateFlags, zkCreateACL) conns[0].Close() - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": clients := mustCreateConnsConsul(gcfg.DatabaseEndpoints, 1) _, err = clients[0].Put(&consulapi.KVPair{Key: key, Value: vals.bytes[0]}, nil) @@ -351,7 +351,7 @@ func newReadHandlers(gcfg dbtesterpb.ConfigClientMachineAgentControl) (rhs []Req conns[i].Close() } } - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": conns := mustCreateConnsConsul(gcfg.DatabaseEndpoints, gcfg.ConfigClientMachineBenchmarkOptions.ConnectionNumber) for i := range conns { rhs[i] = newGetConsul(conns[i]) @@ -420,7 +420,7 @@ func newWriteHandlers(gcfg dbtesterpb.ConfigClientMachineAgentControl) (rhs []Re conns[i].Close() } } - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": conns := mustCreateConnsConsul(gcfg.DatabaseEndpoints, gcfg.ConfigClientMachineBenchmarkOptions.ConnectionNumber) for i := range conns { rhs[i] = newPutConsul(conns[i]) @@ -466,7 +466,7 @@ func newReadOneshotHandlers(gcfg dbtesterpb.ConfigClientMachineAgentControl) []R return newGetZK(conns[0])(ctx, req) } } - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": for i := range rhs { rhs[i] = func(ctx context.Context, req *request) error { conns := mustCreateConnsConsul(gcfg.DatabaseEndpoints, 1) @@ -514,7 +514,7 @@ func generateReads(gcfg dbtesterpb.ConfigClientMachineAgentControl, key string, } inflightReqs <- request{zkOp: op} - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": op := consulOp{key: key} if gcfg.ConfigClientMachineBenchmarkOptions.StaleRead { op.staleRead = true @@ -561,7 +561,7 @@ func generateWrites(gcfg dbtesterpb.ConfigClientMachineAgentControl, startIdx in inflightReqs <- request{etcdv3Op: clientv3.OpPut(k, vs)} case "zookeeper__r3_4_9", "zookeeper__r3_5_2_alpha", "zookeeper__r3_5_3_beta", "zetcd__beta": inflightReqs <- request{zkOp: zkOp{key: "/" + k, value: v}} - case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_3", "cetcd__beta": + case "consul__v0_7_5", "consul__v0_8_0", "consul__v0_8_4", "cetcd__beta": inflightReqs <- request{consulOp: consulOp{key: k, value: v}} default: plog.Panicf("%q is unknown database ID", gcfg.DatabaseID)