diff --git a/agent/agent_consul.go b/agent/agent_consul.go index e1d2f1a3..0578af33 100644 --- a/agent/agent_consul.go +++ b/agent/agent_consul.go @@ -37,7 +37,7 @@ func startConsul(fs *flags, t *transporterServer) error { var flags []string switch t.req.DatabaseID { - case dbtesterpb.DatabaseID_consul__v0_8_4: + case dbtesterpb.DatabaseID_consul__v1_0_2: switch t.req.IPIndex { case 0: // leader flags = []string{ diff --git a/agent/server.go b/agent/server.go index ec65d713..2301e56c 100644 --- a/agent/server.go +++ b/agent/server.go @@ -111,7 +111,7 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques plog.Infof("Zookeeper data directory: %q", globalFlags.zkDataDir) plog.Infof("Zookeeper configuration path: %q", globalFlags.zkConfig) - case dbtesterpb.DatabaseID_consul__v0_8_4: + case dbtesterpb.DatabaseID_consul__v1_0_2: plog.Infof("Consul executable binary path: %q", globalFlags.consulExec) plog.Infof("Consul data directory: %q", globalFlags.consulDataDir) @@ -178,7 +178,7 @@ func (t *transporterServer) Transfer(ctx context.Context, req *dbtesterpb.Reques plog.Errorf("startZookeeper error %v", err) return nil, err } - case dbtesterpb.DatabaseID_consul__v0_8_4: + case dbtesterpb.DatabaseID_consul__v1_0_2: if err := startConsul(&globalFlags, t); err != nil { plog.Errorf("startConsul error %v", err) return nil, err @@ -289,7 +289,7 @@ func measureDatabasSize(flg flags, rdb dbtesterpb.DatabaseID) (int64, error) { return fileinspect.Size(flg.etcdDataDir) case dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta: return fileinspect.Size(flg.zkDataDir) - case dbtesterpb.DatabaseID_consul__v0_8_4: + case dbtesterpb.DatabaseID_consul__v1_0_2: return fileinspect.Size(flg.consulDataDir) default: return 0, fmt.Errorf("uknown %q", rdb) diff --git a/config_dbtester.go b/config_dbtester.go index 6eaa7023..999e5f69 100644 --- a/config_dbtester.go +++ b/config_dbtester.go @@ -223,14 +223,14 @@ func ReadConfig(fpath string, analyze bool) (*Config, error) { cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta.String()] = v } - if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_4.String()]; ok { + if v, ok := cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v1_0_2.String()]; ok { if v.AgentPortToConnect == 0 { v.AgentPortToConnect = defaultAgentPort } if v.DatabasePortToConnect == 0 { v.DatabasePortToConnect = defaultConsulClientPort } - cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v0_8_4.String()] = v + cfg.DatabaseIDToConfigClientMachineAgentControl[dbtesterpb.DatabaseID_consul__v1_0_2.String()] = v } // need etcd configs since it's backed by etcd @@ -339,7 +339,7 @@ func (cfg *Config) ToRequest(databaseID string, op dbtesterpb.Operation, idx int MaxClientConnections: gcfg.Flag_Zookeeper_R3_5_3Beta.MaxClientConnections, } - case dbtesterpb.DatabaseID_consul__v0_8_4: + case dbtesterpb.DatabaseID_consul__v1_0_2: 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 b2e0b58b..d0a475ff 100644 --- a/dbtesterpb/config_analyze_machine.pb.go +++ b/dbtesterpb/config_analyze_machine.pb.go @@ -26,7 +26,7 @@ ConfigClientMachineBenchmarkSteps ConfigClientMachineAgentControl Flag_Cetcd_Beta - Flag_Consul_V0_8_4 + Flag_Consul_V1_0_2 Flag_Etcd_Tip Flag_Etcd_V3_2 Flag_Etcd_V3_3 diff --git a/dbtesterpb/config_client_machine.pb.go b/dbtesterpb/config_client_machine.pb.go index 3c08b0a9..cd2cac89 100644 --- a/dbtesterpb/config_client_machine.pb.go +++ b/dbtesterpb/config_client_machine.pb.go @@ -92,7 +92,7 @@ type ConfigClientMachineAgentControl struct { Flag_Etcd_V3_2 *Flag_Etcd_V3_2 `protobuf:"bytes,101,opt,name=flag__etcd__v3_2,json=flagEtcdV32" json:"flag__etcd__v3_2,omitempty" yaml:"etcd__v3_2"` Flag_Etcd_V3_3 *Flag_Etcd_V3_3 `protobuf:"bytes,102,opt,name=flag__etcd__v3_3,json=flagEtcdV33" json:"flag__etcd__v3_3,omitempty" yaml:"etcd__v3_3"` Flag_Zookeeper_R3_5_3Beta *Flag_Zookeeper_R3_5_3Beta `protobuf:"bytes,200,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_8_4 *Flag_Consul_V0_8_4 `protobuf:"bytes,300,opt,name=flag__consul__v0_8_4,json=flagConsulV084" json:"flag__consul__v0_8_4,omitempty" yaml:"consul__v0_8_4"` + Flag_Consul_V1_0_2 *Flag_Consul_V1_0_2 `protobuf:"bytes,300,opt,name=flag__consul__v1_0_2,json=flagConsulV102" json:"flag__consul__v1_0_2,omitempty" yaml:"consul__v1_0_2"` 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"` @@ -522,13 +522,13 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { } i += n6 } - if m.Flag_Consul_V0_8_4 != nil { + if m.Flag_Consul_V1_0_2 != nil { dAtA[i] = 0xe2 i++ dAtA[i] = 0x12 i++ - i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Consul_V0_8_4.Size())) - n7, err := m.Flag_Consul_V0_8_4.MarshalTo(dAtA[i:]) + i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Consul_V1_0_2.Size())) + n7, err := m.Flag_Consul_V1_0_2.MarshalTo(dAtA[i:]) if err != nil { return 0, err } @@ -778,8 +778,8 @@ func (m *ConfigClientMachineAgentControl) Size() (n int) { l = m.Flag_Zookeeper_R3_5_3Beta.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) } - if m.Flag_Consul_V0_8_4 != nil { - l = m.Flag_Consul_V0_8_4.Size() + if m.Flag_Consul_V1_0_2 != nil { + l = m.Flag_Consul_V1_0_2.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) } if m.Flag_Cetcd_Beta != nil { @@ -2128,7 +2128,7 @@ func (m *ConfigClientMachineAgentControl) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 300: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_4", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V1_0_2", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2152,10 +2152,10 @@ func (m *ConfigClientMachineAgentControl) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Flag_Consul_V0_8_4 == nil { - m.Flag_Consul_V0_8_4 = &Flag_Consul_V0_8_4{} + if m.Flag_Consul_V1_0_2 == nil { + m.Flag_Consul_V1_0_2 = &Flag_Consul_V1_0_2{} } - if err := m.Flag_Consul_V0_8_4.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Flag_Consul_V1_0_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2422,111 +2422,111 @@ func init() { } var fileDescriptorConfigClientMachine = []byte{ - // 1685 bytes of a gzipped FileDescriptorProto + // 1684 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x4f, 0x73, 0xdb, 0xc6, 0x15, 0x0f, 0x4d, 0x3b, 0x96, 0x56, 0xfe, 0xbb, 0xb6, 0x6c, 0x5a, 0x96, 0xb5, 0x32, 0x6c, 0x37, - 0xca, 0xa4, 0x96, 0x1c, 0x51, 0xc9, 0xa4, 0x9d, 0x76, 0xda, 0x50, 0x4a, 0x5b, 0x8f, 0x95, 0x84, - 0x05, 0x15, 0x77, 0xea, 0xe9, 0x74, 0xbb, 0x04, 0x9f, 0x20, 0x44, 0x20, 0x16, 0xc5, 0x2e, 0x34, - 0xa5, 0x7a, 0xed, 0x4c, 0xa7, 0x3d, 0xe5, 0x98, 0x63, 0x7b, 0xef, 0xe7, 0xe8, 0xf8, 0xd8, 0x4f, - 0x80, 0x69, 0xed, 0x4b, 0x7b, 0xc5, 0xf4, 0x03, 0x64, 0xf6, 0x01, 0x24, 0x01, 0x12, 0xa2, 0x78, - 0x13, 0xf7, 0xfd, 0xfe, 0xed, 0x02, 0xfb, 0x76, 0x21, 0xf2, 0xbd, 0x5e, 0x57, 0x83, 0xd2, 0x10, - 0x85, 0xdd, 0x2d, 0x47, 0x06, 0x87, 0x9e, 0xcb, 0x1d, 0xdf, 0x83, 0x40, 0xf3, 0xbe, 0x70, 0x8e, - 0xbc, 0x00, 0x36, 0xc3, 0x48, 0x6a, 0x49, 0xc9, 0x18, 0xb7, 0xf2, 0xd4, 0xf5, 0xf4, 0x51, 0xdc, - 0xdd, 0x74, 0x64, 0x7f, 0xcb, 0x95, 0xae, 0xdc, 0x42, 0x48, 0x37, 0x3e, 0xc4, 0x5f, 0xf8, 0x03, - 0xff, 0xca, 0xa8, 0x2b, 0x2b, 0x05, 0x8b, 0x43, 0x5f, 0xb8, 0x1c, 0xb4, 0xd3, 0xcb, 0x6b, 0x6c, - 0xb2, 0x76, 0x2a, 0xe5, 0x31, 0x40, 0x08, 0x51, 0x0e, 0x58, 0x9d, 0x04, 0x38, 0x32, 0x50, 0xb1, - 0x9f, 0x57, 0xef, 0x4f, 0xd1, 0x0b, 0xda, 0x53, 0x45, 0x67, 0x5c, 0xb4, 0xde, 0x5e, 0x21, 0x2b, - 0xbb, 0x38, 0xdf, 0x5d, 0x9c, 0xee, 0xe7, 0xd9, 0x6c, 0x9f, 0x07, 0x9e, 0xf6, 0x84, 0x4f, 0x3f, - 0x26, 0xa4, 0x2d, 0xf4, 0x51, 0x3b, 0x82, 0x43, 0xef, 0x0f, 0x8d, 0xda, 0x7a, 0x6d, 0x63, 0xb1, - 0x75, 0x27, 0x4d, 0x18, 0x1d, 0x88, 0xbe, 0xff, 0x43, 0x2b, 0x14, 0xfa, 0x88, 0x87, 0x58, 0xb4, - 0xec, 0x02, 0x92, 0x3e, 0x25, 0x97, 0xf7, 0xa5, 0x6b, 0x06, 0x1a, 0x17, 0x90, 0x74, 0x2b, 0x4d, - 0xd8, 0xf5, 0x8c, 0xe4, 0x4b, 0x97, 0x1b, 0xa2, 0x65, 0x0f, 0x31, 0x94, 0x93, 0xbb, 0x99, 0x7d, - 0x67, 0xa0, 0x34, 0xf4, 0x3f, 0x07, 0x1d, 0x79, 0x8e, 0x42, 0x7a, 0x1d, 0xe9, 0x4f, 0xd2, 0x84, - 0x3d, 0xcc, 0xe8, 0xf9, 0x63, 0x51, 0x88, 0xe4, 0xfd, 0x0c, 0x9a, 0x0b, 0x9e, 0xa5, 0x42, 0xff, - 0x54, 0x23, 0x8f, 0x2a, 0x6a, 0xcf, 0x03, 0xb3, 0x2c, 0xd2, 0x17, 0x1a, 0x7a, 0xe8, 0x76, 0x11, - 0xdd, 0xb6, 0xd3, 0x84, 0x6d, 0xce, 0x72, 0xf3, 0x0a, 0xbc, 0xdc, 0x7a, 0x1e, 0x79, 0xfa, 0xd7, - 0x1a, 0x79, 0x92, 0xe1, 0xf6, 0x85, 0x86, 0xc0, 0x19, 0x1c, 0x1c, 0x45, 0x32, 0x76, 0x8f, 0xc2, - 0x58, 0x1f, 0x78, 0x7d, 0x50, 0x10, 0x79, 0x90, 0x4d, 0xfb, 0x12, 0x06, 0xd9, 0x49, 0x13, 0xf6, - 0xac, 0x14, 0xc4, 0xcf, 0x78, 0x5c, 0x8f, 0x88, 0x5c, 0x8f, 0x98, 0x79, 0x94, 0xf9, 0x2c, 0xe8, - 0x1f, 0xc9, 0x7a, 0x09, 0xb8, 0xe7, 0x29, 0x1d, 0x79, 0xdd, 0x58, 0x7b, 0x32, 0xf8, 0xd4, 0xf7, - 0x31, 0xc6, 0xbb, 0x18, 0x63, 0x2b, 0x4d, 0xd8, 0x07, 0x95, 0x31, 0x7a, 0x05, 0x0e, 0x17, 0xbe, - 0x9f, 0x27, 0x38, 0x57, 0x98, 0x7e, 0x53, 0x23, 0xef, 0x9d, 0x09, 0x6a, 0x43, 0xe4, 0x40, 0xa0, - 0x3d, 0x1f, 0x30, 0xc4, 0x65, 0x0c, 0xf1, 0x71, 0x9a, 0xb0, 0xed, 0xf3, 0x43, 0x84, 0x23, 0x6e, - 0x9e, 0x65, 0x5e, 0x1b, 0xfa, 0xe7, 0x1a, 0x79, 0x7c, 0x26, 0xb6, 0x13, 0xf7, 0xfb, 0x22, 0x1a, - 0x60, 0x9e, 0x05, 0xcc, 0xd3, 0x4c, 0x13, 0xb6, 0x75, 0x7e, 0x1e, 0x95, 0x11, 0xf3, 0x30, 0x73, - 0x19, 0xd0, 0x90, 0xac, 0x96, 0x70, 0xad, 0xc1, 0x0b, 0x18, 0x7c, 0x11, 0xf7, 0xbb, 0x10, 0x61, - 0x80, 0x45, 0x0c, 0xf0, 0xfd, 0x34, 0x61, 0x1b, 0x95, 0x01, 0xba, 0x03, 0x7e, 0x0c, 0x03, 0x1e, - 0x20, 0x23, 0x77, 0x9e, 0xa9, 0x48, 0x07, 0x84, 0x75, 0x20, 0x3a, 0x81, 0x68, 0xcf, 0x53, 0xc7, - 0x9d, 0x50, 0x38, 0xf0, 0x95, 0x12, 0x2e, 0x14, 0x67, 0x4d, 0x26, 0x5f, 0x05, 0x85, 0x04, 0x33, - 0xdb, 0x63, 0xae, 0x0c, 0x85, 0xc7, 0x86, 0x33, 0x31, 0xe3, 0xf3, 0x74, 0xe9, 0x6f, 0xc8, 0x9d, - 0x9f, 0x4b, 0xe9, 0xfa, 0xb0, 0xeb, 0xcb, 0xb8, 0xd7, 0x8e, 0xe4, 0xd7, 0xe0, 0xe8, 0x2f, 0x44, - 0x1f, 0x1a, 0x3d, 0x74, 0x7c, 0x9c, 0x26, 0x6c, 0x3d, 0x73, 0x74, 0x11, 0xc7, 0x1d, 0x03, 0xe4, - 0x61, 0x86, 0xe4, 0x81, 0xe8, 0x83, 0x65, 0x9f, 0xa1, 0x41, 0x0f, 0xc9, 0xbd, 0x42, 0xa5, 0xa3, - 0x65, 0x24, 0x5c, 0x78, 0x01, 0xd9, 0x94, 0x00, 0x0d, 0x36, 0xd2, 0x84, 0x3d, 0xae, 0x30, 0x50, - 0x19, 0x18, 0x97, 0x32, 0x9b, 0xcb, 0xd9, 0x52, 0x74, 0x87, 0x2c, 0x57, 0x16, 0x1b, 0x87, 0xc6, - 0xc3, 0xae, 0x2e, 0x52, 0x49, 0x56, 0xa7, 0x0b, 0xad, 0xd8, 0x39, 0x86, 0x6c, 0x05, 0x5c, 0x0c, - 0xf8, 0x41, 0x9a, 0xb0, 0xf7, 0x66, 0x04, 0xec, 0x22, 0x21, 0x5f, 0x88, 0x99, 0x82, 0x34, 0x26, - 0x6b, 0xd3, 0xf5, 0x4e, 0xdc, 0xdd, 0xf3, 0x22, 0x70, 0xb4, 0x8c, 0x06, 0x8d, 0x23, 0xb4, 0x7c, - 0x9a, 0x26, 0xec, 0xfd, 0x19, 0x96, 0x2a, 0xee, 0xf2, 0xde, 0x90, 0x63, 0xd9, 0xe7, 0x88, 0x5a, - 0xff, 0xbc, 0x44, 0x1e, 0x55, 0x9c, 0x32, 0x2d, 0x08, 0x9c, 0xa3, 0xbe, 0x88, 0x8e, 0xbf, 0x0c, - 0xcd, 0x16, 0x50, 0xf4, 0x11, 0xb9, 0x78, 0x30, 0x08, 0x21, 0x3f, 0x68, 0xae, 0xa7, 0x09, 0x5b, - 0xca, 0x42, 0xe8, 0x41, 0x08, 0x96, 0x8d, 0x45, 0xfa, 0x13, 0x72, 0xd5, 0x86, 0xdf, 0xc7, 0xa0, - 0x74, 0xf6, 0x02, 0xe3, 0x09, 0x53, 0x6f, 0xdd, 0x4b, 0x13, 0xb6, 0x9c, 0xa1, 0xa3, 0xac, 0x9c, - 0x6f, 0x00, 0xcb, 0x2e, 0xe3, 0xe9, 0x2f, 0xc8, 0x8d, 0x5d, 0x19, 0x04, 0xe0, 0x18, 0xd3, 0x5c, - 0xa3, 0x8e, 0x1a, 0xab, 0x69, 0xc2, 0x1a, 0xf9, 0x96, 0x1a, 0x21, 0x46, 0x32, 0x53, 0x2c, 0xfa, - 0x23, 0x72, 0x25, 0x9b, 0x50, 0xae, 0x72, 0x11, 0x55, 0x1a, 0x69, 0xc2, 0x6e, 0x97, 0x36, 0xe6, - 0x50, 0xa1, 0x84, 0xa6, 0xbf, 0x25, 0x77, 0xc7, 0x8a, 0xc5, 0x8a, 0x6a, 0x5c, 0x5a, 0xaf, 0x6f, - 0xd4, 0x8b, 0xaf, 0x7e, 0x21, 0x4e, 0x49, 0x53, 0x99, 0x43, 0xaf, 0x5a, 0x84, 0x7a, 0x64, 0xc5, - 0x16, 0x1a, 0xf6, 0xbd, 0xbe, 0xa7, 0xf3, 0x15, 0x50, 0x6d, 0x88, 0x3a, 0xe0, 0xc8, 0xa0, 0x87, - 0xad, 0xbd, 0xde, 0x7a, 0x3f, 0x4d, 0xd8, 0x93, 0x7c, 0xd5, 0x84, 0x06, 0xee, 0x1b, 0x30, 0xcf, - 0x17, 0x50, 0x99, 0x6e, 0xca, 0x15, 0xe2, 0x2d, 0x7b, 0x86, 0x98, 0x39, 0xef, 0x3b, 0xa2, 0x8f, - 0x2f, 0xbc, 0xe9, 0xd6, 0x0b, 0xc5, 0xf3, 0x5e, 0x89, 0x3e, 0x6e, 0x22, 0xcb, 0x1e, 0x62, 0xe8, - 0x8f, 0xc9, 0x95, 0x17, 0x30, 0xe8, 0x78, 0xa7, 0xd0, 0x1a, 0x68, 0x50, 0xd8, 0x51, 0x4b, 0x4f, - 0xd0, 0xec, 0x39, 0xe5, 0x9d, 0x02, 0xef, 0x9a, 0xba, 0x65, 0x97, 0xe0, 0x74, 0x97, 0x5c, 0x7b, - 0x29, 0xfc, 0x18, 0xc6, 0x02, 0x8b, 0x28, 0x70, 0x3f, 0x4d, 0xd8, 0xdd, 0x4c, 0xe0, 0xc4, 0xd4, - 0x4b, 0x12, 0x13, 0x14, 0xda, 0x24, 0x8b, 0x1d, 0x2d, 0x7c, 0xb0, 0x41, 0xf4, 0xb0, 0xb9, 0x2d, - 0xb4, 0x96, 0xd3, 0x84, 0xdd, 0xcc, 0x43, 0x9b, 0x12, 0x8f, 0x40, 0xf4, 0x2c, 0x7b, 0x8c, 0xb3, - 0x92, 0x0b, 0xe4, 0xe1, 0xac, 0x17, 0xb9, 0xa3, 0x21, 0x54, 0xf4, 0x4b, 0x42, 0xcd, 0x1f, 0x1f, - 0x76, 0xb4, 0x88, 0xf4, 0x9e, 0xd0, 0xa2, 0x2b, 0x54, 0xf6, 0x52, 0x2f, 0xb4, 0x58, 0x9a, 0xb0, - 0xfb, 0x43, 0x0f, 0x08, 0x3f, 0xe4, 0xca, 0x80, 0x78, 0x2f, 0x47, 0x59, 0x76, 0x05, 0x95, 0xda, - 0xe4, 0x96, 0x19, 0xdd, 0xee, 0xe8, 0x08, 0x94, 0x1a, 0x29, 0x5e, 0x40, 0xc5, 0xf5, 0x34, 0x61, - 0xab, 0x63, 0xc5, 0x6d, 0xae, 0x10, 0x55, 0x90, 0xac, 0x22, 0xd3, 0x7d, 0x72, 0xd3, 0x0c, 0x37, - 0x3b, 0x5a, 0x86, 0x23, 0xc5, 0x3a, 0x2a, 0xae, 0xa5, 0x09, 0x5b, 0x19, 0x2b, 0x36, 0xcd, 0xb6, - 0x0f, 0x0b, 0x7a, 0xd3, 0x44, 0xfa, 0x33, 0x72, 0xdd, 0x0c, 0xee, 0x7c, 0x15, 0xfa, 0x52, 0xf4, - 0xf6, 0xa5, 0xab, 0x70, 0x33, 0x2c, 0x14, 0xb7, 0x94, 0xd1, 0xda, 0xe1, 0x31, 0x22, 0xb8, 0x2f, - 0x5d, 0x65, 0xd9, 0x93, 0x24, 0xeb, 0xef, 0x57, 0x09, 0xab, 0x58, 0xe0, 0x4f, 0x5d, 0x08, 0xf4, - 0xae, 0x0c, 0x74, 0x24, 0xf1, 0x52, 0x3a, 0xf4, 0x7d, 0xbe, 0x37, 0x7d, 0x29, 0x1d, 0xe6, 0xe4, - 0x5e, 0xcf, 0xb2, 0x0b, 0x48, 0xfa, 0x4b, 0x72, 0x6b, 0xf8, 0x6b, 0x0f, 0x94, 0x13, 0x79, 0xd8, - 0x75, 0xf2, 0x0b, 0x6a, 0xe1, 0xb9, 0x8c, 0x04, 0x7a, 0x63, 0x94, 0x65, 0x57, 0x71, 0xe9, 0x0f, - 0xc8, 0xd2, 0x70, 0xf8, 0x40, 0xb8, 0xf9, 0x65, 0xf5, 0x6e, 0x9a, 0xb0, 0x5b, 0x13, 0x52, 0x5a, - 0xb8, 0x96, 0x5d, 0xc4, 0x9a, 0x2d, 0xd3, 0x06, 0x88, 0x9e, 0xb7, 0xcd, 0x4a, 0xd5, 0xcb, 0x57, - 0xe4, 0x10, 0x20, 0xe2, 0x5e, 0xa8, 0x2c, 0x7b, 0x88, 0xa1, 0x3f, 0x25, 0x57, 0xf3, 0x3f, 0x3b, - 0x3a, 0xf2, 0x02, 0x37, 0xbf, 0x21, 0xae, 0xa4, 0x09, 0xbb, 0x53, 0x26, 0x99, 0xe7, 0xef, 0x05, - 0xae, 0x65, 0x97, 0x09, 0xb4, 0x4d, 0x28, 0x2e, 0x63, 0x5b, 0x46, 0xfa, 0x40, 0xe6, 0x4d, 0x23, - 0x6f, 0x03, 0x85, 0x77, 0x48, 0x18, 0x0c, 0x0f, 0x65, 0xa4, 0xb9, 0x96, 0x3c, 0xef, 0x3b, 0x96, - 0x5d, 0xc1, 0xa5, 0x2d, 0x72, 0x0d, 0x47, 0x3f, 0x0b, 0x7a, 0xa1, 0xf4, 0x02, 0xad, 0x1a, 0x97, - 0x71, 0x26, 0x85, 0x50, 0x99, 0x1a, 0x0c, 0x01, 0x96, 0x3d, 0xc1, 0xa0, 0xbf, 0x26, 0xcb, 0xc3, - 0x55, 0x29, 0x07, 0xcb, 0x7a, 0xc2, 0xa3, 0x34, 0x61, 0x6c, 0x62, 0x2d, 0xa7, 0xb2, 0x55, 0x2b, - 0xd0, 0x17, 0xe4, 0xe6, 0xb0, 0x30, 0x4e, 0xb8, 0x88, 0x09, 0x1f, 0xa4, 0x09, 0xbb, 0x37, 0x21, - 0x5b, 0x08, 0x39, 0xcd, 0xa3, 0xbf, 0x22, 0xd7, 0xf1, 0xe3, 0x09, 0xbf, 0xda, 0x38, 0xd7, 0x5e, - 0x88, 0xf7, 0x93, 0xa5, 0xed, 0xfb, 0x9b, 0xe3, 0xef, 0xab, 0xcd, 0x09, 0x48, 0xeb, 0x76, 0x9a, - 0xb0, 0x1b, 0x99, 0xcf, 0x68, 0xd0, 0xb2, 0x97, 0x0c, 0xec, 0x33, 0xed, 0xf4, 0x0e, 0xbc, 0x90, - 0xbe, 0x22, 0x37, 0x8a, 0xac, 0x93, 0x26, 0xdf, 0xc6, 0x8b, 0xc9, 0xd2, 0xf6, 0xea, 0x59, 0xca, - 0x06, 0x53, 0x6c, 0x56, 0xe3, 0xd1, 0x82, 0xf6, 0xcb, 0xe6, 0x76, 0x85, 0x76, 0x13, 0x2f, 0x24, - 0xb3, 0xb5, 0x9b, 0x95, 0xda, 0xcd, 0x92, 0x76, 0x93, 0xfe, 0xa5, 0x46, 0x56, 0x33, 0xe2, 0xe8, - 0x5b, 0x95, 0xf3, 0xa8, 0xc9, 0x3f, 0xe2, 0x4d, 0xde, 0x05, 0x2d, 0x1a, 0xaf, 0x6b, 0xe8, 0xb4, - 0x31, 0xed, 0x54, 0x4d, 0x68, 0x3d, 0x4c, 0x13, 0xf6, 0x20, 0x73, 0xad, 0x46, 0x58, 0xf6, 0xb2, - 0x11, 0x78, 0x35, 0x2c, 0xda, 0xcd, 0x8f, 0x9a, 0x2d, 0xd0, 0x82, 0x7e, 0x4d, 0x6e, 0x67, 0xca, - 0xd9, 0x57, 0x31, 0xe7, 0x27, 0xcf, 0xf8, 0x27, 0x7c, 0xa7, 0xf1, 0x8f, 0x0b, 0x18, 0x61, 0x7d, - 0x3a, 0x42, 0x19, 0x58, 0x3c, 0x7a, 0xca, 0x15, 0xcb, 0xbe, 0x66, 0x08, 0xbb, 0x38, 0xf8, 0xf2, - 0xd9, 0x27, 0x3b, 0xf4, 0x77, 0xe4, 0x66, 0x2e, 0x91, 0x2d, 0x0d, 0xce, 0xf5, 0x9b, 0x3a, 0x1a, - 0x3d, 0xa8, 0x30, 0x1a, 0xa3, 0x8a, 0x4d, 0xaa, 0x30, 0x6c, 0xd9, 0x57, 0xd1, 0xc2, 0x8c, 0xe0, - 0x6c, 0x46, 0x0e, 0xa7, 0x05, 0x87, 0xff, 0x9f, 0xe9, 0x70, 0x5a, 0xed, 0x70, 0x3a, 0xe5, 0xf0, - 0x6a, 0xe4, 0xf0, 0xb7, 0xda, 0x5c, 0xf7, 0xb1, 0xc6, 0x7f, 0x2f, 0xa3, 0xe9, 0x56, 0xd1, 0x74, - 0x0e, 0x5e, 0xb1, 0xe9, 0x77, 0x87, 0x35, 0x2e, 0xb3, 0xa2, 0xf9, 0x54, 0x9e, 0xe3, 0x2a, 0xf8, - 0x6d, 0x6d, 0x8e, 0x93, 0xb6, 0xf1, 0xbf, 0x2c, 0xe0, 0xd3, 0x79, 0x03, 0x22, 0xab, 0xd8, 0x9f, - 0xc6, 0xf1, 0xcc, 0xe9, 0xa4, 0x2c, 0xfb, 0x7c, 0xd3, 0xd6, 0xed, 0xd7, 0xff, 0x59, 0x7b, 0xe7, - 0xf5, 0x9b, 0xb5, 0xda, 0xbf, 0xde, 0xac, 0xd5, 0xfe, 0xfd, 0x66, 0xad, 0xf6, 0xed, 0xdb, 0xb5, - 0x77, 0xba, 0xef, 0xe2, 0x3f, 0x54, 0x9a, 0xdf, 0x05, 0x00, 0x00, 0xff, 0xff, 0x91, 0x58, 0x29, - 0x69, 0x4a, 0x12, 0x00, 0x00, + 0xca, 0xa4, 0x96, 0x6c, 0xd2, 0xc9, 0x4c, 0x3b, 0xed, 0xb4, 0xa1, 0x94, 0xb6, 0x1e, 0x2b, 0x09, + 0x0b, 0x2a, 0xee, 0xd4, 0xd3, 0xe9, 0x76, 0x09, 0x3e, 0x41, 0x88, 0x40, 0x2c, 0x8a, 0x5d, 0x78, + 0x4a, 0xf5, 0xda, 0x99, 0x4e, 0x7b, 0xca, 0x31, 0xc7, 0xf6, 0xde, 0xcf, 0xd1, 0xf1, 0xb1, 0x9f, + 0x00, 0xd3, 0xda, 0x97, 0xf6, 0x8a, 0xe9, 0x07, 0xc8, 0xec, 0x03, 0x48, 0x02, 0x24, 0x44, 0xf1, + 0x26, 0xee, 0xfb, 0xfd, 0xdb, 0x05, 0xf6, 0xed, 0x42, 0xe4, 0x7b, 0xfd, 0x9e, 0x06, 0xa5, 0x21, + 0x0a, 0x7b, 0x3b, 0x8e, 0x0c, 0x0e, 0x3d, 0x97, 0x3b, 0xbe, 0x07, 0x81, 0xe6, 0x03, 0xe1, 0x1c, + 0x79, 0x01, 0x6c, 0x87, 0x91, 0xd4, 0x92, 0x92, 0x09, 0x6e, 0xed, 0xb1, 0xeb, 0xe9, 0xa3, 0xb8, + 0xb7, 0xed, 0xc8, 0xc1, 0x8e, 0x2b, 0x5d, 0xb9, 0x83, 0x90, 0x5e, 0x7c, 0x88, 0xbf, 0xf0, 0x07, + 0xfe, 0x95, 0x51, 0xd7, 0xd6, 0x0a, 0x16, 0x87, 0xbe, 0x70, 0x39, 0x68, 0xa7, 0x9f, 0xd7, 0xd8, + 0x74, 0xed, 0x44, 0xca, 0x63, 0x80, 0x10, 0xa2, 0x1c, 0xb0, 0x3e, 0x0d, 0x70, 0x64, 0xa0, 0x62, + 0x3f, 0xaf, 0xde, 0x9d, 0xa1, 0x17, 0xb4, 0x67, 0x8a, 0xce, 0xa4, 0x68, 0xbd, 0xbb, 0x44, 0xd6, + 0x76, 0x71, 0xbe, 0xbb, 0x38, 0xdd, 0xcf, 0xb3, 0xd9, 0x3e, 0x0f, 0x3c, 0xed, 0x09, 0x9f, 0x7e, + 0x42, 0x48, 0x47, 0xe8, 0xa3, 0x4e, 0x04, 0x87, 0xde, 0x1f, 0x1a, 0xb5, 0xcd, 0xda, 0xd6, 0x72, + 0xfb, 0x56, 0x9a, 0x30, 0x3a, 0x14, 0x03, 0xff, 0x87, 0x56, 0x28, 0xf4, 0x11, 0x0f, 0xb1, 0x68, + 0xd9, 0x05, 0x24, 0x7d, 0x4c, 0x2e, 0xee, 0x4b, 0xd7, 0x0c, 0x34, 0xce, 0x21, 0xe9, 0x46, 0x9a, + 0xb0, 0xab, 0x19, 0xc9, 0x97, 0x2e, 0x37, 0x44, 0xcb, 0x1e, 0x61, 0x28, 0x27, 0xb7, 0x33, 0xfb, + 0xee, 0x50, 0x69, 0x18, 0x7c, 0x0e, 0x3a, 0xf2, 0x1c, 0x85, 0xf4, 0x3a, 0xd2, 0x1f, 0xa5, 0x09, + 0xbb, 0x9f, 0xd1, 0xf3, 0xc7, 0xa2, 0x10, 0xc9, 0x07, 0x19, 0x34, 0x17, 0x3c, 0x4d, 0x85, 0xfe, + 0xa9, 0x46, 0x1e, 0x54, 0xd4, 0x9e, 0x07, 0x66, 0x59, 0xa4, 0x2f, 0x34, 0xf4, 0xd1, 0xed, 0x3c, + 0xba, 0x35, 0xd3, 0x84, 0x6d, 0xcf, 0x73, 0xf3, 0x0a, 0xbc, 0xdc, 0x7a, 0x11, 0x79, 0xfa, 0xd7, + 0x1a, 0x79, 0x94, 0xe1, 0xf6, 0x85, 0x86, 0xc0, 0x19, 0x1e, 0x1c, 0x45, 0x32, 0x76, 0x8f, 0xc2, + 0x58, 0x1f, 0x78, 0x03, 0x50, 0x10, 0x79, 0x90, 0x4d, 0xfb, 0x02, 0x06, 0x79, 0x96, 0x26, 0xec, + 0x49, 0x29, 0x88, 0x9f, 0xf1, 0xb8, 0x1e, 0x13, 0xb9, 0x1e, 0x33, 0xf3, 0x28, 0x8b, 0x59, 0xd0, + 0x3f, 0x92, 0xcd, 0x12, 0x70, 0xcf, 0x53, 0x3a, 0xf2, 0x7a, 0xb1, 0xf6, 0x64, 0xf0, 0xa9, 0xef, + 0x63, 0x8c, 0xf7, 0x31, 0xc6, 0x4e, 0x9a, 0xb0, 0x8f, 0x2a, 0x63, 0xf4, 0x0b, 0x1c, 0x2e, 0x7c, + 0x3f, 0x4f, 0x70, 0xa6, 0x30, 0xfd, 0xa6, 0x46, 0x3e, 0x38, 0x15, 0xd4, 0x81, 0xc8, 0x81, 0x40, + 0x7b, 0x3e, 0x60, 0x88, 0x8b, 0x18, 0xe2, 0x93, 0x34, 0x61, 0xcd, 0xb3, 0x43, 0x84, 0x63, 0x6e, + 0x9e, 0x65, 0x51, 0x1b, 0xfa, 0xe7, 0x1a, 0x79, 0x78, 0x2a, 0xb6, 0x1b, 0x0f, 0x06, 0x22, 0x1a, + 0x62, 0x9e, 0x25, 0xcc, 0xd3, 0x4a, 0x13, 0xb6, 0x73, 0x76, 0x1e, 0x95, 0x11, 0xf3, 0x30, 0x0b, + 0x19, 0xd0, 0x90, 0xac, 0x97, 0x70, 0xed, 0xe1, 0x0b, 0x18, 0x7e, 0x11, 0x0f, 0x7a, 0x10, 0x61, + 0x80, 0x65, 0x0c, 0xf0, 0xfd, 0x34, 0x61, 0x5b, 0x95, 0x01, 0x7a, 0x43, 0x7e, 0x0c, 0x43, 0x1e, + 0x20, 0x23, 0x77, 0x9e, 0xab, 0x48, 0x87, 0x84, 0x75, 0x21, 0x7a, 0x0d, 0xd1, 0x9e, 0xa7, 0x8e, + 0xbb, 0xa1, 0x70, 0xe0, 0x2b, 0x25, 0x5c, 0x28, 0xce, 0x9a, 0x4c, 0xbf, 0x0a, 0x0a, 0x09, 0x66, + 0xb6, 0xc7, 0x5c, 0x19, 0x0a, 0x8f, 0x0d, 0x67, 0x6a, 0xc6, 0x67, 0xe9, 0xd2, 0xdf, 0x90, 0x5b, + 0x3f, 0x97, 0xd2, 0xf5, 0x61, 0xd7, 0x97, 0x71, 0xbf, 0x13, 0xc9, 0xaf, 0xc1, 0xd1, 0x5f, 0x88, + 0x01, 0x34, 0xfa, 0xe8, 0xf8, 0x30, 0x4d, 0xd8, 0x66, 0xe6, 0xe8, 0x22, 0x8e, 0x3b, 0x06, 0xc8, + 0xc3, 0x0c, 0xc9, 0x03, 0x31, 0x00, 0xcb, 0x3e, 0x45, 0x83, 0x1e, 0x92, 0x3b, 0x85, 0x4a, 0x57, + 0xcb, 0x48, 0xb8, 0xf0, 0x02, 0xb2, 0x29, 0x01, 0x1a, 0x6c, 0xa5, 0x09, 0x7b, 0x58, 0x61, 0xa0, + 0x32, 0x30, 0x2e, 0x65, 0x36, 0x97, 0xd3, 0xa5, 0xe8, 0x33, 0xb2, 0x5a, 0x59, 0x6c, 0x1c, 0x1a, + 0x0f, 0xbb, 0xba, 0x48, 0x25, 0x59, 0x9f, 0x2d, 0xb4, 0x63, 0xe7, 0x18, 0xb2, 0x15, 0x70, 0x31, + 0xe0, 0x47, 0x69, 0xc2, 0x3e, 0x98, 0x13, 0xb0, 0x87, 0x84, 0x7c, 0x21, 0xe6, 0x0a, 0xd2, 0x98, + 0x6c, 0xcc, 0xd6, 0xbb, 0x71, 0x6f, 0xcf, 0x8b, 0xc0, 0xd1, 0x32, 0x1a, 0x36, 0x8e, 0xd0, 0xf2, + 0x71, 0x9a, 0xb0, 0x0f, 0xe7, 0x58, 0xaa, 0xb8, 0xc7, 0xfb, 0x23, 0x8e, 0x65, 0x9f, 0x21, 0x6a, + 0xfd, 0xf3, 0x02, 0x79, 0x50, 0x71, 0xca, 0xb4, 0x21, 0x70, 0x8e, 0x06, 0x22, 0x3a, 0xfe, 0x32, + 0x34, 0x5b, 0x40, 0xd1, 0x07, 0xe4, 0xfc, 0xc1, 0x30, 0x84, 0xfc, 0xa0, 0xb9, 0x9a, 0x26, 0x6c, + 0x25, 0x0b, 0xa1, 0x87, 0x21, 0x58, 0x36, 0x16, 0xe9, 0x4f, 0xc8, 0x65, 0x1b, 0x7e, 0x1f, 0x83, + 0xd2, 0xd9, 0x0b, 0x8c, 0x27, 0x4c, 0xbd, 0x7d, 0x27, 0x4d, 0xd8, 0x6a, 0x86, 0x8e, 0xb2, 0x72, + 0xbe, 0x01, 0x2c, 0xbb, 0x8c, 0xa7, 0xbf, 0x20, 0xd7, 0x76, 0x65, 0x10, 0x80, 0x63, 0x4c, 0x73, + 0x8d, 0x3a, 0x6a, 0xac, 0xa7, 0x09, 0x6b, 0xe4, 0x5b, 0x6a, 0x8c, 0x18, 0xcb, 0xcc, 0xb0, 0xe8, + 0x8f, 0xc8, 0xa5, 0x6c, 0x42, 0xb9, 0xca, 0x79, 0x54, 0x69, 0xa4, 0x09, 0xbb, 0x59, 0xda, 0x98, + 0x23, 0x85, 0x12, 0x9a, 0xfe, 0x96, 0xdc, 0x9e, 0x28, 0x16, 0x2b, 0xaa, 0x71, 0x61, 0xb3, 0xbe, + 0x55, 0x2f, 0xbe, 0xfa, 0x85, 0x38, 0x25, 0x4d, 0x65, 0x0e, 0xbd, 0x6a, 0x11, 0xea, 0x91, 0x35, + 0x5b, 0x68, 0xd8, 0xf7, 0x06, 0x9e, 0xce, 0x57, 0x40, 0x75, 0x20, 0xea, 0x82, 0x23, 0x83, 0x3e, + 0xb6, 0xf6, 0x7a, 0xfb, 0xc3, 0x34, 0x61, 0x8f, 0xf2, 0x55, 0x13, 0x1a, 0xb8, 0x6f, 0xc0, 0x3c, + 0x5f, 0x40, 0x65, 0xba, 0x29, 0x57, 0x88, 0xb7, 0xec, 0x39, 0x62, 0xe6, 0xbc, 0xef, 0x8a, 0x01, + 0xbe, 0xf0, 0xa6, 0x5b, 0x2f, 0x15, 0xcf, 0x7b, 0x25, 0x06, 0xb8, 0x89, 0x2c, 0x7b, 0x84, 0xa1, + 0x3f, 0x26, 0x97, 0x5e, 0xc0, 0xb0, 0xeb, 0x9d, 0x40, 0x7b, 0xa8, 0x41, 0x61, 0x47, 0x2d, 0x3d, + 0x41, 0xb3, 0xe7, 0x94, 0x77, 0x02, 0xbc, 0x67, 0xea, 0x96, 0x5d, 0x82, 0xd3, 0x5d, 0x72, 0xe5, + 0xa5, 0xf0, 0x63, 0x98, 0x08, 0x2c, 0xa3, 0xc0, 0xdd, 0x34, 0x61, 0xb7, 0x33, 0x81, 0xd7, 0xa6, + 0x5e, 0x92, 0x98, 0xa2, 0xd0, 0x16, 0x59, 0xee, 0x6a, 0xe1, 0x83, 0x0d, 0xa2, 0x8f, 0xcd, 0x6d, + 0xa9, 0xbd, 0x9a, 0x26, 0xec, 0x7a, 0x1e, 0xda, 0x94, 0x78, 0x04, 0xa2, 0x6f, 0xd9, 0x13, 0x9c, + 0x95, 0x9c, 0x23, 0xf7, 0xe7, 0xbd, 0xc8, 0x5d, 0x0d, 0xa1, 0xa2, 0x5f, 0x12, 0x6a, 0xfe, 0x78, + 0xda, 0xd5, 0x22, 0xd2, 0x7b, 0x42, 0x8b, 0x9e, 0x50, 0xd9, 0x4b, 0xbd, 0xd4, 0x66, 0x69, 0xc2, + 0xee, 0x8e, 0x3c, 0x20, 0x7c, 0xca, 0x95, 0x01, 0xf1, 0x7e, 0x8e, 0xb2, 0xec, 0x0a, 0x2a, 0xb5, + 0xc9, 0x0d, 0x33, 0xda, 0xec, 0xea, 0x08, 0x94, 0x1a, 0x2b, 0x9e, 0x43, 0xc5, 0xcd, 0x34, 0x61, + 0xeb, 0x13, 0xc5, 0x26, 0x57, 0x88, 0x2a, 0x48, 0x56, 0x91, 0xe9, 0x3e, 0xb9, 0x6e, 0x86, 0x5b, + 0x5d, 0x2d, 0xc3, 0xb1, 0x62, 0x1d, 0x15, 0x37, 0xd2, 0x84, 0xad, 0x4d, 0x14, 0x5b, 0x66, 0xdb, + 0x87, 0x05, 0xbd, 0x59, 0x22, 0xfd, 0x19, 0xb9, 0x6a, 0x06, 0x9f, 0x7d, 0x15, 0xfa, 0x52, 0xf4, + 0xf7, 0xa5, 0xab, 0x70, 0x33, 0x2c, 0x15, 0xb7, 0x94, 0xd1, 0x7a, 0xc6, 0x63, 0x44, 0x70, 0x5f, + 0xba, 0xca, 0xb2, 0xa7, 0x49, 0xd6, 0xdf, 0x2f, 0x13, 0x56, 0xb1, 0xc0, 0x9f, 0xba, 0x10, 0xe8, + 0x5d, 0x19, 0xe8, 0x48, 0xe2, 0xa5, 0x74, 0xe4, 0xfb, 0x7c, 0x6f, 0xf6, 0x52, 0x3a, 0xca, 0xc9, + 0xbd, 0xbe, 0x65, 0x17, 0x90, 0xf4, 0x97, 0xe4, 0xc6, 0xe8, 0xd7, 0x1e, 0x28, 0x27, 0xf2, 0xb0, + 0xeb, 0xe4, 0x17, 0xd4, 0xc2, 0x73, 0x19, 0x0b, 0xf4, 0x27, 0x28, 0xcb, 0xae, 0xe2, 0xd2, 0x1f, + 0x90, 0x95, 0xd1, 0xf0, 0x81, 0x70, 0xf3, 0xcb, 0xea, 0xed, 0x34, 0x61, 0x37, 0xa6, 0xa4, 0xb4, + 0x70, 0x2d, 0xbb, 0x88, 0x35, 0x5b, 0xa6, 0x03, 0x10, 0x3d, 0xef, 0x98, 0x95, 0xaa, 0x97, 0xaf, + 0xc8, 0x21, 0x40, 0xc4, 0xbd, 0x50, 0x59, 0xf6, 0x08, 0x43, 0x7f, 0x4a, 0x2e, 0xe7, 0x7f, 0x76, + 0x75, 0xe4, 0x05, 0x6e, 0x7e, 0x43, 0x5c, 0x4b, 0x13, 0x76, 0xab, 0x4c, 0x32, 0xcf, 0xdf, 0x0b, + 0x5c, 0xcb, 0x2e, 0x13, 0x68, 0x87, 0x50, 0x5c, 0xc6, 0x8e, 0x8c, 0xf4, 0x81, 0xcc, 0x9b, 0x46, + 0xde, 0x06, 0x0a, 0xef, 0x90, 0x30, 0x18, 0x1e, 0xca, 0x48, 0x73, 0x2d, 0x79, 0xde, 0x77, 0x2c, + 0xbb, 0x82, 0x4b, 0xdb, 0xe4, 0x0a, 0x8e, 0x7e, 0x16, 0xf4, 0x43, 0xe9, 0x05, 0x5a, 0x35, 0x2e, + 0xe2, 0x4c, 0x0a, 0xa1, 0x32, 0x35, 0x18, 0x01, 0x2c, 0x7b, 0x8a, 0x41, 0x7f, 0x4d, 0x56, 0x47, + 0xab, 0x52, 0x0e, 0x96, 0xf5, 0x84, 0x07, 0x69, 0xc2, 0xd8, 0xd4, 0x5a, 0xce, 0x64, 0xab, 0x56, + 0xa0, 0x2f, 0xc8, 0xf5, 0x51, 0x61, 0x92, 0x70, 0x19, 0x13, 0xde, 0x4b, 0x13, 0x76, 0x67, 0x4a, + 0xb6, 0x10, 0x72, 0x96, 0x47, 0x7f, 0x45, 0xae, 0xe2, 0xc7, 0x13, 0x7e, 0xb5, 0x71, 0xae, 0xbd, + 0x10, 0xef, 0x27, 0x2b, 0xcd, 0xbb, 0xdb, 0x93, 0xef, 0xab, 0xed, 0x29, 0x48, 0xfb, 0x66, 0x9a, + 0xb0, 0x6b, 0x99, 0xcf, 0x78, 0xd0, 0xb2, 0x57, 0x0c, 0xec, 0x33, 0xed, 0xf4, 0x0f, 0xbc, 0x90, + 0xbe, 0x22, 0xd7, 0x8a, 0xac, 0xd7, 0x2d, 0xde, 0xc4, 0x8b, 0xc9, 0x4a, 0x73, 0xfd, 0x34, 0x65, + 0x83, 0x29, 0x36, 0xab, 0xc9, 0x68, 0x41, 0xfb, 0x65, 0xab, 0x59, 0xa1, 0xdd, 0xc2, 0x0b, 0xc9, + 0x7c, 0xed, 0x56, 0xa5, 0x76, 0xab, 0xa4, 0xdd, 0xa2, 0x7f, 0xa9, 0x91, 0xf5, 0x8c, 0x38, 0xfe, + 0x56, 0xe5, 0x3c, 0x6a, 0xf1, 0x8f, 0x79, 0x8b, 0xf7, 0x40, 0x8b, 0xc6, 0x9b, 0x1a, 0x3a, 0x6d, + 0xcd, 0x3a, 0x55, 0x13, 0xda, 0xf7, 0xd3, 0x84, 0xdd, 0xcb, 0x5c, 0xab, 0x11, 0x96, 0xbd, 0x6a, + 0x04, 0x5e, 0x8d, 0x8a, 0x76, 0xeb, 0xe3, 0x56, 0x1b, 0xb4, 0xa0, 0x5f, 0x93, 0x9b, 0x99, 0x72, + 0xf6, 0x55, 0xcc, 0xf9, 0xeb, 0xa7, 0xfc, 0x09, 0x6f, 0x36, 0xfe, 0x71, 0x0e, 0x23, 0x6c, 0xce, + 0x46, 0x28, 0x03, 0x8b, 0x47, 0x4f, 0xb9, 0x62, 0xd9, 0x57, 0x0c, 0x61, 0x17, 0x07, 0x5f, 0x3e, + 0x7d, 0xd2, 0xa4, 0xbf, 0x23, 0xd7, 0x73, 0x89, 0x6c, 0x69, 0x70, 0xae, 0xdf, 0xd4, 0xd1, 0xe8, + 0x5e, 0x85, 0xd1, 0x04, 0x55, 0x6c, 0x52, 0x85, 0x61, 0xcb, 0xbe, 0x8c, 0x16, 0x66, 0x04, 0x67, + 0x33, 0x76, 0x38, 0x29, 0x38, 0xfc, 0xff, 0x54, 0x87, 0x93, 0x6a, 0x87, 0x93, 0x19, 0x87, 0x57, + 0x63, 0x87, 0xbf, 0xd5, 0x16, 0xba, 0x8f, 0x35, 0xfe, 0x7b, 0x11, 0x4d, 0x77, 0x8a, 0xa6, 0x0b, + 0xf0, 0x8a, 0x4d, 0xbf, 0x37, 0xaa, 0x71, 0x99, 0x15, 0xcd, 0xa7, 0xf2, 0x02, 0x57, 0xc1, 0x6f, + 0x6b, 0x0b, 0x9c, 0xb4, 0x8d, 0xff, 0x65, 0x01, 0x1f, 0x2f, 0x1a, 0x10, 0x59, 0xc5, 0xfe, 0x34, + 0x89, 0x67, 0x4e, 0x27, 0x65, 0xd9, 0x67, 0x9b, 0xb6, 0x6f, 0xbe, 0xf9, 0xcf, 0xc6, 0x7b, 0x6f, + 0xde, 0x6e, 0xd4, 0xfe, 0xf5, 0x76, 0xa3, 0xf6, 0xef, 0xb7, 0x1b, 0xb5, 0x6f, 0xdf, 0x6d, 0xbc, + 0xd7, 0x7b, 0x1f, 0xff, 0xa1, 0xd2, 0xfa, 0x2e, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xef, 0x79, 0xe4, + 0x4a, 0x12, 0x00, 0x00, } diff --git a/dbtesterpb/config_client_machine.proto b/dbtesterpb/config_client_machine.proto index 67b39f76..28ac7ef7 100644 --- a/dbtesterpb/config_client_machine.proto +++ b/dbtesterpb/config_client_machine.proto @@ -79,7 +79,7 @@ message ConfigClientMachineAgentControl { flag__zookeeper__r3_5_3_beta flag__zookeeper__r3_5_3_beta = 200 [(gogoproto.moretags) = "yaml:\"zookeeper__r3_5_3_beta\""]; - flag__consul__v0_8_4 flag__consul__v0_8_4 = 300 [(gogoproto.moretags) = "yaml:\"consul__v0_8_4\""]; + flag__consul__v1_0_2 flag__consul__v1_0_2 = 300 [(gogoproto.moretags) = "yaml:\"consul__v1_0_2\""]; 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 c5197138..12b777f5 100644 --- a/dbtesterpb/database_id.pb.go +++ b/dbtesterpb/database_id.pb.go @@ -26,7 +26,7 @@ const ( // https://zookeeper.apache.org/releases.html DatabaseID_zookeeper__r3_5_3_beta DatabaseID = 100 // https://github.com/hashicorp/consul/releases - DatabaseID_consul__v0_8_4 DatabaseID = 200 + DatabaseID_consul__v1_0_2 DatabaseID = 200 // https://github.com/coreos/zetcd/releases DatabaseID_zetcd__beta DatabaseID = 300 // https://github.com/coreos/cetcd/releases @@ -38,7 +38,7 @@ var DatabaseID_name = map[int32]string{ 1: "etcd__v3_2", 2: "etcd__v3_3", 100: "zookeeper__r3_5_3_beta", - 200: "consul__v0_8_4", + 200: "consul__v1_0_2", 300: "zetcd__beta", 400: "cetcd__beta", } @@ -47,7 +47,7 @@ var DatabaseID_value = map[string]int32{ "etcd__v3_2": 1, "etcd__v3_3": 2, "zookeeper__r3_5_3_beta": 100, - "consul__v0_8_4": 200, + "consul__v1_0_2": 200, "zetcd__beta": 300, "cetcd__beta": 400, } @@ -74,10 +74,10 @@ var fileDescriptorDatabaseId = []byte{ 0x66, 0x81, 0x00, 0x83, 0x10, 0x1f, 0x17, 0x17, 0x84, 0x5b, 0x66, 0x1c, 0x6f, 0x24, 0xc0, 0x88, 0xc2, 0x37, 0x16, 0x60, 0x12, 0x92, 0xe2, 0x12, 0xab, 0xca, 0xcf, 0xcf, 0x4e, 0x4d, 0x2d, 0x48, 0x2d, 0x8a, 0x8f, 0x2f, 0x32, 0x8e, 0x37, 0x8d, 0x37, 0x8e, 0x4f, 0x4a, 0x2d, 0x49, 0x14, 0x48, - 0x11, 0x12, 0xe6, 0xe2, 0x4b, 0xce, 0xcf, 0x2b, 0x2e, 0xcd, 0x89, 0x8f, 0x2f, 0x33, 0x88, 0xb7, - 0x88, 0x37, 0x11, 0x38, 0xc1, 0x28, 0x24, 0xc0, 0xc5, 0x5d, 0x05, 0x31, 0x01, 0xac, 0x6a, 0x0d, + 0x11, 0x12, 0xe6, 0xe2, 0x4b, 0xce, 0xcf, 0x2b, 0x2e, 0xcd, 0x89, 0x8f, 0x2f, 0x33, 0x8c, 0x37, + 0x88, 0x37, 0x12, 0x38, 0xc1, 0x28, 0x24, 0xc0, 0xc5, 0x5d, 0x05, 0x31, 0x01, 0xac, 0x6a, 0x0d, 0x13, 0x48, 0x24, 0x19, 0x49, 0x64, 0x02, 0xb3, 0x93, 0xc8, 0x89, 0x87, 0x72, 0x0c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x49, - 0x6c, 0x60, 0xf7, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x37, 0xed, 0xbb, 0xeb, 0x0a, 0x01, + 0x6c, 0x60, 0xf7, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x30, 0x14, 0xdc, 0x70, 0x0a, 0x01, 0x00, 0x00, } diff --git a/dbtesterpb/database_id.proto b/dbtesterpb/database_id.proto index bb983baf..3e84cf6a 100644 --- a/dbtesterpb/database_id.proto +++ b/dbtesterpb/database_id.proto @@ -21,7 +21,7 @@ enum DatabaseID { zookeeper__r3_5_3_beta = 100; // https://github.com/hashicorp/consul/releases - consul__v0_8_4 = 200; + consul__v1_0_2 = 200; // https://github.com/coreos/zetcd/releases zetcd__beta = 300; diff --git a/dbtesterpb/flag_consul.pb.go b/dbtesterpb/flag_consul.pb.go index 7ffa48ef..c4ad0963 100644 --- a/dbtesterpb/flag_consul.pb.go +++ b/dbtesterpb/flag_consul.pb.go @@ -16,18 +16,18 @@ var _ = fmt.Errorf var _ = math.Inf // See https://github.com/hashicorp/consul for more. -type Flag_Consul_V0_8_4 struct { +type Flag_Consul_V1_0_2 struct { } -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{0} } +func (m *Flag_Consul_V1_0_2) Reset() { *m = Flag_Consul_V1_0_2{} } +func (m *Flag_Consul_V1_0_2) String() string { return proto.CompactTextString(m) } +func (*Flag_Consul_V1_0_2) ProtoMessage() {} +func (*Flag_Consul_V1_0_2) Descriptor() ([]byte, []int) { return fileDescriptorFlagConsul, []int{0} } func init() { - proto.RegisterType((*Flag_Consul_V0_8_4)(nil), "dbtesterpb.flag__consul__v0_8_4") + proto.RegisterType((*Flag_Consul_V1_0_2)(nil), "dbtesterpb.flag__consul__v1_0_2") } -func (m *Flag_Consul_V0_8_4) Marshal() (dAtA []byte, err error) { +func (m *Flag_Consul_V1_0_2) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalTo(dAtA) @@ -37,7 +37,7 @@ func (m *Flag_Consul_V0_8_4) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *Flag_Consul_V0_8_4) MarshalTo(dAtA []byte) (int, error) { +func (m *Flag_Consul_V1_0_2) MarshalTo(dAtA []byte) (int, error) { var i int _ = i var l int @@ -54,7 +54,7 @@ func encodeVarintFlagConsul(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return offset + 1 } -func (m *Flag_Consul_V0_8_4) Size() (n int) { +func (m *Flag_Consul_V1_0_2) Size() (n int) { var l int _ = l return n @@ -73,7 +73,7 @@ func sovFlagConsul(x uint64) (n int) { func sozFlagConsul(x uint64) (n int) { return sovFlagConsul(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *Flag_Consul_V0_8_4) Unmarshal(dAtA []byte) error { +func (m *Flag_Consul_V1_0_2) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -96,10 +96,10 @@ func (m *Flag_Consul_V0_8_4) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: flag__consul__v0_8_4: wiretype end group for non-group") + return fmt.Errorf("proto: flag__consul__v1_0_2: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: flag__consul__v0_8_4: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: flag__consul__v1_0_2: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -237,8 +237,8 @@ var fileDescriptorFlagConsul = []byte{ 0x2e, 0xcd, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x42, 0xc8, 0x4a, 0xe9, 0xa6, 0x67, 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, 0x45, 0xbc, 0x89, 0x93, 0xc8, 0x89, 0x87, 0x72, + 0x0f, 0x6a, 0x60, 0x7c, 0x7c, 0x99, 0x61, 0xbc, 0x41, 0xbc, 0x91, 0x93, 0xc8, 0x89, 0x87, 0x72, 0x0c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8c, 0xc7, - 0x72, 0x0c, 0x49, 0x6c, 0x60, 0x4d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x01, 0x81, - 0x25, 0x8f, 0x00, 0x00, 0x00, + 0x72, 0x0c, 0x49, 0x6c, 0x60, 0x4d, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x25, 0xe5, 0xaa, + 0xa0, 0x8f, 0x00, 0x00, 0x00, } diff --git a/dbtesterpb/flag_consul.proto b/dbtesterpb/flag_consul.proto index 002d3d9a..1ce0c525 100644 --- a/dbtesterpb/flag_consul.proto +++ b/dbtesterpb/flag_consul.proto @@ -9,5 +9,5 @@ option (gogoproto.unmarshaler_all) = true; option (gogoproto.goproto_getters_all) = false; // See https://github.com/hashicorp/consul for more. -message flag__consul__v0_8_4 { +message flag__consul__v1_0_2 { } diff --git a/dbtesterpb/message.pb.go b/dbtesterpb/message.pb.go index b05616d6..1741afb2 100644 --- a/dbtesterpb/message.pb.go +++ b/dbtesterpb/message.pb.go @@ -58,7 +58,7 @@ type Request struct { Flag_Etcd_V3_2 *Flag_Etcd_V3_2 `protobuf:"bytes,101,opt,name=flag__etcd__v3_2,json=flagEtcdV32" json:"flag__etcd__v3_2,omitempty"` Flag_Etcd_V3_3 *Flag_Etcd_V3_3 `protobuf:"bytes,102,opt,name=flag__etcd__v3_3,json=flagEtcdV33" json:"flag__etcd__v3_3,omitempty"` Flag_Zookeeper_R3_5_3Beta *Flag_Zookeeper_R3_5_3Beta `protobuf:"bytes,200,opt,name=flag__zookeeper__r3_5_3_beta,json=flagZookeeperR353Beta" json:"flag__zookeeper__r3_5_3_beta,omitempty"` - Flag_Consul_V0_8_4 *Flag_Consul_V0_8_4 `protobuf:"bytes,300,opt,name=flag__consul__v0_8_4,json=flagConsulV084" json:"flag__consul__v0_8_4,omitempty"` + Flag_Consul_V1_0_2 *Flag_Consul_V1_0_2 `protobuf:"bytes,300,opt,name=flag__consul__v1_0_2,json=flagConsulV102" json:"flag__consul__v1_0_2,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"` } @@ -273,13 +273,13 @@ func (m *Request) MarshalTo(dAtA []byte) (int, error) { } i += n5 } - if m.Flag_Consul_V0_8_4 != nil { + if m.Flag_Consul_V1_0_2 != nil { dAtA[i] = 0xe2 i++ dAtA[i] = 0x12 i++ - i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Consul_V0_8_4.Size())) - n6, err := m.Flag_Consul_V0_8_4.MarshalTo(dAtA[i:]) + i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Consul_V1_0_2.Size())) + n6, err := m.Flag_Consul_V1_0_2.MarshalTo(dAtA[i:]) if err != nil { return 0, err } @@ -400,8 +400,8 @@ func (m *Request) Size() (n int) { l = m.Flag_Zookeeper_R3_5_3Beta.Size() n += 2 + l + sovMessage(uint64(l)) } - if m.Flag_Consul_V0_8_4 != nil { - l = m.Flag_Consul_V0_8_4.Size() + if m.Flag_Consul_V1_0_2 != nil { + l = m.Flag_Consul_V1_0_2.Size() n += 2 + l + sovMessage(uint64(l)) } if m.Flag_Cetcd_Beta != nil { @@ -790,7 +790,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 300: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_4", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V1_0_2", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -814,10 +814,10 @@ func (m *Request) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Flag_Consul_V0_8_4 == nil { - m.Flag_Consul_V0_8_4 = &Flag_Consul_V0_8_4{} + if m.Flag_Consul_V1_0_2 == nil { + m.Flag_Consul_V1_0_2 = &Flag_Consul_V1_0_2{} } - if err := m.Flag_Consul_V0_8_4.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Flag_Consul_V1_0_2.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1105,49 +1105,49 @@ var ( func init() { proto.RegisterFile("dbtesterpb/message.proto", fileDescriptorMessage) } var fileDescriptorMessage = []byte{ - // 692 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xd1, 0x4e, 0x1b, 0x39, - 0x14, 0x86, 0x33, 0x04, 0x48, 0xe2, 0x28, 0x6c, 0xd6, 0xc0, 0xca, 0x0a, 0x6c, 0x76, 0x84, 0x56, - 0x28, 0x42, 0xda, 0x04, 0x65, 0x60, 0xcb, 0x6d, 0x09, 0xad, 0x88, 0xd4, 0x16, 0xe4, 0x04, 0x2e, - 0xb8, 0xb1, 0x3c, 0x93, 0x93, 0x61, 0x44, 0x32, 0x9e, 0x7a, 0x1c, 0xd4, 0xf2, 0x14, 0xbd, 0xec, - 0x43, 0xf4, 0x01, 0xfa, 0x08, 0x5c, 0xf6, 0x11, 0x5a, 0xfa, 0x0a, 0x7d, 0x80, 0x6a, 0x3c, 0x09, - 0x31, 0x24, 0xb4, 0x77, 0x39, 0xff, 0xff, 0xfb, 0x1b, 0xfb, 0xc4, 0x3e, 0x88, 0xf4, 0x5c, 0x05, - 0xb1, 0x02, 0x19, 0xb9, 0x8d, 0x21, 0xc4, 0x31, 0xf7, 0xa1, 0x1e, 0x49, 0xa1, 0x04, 0x46, 0x53, - 0xa7, 0xf2, 0x9f, 0x1f, 0xa8, 0xcb, 0x91, 0x5b, 0xf7, 0xc4, 0xb0, 0xe1, 0x0b, 0x5f, 0x34, 0x74, - 0xc4, 0x1d, 0xf5, 0x75, 0xa5, 0x0b, 0xfd, 0x2b, 0x5d, 0x5a, 0xd9, 0x34, 0xa0, 0x3d, 0xae, 0xb8, - 0xcb, 0x63, 0x60, 0x41, 0x6f, 0xec, 0x56, 0x0c, 0xb7, 0x3f, 0xe0, 0x3e, 0x03, 0xe5, 0x4d, 0xbc, - 0x7f, 0x1e, 0x7b, 0x37, 0x42, 0x5c, 0x01, 0x44, 0x20, 0xe7, 0xa0, 0x75, 0xc0, 0x13, 0x61, 0x3c, - 0x1a, 0x8c, 0xdd, 0x8d, 0x99, 0xe5, 0x06, 0x7b, 0xc6, 0xf4, 0x0c, 0x73, 0xdb, 0x30, 0x3d, 0x11, - 0xf6, 0x03, 0x9f, 0x79, 0x83, 0x00, 0x42, 0xc5, 0x86, 0xdc, 0xbb, 0x0c, 0xc2, 0x71, 0x57, 0xb6, - 0x3e, 0xe7, 0x50, 0x8e, 0xc2, 0xdb, 0x11, 0xc4, 0x0a, 0x3b, 0xa8, 0x70, 0x12, 0x81, 0xe4, 0x2a, - 0x10, 0x21, 0xb1, 0x6c, 0xab, 0xb6, 0xd2, 0x5c, 0xaf, 0x4f, 0x39, 0xf5, 0x7b, 0x93, 0x4e, 0x73, - 0x78, 0x07, 0x95, 0xbb, 0x32, 0xf0, 0x7d, 0x90, 0xaf, 0x84, 0x7f, 0x16, 0x0d, 0x04, 0xef, 0x91, - 0x05, 0xdb, 0xaa, 0xe5, 0xe9, 0x8c, 0x8e, 0xff, 0x47, 0xe8, 0x68, 0xdc, 0xbe, 0xf6, 0x11, 0xc9, - 0xea, 0x2f, 0xfc, 0x65, 0x7e, 0x61, 0xea, 0x52, 0x23, 0x89, 0x6d, 0x54, 0x9c, 0x54, 0x5d, 0xee, - 0x93, 0x45, 0xdb, 0xaa, 0x15, 0xa8, 0x29, 0xe1, 0x7f, 0x51, 0xe9, 0x14, 0x40, 0xb6, 0x4f, 0xe3, - 0x8e, 0x92, 0x41, 0xe8, 0x93, 0x25, 0x9d, 0x79, 0x28, 0x62, 0x82, 0x72, 0xed, 0xd3, 0x76, 0xd8, - 0x83, 0x77, 0x64, 0xd9, 0xb6, 0x6a, 0x25, 0x3a, 0x29, 0xf1, 0x2e, 0x5a, 0x6d, 0x8d, 0xa4, 0x84, - 0x50, 0xb5, 0x74, 0x97, 0xde, 0x8c, 0x86, 0x2e, 0x48, 0x92, 0xb3, 0xad, 0x5a, 0x96, 0xce, 0xb3, - 0x70, 0x1f, 0x55, 0x5a, 0xba, 0xaf, 0xa9, 0xfa, 0x3a, 0xed, 0x6a, 0x3b, 0x0c, 0x54, 0xc0, 0x07, - 0x24, 0x6f, 0x5b, 0xb5, 0x62, 0x73, 0xdb, 0x3c, 0xdb, 0xd3, 0x69, 0xfa, 0x0b, 0x12, 0x7e, 0x8e, - 0xfe, 0xd0, 0x7f, 0xae, 0xbe, 0x55, 0x8c, 0xa9, 0x20, 0x22, 0x3d, 0x0d, 0xdf, 0x30, 0xe1, 0x8f, - 0x22, 0xb4, 0x98, 0x08, 0x2f, 0x94, 0xd7, 0xeb, 0x06, 0x11, 0x6e, 0xa1, 0xb2, 0xe9, 0x5f, 0x3b, - 0xac, 0x49, 0x40, 0x33, 0x36, 0x9f, 0x62, 0x24, 0x99, 0x29, 0xe4, 0xdc, 0x69, 0xce, 0x81, 0x38, - 0xa4, 0xff, 0x5b, 0x88, 0x63, 0x42, 0x1c, 0xdc, 0x47, 0x9b, 0x69, 0xe0, 0xfe, 0x19, 0x30, 0x26, - 0x1d, 0xb6, 0xcf, 0x1c, 0xe6, 0x82, 0xe2, 0xe4, 0xd6, 0xd2, 0xc4, 0xda, 0x2c, 0x71, 0xfe, 0x02, - 0xba, 0x9e, 0xb8, 0x17, 0x13, 0x8f, 0x3a, 0xfb, 0xce, 0x21, 0x28, 0x8e, 0x4f, 0xd0, 0x5a, 0xba, - 0x2c, 0x7d, 0x4d, 0x8c, 0x5d, 0xef, 0xb2, 0x03, 0xb6, 0x47, 0x3e, 0x2d, 0x68, 0xbe, 0x3d, 0xcb, - 0x7f, 0x18, 0xa4, 0x2b, 0x89, 0xda, 0xd2, 0xda, 0xf9, 0xee, 0xc1, 0x1e, 0x3e, 0x46, 0x7f, 0x8e, - 0x73, 0xe9, 0xd1, 0xf4, 0x6e, 0x3f, 0x64, 0x35, 0xed, 0xef, 0x39, 0xb4, 0x69, 0x8a, 0x96, 0x34, - 0x2a, 0x11, 0xf4, 0xd6, 0xee, 0x49, 0x37, 0x06, 0xe9, 0xc7, 0x93, 0xa4, 0x9b, 0xc7, 0xa4, 0x8b, - 0x09, 0x69, 0xeb, 0x1c, 0xe5, 0x29, 0xc4, 0x91, 0x08, 0x63, 0x48, 0x6e, 0x76, 0x67, 0xe4, 0x79, - 0x10, 0xc7, 0xfa, 0xe1, 0xe6, 0xe9, 0xa4, 0x4c, 0x6e, 0xf6, 0x51, 0x10, 0x5f, 0x75, 0x22, 0xee, - 0xc1, 0x59, 0x32, 0x0e, 0x0f, 0xdf, 0x2b, 0x88, 0xf5, 0x13, 0xcd, 0xd2, 0x79, 0xd6, 0x4e, 0xc3, - 0x18, 0x03, 0xb8, 0x80, 0x96, 0x3a, 0x8a, 0x4b, 0x55, 0xce, 0xe0, 0x3c, 0x5a, 0xec, 0x28, 0x11, - 0x95, 0x2d, 0x5c, 0x42, 0x85, 0x63, 0xe0, 0x52, 0xb9, 0xc0, 0x55, 0x79, 0xa1, 0xf9, 0x12, 0x15, - 0xbb, 0x92, 0x87, 0x71, 0x24, 0xa4, 0x02, 0x89, 0x9f, 0xa1, 0xbc, 0x2e, 0xfb, 0x20, 0xf1, 0xaa, - 0x79, 0xa2, 0xf1, 0x9c, 0xa9, 0xac, 0x3d, 0x14, 0xd3, 0x23, 0x6c, 0x65, 0x0e, 0xd7, 0x6e, 0xbf, - 0x55, 0x33, 0xb7, 0x77, 0x55, 0xeb, 0xcb, 0x5d, 0xd5, 0xfa, 0x7a, 0x57, 0xb5, 0x3e, 0x7e, 0xaf, - 0x66, 0xdc, 0x65, 0x3d, 0xa8, 0x9c, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x56, 0xc5, 0x68, 0x60, - 0xda, 0x05, 0x00, 0x00, + // 690 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0x51, 0x4e, 0x1b, 0x3b, + 0x14, 0x86, 0x33, 0x04, 0x48, 0xe2, 0x28, 0xdc, 0x5c, 0x03, 0x57, 0x56, 0xe0, 0xa6, 0x23, 0x54, + 0xa1, 0x08, 0xa9, 0x09, 0x64, 0x44, 0xfb, 0x5c, 0x42, 0x2b, 0x22, 0xb5, 0x05, 0x39, 0x81, 0x07, + 0x5e, 0x2c, 0xcf, 0xe4, 0x64, 0x18, 0x91, 0x8c, 0xa7, 0x1e, 0x07, 0xb5, 0xac, 0xa2, 0x8f, 0x5d, + 0x44, 0x17, 0xd0, 0x25, 0xf0, 0xd8, 0x25, 0xb4, 0x74, 0x0b, 0x5d, 0x40, 0x35, 0x9e, 0x84, 0x18, + 0x12, 0xda, 0xb7, 0x9c, 0xff, 0xff, 0xfd, 0x8d, 0x7d, 0x62, 0x1f, 0x44, 0x7a, 0xae, 0x82, 0x58, + 0x81, 0x8c, 0xdc, 0xc6, 0x10, 0xe2, 0x98, 0xfb, 0x50, 0x8f, 0xa4, 0x50, 0x02, 0xa3, 0xa9, 0x53, + 0x79, 0xe6, 0x07, 0xea, 0x62, 0xe4, 0xd6, 0x3d, 0x31, 0x6c, 0xf8, 0xc2, 0x17, 0x0d, 0x1d, 0x71, + 0x47, 0x7d, 0x5d, 0xe9, 0x42, 0xff, 0x4a, 0x97, 0x56, 0x36, 0x0d, 0x68, 0x8f, 0x2b, 0xee, 0xf2, + 0x18, 0x58, 0xd0, 0x1b, 0xbb, 0x15, 0xc3, 0xed, 0x0f, 0xb8, 0xcf, 0x40, 0x79, 0x13, 0xef, 0xc9, + 0x43, 0xef, 0x5a, 0x88, 0x4b, 0x80, 0x08, 0xe4, 0x1c, 0xb4, 0x0e, 0x78, 0x22, 0x8c, 0x47, 0x83, + 0xb1, 0xbb, 0x31, 0xb3, 0xdc, 0x60, 0xcf, 0x98, 0x9e, 0x61, 0x6e, 0x1b, 0xa6, 0x27, 0xc2, 0x7e, + 0xe0, 0x33, 0x6f, 0x10, 0x40, 0xa8, 0xd8, 0x90, 0x7b, 0x17, 0x41, 0x38, 0xee, 0xca, 0xd6, 0xd7, + 0x1c, 0xca, 0x51, 0x78, 0x3f, 0x82, 0x58, 0x61, 0x07, 0x15, 0x8e, 0x23, 0x90, 0x5c, 0x05, 0x22, + 0x24, 0x96, 0x6d, 0xd5, 0x56, 0x9a, 0xeb, 0xf5, 0x29, 0xa7, 0x7e, 0x67, 0xd2, 0x69, 0x0e, 0xef, + 0xa0, 0x72, 0x57, 0x06, 0xbe, 0x0f, 0xf2, 0x8d, 0xf0, 0x4f, 0xa3, 0x81, 0xe0, 0x3d, 0xb2, 0x60, + 0x5b, 0xb5, 0x3c, 0x9d, 0xd1, 0xf1, 0x73, 0x84, 0x0e, 0xc7, 0xed, 0x6b, 0x1f, 0x92, 0xac, 0xfe, + 0xc2, 0x7f, 0xe6, 0x17, 0xa6, 0x2e, 0x35, 0x92, 0xd8, 0x46, 0xc5, 0x49, 0xd5, 0xe5, 0x3e, 0x59, + 0xb4, 0xad, 0x5a, 0x81, 0x9a, 0x12, 0x7e, 0x8a, 0x4a, 0x27, 0x00, 0xb2, 0x7d, 0x12, 0x77, 0x94, + 0x0c, 0x42, 0x9f, 0x2c, 0xe9, 0xcc, 0x7d, 0x11, 0x13, 0x94, 0x6b, 0x9f, 0xb4, 0xc3, 0x1e, 0x7c, + 0x20, 0xcb, 0xb6, 0x55, 0x2b, 0xd1, 0x49, 0x89, 0x77, 0xd1, 0x6a, 0x6b, 0x24, 0x25, 0x84, 0xaa, + 0xa5, 0xbb, 0xf4, 0x6e, 0x34, 0x74, 0x41, 0x92, 0x9c, 0x6d, 0xd5, 0xb2, 0x74, 0x9e, 0x85, 0xfb, + 0xa8, 0xd2, 0xd2, 0x7d, 0x4d, 0xd5, 0xb7, 0x69, 0x57, 0xdb, 0x61, 0xa0, 0x02, 0x3e, 0x20, 0x79, + 0xdb, 0xaa, 0x15, 0x9b, 0xdb, 0xe6, 0xd9, 0x1e, 0x4f, 0xd3, 0x3f, 0x90, 0xf0, 0x4b, 0xf4, 0x8f, + 0xfe, 0x73, 0xf5, 0xad, 0x62, 0x4c, 0x05, 0x11, 0xe9, 0x69, 0xf8, 0x86, 0x09, 0x7f, 0x10, 0xa1, + 0xc5, 0x44, 0x78, 0xa5, 0xbc, 0x5e, 0x37, 0x88, 0x70, 0x0b, 0x95, 0x4d, 0xff, 0xca, 0x61, 0x4d, + 0x02, 0x9a, 0xb1, 0xf9, 0x18, 0x23, 0xc9, 0x4c, 0x21, 0x67, 0x4e, 0x73, 0x0e, 0xc4, 0x21, 0xfd, + 0xbf, 0x42, 0x1c, 0x13, 0xe2, 0xe0, 0x3e, 0xda, 0x4c, 0x03, 0x77, 0xcf, 0x80, 0x31, 0xe9, 0xb0, + 0x7d, 0xe6, 0x30, 0x17, 0x14, 0x27, 0x37, 0x96, 0x26, 0xd6, 0x66, 0x89, 0xf3, 0x17, 0xd0, 0xf5, + 0xc4, 0x3d, 0x9f, 0x78, 0xd4, 0xd9, 0x77, 0x0e, 0x40, 0x71, 0x7c, 0x8c, 0xd6, 0xd2, 0x65, 0xe9, + 0x6b, 0x62, 0xec, 0x6a, 0x8f, 0xed, 0xb2, 0x26, 0xf9, 0xb2, 0xa0, 0xf9, 0xf6, 0x2c, 0xff, 0x7e, + 0x90, 0xae, 0x24, 0x6a, 0x4b, 0x6b, 0x67, 0x7b, 0xbb, 0x4d, 0x7c, 0x84, 0xfe, 0x1d, 0xe7, 0xd2, + 0xa3, 0xe9, 0xdd, 0x7e, 0xca, 0x6a, 0xda, 0xff, 0x73, 0x68, 0xd3, 0x14, 0x2d, 0x69, 0x54, 0x22, + 0xe8, 0xad, 0xdd, 0x91, 0xae, 0x0d, 0xd2, 0xaf, 0x47, 0x49, 0xd7, 0x0f, 0x49, 0xe7, 0x13, 0xd2, + 0xd6, 0x19, 0xca, 0x53, 0x88, 0x23, 0x11, 0xc6, 0x90, 0xdc, 0xec, 0xce, 0xc8, 0xf3, 0x20, 0x8e, + 0xf5, 0xc3, 0xcd, 0xd3, 0x49, 0x99, 0xdc, 0xec, 0xc3, 0x20, 0xbe, 0xec, 0x44, 0xdc, 0x83, 0xd3, + 0x64, 0x1c, 0x1e, 0x7c, 0x54, 0x10, 0xeb, 0x27, 0x9a, 0xa5, 0xf3, 0xac, 0x9d, 0x86, 0x31, 0x06, + 0x70, 0x01, 0x2d, 0x75, 0x14, 0x97, 0xaa, 0x9c, 0xc1, 0x79, 0xb4, 0xd8, 0x51, 0x22, 0x2a, 0x5b, + 0xb8, 0x84, 0x0a, 0x47, 0xc0, 0xa5, 0x72, 0x81, 0xab, 0xf2, 0x42, 0xf3, 0x35, 0x2a, 0x76, 0x25, + 0x0f, 0xe3, 0x48, 0x48, 0x05, 0x12, 0xbf, 0x40, 0x79, 0x5d, 0xf6, 0x41, 0xe2, 0x55, 0xf3, 0x44, + 0xe3, 0x39, 0x53, 0x59, 0xbb, 0x2f, 0xa6, 0x47, 0xd8, 0xca, 0x1c, 0xac, 0xdd, 0xfc, 0xa8, 0x66, + 0x6e, 0x6e, 0xab, 0xd6, 0xb7, 0xdb, 0xaa, 0xf5, 0xfd, 0xb6, 0x6a, 0x7d, 0xfe, 0x59, 0xcd, 0xb8, + 0xcb, 0x7a, 0x50, 0x39, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3f, 0xed, 0x0b, 0xe3, 0xda, 0x05, + 0x00, 0x00, } diff --git a/dbtesterpb/message.proto b/dbtesterpb/message.proto index 65bf7460..19c30803 100644 --- a/dbtesterpb/message.proto +++ b/dbtesterpb/message.proto @@ -51,7 +51,7 @@ message Request { flag__zookeeper__r3_5_3_beta flag__zookeeper__r3_5_3_beta = 200; - flag__consul__v0_8_4 flag__consul__v0_8_4 = 300; + flag__consul__v1_0_2 flag__consul__v1_0_2 = 300; 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 3cb70062..5e900ad6 100644 --- a/dbtesterpb/util.go +++ b/dbtesterpb/util.go @@ -47,7 +47,7 @@ func GetRGBI(databaseID string, i int) color.Color { return color.RGBA{63, 81, 181, 255} // indigo case "zookeeper__r3_5_3_beta": return color.RGBA{94, 191, 30, 255} // green - case "consul__v0_8_4": + case "consul__v1_0_2": return color.RGBA{254, 25, 102, 255} // red case "zetcd__beta": return color.RGBA{251, 206, 0, 255} // yellow @@ -67,7 +67,7 @@ func GetRGBII(databaseID string, i int) color.Color { return color.RGBA{159, 168, 218, 255} // light-indigo case "zookeeper__r3_5_3_beta": return color.RGBA{155, 176, 29, 255} // light-green - case "consul__v0_8_4": + case "consul__v1_0_2": return color.RGBA{255, 202, 178, 255} // light-red case "zetcd__beta": return color.RGBA{245, 247, 166, 255} // light-yellow @@ -87,7 +87,7 @@ func GetRGBIII(databaseID string, i int) color.Color { return color.RGBA{26, 35, 126, 255} // deep-indigo case "zookeeper__r3_5_3_beta": return color.RGBA{129, 210, 178, 255} // mid-cyan - case "consul__v0_8_4": + case "consul__v1_0_2": 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 b97eba2c..655ee30a 100644 --- a/stress.go +++ b/stress.go @@ -178,7 +178,7 @@ func (cfg *Config) Stress(databaseID string) error { totalKeysFunc = getTotalKeysEtcdv3 case "zookeeper__r3_5_3_beta", "zetcd__beta": totalKeysFunc = getTotalKeysZk - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": totalKeysFunc = getTotalKeysConsul default: plog.Panicf("%q is unknown database ID", gcfg.DatabaseID) @@ -232,7 +232,7 @@ func (cfg *Config) Stress(databaseID string) error { os.Exit(1) } - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": plog.Infof("write started [request: PUT | key: %q | database: %q]", key, gcfg.DatabaseID) var err error for i := 0; i < 7; i++ { @@ -276,7 +276,7 @@ func (cfg *Config) Stress(databaseID string) error { _, err = conns[0].Create("/"+key, vals.bytes[0], zkCreateFlags, zkCreateACL) conns[0].Close() - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": clients := mustCreateConnsConsul(gcfg.DatabaseEndpoints, 1) _, err = clients[0].Put(&consulapi.KVPair{Key: key, Value: vals.bytes[0]}, nil) @@ -323,7 +323,7 @@ func newReadHandlers(gcfg dbtesterpb.ConfigClientMachineAgentControl) (rhs []Req conns[i].Close() } } - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": conns := mustCreateConnsConsul(gcfg.DatabaseEndpoints, gcfg.ConfigClientMachineBenchmarkOptions.ConnectionNumber) for i := range conns { rhs[i] = newGetConsul(conns[i]) @@ -387,7 +387,7 @@ func newWriteHandlers(gcfg dbtesterpb.ConfigClientMachineAgentControl) (rhs []Re conns[i].Close() } } - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": conns := mustCreateConnsConsul(gcfg.DatabaseEndpoints, gcfg.ConfigClientMachineBenchmarkOptions.ConnectionNumber) for i := range conns { rhs[i] = newPutConsul(conns[i]) @@ -426,7 +426,7 @@ func newReadOneshotHandlers(gcfg dbtesterpb.ConfigClientMachineAgentControl) []R return newGetZK(conns[0])(ctx, req) } } - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": for i := range rhs { rhs[i] = func(ctx context.Context, req *request) error { conns := mustCreateConnsConsul(gcfg.DatabaseEndpoints, 1) @@ -470,7 +470,7 @@ func generateReads(gcfg dbtesterpb.ConfigClientMachineAgentControl, key string, } inflightReqs <- request{zkOp: op} - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": op := consulOp{key: key} if gcfg.ConfigClientMachineBenchmarkOptions.StaleRead { op.staleRead = true @@ -515,7 +515,7 @@ func generateWrites(gcfg dbtesterpb.ConfigClientMachineAgentControl, startIdx in inflightReqs <- request{etcdv3Op: clientv3.OpPut(k, vs)} case "zookeeper__r3_5_3_beta", "zetcd__beta": inflightReqs <- request{zkOp: zkOp{key: "/" + k, value: v}} - case "consul__v0_8_4", "cetcd__beta": + case "consul__v1_0_2", "cetcd__beta": inflightReqs <- request{consulOp: consulOp{key: k, value: v}} default: plog.Panicf("%q is unknown database ID", gcfg.DatabaseID)