From 0c0fb4d0f9484894d5c4143dcf53c0b7d8929a75 Mon Sep 17 00:00:00 2001 From: amyangfei Date: Thu, 17 Oct 2019 15:04:52 +0800 Subject: [PATCH] DM-worker: add error abstraction in pb.ProcessError (#297) --- checker/checker.go | 5 +- dm/pb/dmmaster.pb.go | 2201 +++++++++++++++++++++++++------- dm/pb/dmworker.pb.go | 743 ++++++++--- dm/proto/dmworker.proto | 13 + dm/unit/unit.go | 20 +- dm/worker/relay.go | 9 +- dm/worker/relay_test.go | 5 +- dm/worker/status.go | 16 + dm/worker/subtask.go | 14 +- dm/worker/subtask_test.go | 2 +- dm/worker/task_checker.go | 10 +- dm/worker/task_checker_test.go | 53 +- loader/loader.go | 8 +- mydumper/mydumper.go | 5 +- relay/relay.go | 2 +- syncer/mode.go | 3 +- syncer/syncer.go | 9 +- 17 files changed, 2417 insertions(+), 701 deletions(-) diff --git a/checker/checker.go b/checker/checker.go index 168ea274ba..aa2877e27f 100644 --- a/checker/checker.go +++ b/checker/checker.go @@ -18,6 +18,7 @@ import ( "context" "database/sql" "encoding/json" + "errors" "fmt" "strings" "sync" @@ -235,9 +236,9 @@ func (c *Checker) Process(ctx context.Context, pr chan pb.ProcessResult) { errs := make([]*pb.ProcessError, 0, 1) result, err := check.Do(cctx, c.checkList) if err != nil { - errs = append(errs, unit.NewProcessError(pb.ErrorType_CheckFailed, err.Error())) + errs = append(errs, unit.NewProcessError(pb.ErrorType_CheckFailed, err)) } else if !result.Summary.Passed { - errs = append(errs, unit.NewProcessError(pb.ErrorType_CheckFailed, "check was failed, please see detail")) + errs = append(errs, unit.NewProcessError(pb.ErrorType_CheckFailed, errors.New("check was failed, please see detail"))) } c.updateInstruction(result) diff --git a/dm/pb/dmmaster.pb.go b/dm/pb/dmmaster.pb.go index b983c02a4a..c54ab21a6d 100644 --- a/dm/pb/dmmaster.pb.go +++ b/dm/pb/dmmaster.pb.go @@ -1,123 +1,17 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dmmaster.proto -/* - Package pb is a generated protocol buffer package. - - It is generated from these files: - dmmaster.proto - dmworker.proto - tracer.proto - tracer_base.proto - tracer_syncer.proto - - It has these top-level messages: - MigrateWorkerRelayRequest - UpdateWorkerRelayConfigRequest - StartTaskRequest - StartTaskResponse - UpdateMasterConfigRequest - UpdateMasterConfigResponse - OperateTaskRequest - OperateTaskResponse - UpdateTaskRequest - UpdateTaskResponse - QueryStatusListRequest - QueryStatusListResponse - QueryErrorListRequest - QueryErrorListResponse - ShowDDLLocksRequest - DDLLock - ShowDDLLocksResponse - UnlockDDLLockRequest - UnlockDDLLockResponse - BreakWorkerDDLLockRequest - BreakWorkerDDLLockResponse - SwitchWorkerRelayMasterRequest - SwitchWorkerRelayMasterResponse - OperateWorkerRelayRequest - OperateWorkerRelayResponse - RefreshWorkerTasksRequest - RefreshWorkerTasksMsg - RefreshWorkerTasksResponse - HandleSQLsRequest - HandleSQLsResponse - PurgeWorkerRelayRequest - PurgeWorkerRelayResponse - CheckTaskRequest - CheckTaskResponse - StartSubTaskRequest - UpdateRelayRequest - MigrateRelayRequest - OperateSubTaskRequest - OperateSubTaskResponse - QueryTaskOperationRequest - QueryTaskOperationResponse - UpdateSubTaskRequest - QueryStatusRequest - QueryErrorRequest - HandleSubTaskSQLsRequest - CommonWorkerResponse - QueryStatusResponse - QueryErrorResponse - CheckStatus - DumpStatus - LoadStatus - ShardingGroup - SyncStatus - RelayStatus - SubTaskStatus - SubTaskStatusList - CheckError - DumpError - LoadError - SyncSQLError - SyncError - RelayError - SubTaskError - SubTaskErrorList - ProcessResult - ProcessError - DDLInfo - DDLLockInfo - ExecDDLRequest - BreakDDLLockRequest - SwitchRelayMasterRequest - OperateRelayRequest - OperateRelayResponse - PurgeRelayRequest - QueryWorkerConfigRequest - QueryWorkerConfigResponse - TaskMeta - TaskLog - GetTSORequest - GetTSOResponse - CommonUploadResponse - UploadSyncerBinlogEventRequest - UploadSyncerJobEventRequest - BaseEvent - MySQLPosition - SyncerState - ExecDDLInfo - SyncerBinlogEvent - SyncerJobEvent -*/ package pb import ( - "fmt" - - proto "github.com/gogo/protobuf/proto" - + context "context" + fmt "fmt" + io "io" math "math" + proto "github.com/gogo/protobuf/proto" _ "google.golang.org/genproto/googleapis/api/annotations" - - context "golang.org/x/net/context" - grpc "google.golang.org/grpc" - - io "io" ) // Reference imports to suppress errors if they are not otherwise used. @@ -141,9 +35,35 @@ func (m *MigrateWorkerRelayRequest) Reset() { *m = MigrateWorkerRelayReq func (m *MigrateWorkerRelayRequest) String() string { return proto.CompactTextString(m) } func (*MigrateWorkerRelayRequest) ProtoMessage() {} func (*MigrateWorkerRelayRequest) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{0} + return fileDescriptor_f9bef11f2a341f03, []int{0} +} +func (m *MigrateWorkerRelayRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MigrateWorkerRelayRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MigrateWorkerRelayRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MigrateWorkerRelayRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MigrateWorkerRelayRequest.Merge(m, src) +} +func (m *MigrateWorkerRelayRequest) XXX_Size() int { + return m.Size() +} +func (m *MigrateWorkerRelayRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MigrateWorkerRelayRequest.DiscardUnknown(m) } +var xxx_messageInfo_MigrateWorkerRelayRequest proto.InternalMessageInfo + func (m *MigrateWorkerRelayRequest) GetBinlogName() string { if m != nil { return m.BinlogName @@ -174,9 +94,35 @@ func (m *UpdateWorkerRelayConfigRequest) Reset() { *m = UpdateWorkerRela func (m *UpdateWorkerRelayConfigRequest) String() string { return proto.CompactTextString(m) } func (*UpdateWorkerRelayConfigRequest) ProtoMessage() {} func (*UpdateWorkerRelayConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{1} + return fileDescriptor_f9bef11f2a341f03, []int{1} +} +func (m *UpdateWorkerRelayConfigRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UpdateWorkerRelayConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UpdateWorkerRelayConfigRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UpdateWorkerRelayConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateWorkerRelayConfigRequest.Merge(m, src) +} +func (m *UpdateWorkerRelayConfigRequest) XXX_Size() int { + return m.Size() +} +func (m *UpdateWorkerRelayConfigRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateWorkerRelayConfigRequest.DiscardUnknown(m) } +var xxx_messageInfo_UpdateWorkerRelayConfigRequest proto.InternalMessageInfo + func (m *UpdateWorkerRelayConfigRequest) GetConfig() string { if m != nil { return m.Config @@ -193,13 +139,41 @@ func (m *UpdateWorkerRelayConfigRequest) GetWorker() string { type StartTaskRequest struct { Task string `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` - Workers []string `protobuf:"bytes,2,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,2,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *StartTaskRequest) Reset() { *m = StartTaskRequest{} } -func (m *StartTaskRequest) String() string { return proto.CompactTextString(m) } -func (*StartTaskRequest) ProtoMessage() {} -func (*StartTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{2} } +func (m *StartTaskRequest) Reset() { *m = StartTaskRequest{} } +func (m *StartTaskRequest) String() string { return proto.CompactTextString(m) } +func (*StartTaskRequest) ProtoMessage() {} +func (*StartTaskRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{2} +} +func (m *StartTaskRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StartTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_StartTaskRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *StartTaskRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartTaskRequest.Merge(m, src) +} +func (m *StartTaskRequest) XXX_Size() int { + return m.Size() +} +func (m *StartTaskRequest) XXX_DiscardUnknown() { + xxx_messageInfo_StartTaskRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_StartTaskRequest proto.InternalMessageInfo func (m *StartTaskRequest) GetTask() string { if m != nil { @@ -218,13 +192,41 @@ func (m *StartTaskRequest) GetWorkers() []string { type StartTaskResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` +} + +func (m *StartTaskResponse) Reset() { *m = StartTaskResponse{} } +func (m *StartTaskResponse) String() string { return proto.CompactTextString(m) } +func (*StartTaskResponse) ProtoMessage() {} +func (*StartTaskResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{3} +} +func (m *StartTaskResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *StartTaskResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_StartTaskResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *StartTaskResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartTaskResponse.Merge(m, src) +} +func (m *StartTaskResponse) XXX_Size() int { + return m.Size() +} +func (m *StartTaskResponse) XXX_DiscardUnknown() { + xxx_messageInfo_StartTaskResponse.DiscardUnknown(m) } -func (m *StartTaskResponse) Reset() { *m = StartTaskResponse{} } -func (m *StartTaskResponse) String() string { return proto.CompactTextString(m) } -func (*StartTaskResponse) ProtoMessage() {} -func (*StartTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{3} } +var xxx_messageInfo_StartTaskResponse proto.InternalMessageInfo func (m *StartTaskResponse) GetResult() bool { if m != nil { @@ -255,8 +257,34 @@ func (m *UpdateMasterConfigRequest) Reset() { *m = UpdateMasterConfigReq func (m *UpdateMasterConfigRequest) String() string { return proto.CompactTextString(m) } func (*UpdateMasterConfigRequest) ProtoMessage() {} func (*UpdateMasterConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{4} + return fileDescriptor_f9bef11f2a341f03, []int{4} +} +func (m *UpdateMasterConfigRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UpdateMasterConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UpdateMasterConfigRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UpdateMasterConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateMasterConfigRequest.Merge(m, src) } +func (m *UpdateMasterConfigRequest) XXX_Size() int { + return m.Size() +} +func (m *UpdateMasterConfigRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateMasterConfigRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateMasterConfigRequest proto.InternalMessageInfo func (m *UpdateMasterConfigRequest) GetConfig() string { if m != nil { @@ -268,16 +296,42 @@ func (m *UpdateMasterConfigRequest) GetConfig() string { type UpdateMasterConfigResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*QueryStatusResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*QueryStatusResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *UpdateMasterConfigResponse) Reset() { *m = UpdateMasterConfigResponse{} } func (m *UpdateMasterConfigResponse) String() string { return proto.CompactTextString(m) } func (*UpdateMasterConfigResponse) ProtoMessage() {} func (*UpdateMasterConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{5} + return fileDescriptor_f9bef11f2a341f03, []int{5} +} +func (m *UpdateMasterConfigResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UpdateMasterConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UpdateMasterConfigResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UpdateMasterConfigResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateMasterConfigResponse.Merge(m, src) +} +func (m *UpdateMasterConfigResponse) XXX_Size() int { + return m.Size() +} +func (m *UpdateMasterConfigResponse) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateMasterConfigResponse.DiscardUnknown(m) } +var xxx_messageInfo_UpdateMasterConfigResponse proto.InternalMessageInfo + func (m *UpdateMasterConfigResponse) GetResult() bool { if m != nil { return m.Result @@ -302,13 +356,41 @@ func (m *UpdateMasterConfigResponse) GetWorkers() []*QueryStatusResponse { type OperateTaskRequest struct { Op TaskOp `protobuf:"varint,1,opt,name=op,proto3,enum=pb.TaskOp" json:"op,omitempty"` Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - Workers []string `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` +} + +func (m *OperateTaskRequest) Reset() { *m = OperateTaskRequest{} } +func (m *OperateTaskRequest) String() string { return proto.CompactTextString(m) } +func (*OperateTaskRequest) ProtoMessage() {} +func (*OperateTaskRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{6} +} +func (m *OperateTaskRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OperateTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OperateTaskRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OperateTaskRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_OperateTaskRequest.Merge(m, src) +} +func (m *OperateTaskRequest) XXX_Size() int { + return m.Size() +} +func (m *OperateTaskRequest) XXX_DiscardUnknown() { + xxx_messageInfo_OperateTaskRequest.DiscardUnknown(m) } -func (m *OperateTaskRequest) Reset() { *m = OperateTaskRequest{} } -func (m *OperateTaskRequest) String() string { return proto.CompactTextString(m) } -func (*OperateTaskRequest) ProtoMessage() {} -func (*OperateTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{6} } +var xxx_messageInfo_OperateTaskRequest proto.InternalMessageInfo func (m *OperateTaskRequest) GetOp() TaskOp { if m != nil { @@ -335,13 +417,41 @@ type OperateTaskResponse struct { Op TaskOp `protobuf:"varint,1,opt,name=op,proto3,enum=pb.TaskOp" json:"op,omitempty"` Result bool `protobuf:"varint,2,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*OperateSubTaskResponse `protobuf:"bytes,4,rep,name=workers" json:"workers,omitempty"` + Workers []*OperateSubTaskResponse `protobuf:"bytes,4,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *OperateTaskResponse) Reset() { *m = OperateTaskResponse{} } -func (m *OperateTaskResponse) String() string { return proto.CompactTextString(m) } -func (*OperateTaskResponse) ProtoMessage() {} -func (*OperateTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{7} } +func (m *OperateTaskResponse) Reset() { *m = OperateTaskResponse{} } +func (m *OperateTaskResponse) String() string { return proto.CompactTextString(m) } +func (*OperateTaskResponse) ProtoMessage() {} +func (*OperateTaskResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{7} +} +func (m *OperateTaskResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OperateTaskResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OperateTaskResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OperateTaskResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_OperateTaskResponse.Merge(m, src) +} +func (m *OperateTaskResponse) XXX_Size() int { + return m.Size() +} +func (m *OperateTaskResponse) XXX_DiscardUnknown() { + xxx_messageInfo_OperateTaskResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_OperateTaskResponse proto.InternalMessageInfo func (m *OperateTaskResponse) GetOp() TaskOp { if m != nil { @@ -378,13 +488,41 @@ func (m *OperateTaskResponse) GetWorkers() []*OperateSubTaskResponse { // workers need to do update, empty for all workers in processing the task type UpdateTaskRequest struct { Task string `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` - Workers []string `protobuf:"bytes,2,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,2,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } -func (m *UpdateTaskRequest) String() string { return proto.CompactTextString(m) } -func (*UpdateTaskRequest) ProtoMessage() {} -func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{8} } +func (m *UpdateTaskRequest) Reset() { *m = UpdateTaskRequest{} } +func (m *UpdateTaskRequest) String() string { return proto.CompactTextString(m) } +func (*UpdateTaskRequest) ProtoMessage() {} +func (*UpdateTaskRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{8} +} +func (m *UpdateTaskRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UpdateTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UpdateTaskRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UpdateTaskRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateTaskRequest.Merge(m, src) +} +func (m *UpdateTaskRequest) XXX_Size() int { + return m.Size() +} +func (m *UpdateTaskRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateTaskRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_UpdateTaskRequest proto.InternalMessageInfo func (m *UpdateTaskRequest) GetTask() string { if m != nil { @@ -403,13 +541,41 @@ func (m *UpdateTaskRequest) GetWorkers() []string { type UpdateTaskResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` +} + +func (m *UpdateTaskResponse) Reset() { *m = UpdateTaskResponse{} } +func (m *UpdateTaskResponse) String() string { return proto.CompactTextString(m) } +func (*UpdateTaskResponse) ProtoMessage() {} +func (*UpdateTaskResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{9} +} +func (m *UpdateTaskResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UpdateTaskResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UpdateTaskResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UpdateTaskResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateTaskResponse.Merge(m, src) +} +func (m *UpdateTaskResponse) XXX_Size() int { + return m.Size() +} +func (m *UpdateTaskResponse) XXX_DiscardUnknown() { + xxx_messageInfo_UpdateTaskResponse.DiscardUnknown(m) } -func (m *UpdateTaskResponse) Reset() { *m = UpdateTaskResponse{} } -func (m *UpdateTaskResponse) String() string { return proto.CompactTextString(m) } -func (*UpdateTaskResponse) ProtoMessage() {} -func (*UpdateTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{9} } +var xxx_messageInfo_UpdateTaskResponse proto.InternalMessageInfo func (m *UpdateTaskResponse) GetResult() bool { if m != nil { @@ -434,13 +600,41 @@ func (m *UpdateTaskResponse) GetWorkers() []*CommonWorkerResponse { type QueryStatusListRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Workers []string `protobuf:"bytes,2,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,2,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *QueryStatusListRequest) Reset() { *m = QueryStatusListRequest{} } -func (m *QueryStatusListRequest) String() string { return proto.CompactTextString(m) } -func (*QueryStatusListRequest) ProtoMessage() {} -func (*QueryStatusListRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{10} } +func (m *QueryStatusListRequest) Reset() { *m = QueryStatusListRequest{} } +func (m *QueryStatusListRequest) String() string { return proto.CompactTextString(m) } +func (*QueryStatusListRequest) ProtoMessage() {} +func (*QueryStatusListRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{10} +} +func (m *QueryStatusListRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryStatusListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryStatusListRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryStatusListRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryStatusListRequest.Merge(m, src) +} +func (m *QueryStatusListRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryStatusListRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryStatusListRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryStatusListRequest proto.InternalMessageInfo func (m *QueryStatusListRequest) GetName() string { if m != nil { @@ -459,13 +653,41 @@ func (m *QueryStatusListRequest) GetWorkers() []string { type QueryStatusListResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*QueryStatusResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*QueryStatusResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` +} + +func (m *QueryStatusListResponse) Reset() { *m = QueryStatusListResponse{} } +func (m *QueryStatusListResponse) String() string { return proto.CompactTextString(m) } +func (*QueryStatusListResponse) ProtoMessage() {} +func (*QueryStatusListResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{11} +} +func (m *QueryStatusListResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryStatusListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryStatusListResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryStatusListResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryStatusListResponse.Merge(m, src) +} +func (m *QueryStatusListResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryStatusListResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryStatusListResponse.DiscardUnknown(m) } -func (m *QueryStatusListResponse) Reset() { *m = QueryStatusListResponse{} } -func (m *QueryStatusListResponse) String() string { return proto.CompactTextString(m) } -func (*QueryStatusListResponse) ProtoMessage() {} -func (*QueryStatusListResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{11} } +var xxx_messageInfo_QueryStatusListResponse proto.InternalMessageInfo func (m *QueryStatusListResponse) GetResult() bool { if m != nil { @@ -490,13 +712,41 @@ func (m *QueryStatusListResponse) GetWorkers() []*QueryStatusResponse { type QueryErrorListRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Workers []string `protobuf:"bytes,2,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,2,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *QueryErrorListRequest) Reset() { *m = QueryErrorListRequest{} } -func (m *QueryErrorListRequest) String() string { return proto.CompactTextString(m) } -func (*QueryErrorListRequest) ProtoMessage() {} -func (*QueryErrorListRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{12} } +func (m *QueryErrorListRequest) Reset() { *m = QueryErrorListRequest{} } +func (m *QueryErrorListRequest) String() string { return proto.CompactTextString(m) } +func (*QueryErrorListRequest) ProtoMessage() {} +func (*QueryErrorListRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{12} +} +func (m *QueryErrorListRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryErrorListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryErrorListRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryErrorListRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryErrorListRequest.Merge(m, src) +} +func (m *QueryErrorListRequest) XXX_Size() int { + return m.Size() +} +func (m *QueryErrorListRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryErrorListRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryErrorListRequest proto.InternalMessageInfo func (m *QueryErrorListRequest) GetName() string { if m != nil { @@ -515,13 +765,41 @@ func (m *QueryErrorListRequest) GetWorkers() []string { type QueryErrorListResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*QueryErrorResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*QueryErrorResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *QueryErrorListResponse) Reset() { *m = QueryErrorListResponse{} } -func (m *QueryErrorListResponse) String() string { return proto.CompactTextString(m) } -func (*QueryErrorListResponse) ProtoMessage() {} -func (*QueryErrorListResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{13} } +func (m *QueryErrorListResponse) Reset() { *m = QueryErrorListResponse{} } +func (m *QueryErrorListResponse) String() string { return proto.CompactTextString(m) } +func (*QueryErrorListResponse) ProtoMessage() {} +func (*QueryErrorListResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{13} +} +func (m *QueryErrorListResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *QueryErrorListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_QueryErrorListResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *QueryErrorListResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryErrorListResponse.Merge(m, src) +} +func (m *QueryErrorListResponse) XXX_Size() int { + return m.Size() +} +func (m *QueryErrorListResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryErrorListResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_QueryErrorListResponse proto.InternalMessageInfo func (m *QueryErrorListResponse) GetResult() bool { if m != nil { @@ -551,13 +829,41 @@ func (m *QueryErrorListResponse) GetWorkers() []*QueryErrorResponse { // if specify task and workers both, and workers not doing the task , it will return empty DDL locks type ShowDDLLocksRequest struct { Task string `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` - Workers []string `protobuf:"bytes,2,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,2,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *ShowDDLLocksRequest) Reset() { *m = ShowDDLLocksRequest{} } -func (m *ShowDDLLocksRequest) String() string { return proto.CompactTextString(m) } -func (*ShowDDLLocksRequest) ProtoMessage() {} -func (*ShowDDLLocksRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{14} } +func (m *ShowDDLLocksRequest) Reset() { *m = ShowDDLLocksRequest{} } +func (m *ShowDDLLocksRequest) String() string { return proto.CompactTextString(m) } +func (*ShowDDLLocksRequest) ProtoMessage() {} +func (*ShowDDLLocksRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{14} +} +func (m *ShowDDLLocksRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ShowDDLLocksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ShowDDLLocksRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ShowDDLLocksRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShowDDLLocksRequest.Merge(m, src) +} +func (m *ShowDDLLocksRequest) XXX_Size() int { + return m.Size() +} +func (m *ShowDDLLocksRequest) XXX_DiscardUnknown() { + xxx_messageInfo_ShowDDLLocksRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_ShowDDLLocksRequest proto.InternalMessageInfo func (m *ShowDDLLocksRequest) GetTask() string { if m != nil { @@ -585,15 +891,43 @@ type DDLLock struct { ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` Task string `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"` Owner string `protobuf:"bytes,3,opt,name=owner,proto3" json:"owner,omitempty"` - DDLs []string `protobuf:"bytes,4,rep,name=DDLs" json:"DDLs,omitempty"` - Synced []string `protobuf:"bytes,5,rep,name=synced" json:"synced,omitempty"` - Unsynced []string `protobuf:"bytes,6,rep,name=unsynced" json:"unsynced,omitempty"` + DDLs []string `protobuf:"bytes,4,rep,name=DDLs,proto3" json:"DDLs,omitempty"` + Synced []string `protobuf:"bytes,5,rep,name=synced,proto3" json:"synced,omitempty"` + Unsynced []string `protobuf:"bytes,6,rep,name=unsynced,proto3" json:"unsynced,omitempty"` } -func (m *DDLLock) Reset() { *m = DDLLock{} } -func (m *DDLLock) String() string { return proto.CompactTextString(m) } -func (*DDLLock) ProtoMessage() {} -func (*DDLLock) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{15} } +func (m *DDLLock) Reset() { *m = DDLLock{} } +func (m *DDLLock) String() string { return proto.CompactTextString(m) } +func (*DDLLock) ProtoMessage() {} +func (*DDLLock) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{15} +} +func (m *DDLLock) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *DDLLock) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_DDLLock.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *DDLLock) XXX_Merge(src proto.Message) { + xxx_messageInfo_DDLLock.Merge(m, src) +} +func (m *DDLLock) XXX_Size() int { + return m.Size() +} +func (m *DDLLock) XXX_DiscardUnknown() { + xxx_messageInfo_DDLLock.DiscardUnknown(m) +} + +var xxx_messageInfo_DDLLock proto.InternalMessageInfo func (m *DDLLock) GetID() string { if m != nil { @@ -640,13 +974,41 @@ func (m *DDLLock) GetUnsynced() []string { type ShowDDLLocksResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Locks []*DDLLock `protobuf:"bytes,3,rep,name=locks" json:"locks,omitempty"` + Locks []*DDLLock `protobuf:"bytes,3,rep,name=locks,proto3" json:"locks,omitempty"` +} + +func (m *ShowDDLLocksResponse) Reset() { *m = ShowDDLLocksResponse{} } +func (m *ShowDDLLocksResponse) String() string { return proto.CompactTextString(m) } +func (*ShowDDLLocksResponse) ProtoMessage() {} +func (*ShowDDLLocksResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{16} +} +func (m *ShowDDLLocksResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ShowDDLLocksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ShowDDLLocksResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *ShowDDLLocksResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShowDDLLocksResponse.Merge(m, src) +} +func (m *ShowDDLLocksResponse) XXX_Size() int { + return m.Size() +} +func (m *ShowDDLLocksResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ShowDDLLocksResponse.DiscardUnknown(m) } -func (m *ShowDDLLocksResponse) Reset() { *m = ShowDDLLocksResponse{} } -func (m *ShowDDLLocksResponse) String() string { return proto.CompactTextString(m) } -func (*ShowDDLLocksResponse) ProtoMessage() {} -func (*ShowDDLLocksResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{16} } +var xxx_messageInfo_ShowDDLLocksResponse proto.InternalMessageInfo func (m *ShowDDLLocksResponse) GetResult() bool { if m != nil { @@ -678,14 +1040,42 @@ func (m *ShowDDLLocksResponse) GetLocks() []*DDLLock { type UnlockDDLLockRequest struct { ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"` ReplaceOwner string `protobuf:"bytes,2,opt,name=replaceOwner,proto3" json:"replaceOwner,omitempty"` - Workers []string `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` ForceRemove bool `protobuf:"varint,4,opt,name=forceRemove,proto3" json:"forceRemove,omitempty"` } -func (m *UnlockDDLLockRequest) Reset() { *m = UnlockDDLLockRequest{} } -func (m *UnlockDDLLockRequest) String() string { return proto.CompactTextString(m) } -func (*UnlockDDLLockRequest) ProtoMessage() {} -func (*UnlockDDLLockRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{17} } +func (m *UnlockDDLLockRequest) Reset() { *m = UnlockDDLLockRequest{} } +func (m *UnlockDDLLockRequest) String() string { return proto.CompactTextString(m) } +func (*UnlockDDLLockRequest) ProtoMessage() {} +func (*UnlockDDLLockRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{17} +} +func (m *UnlockDDLLockRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UnlockDDLLockRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UnlockDDLLockRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UnlockDDLLockRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UnlockDDLLockRequest.Merge(m, src) +} +func (m *UnlockDDLLockRequest) XXX_Size() int { + return m.Size() +} +func (m *UnlockDDLLockRequest) XXX_DiscardUnknown() { + xxx_messageInfo_UnlockDDLLockRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_UnlockDDLLockRequest proto.InternalMessageInfo func (m *UnlockDDLLockRequest) GetID() string { if m != nil { @@ -718,13 +1108,41 @@ func (m *UnlockDDLLockRequest) GetForceRemove() bool { type UnlockDDLLockResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *UnlockDDLLockResponse) Reset() { *m = UnlockDDLLockResponse{} } -func (m *UnlockDDLLockResponse) String() string { return proto.CompactTextString(m) } -func (*UnlockDDLLockResponse) ProtoMessage() {} -func (*UnlockDDLLockResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{18} } +func (m *UnlockDDLLockResponse) Reset() { *m = UnlockDDLLockResponse{} } +func (m *UnlockDDLLockResponse) String() string { return proto.CompactTextString(m) } +func (*UnlockDDLLockResponse) ProtoMessage() {} +func (*UnlockDDLLockResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{18} +} +func (m *UnlockDDLLockResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *UnlockDDLLockResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_UnlockDDLLockResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *UnlockDDLLockResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UnlockDDLLockResponse.Merge(m, src) +} +func (m *UnlockDDLLockResponse) XXX_Size() int { + return m.Size() +} +func (m *UnlockDDLLockResponse) XXX_DiscardUnknown() { + xxx_messageInfo_UnlockDDLLockResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_UnlockDDLLockResponse proto.InternalMessageInfo func (m *UnlockDDLLockResponse) GetResult() bool { if m != nil { @@ -755,7 +1173,7 @@ func (m *UnlockDDLLockResponse) GetWorkers() []*CommonWorkerResponse { // skipDDL: skip DDL which is blocking // execDDL and skipDDL can not specify both at the same time, but can specify neither type BreakWorkerDDLLockRequest struct { - Workers []string `protobuf:"bytes,1,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,1,rep,name=workers,proto3" json:"workers,omitempty"` Task string `protobuf:"bytes,2,opt,name=task,proto3" json:"task,omitempty"` RemoveLockID string `protobuf:"bytes,3,opt,name=removeLockID,proto3" json:"removeLockID,omitempty"` ExecDDL bool `protobuf:"varint,4,opt,name=execDDL,proto3" json:"execDDL,omitempty"` @@ -766,9 +1184,35 @@ func (m *BreakWorkerDDLLockRequest) Reset() { *m = BreakWorkerDDLLockReq func (m *BreakWorkerDDLLockRequest) String() string { return proto.CompactTextString(m) } func (*BreakWorkerDDLLockRequest) ProtoMessage() {} func (*BreakWorkerDDLLockRequest) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{19} + return fileDescriptor_f9bef11f2a341f03, []int{19} +} +func (m *BreakWorkerDDLLockRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *BreakWorkerDDLLockRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_BreakWorkerDDLLockRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *BreakWorkerDDLLockRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BreakWorkerDDLLockRequest.Merge(m, src) +} +func (m *BreakWorkerDDLLockRequest) XXX_Size() int { + return m.Size() +} +func (m *BreakWorkerDDLLockRequest) XXX_DiscardUnknown() { + xxx_messageInfo_BreakWorkerDDLLockRequest.DiscardUnknown(m) } +var xxx_messageInfo_BreakWorkerDDLLockRequest proto.InternalMessageInfo + func (m *BreakWorkerDDLLockRequest) GetWorkers() []string { if m != nil { return m.Workers @@ -807,16 +1251,42 @@ func (m *BreakWorkerDDLLockRequest) GetSkipDDL() bool { type BreakWorkerDDLLockResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *BreakWorkerDDLLockResponse) Reset() { *m = BreakWorkerDDLLockResponse{} } func (m *BreakWorkerDDLLockResponse) String() string { return proto.CompactTextString(m) } func (*BreakWorkerDDLLockResponse) ProtoMessage() {} func (*BreakWorkerDDLLockResponse) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{20} + return fileDescriptor_f9bef11f2a341f03, []int{20} +} +func (m *BreakWorkerDDLLockResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *BreakWorkerDDLLockResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_BreakWorkerDDLLockResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *BreakWorkerDDLLockResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BreakWorkerDDLLockResponse.Merge(m, src) +} +func (m *BreakWorkerDDLLockResponse) XXX_Size() int { + return m.Size() +} +func (m *BreakWorkerDDLLockResponse) XXX_DiscardUnknown() { + xxx_messageInfo_BreakWorkerDDLLockResponse.DiscardUnknown(m) } +var xxx_messageInfo_BreakWorkerDDLLockResponse proto.InternalMessageInfo + func (m *BreakWorkerDDLLockResponse) GetResult() bool { if m != nil { return m.Result @@ -841,16 +1311,42 @@ func (m *BreakWorkerDDLLockResponse) GetWorkers() []*CommonWorkerResponse { // SwitchWorkerRelayMasterRequest represents a request for some dm-workers to switch relay unit's master server // workers: relay unit in these dm-workers need to switch master server type SwitchWorkerRelayMasterRequest struct { - Workers []string `protobuf:"bytes,1,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,1,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *SwitchWorkerRelayMasterRequest) Reset() { *m = SwitchWorkerRelayMasterRequest{} } func (m *SwitchWorkerRelayMasterRequest) String() string { return proto.CompactTextString(m) } func (*SwitchWorkerRelayMasterRequest) ProtoMessage() {} func (*SwitchWorkerRelayMasterRequest) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{21} + return fileDescriptor_f9bef11f2a341f03, []int{21} +} +func (m *SwitchWorkerRelayMasterRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SwitchWorkerRelayMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SwitchWorkerRelayMasterRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SwitchWorkerRelayMasterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SwitchWorkerRelayMasterRequest.Merge(m, src) +} +func (m *SwitchWorkerRelayMasterRequest) XXX_Size() int { + return m.Size() +} +func (m *SwitchWorkerRelayMasterRequest) XXX_DiscardUnknown() { + xxx_messageInfo_SwitchWorkerRelayMasterRequest.DiscardUnknown(m) } +var xxx_messageInfo_SwitchWorkerRelayMasterRequest proto.InternalMessageInfo + func (m *SwitchWorkerRelayMasterRequest) GetWorkers() []string { if m != nil { return m.Workers @@ -861,16 +1357,42 @@ func (m *SwitchWorkerRelayMasterRequest) GetWorkers() []string { type SwitchWorkerRelayMasterResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *SwitchWorkerRelayMasterResponse) Reset() { *m = SwitchWorkerRelayMasterResponse{} } func (m *SwitchWorkerRelayMasterResponse) String() string { return proto.CompactTextString(m) } func (*SwitchWorkerRelayMasterResponse) ProtoMessage() {} func (*SwitchWorkerRelayMasterResponse) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{22} + return fileDescriptor_f9bef11f2a341f03, []int{22} +} +func (m *SwitchWorkerRelayMasterResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SwitchWorkerRelayMasterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SwitchWorkerRelayMasterResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *SwitchWorkerRelayMasterResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SwitchWorkerRelayMasterResponse.Merge(m, src) +} +func (m *SwitchWorkerRelayMasterResponse) XXX_Size() int { + return m.Size() +} +func (m *SwitchWorkerRelayMasterResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SwitchWorkerRelayMasterResponse.DiscardUnknown(m) } +var xxx_messageInfo_SwitchWorkerRelayMasterResponse proto.InternalMessageInfo + func (m *SwitchWorkerRelayMasterResponse) GetResult() bool { if m != nil { return m.Result @@ -895,16 +1417,42 @@ func (m *SwitchWorkerRelayMasterResponse) GetWorkers() []*CommonWorkerResponse { // OperateWorkerRelayRequest represents a request for some dm-workers to operate relay unit type OperateWorkerRelayRequest struct { Op RelayOp `protobuf:"varint,1,opt,name=op,proto3,enum=pb.RelayOp" json:"op,omitempty"` - Workers []string `protobuf:"bytes,2,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,2,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *OperateWorkerRelayRequest) Reset() { *m = OperateWorkerRelayRequest{} } func (m *OperateWorkerRelayRequest) String() string { return proto.CompactTextString(m) } func (*OperateWorkerRelayRequest) ProtoMessage() {} func (*OperateWorkerRelayRequest) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{23} + return fileDescriptor_f9bef11f2a341f03, []int{23} +} +func (m *OperateWorkerRelayRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OperateWorkerRelayRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OperateWorkerRelayRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OperateWorkerRelayRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_OperateWorkerRelayRequest.Merge(m, src) +} +func (m *OperateWorkerRelayRequest) XXX_Size() int { + return m.Size() +} +func (m *OperateWorkerRelayRequest) XXX_DiscardUnknown() { + xxx_messageInfo_OperateWorkerRelayRequest.DiscardUnknown(m) } +var xxx_messageInfo_OperateWorkerRelayRequest proto.InternalMessageInfo + func (m *OperateWorkerRelayRequest) GetOp() RelayOp { if m != nil { return m.Op @@ -923,16 +1471,42 @@ type OperateWorkerRelayResponse struct { Op RelayOp `protobuf:"varint,1,opt,name=op,proto3,enum=pb.RelayOp" json:"op,omitempty"` Result bool `protobuf:"varint,2,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,3,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*OperateRelayResponse `protobuf:"bytes,4,rep,name=workers" json:"workers,omitempty"` + Workers []*OperateRelayResponse `protobuf:"bytes,4,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *OperateWorkerRelayResponse) Reset() { *m = OperateWorkerRelayResponse{} } func (m *OperateWorkerRelayResponse) String() string { return proto.CompactTextString(m) } func (*OperateWorkerRelayResponse) ProtoMessage() {} func (*OperateWorkerRelayResponse) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{24} + return fileDescriptor_f9bef11f2a341f03, []int{24} +} +func (m *OperateWorkerRelayResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *OperateWorkerRelayResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_OperateWorkerRelayResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *OperateWorkerRelayResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_OperateWorkerRelayResponse.Merge(m, src) +} +func (m *OperateWorkerRelayResponse) XXX_Size() int { + return m.Size() +} +func (m *OperateWorkerRelayResponse) XXX_DiscardUnknown() { + xxx_messageInfo_OperateWorkerRelayResponse.DiscardUnknown(m) } +var xxx_messageInfo_OperateWorkerRelayResponse proto.InternalMessageInfo + func (m *OperateWorkerRelayResponse) GetOp() RelayOp { if m != nil { return m.Op @@ -968,18 +1542,72 @@ func (m *RefreshWorkerTasksRequest) Reset() { *m = RefreshWorkerTasksReq func (m *RefreshWorkerTasksRequest) String() string { return proto.CompactTextString(m) } func (*RefreshWorkerTasksRequest) ProtoMessage() {} func (*RefreshWorkerTasksRequest) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{25} + return fileDescriptor_f9bef11f2a341f03, []int{25} +} +func (m *RefreshWorkerTasksRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RefreshWorkerTasksRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RefreshWorkerTasksRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RefreshWorkerTasksRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RefreshWorkerTasksRequest.Merge(m, src) +} +func (m *RefreshWorkerTasksRequest) XXX_Size() int { + return m.Size() } +func (m *RefreshWorkerTasksRequest) XXX_DiscardUnknown() { + xxx_messageInfo_RefreshWorkerTasksRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_RefreshWorkerTasksRequest proto.InternalMessageInfo type RefreshWorkerTasksMsg struct { Worker string `protobuf:"bytes,1,opt,name=worker,proto3" json:"worker,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` } -func (m *RefreshWorkerTasksMsg) Reset() { *m = RefreshWorkerTasksMsg{} } -func (m *RefreshWorkerTasksMsg) String() string { return proto.CompactTextString(m) } -func (*RefreshWorkerTasksMsg) ProtoMessage() {} -func (*RefreshWorkerTasksMsg) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{26} } +func (m *RefreshWorkerTasksMsg) Reset() { *m = RefreshWorkerTasksMsg{} } +func (m *RefreshWorkerTasksMsg) String() string { return proto.CompactTextString(m) } +func (*RefreshWorkerTasksMsg) ProtoMessage() {} +func (*RefreshWorkerTasksMsg) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{26} +} +func (m *RefreshWorkerTasksMsg) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RefreshWorkerTasksMsg) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RefreshWorkerTasksMsg.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RefreshWorkerTasksMsg) XXX_Merge(src proto.Message) { + xxx_messageInfo_RefreshWorkerTasksMsg.Merge(m, src) +} +func (m *RefreshWorkerTasksMsg) XXX_Size() int { + return m.Size() +} +func (m *RefreshWorkerTasksMsg) XXX_DiscardUnknown() { + xxx_messageInfo_RefreshWorkerTasksMsg.DiscardUnknown(m) +} + +var xxx_messageInfo_RefreshWorkerTasksMsg proto.InternalMessageInfo func (m *RefreshWorkerTasksMsg) GetWorker() string { if m != nil { @@ -997,16 +1625,42 @@ func (m *RefreshWorkerTasksMsg) GetMsg() string { type RefreshWorkerTasksResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` - Workers []*RefreshWorkerTasksMsg `protobuf:"bytes,2,rep,name=workers" json:"workers,omitempty"` + Workers []*RefreshWorkerTasksMsg `protobuf:"bytes,2,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *RefreshWorkerTasksResponse) Reset() { *m = RefreshWorkerTasksResponse{} } func (m *RefreshWorkerTasksResponse) String() string { return proto.CompactTextString(m) } func (*RefreshWorkerTasksResponse) ProtoMessage() {} func (*RefreshWorkerTasksResponse) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{27} + return fileDescriptor_f9bef11f2a341f03, []int{27} +} +func (m *RefreshWorkerTasksResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *RefreshWorkerTasksResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_RefreshWorkerTasksResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *RefreshWorkerTasksResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RefreshWorkerTasksResponse.Merge(m, src) +} +func (m *RefreshWorkerTasksResponse) XXX_Size() int { + return m.Size() +} +func (m *RefreshWorkerTasksResponse) XXX_DiscardUnknown() { + xxx_messageInfo_RefreshWorkerTasksResponse.DiscardUnknown(m) } +var xxx_messageInfo_RefreshWorkerTasksResponse proto.InternalMessageInfo + func (m *RefreshWorkerTasksResponse) GetResult() bool { if m != nil { return m.Result @@ -1024,17 +1678,45 @@ func (m *RefreshWorkerTasksResponse) GetWorkers() []*RefreshWorkerTasksMsg { type HandleSQLsRequest struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Op SQLOp `protobuf:"varint,2,opt,name=op,proto3,enum=pb.SQLOp" json:"op,omitempty"` - Args []string `protobuf:"bytes,3,rep,name=args" json:"args,omitempty"` + Args []string `protobuf:"bytes,3,rep,name=args,proto3" json:"args,omitempty"` BinlogPos string `protobuf:"bytes,4,opt,name=binlogPos,proto3" json:"binlogPos,omitempty"` Worker string `protobuf:"bytes,5,opt,name=worker,proto3" json:"worker,omitempty"` SqlPattern string `protobuf:"bytes,6,opt,name=sqlPattern,proto3" json:"sqlPattern,omitempty"` Sharding bool `protobuf:"varint,7,opt,name=sharding,proto3" json:"sharding,omitempty"` } -func (m *HandleSQLsRequest) Reset() { *m = HandleSQLsRequest{} } -func (m *HandleSQLsRequest) String() string { return proto.CompactTextString(m) } -func (*HandleSQLsRequest) ProtoMessage() {} -func (*HandleSQLsRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{28} } +func (m *HandleSQLsRequest) Reset() { *m = HandleSQLsRequest{} } +func (m *HandleSQLsRequest) String() string { return proto.CompactTextString(m) } +func (*HandleSQLsRequest) ProtoMessage() {} +func (*HandleSQLsRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{28} +} +func (m *HandleSQLsRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HandleSQLsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HandleSQLsRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HandleSQLsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_HandleSQLsRequest.Merge(m, src) +} +func (m *HandleSQLsRequest) XXX_Size() int { + return m.Size() +} +func (m *HandleSQLsRequest) XXX_DiscardUnknown() { + xxx_messageInfo_HandleSQLsRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_HandleSQLsRequest proto.InternalMessageInfo func (m *HandleSQLsRequest) GetName() string { if m != nil { @@ -1088,13 +1770,41 @@ func (m *HandleSQLsRequest) GetSharding() bool { type HandleSQLsResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` } -func (m *HandleSQLsResponse) Reset() { *m = HandleSQLsResponse{} } -func (m *HandleSQLsResponse) String() string { return proto.CompactTextString(m) } -func (*HandleSQLsResponse) ProtoMessage() {} -func (*HandleSQLsResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{29} } +func (m *HandleSQLsResponse) Reset() { *m = HandleSQLsResponse{} } +func (m *HandleSQLsResponse) String() string { return proto.CompactTextString(m) } +func (*HandleSQLsResponse) ProtoMessage() {} +func (*HandleSQLsResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{29} +} +func (m *HandleSQLsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *HandleSQLsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_HandleSQLsResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *HandleSQLsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_HandleSQLsResponse.Merge(m, src) +} +func (m *HandleSQLsResponse) XXX_Size() int { + return m.Size() +} +func (m *HandleSQLsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_HandleSQLsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_HandleSQLsResponse proto.InternalMessageInfo func (m *HandleSQLsResponse) GetResult() bool { if m != nil { @@ -1124,17 +1834,45 @@ func (m *HandleSQLsResponse) GetWorkers() []*CommonWorkerResponse { // filename: whether purge relay log files before this filename // subDir: specify relay sub directory for @filename type PurgeWorkerRelayRequest struct { - Workers []string `protobuf:"bytes,1,rep,name=workers" json:"workers,omitempty"` + Workers []string `protobuf:"bytes,1,rep,name=workers,proto3" json:"workers,omitempty"` Inactive bool `protobuf:"varint,2,opt,name=inactive,proto3" json:"inactive,omitempty"` Time int64 `protobuf:"varint,3,opt,name=time,proto3" json:"time,omitempty"` Filename string `protobuf:"bytes,4,opt,name=filename,proto3" json:"filename,omitempty"` SubDir string `protobuf:"bytes,5,opt,name=subDir,proto3" json:"subDir,omitempty"` } -func (m *PurgeWorkerRelayRequest) Reset() { *m = PurgeWorkerRelayRequest{} } -func (m *PurgeWorkerRelayRequest) String() string { return proto.CompactTextString(m) } -func (*PurgeWorkerRelayRequest) ProtoMessage() {} -func (*PurgeWorkerRelayRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{30} } +func (m *PurgeWorkerRelayRequest) Reset() { *m = PurgeWorkerRelayRequest{} } +func (m *PurgeWorkerRelayRequest) String() string { return proto.CompactTextString(m) } +func (*PurgeWorkerRelayRequest) ProtoMessage() {} +func (*PurgeWorkerRelayRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{30} +} +func (m *PurgeWorkerRelayRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PurgeWorkerRelayRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PurgeWorkerRelayRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PurgeWorkerRelayRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PurgeWorkerRelayRequest.Merge(m, src) +} +func (m *PurgeWorkerRelayRequest) XXX_Size() int { + return m.Size() +} +func (m *PurgeWorkerRelayRequest) XXX_DiscardUnknown() { + xxx_messageInfo_PurgeWorkerRelayRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_PurgeWorkerRelayRequest proto.InternalMessageInfo func (m *PurgeWorkerRelayRequest) GetWorkers() []string { if m != nil { @@ -1174,15 +1912,41 @@ func (m *PurgeWorkerRelayRequest) GetSubDir() string { type PurgeWorkerRelayResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` - Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers" json:"workers,omitempty"` + Workers []*CommonWorkerResponse `protobuf:"bytes,3,rep,name=workers,proto3" json:"workers,omitempty"` } func (m *PurgeWorkerRelayResponse) Reset() { *m = PurgeWorkerRelayResponse{} } func (m *PurgeWorkerRelayResponse) String() string { return proto.CompactTextString(m) } func (*PurgeWorkerRelayResponse) ProtoMessage() {} func (*PurgeWorkerRelayResponse) Descriptor() ([]byte, []int) { - return fileDescriptorDmmaster, []int{31} + return fileDescriptor_f9bef11f2a341f03, []int{31} +} +func (m *PurgeWorkerRelayResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *PurgeWorkerRelayResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_PurgeWorkerRelayResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *PurgeWorkerRelayResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PurgeWorkerRelayResponse.Merge(m, src) +} +func (m *PurgeWorkerRelayResponse) XXX_Size() int { + return m.Size() } +func (m *PurgeWorkerRelayResponse) XXX_DiscardUnknown() { + xxx_messageInfo_PurgeWorkerRelayResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_PurgeWorkerRelayResponse proto.InternalMessageInfo func (m *PurgeWorkerRelayResponse) GetResult() bool { if m != nil { @@ -1209,10 +1973,38 @@ type CheckTaskRequest struct { Task string `protobuf:"bytes,1,opt,name=task,proto3" json:"task,omitempty"` } -func (m *CheckTaskRequest) Reset() { *m = CheckTaskRequest{} } -func (m *CheckTaskRequest) String() string { return proto.CompactTextString(m) } -func (*CheckTaskRequest) ProtoMessage() {} -func (*CheckTaskRequest) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{32} } +func (m *CheckTaskRequest) Reset() { *m = CheckTaskRequest{} } +func (m *CheckTaskRequest) String() string { return proto.CompactTextString(m) } +func (*CheckTaskRequest) ProtoMessage() {} +func (*CheckTaskRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{32} +} +func (m *CheckTaskRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckTaskRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckTaskRequest.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckTaskRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckTaskRequest.Merge(m, src) +} +func (m *CheckTaskRequest) XXX_Size() int { + return m.Size() +} +func (m *CheckTaskRequest) XXX_DiscardUnknown() { + xxx_messageInfo_CheckTaskRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_CheckTaskRequest proto.InternalMessageInfo func (m *CheckTaskRequest) GetTask() string { if m != nil { @@ -1226,10 +2018,38 @@ type CheckTaskResponse struct { Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` } -func (m *CheckTaskResponse) Reset() { *m = CheckTaskResponse{} } -func (m *CheckTaskResponse) String() string { return proto.CompactTextString(m) } -func (*CheckTaskResponse) ProtoMessage() {} -func (*CheckTaskResponse) Descriptor() ([]byte, []int) { return fileDescriptorDmmaster, []int{33} } +func (m *CheckTaskResponse) Reset() { *m = CheckTaskResponse{} } +func (m *CheckTaskResponse) String() string { return proto.CompactTextString(m) } +func (*CheckTaskResponse) ProtoMessage() {} +func (*CheckTaskResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_f9bef11f2a341f03, []int{33} +} +func (m *CheckTaskResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CheckTaskResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_CheckTaskResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *CheckTaskResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CheckTaskResponse.Merge(m, src) +} +func (m *CheckTaskResponse) XXX_Size() int { + return m.Size() +} +func (m *CheckTaskResponse) XXX_DiscardUnknown() { + xxx_messageInfo_CheckTaskResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_CheckTaskResponse proto.InternalMessageInfo func (m *CheckTaskResponse) GetResult() bool { if m != nil { @@ -1282,6 +2102,98 @@ func init() { proto.RegisterType((*CheckTaskResponse)(nil), "pb.CheckTaskResponse") } +func init() { proto.RegisterFile("dmmaster.proto", fileDescriptor_f9bef11f2a341f03) } + +var fileDescriptor_f9bef11f2a341f03 = []byte{ + // 1362 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xcf, 0x4f, 0xe3, 0xc6, + 0x17, 0x8f, 0x13, 0xc8, 0x92, 0x97, 0x5d, 0x04, 0xb3, 0x90, 0x38, 0x86, 0xf5, 0xf2, 0xf5, 0xb7, + 0x5a, 0xa1, 0x1e, 0xa0, 0x84, 0x9e, 0x90, 0x56, 0xea, 0x42, 0x58, 0x15, 0x29, 0x14, 0x70, 0x8a, + 0xaa, 0xbd, 0x54, 0x72, 0x92, 0x21, 0x58, 0x49, 0x6c, 0x63, 0x3b, 0xb0, 0xb4, 0xaa, 0x2a, 0xf5, + 0xd0, 0x43, 0x7b, 0x69, 0xd5, 0xc3, 0x9e, 0xfb, 0xdf, 0xec, 0x71, 0xa5, 0x5e, 0x7a, 0xac, 0xa0, + 0x7f, 0x48, 0x35, 0x3f, 0x62, 0x8f, 0x7f, 0x85, 0x85, 0x43, 0x6e, 0x9e, 0x79, 0x9e, 0xcf, 0xfb, + 0xbc, 0x37, 0x6f, 0xde, 0x7c, 0x6c, 0x98, 0xef, 0x0e, 0x87, 0x86, 0xe7, 0x63, 0x77, 0xc3, 0x71, + 0x6d, 0xdf, 0x46, 0x79, 0xa7, 0xad, 0xcc, 0x77, 0x87, 0x57, 0xb6, 0xdb, 0x1f, 0xcf, 0x29, 0xab, + 0x3d, 0xdb, 0xee, 0x0d, 0xf0, 0xa6, 0xe1, 0x98, 0x9b, 0x86, 0x65, 0xd9, 0xbe, 0xe1, 0x9b, 0xb6, + 0xe5, 0x31, 0xab, 0x76, 0x01, 0xb5, 0x43, 0xb3, 0xe7, 0x1a, 0x3e, 0xfe, 0x86, 0x2e, 0xd2, 0xf1, + 0xc0, 0xb8, 0xd6, 0xf1, 0xc5, 0x08, 0x7b, 0x3e, 0x52, 0x01, 0x76, 0x4d, 0x6b, 0x60, 0xf7, 0xbe, + 0x32, 0x86, 0x58, 0x96, 0xd6, 0xa4, 0xf5, 0x92, 0x2e, 0xcc, 0xa0, 0x55, 0x28, 0xb1, 0xd1, 0xb1, + 0xed, 0xc9, 0xf9, 0x35, 0x69, 0xfd, 0x89, 0x1e, 0x4e, 0xa0, 0x0a, 0x14, 0x19, 0x11, 0xb9, 0x40, + 0x57, 0xf2, 0x91, 0x76, 0x0c, 0xea, 0xa9, 0xd3, 0x8d, 0x7a, 0xdc, 0xb3, 0xad, 0x33, 0xb3, 0x37, + 0xf6, 0x5b, 0x81, 0x62, 0x87, 0x4e, 0x70, 0x9f, 0x7c, 0x24, 0x20, 0xe6, 0x23, 0x88, 0x5f, 0xc0, + 0x42, 0xcb, 0x37, 0x5c, 0xff, 0x6b, 0xc3, 0xeb, 0x8f, 0x31, 0x10, 0xcc, 0xf8, 0x86, 0xd7, 0xe7, + 0x08, 0xf4, 0x19, 0xc9, 0xf0, 0x88, 0xad, 0x20, 0x6c, 0x0b, 0xeb, 0x25, 0x7d, 0x3c, 0xd4, 0x2e, + 0x60, 0x51, 0x40, 0xf0, 0x1c, 0xdb, 0xf2, 0x30, 0x71, 0xe7, 0x62, 0x6f, 0x34, 0xf0, 0x29, 0xc8, + 0x9c, 0xce, 0x47, 0x68, 0x01, 0x0a, 0x43, 0xaf, 0xc7, 0x39, 0x90, 0x47, 0x54, 0x0f, 0x81, 0x0b, + 0x6b, 0x85, 0xf5, 0x72, 0x5d, 0xde, 0x70, 0xda, 0x1b, 0x7b, 0xf6, 0x70, 0x68, 0x5b, 0xe3, 0x28, + 0x19, 0x68, 0xe8, 0x72, 0x1b, 0x6a, 0x2c, 0x0d, 0x87, 0x74, 0x07, 0x3f, 0x2a, 0x03, 0xda, 0x35, + 0x28, 0x69, 0x8b, 0xee, 0x4d, 0x78, 0x2b, 0x4e, 0xb8, 0x4a, 0x08, 0x9f, 0x8c, 0xb0, 0x7b, 0xdd, + 0xf2, 0x0d, 0x7f, 0xe4, 0x25, 0xf9, 0x7e, 0x0b, 0xe8, 0xc8, 0xc1, 0xa4, 0x52, 0xc4, 0x34, 0x2b, + 0x90, 0xb7, 0x1d, 0xea, 0x6e, 0xbe, 0x0e, 0x04, 0x83, 0x18, 0x8f, 0x1c, 0x3d, 0x6f, 0x3b, 0x64, + 0x0b, 0x2c, 0x52, 0x38, 0xcc, 0x2f, 0x7d, 0x16, 0xb7, 0xa0, 0x10, 0xdd, 0x82, 0xdf, 0x25, 0x78, + 0x1a, 0x71, 0xc0, 0x83, 0x9a, 0xe4, 0x21, 0x0c, 0x38, 0x9f, 0x16, 0x70, 0x21, 0x0c, 0xf8, 0xf3, + 0xd0, 0xef, 0x0c, 0x0d, 0x58, 0x21, 0x50, 0xdc, 0x5f, 0x6b, 0xd4, 0x16, 0x5d, 0x86, 0x9c, 0x5e, + 0xc1, 0x22, 0x4b, 0xf7, 0xc3, 0x2b, 0xcb, 0x05, 0x24, 0x42, 0x4c, 0xa5, 0xb4, 0x5e, 0x43, 0x45, + 0xd8, 0xca, 0xa6, 0xe9, 0xf9, 0x02, 0x77, 0x2b, 0x3c, 0xcb, 0x89, 0x2d, 0x89, 0x71, 0xbf, 0x84, + 0x6a, 0x02, 0x67, 0x1a, 0xa5, 0xb6, 0x0f, 0xcb, 0xd4, 0xbe, 0xef, 0xba, 0xb6, 0xfb, 0x70, 0xfa, + 0x3e, 0x4f, 0x83, 0x00, 0x73, 0x6f, 0xf6, 0x9f, 0xc5, 0xd9, 0x57, 0x02, 0xf6, 0x14, 0x36, 0x49, + 0x7e, 0x0f, 0x9e, 0xb6, 0xce, 0xed, 0xab, 0x46, 0xa3, 0xd9, 0xb4, 0x3b, 0x7d, 0xef, 0x61, 0x55, + 0xf3, 0xab, 0x04, 0x8f, 0x38, 0x02, 0x9a, 0x87, 0xfc, 0x41, 0x83, 0xaf, 0xcb, 0x1f, 0x34, 0x02, + 0xa4, 0xbc, 0x80, 0xb4, 0x04, 0xb3, 0xf6, 0x95, 0x15, 0xb4, 0x5a, 0x36, 0x20, 0x6f, 0x36, 0x1a, + 0x4d, 0x56, 0xf1, 0x25, 0x9d, 0x3e, 0x93, 0xd0, 0xbd, 0x6b, 0xab, 0x83, 0xbb, 0xf2, 0x2c, 0x9d, + 0xe5, 0x23, 0xa4, 0xc0, 0xdc, 0xc8, 0xe2, 0x96, 0x22, 0xb5, 0x04, 0x63, 0xad, 0x03, 0x4b, 0xd1, + 0x90, 0xee, 0x9d, 0xc6, 0xff, 0xc1, 0xec, 0x80, 0x2c, 0xe5, 0x49, 0x2c, 0x93, 0x24, 0x72, 0x38, + 0x9d, 0x59, 0xb4, 0x9f, 0x25, 0x58, 0x3a, 0xb5, 0xc8, 0xf3, 0xd8, 0xc0, 0x33, 0x17, 0x8f, 0x5f, + 0x83, 0xc7, 0x2e, 0x76, 0x06, 0x46, 0x07, 0x1f, 0xd1, 0x90, 0x99, 0x9b, 0xc8, 0x5c, 0x76, 0x9b, + 0x41, 0x6b, 0x50, 0x3e, 0xb3, 0xdd, 0x0e, 0xd6, 0xf1, 0xd0, 0xbe, 0xc4, 0xf2, 0x0c, 0x25, 0x2e, + 0x4e, 0x69, 0x23, 0x58, 0x8e, 0xf1, 0x98, 0xca, 0xa1, 0xfd, 0x53, 0x82, 0xda, 0xae, 0x8b, 0x8d, + 0x3e, 0x7b, 0x21, 0x96, 0x04, 0x21, 0x20, 0x29, 0x1a, 0x50, 0x5a, 0x39, 0xd0, 0x14, 0x91, 0x60, + 0x08, 0xc4, 0x41, 0x83, 0x57, 0x45, 0x64, 0x8e, 0x20, 0xe2, 0xb7, 0xb8, 0xd3, 0x68, 0x34, 0x79, + 0x12, 0xc6, 0x43, 0x62, 0xf1, 0xfa, 0xa6, 0x43, 0x2c, 0xb3, 0xcc, 0xc2, 0x87, 0xda, 0x77, 0xa0, + 0xa4, 0x51, 0x9c, 0x4a, 0x7e, 0x76, 0x40, 0x6d, 0x5d, 0x99, 0x7e, 0xe7, 0x5c, 0x90, 0x0d, 0xec, + 0x16, 0xbc, 0x33, 0x47, 0xda, 0x8f, 0xf0, 0x3c, 0x73, 0xed, 0x54, 0xc8, 0xeb, 0x50, 0xe3, 0x77, + 0x4d, 0x8a, 0xcc, 0x5a, 0x11, 0x6e, 0x38, 0x7a, 0x32, 0xa8, 0x95, 0x5f, 0x71, 0xd9, 0x3d, 0xe2, + 0x9d, 0x04, 0x4a, 0x1a, 0x28, 0x0f, 0x68, 0x22, 0xea, 0xc7, 0x5f, 0x9c, 0xf5, 0xf8, 0xc5, 0x29, + 0x0b, 0x17, 0x67, 0xc4, 0x63, 0xc8, 0x6c, 0x05, 0x6a, 0x3a, 0x3e, 0x73, 0xb1, 0xc7, 0xf3, 0x4d, + 0xae, 0xbe, 0x71, 0x23, 0xd4, 0x5e, 0xc1, 0x72, 0xd2, 0x78, 0xe8, 0x89, 0xea, 0x4e, 0x12, 0xd5, + 0x5d, 0x72, 0x07, 0x34, 0x13, 0x94, 0x34, 0xfc, 0x3b, 0x76, 0x72, 0x3b, 0x9a, 0xc9, 0x72, 0xbd, + 0xc6, 0xb2, 0x92, 0xc2, 0x25, 0x0c, 0xe5, 0xbd, 0x04, 0x8b, 0x5f, 0x1a, 0x56, 0x77, 0x80, 0x5b, + 0x27, 0x4d, 0x6f, 0xd2, 0x3d, 0x54, 0xa3, 0xf9, 0xce, 0xd3, 0x7c, 0x97, 0x08, 0x72, 0xeb, 0xa4, + 0x19, 0x0a, 0x21, 0xc3, 0xed, 0x8d, 0x5b, 0x11, 0x7d, 0x26, 0xda, 0xb9, 0x1d, 0x68, 0xe7, 0x19, + 0x8a, 0x13, 0x4e, 0x08, 0xb9, 0x98, 0x8d, 0xe4, 0x42, 0x05, 0xf0, 0x2e, 0x06, 0xc7, 0x86, 0xef, + 0x63, 0xd7, 0x92, 0x8b, 0x4c, 0x91, 0x87, 0x33, 0xa4, 0x8b, 0x7b, 0xe7, 0x86, 0xdb, 0x35, 0xad, + 0x9e, 0xfc, 0x88, 0x46, 0x1f, 0x8c, 0x89, 0x12, 0x11, 0x23, 0x99, 0x4a, 0xdd, 0xbf, 0x93, 0xa0, + 0x7a, 0x3c, 0x72, 0x7b, 0x69, 0x65, 0x9f, 0xdd, 0xd2, 0x14, 0x98, 0x33, 0x2d, 0xa3, 0xe3, 0x9b, + 0x97, 0x98, 0xd7, 0x67, 0x30, 0xa6, 0xed, 0xce, 0x1c, 0x62, 0x5a, 0xa2, 0x05, 0x9d, 0x3e, 0x93, + 0xf7, 0xcf, 0xcc, 0x01, 0xa6, 0x5b, 0xc2, 0x52, 0x19, 0x8c, 0xe9, 0x7d, 0x37, 0x6a, 0x37, 0xcc, + 0x20, 0x93, 0x6c, 0xa4, 0xbd, 0x05, 0x39, 0x49, 0x6c, 0x2a, 0x39, 0x79, 0x01, 0x0b, 0x7b, 0xe7, + 0xb8, 0xd3, 0xbf, 0x43, 0x53, 0x6a, 0x2f, 0x61, 0x51, 0x78, 0xef, 0xbe, 0xd4, 0xea, 0xbf, 0x94, + 0xa1, 0xc8, 0x7a, 0x1c, 0x7a, 0x03, 0xa5, 0xe0, 0xeb, 0x06, 0x2d, 0xd1, 0xda, 0x8c, 0x7d, 0x2e, + 0x29, 0xcb, 0xb1, 0x59, 0xe6, 0x4e, 0x7b, 0xfe, 0xd3, 0x5f, 0xff, 0xfe, 0x91, 0xaf, 0x69, 0x4b, + 0xe4, 0xf3, 0xd1, 0xdb, 0xbc, 0xdc, 0x32, 0x06, 0xce, 0xb9, 0xb1, 0xb5, 0x49, 0x08, 0x7a, 0x3b, + 0xd2, 0xa7, 0xe8, 0x0c, 0xca, 0x82, 0x68, 0x47, 0x15, 0xa1, 0x39, 0x88, 0xf0, 0xd5, 0xc4, 0x3c, + 0x77, 0xf0, 0x82, 0x3a, 0x58, 0x53, 0x56, 0xd2, 0x1c, 0x6c, 0x7e, 0x4f, 0xb6, 0xf0, 0x07, 0xe2, + 0xe7, 0x25, 0x40, 0x28, 0xa3, 0x11, 0x65, 0x9b, 0x50, 0xe6, 0x4a, 0x25, 0x3e, 0xcd, 0x9d, 0xe4, + 0xd0, 0x00, 0xca, 0x82, 0xe2, 0x44, 0x4a, 0x4c, 0x82, 0x0a, 0x1a, 0x53, 0x59, 0x49, 0xb5, 0x71, + 0xa4, 0x4f, 0x28, 0x5d, 0x15, 0xad, 0xc6, 0xe8, 0x7a, 0xf4, 0x55, 0xce, 0x17, 0xed, 0x03, 0x84, + 0x0a, 0x11, 0xd5, 0xa2, 0x8a, 0x51, 0xf4, 0xa5, 0xa4, 0x99, 0x02, 0xd2, 0x7b, 0xf0, 0x58, 0x94, + 0x5d, 0x88, 0x26, 0x31, 0x45, 0x5b, 0x2a, 0x72, 0xd2, 0x10, 0x80, 0xbc, 0x86, 0x27, 0x11, 0x35, + 0x83, 0xe8, 0xcb, 0x69, 0x42, 0x4b, 0xa9, 0xa5, 0x58, 0x02, 0x9c, 0xd3, 0xf1, 0x77, 0x8c, 0xf8, + 0xe5, 0x89, 0x9e, 0x85, 0x19, 0x4f, 0xf9, 0x8c, 0x55, 0xd4, 0x2c, 0x73, 0x00, 0xfb, 0x06, 0xaa, + 0x19, 0x3f, 0x03, 0x90, 0x16, 0x2e, 0xce, 0xfa, 0x53, 0xa0, 0x64, 0x1e, 0x37, 0xc6, 0x38, 0x29, + 0x56, 0x18, 0xe3, 0x4c, 0x9d, 0xc5, 0x18, 0x67, 0x6b, 0x1c, 0x2d, 0x47, 0x2a, 0x31, 0x6c, 0xa3, + 0xac, 0x12, 0x13, 0x17, 0x04, 0xab, 0xc4, 0x64, 0xb7, 0xd5, 0x72, 0xa8, 0x0b, 0xd5, 0x0c, 0x29, + 0xc2, 0x02, 0x9e, 0xac, 0x71, 0x94, 0xff, 0x4f, 0x7c, 0x47, 0x48, 0x6b, 0x25, 0x29, 0x0d, 0xe8, + 0xd1, 0x79, 0x26, 0x9c, 0xc4, 0x64, 0x53, 0x66, 0xf1, 0x67, 0xab, 0x0a, 0x2d, 0x87, 0x8e, 0x60, + 0x21, 0xde, 0x38, 0x11, 0x3d, 0x33, 0x19, 0x7d, 0x5e, 0x59, 0x4d, 0x37, 0x8a, 0xfb, 0x94, 0xbc, + 0x84, 0x19, 0xcf, 0x4c, 0x15, 0xc1, 0x78, 0x66, 0x8b, 0x00, 0xca, 0x13, 0x25, 0xff, 0x6c, 0x31, + 0xd8, 0xcc, 0x3f, 0x5e, 0x13, 0xeb, 0x69, 0x07, 0x4a, 0x41, 0x3f, 0x66, 0x5d, 0x34, 0xde, 0xc6, + 0x59, 0x17, 0x4d, 0x34, 0x6d, 0x2d, 0xb7, 0x2b, 0xbf, 0xbf, 0x51, 0xa5, 0x0f, 0x37, 0xaa, 0xf4, + 0xcf, 0x8d, 0x2a, 0xfd, 0x76, 0xab, 0xe6, 0x3e, 0xdc, 0xaa, 0xb9, 0xbf, 0x6f, 0xd5, 0x5c, 0xbb, + 0x48, 0xff, 0xc3, 0x6d, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x1f, 0xa8, 0xac, 0xda, 0xcb, 0x13, + 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -1290,8 +2202,9 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// Client API for Master service - +// MasterClient is the client API for Master service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MasterClient interface { StartTask(ctx context.Context, in *StartTaskRequest, opts ...grpc.CallOption) (*StartTaskResponse, error) OperateTask(ctx context.Context, in *OperateTaskRequest, opts ...grpc.CallOption) (*OperateTaskResponse, error) @@ -1333,7 +2246,7 @@ func NewMasterClient(cc *grpc.ClientConn) MasterClient { func (c *masterClient) StartTask(ctx context.Context, in *StartTaskRequest, opts ...grpc.CallOption) (*StartTaskResponse, error) { out := new(StartTaskResponse) - err := grpc.Invoke(ctx, "/pb.Master/StartTask", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/StartTask", in, out, opts...) if err != nil { return nil, err } @@ -1342,7 +2255,7 @@ func (c *masterClient) StartTask(ctx context.Context, in *StartTaskRequest, opts func (c *masterClient) OperateTask(ctx context.Context, in *OperateTaskRequest, opts ...grpc.CallOption) (*OperateTaskResponse, error) { out := new(OperateTaskResponse) - err := grpc.Invoke(ctx, "/pb.Master/OperateTask", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/OperateTask", in, out, opts...) if err != nil { return nil, err } @@ -1351,7 +2264,7 @@ func (c *masterClient) OperateTask(ctx context.Context, in *OperateTaskRequest, func (c *masterClient) UpdateTask(ctx context.Context, in *UpdateTaskRequest, opts ...grpc.CallOption) (*UpdateTaskResponse, error) { out := new(UpdateTaskResponse) - err := grpc.Invoke(ctx, "/pb.Master/UpdateTask", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/UpdateTask", in, out, opts...) if err != nil { return nil, err } @@ -1360,7 +2273,7 @@ func (c *masterClient) UpdateTask(ctx context.Context, in *UpdateTaskRequest, op func (c *masterClient) QueryStatus(ctx context.Context, in *QueryStatusListRequest, opts ...grpc.CallOption) (*QueryStatusListResponse, error) { out := new(QueryStatusListResponse) - err := grpc.Invoke(ctx, "/pb.Master/QueryStatus", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/QueryStatus", in, out, opts...) if err != nil { return nil, err } @@ -1369,7 +2282,7 @@ func (c *masterClient) QueryStatus(ctx context.Context, in *QueryStatusListReque func (c *masterClient) QueryError(ctx context.Context, in *QueryErrorListRequest, opts ...grpc.CallOption) (*QueryErrorListResponse, error) { out := new(QueryErrorListResponse) - err := grpc.Invoke(ctx, "/pb.Master/QueryError", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/QueryError", in, out, opts...) if err != nil { return nil, err } @@ -1378,7 +2291,7 @@ func (c *masterClient) QueryError(ctx context.Context, in *QueryErrorListRequest func (c *masterClient) ShowDDLLocks(ctx context.Context, in *ShowDDLLocksRequest, opts ...grpc.CallOption) (*ShowDDLLocksResponse, error) { out := new(ShowDDLLocksResponse) - err := grpc.Invoke(ctx, "/pb.Master/ShowDDLLocks", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/ShowDDLLocks", in, out, opts...) if err != nil { return nil, err } @@ -1387,7 +2300,7 @@ func (c *masterClient) ShowDDLLocks(ctx context.Context, in *ShowDDLLocksRequest func (c *masterClient) UnlockDDLLock(ctx context.Context, in *UnlockDDLLockRequest, opts ...grpc.CallOption) (*UnlockDDLLockResponse, error) { out := new(UnlockDDLLockResponse) - err := grpc.Invoke(ctx, "/pb.Master/UnlockDDLLock", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/UnlockDDLLock", in, out, opts...) if err != nil { return nil, err } @@ -1396,7 +2309,7 @@ func (c *masterClient) UnlockDDLLock(ctx context.Context, in *UnlockDDLLockReque func (c *masterClient) UpdateMasterConfig(ctx context.Context, in *UpdateMasterConfigRequest, opts ...grpc.CallOption) (*UpdateMasterConfigResponse, error) { out := new(UpdateMasterConfigResponse) - err := grpc.Invoke(ctx, "/pb.Master/UpdateMasterConfig", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/UpdateMasterConfig", in, out, opts...) if err != nil { return nil, err } @@ -1405,7 +2318,7 @@ func (c *masterClient) UpdateMasterConfig(ctx context.Context, in *UpdateMasterC func (c *masterClient) UpdateWorkerRelayConfig(ctx context.Context, in *UpdateWorkerRelayConfigRequest, opts ...grpc.CallOption) (*CommonWorkerResponse, error) { out := new(CommonWorkerResponse) - err := grpc.Invoke(ctx, "/pb.Master/UpdateWorkerRelayConfig", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/UpdateWorkerRelayConfig", in, out, opts...) if err != nil { return nil, err } @@ -1414,7 +2327,7 @@ func (c *masterClient) UpdateWorkerRelayConfig(ctx context.Context, in *UpdateWo func (c *masterClient) BreakWorkerDDLLock(ctx context.Context, in *BreakWorkerDDLLockRequest, opts ...grpc.CallOption) (*BreakWorkerDDLLockResponse, error) { out := new(BreakWorkerDDLLockResponse) - err := grpc.Invoke(ctx, "/pb.Master/BreakWorkerDDLLock", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/BreakWorkerDDLLock", in, out, opts...) if err != nil { return nil, err } @@ -1423,7 +2336,7 @@ func (c *masterClient) BreakWorkerDDLLock(ctx context.Context, in *BreakWorkerDD func (c *masterClient) HandleSQLs(ctx context.Context, in *HandleSQLsRequest, opts ...grpc.CallOption) (*HandleSQLsResponse, error) { out := new(HandleSQLsResponse) - err := grpc.Invoke(ctx, "/pb.Master/HandleSQLs", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/HandleSQLs", in, out, opts...) if err != nil { return nil, err } @@ -1432,7 +2345,7 @@ func (c *masterClient) HandleSQLs(ctx context.Context, in *HandleSQLsRequest, op func (c *masterClient) SwitchWorkerRelayMaster(ctx context.Context, in *SwitchWorkerRelayMasterRequest, opts ...grpc.CallOption) (*SwitchWorkerRelayMasterResponse, error) { out := new(SwitchWorkerRelayMasterResponse) - err := grpc.Invoke(ctx, "/pb.Master/SwitchWorkerRelayMaster", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/SwitchWorkerRelayMaster", in, out, opts...) if err != nil { return nil, err } @@ -1441,7 +2354,7 @@ func (c *masterClient) SwitchWorkerRelayMaster(ctx context.Context, in *SwitchWo func (c *masterClient) OperateWorkerRelayTask(ctx context.Context, in *OperateWorkerRelayRequest, opts ...grpc.CallOption) (*OperateWorkerRelayResponse, error) { out := new(OperateWorkerRelayResponse) - err := grpc.Invoke(ctx, "/pb.Master/OperateWorkerRelayTask", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/OperateWorkerRelayTask", in, out, opts...) if err != nil { return nil, err } @@ -1450,7 +2363,7 @@ func (c *masterClient) OperateWorkerRelayTask(ctx context.Context, in *OperateWo func (c *masterClient) PurgeWorkerRelay(ctx context.Context, in *PurgeWorkerRelayRequest, opts ...grpc.CallOption) (*PurgeWorkerRelayResponse, error) { out := new(PurgeWorkerRelayResponse) - err := grpc.Invoke(ctx, "/pb.Master/PurgeWorkerRelay", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/PurgeWorkerRelay", in, out, opts...) if err != nil { return nil, err } @@ -1459,7 +2372,7 @@ func (c *masterClient) PurgeWorkerRelay(ctx context.Context, in *PurgeWorkerRela func (c *masterClient) RefreshWorkerTasks(ctx context.Context, in *RefreshWorkerTasksRequest, opts ...grpc.CallOption) (*RefreshWorkerTasksResponse, error) { out := new(RefreshWorkerTasksResponse) - err := grpc.Invoke(ctx, "/pb.Master/RefreshWorkerTasks", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/RefreshWorkerTasks", in, out, opts...) if err != nil { return nil, err } @@ -1468,7 +2381,7 @@ func (c *masterClient) RefreshWorkerTasks(ctx context.Context, in *RefreshWorker func (c *masterClient) MigrateWorkerRelay(ctx context.Context, in *MigrateWorkerRelayRequest, opts ...grpc.CallOption) (*CommonWorkerResponse, error) { out := new(CommonWorkerResponse) - err := grpc.Invoke(ctx, "/pb.Master/MigrateWorkerRelay", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/MigrateWorkerRelay", in, out, opts...) if err != nil { return nil, err } @@ -1477,15 +2390,14 @@ func (c *masterClient) MigrateWorkerRelay(ctx context.Context, in *MigrateWorker func (c *masterClient) CheckTask(ctx context.Context, in *CheckTaskRequest, opts ...grpc.CallOption) (*CheckTaskResponse, error) { out := new(CheckTaskResponse) - err := grpc.Invoke(ctx, "/pb.Master/CheckTask", in, out, c.cc, opts...) + err := c.cc.Invoke(ctx, "/pb.Master/CheckTask", in, out, opts...) if err != nil { return nil, err } return out, nil } -// Server API for Master service - +// MasterServer is the server API for Master service. type MasterServer interface { StartTask(context.Context, *StartTaskRequest) (*StartTaskResponse, error) OperateTask(context.Context, *OperateTaskRequest) (*OperateTaskResponse, error) @@ -3400,6 +4312,9 @@ func encodeVarintDmmaster(dAtA []byte, offset int, v uint64) int { return offset + 1 } func (m *MigrateWorkerRelayRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.BinlogName) @@ -3417,6 +4332,9 @@ func (m *MigrateWorkerRelayRequest) Size() (n int) { } func (m *UpdateWorkerRelayConfigRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Config) @@ -3431,6 +4349,9 @@ func (m *UpdateWorkerRelayConfigRequest) Size() (n int) { } func (m *StartTaskRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Task) @@ -3447,6 +4368,9 @@ func (m *StartTaskRequest) Size() (n int) { } func (m *StartTaskResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3466,6 +4390,9 @@ func (m *StartTaskResponse) Size() (n int) { } func (m *UpdateMasterConfigRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Config) @@ -3476,6 +4403,9 @@ func (m *UpdateMasterConfigRequest) Size() (n int) { } func (m *UpdateMasterConfigResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3495,6 +4425,9 @@ func (m *UpdateMasterConfigResponse) Size() (n int) { } func (m *OperateTaskRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Op != 0 { @@ -3514,6 +4447,9 @@ func (m *OperateTaskRequest) Size() (n int) { } func (m *OperateTaskResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Op != 0 { @@ -3536,6 +4472,9 @@ func (m *OperateTaskResponse) Size() (n int) { } func (m *UpdateTaskRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Task) @@ -3552,6 +4491,9 @@ func (m *UpdateTaskRequest) Size() (n int) { } func (m *UpdateTaskResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3571,6 +4513,9 @@ func (m *UpdateTaskResponse) Size() (n int) { } func (m *QueryStatusListRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -3587,6 +4532,9 @@ func (m *QueryStatusListRequest) Size() (n int) { } func (m *QueryStatusListResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3606,6 +4554,9 @@ func (m *QueryStatusListResponse) Size() (n int) { } func (m *QueryErrorListRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -3622,6 +4573,9 @@ func (m *QueryErrorListRequest) Size() (n int) { } func (m *QueryErrorListResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3641,6 +4595,9 @@ func (m *QueryErrorListResponse) Size() (n int) { } func (m *ShowDDLLocksRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Task) @@ -3657,6 +4614,9 @@ func (m *ShowDDLLocksRequest) Size() (n int) { } func (m *DDLLock) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.ID) @@ -3693,6 +4653,9 @@ func (m *DDLLock) Size() (n int) { } func (m *ShowDDLLocksResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3712,6 +4675,9 @@ func (m *ShowDDLLocksResponse) Size() (n int) { } func (m *UnlockDDLLockRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.ID) @@ -3735,6 +4701,9 @@ func (m *UnlockDDLLockRequest) Size() (n int) { } func (m *UnlockDDLLockResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3754,6 +4723,9 @@ func (m *UnlockDDLLockResponse) Size() (n int) { } func (m *BreakWorkerDDLLockRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Workers) > 0 { @@ -3780,6 +4752,9 @@ func (m *BreakWorkerDDLLockRequest) Size() (n int) { } func (m *BreakWorkerDDLLockResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3799,6 +4774,9 @@ func (m *BreakWorkerDDLLockResponse) Size() (n int) { } func (m *SwitchWorkerRelayMasterRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Workers) > 0 { @@ -3811,6 +4789,9 @@ func (m *SwitchWorkerRelayMasterRequest) Size() (n int) { } func (m *SwitchWorkerRelayMasterResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3830,6 +4811,9 @@ func (m *SwitchWorkerRelayMasterResponse) Size() (n int) { } func (m *OperateWorkerRelayRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Op != 0 { @@ -3845,6 +4829,9 @@ func (m *OperateWorkerRelayRequest) Size() (n int) { } func (m *OperateWorkerRelayResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Op != 0 { @@ -3867,12 +4854,18 @@ func (m *OperateWorkerRelayResponse) Size() (n int) { } func (m *RefreshWorkerTasksRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l return n } func (m *RefreshWorkerTasksMsg) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Worker) @@ -3887,6 +4880,9 @@ func (m *RefreshWorkerTasksMsg) Size() (n int) { } func (m *RefreshWorkerTasksResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3902,6 +4898,9 @@ func (m *RefreshWorkerTasksResponse) Size() (n int) { } func (m *HandleSQLsRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Name) @@ -3936,6 +4935,9 @@ func (m *HandleSQLsRequest) Size() (n int) { } func (m *HandleSQLsResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -3955,6 +4957,9 @@ func (m *HandleSQLsResponse) Size() (n int) { } func (m *PurgeWorkerRelayRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if len(m.Workers) > 0 { @@ -3981,6 +4986,9 @@ func (m *PurgeWorkerRelayRequest) Size() (n int) { } func (m *PurgeWorkerRelayResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -4000,6 +5008,9 @@ func (m *PurgeWorkerRelayResponse) Size() (n int) { } func (m *CheckTaskRequest) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l l = len(m.Task) @@ -4010,6 +5021,9 @@ func (m *CheckTaskRequest) Size() (n int) { } func (m *CheckTaskResponse) Size() (n int) { + if m == nil { + return 0 + } var l int _ = l if m.Result { @@ -4050,7 +5064,7 @@ func (m *MigrateWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4078,7 +5092,7 @@ func (m *MigrateWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4088,6 +5102,9 @@ func (m *MigrateWorkerRelayRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4107,7 +5124,7 @@ func (m *MigrateWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.BinlogPos |= (uint32(b) & 0x7F) << shift + m.BinlogPos |= uint32(b&0x7F) << shift if b < 0x80 { break } @@ -4126,7 +5143,7 @@ func (m *MigrateWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4136,6 +5153,9 @@ func (m *MigrateWorkerRelayRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4150,6 +5170,9 @@ func (m *MigrateWorkerRelayRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4177,7 +5200,7 @@ func (m *UpdateWorkerRelayConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4205,7 +5228,7 @@ func (m *UpdateWorkerRelayConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4215,6 +5238,9 @@ func (m *UpdateWorkerRelayConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4234,7 +5260,7 @@ func (m *UpdateWorkerRelayConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4244,6 +5270,9 @@ func (m *UpdateWorkerRelayConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4258,6 +5287,9 @@ func (m *UpdateWorkerRelayConfigRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4285,7 +5317,7 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4313,7 +5345,7 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4323,6 +5355,9 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4342,7 +5377,7 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4352,6 +5387,9 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4366,6 +5404,9 @@ func (m *StartTaskRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4393,7 +5434,7 @@ func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4421,7 +5462,7 @@ func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4441,7 +5482,7 @@ func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4451,6 +5492,9 @@ func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4470,7 +5514,7 @@ func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4479,6 +5523,9 @@ func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4496,6 +5543,9 @@ func (m *StartTaskResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4523,7 +5573,7 @@ func (m *UpdateMasterConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4551,7 +5601,7 @@ func (m *UpdateMasterConfigRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4561,6 +5611,9 @@ func (m *UpdateMasterConfigRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4575,6 +5628,9 @@ func (m *UpdateMasterConfigRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4602,7 +5658,7 @@ func (m *UpdateMasterConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4630,7 +5686,7 @@ func (m *UpdateMasterConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4650,7 +5706,7 @@ func (m *UpdateMasterConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4660,6 +5716,9 @@ func (m *UpdateMasterConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4679,7 +5738,7 @@ func (m *UpdateMasterConfigResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4688,6 +5747,9 @@ func (m *UpdateMasterConfigResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4705,6 +5767,9 @@ func (m *UpdateMasterConfigResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4732,7 +5797,7 @@ func (m *OperateTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4760,7 +5825,7 @@ func (m *OperateTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Op |= (TaskOp(b) & 0x7F) << shift + m.Op |= TaskOp(b&0x7F) << shift if b < 0x80 { break } @@ -4779,7 +5844,7 @@ func (m *OperateTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4789,6 +5854,9 @@ func (m *OperateTaskRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4808,7 +5876,7 @@ func (m *OperateTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4818,6 +5886,9 @@ func (m *OperateTaskRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4832,6 +5903,9 @@ func (m *OperateTaskRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -4859,7 +5933,7 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4887,7 +5961,7 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Op |= (TaskOp(b) & 0x7F) << shift + m.Op |= TaskOp(b&0x7F) << shift if b < 0x80 { break } @@ -4906,7 +5980,7 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4926,7 +6000,7 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -4936,6 +6010,9 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4955,7 +6032,7 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -4964,6 +6041,9 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -4981,6 +6061,9 @@ func (m *OperateTaskResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5008,7 +6091,7 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5036,7 +6119,7 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5046,6 +6129,9 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5065,7 +6151,7 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5075,6 +6161,9 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5089,6 +6178,9 @@ func (m *UpdateTaskRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5116,7 +6208,7 @@ func (m *UpdateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5144,7 +6236,7 @@ func (m *UpdateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5164,7 +6256,7 @@ func (m *UpdateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5174,6 +6266,9 @@ func (m *UpdateTaskResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5193,7 +6288,7 @@ func (m *UpdateTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5202,6 +6297,9 @@ func (m *UpdateTaskResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5219,6 +6317,9 @@ func (m *UpdateTaskResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5246,7 +6347,7 @@ func (m *QueryStatusListRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5274,7 +6375,7 @@ func (m *QueryStatusListRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5284,6 +6385,9 @@ func (m *QueryStatusListRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5303,7 +6407,7 @@ func (m *QueryStatusListRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5313,6 +6417,9 @@ func (m *QueryStatusListRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5327,6 +6434,9 @@ func (m *QueryStatusListRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5354,7 +6464,7 @@ func (m *QueryStatusListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5382,7 +6492,7 @@ func (m *QueryStatusListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5402,7 +6512,7 @@ func (m *QueryStatusListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5412,6 +6522,9 @@ func (m *QueryStatusListResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5431,7 +6544,7 @@ func (m *QueryStatusListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5440,6 +6553,9 @@ func (m *QueryStatusListResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5457,6 +6573,9 @@ func (m *QueryStatusListResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5484,7 +6603,7 @@ func (m *QueryErrorListRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5512,7 +6631,7 @@ func (m *QueryErrorListRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5522,6 +6641,9 @@ func (m *QueryErrorListRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5541,7 +6663,7 @@ func (m *QueryErrorListRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5551,6 +6673,9 @@ func (m *QueryErrorListRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5565,6 +6690,9 @@ func (m *QueryErrorListRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5592,7 +6720,7 @@ func (m *QueryErrorListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5620,7 +6748,7 @@ func (m *QueryErrorListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5640,7 +6768,7 @@ func (m *QueryErrorListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5650,6 +6778,9 @@ func (m *QueryErrorListResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5669,7 +6800,7 @@ func (m *QueryErrorListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -5678,6 +6809,9 @@ func (m *QueryErrorListResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5695,6 +6829,9 @@ func (m *QueryErrorListResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5722,7 +6859,7 @@ func (m *ShowDDLLocksRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5750,7 +6887,7 @@ func (m *ShowDDLLocksRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5760,6 +6897,9 @@ func (m *ShowDDLLocksRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5779,7 +6919,7 @@ func (m *ShowDDLLocksRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5789,6 +6929,9 @@ func (m *ShowDDLLocksRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5803,6 +6946,9 @@ func (m *ShowDDLLocksRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -5830,7 +6976,7 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5858,7 +7004,7 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5868,6 +7014,9 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5887,7 +7036,7 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5897,6 +7046,9 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5916,7 +7068,7 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5926,6 +7078,9 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5945,7 +7100,7 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5955,6 +7110,9 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -5974,7 +7132,7 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5984,6 +7142,9 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6003,7 +7164,7 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6013,6 +7174,9 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6027,6 +7191,9 @@ func (m *DDLLock) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6054,7 +7221,7 @@ func (m *ShowDDLLocksResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6082,7 +7249,7 @@ func (m *ShowDDLLocksResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6102,7 +7269,7 @@ func (m *ShowDDLLocksResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6112,6 +7279,9 @@ func (m *ShowDDLLocksResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6131,7 +7301,7 @@ func (m *ShowDDLLocksResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6140,6 +7310,9 @@ func (m *ShowDDLLocksResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6157,6 +7330,9 @@ func (m *ShowDDLLocksResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6184,7 +7360,7 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6212,7 +7388,7 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6222,6 +7398,9 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6241,7 +7420,7 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6251,6 +7430,9 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6270,7 +7452,7 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6280,6 +7462,9 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6299,7 +7484,7 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6314,6 +7499,9 @@ func (m *UnlockDDLLockRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6341,7 +7529,7 @@ func (m *UnlockDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6369,7 +7557,7 @@ func (m *UnlockDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6389,7 +7577,7 @@ func (m *UnlockDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6399,6 +7587,9 @@ func (m *UnlockDDLLockResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6418,7 +7609,7 @@ func (m *UnlockDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6427,6 +7618,9 @@ func (m *UnlockDDLLockResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6444,6 +7638,9 @@ func (m *UnlockDDLLockResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6471,7 +7668,7 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6499,7 +7696,7 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6509,6 +7706,9 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6528,7 +7728,7 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6538,6 +7738,9 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6557,7 +7760,7 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6567,6 +7770,9 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6586,7 +7792,7 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6606,7 +7812,7 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6621,6 +7827,9 @@ func (m *BreakWorkerDDLLockRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6648,7 +7857,7 @@ func (m *BreakWorkerDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6676,7 +7885,7 @@ func (m *BreakWorkerDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6696,7 +7905,7 @@ func (m *BreakWorkerDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6706,6 +7915,9 @@ func (m *BreakWorkerDDLLockResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6725,7 +7937,7 @@ func (m *BreakWorkerDDLLockResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6734,6 +7946,9 @@ func (m *BreakWorkerDDLLockResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6751,6 +7966,9 @@ func (m *BreakWorkerDDLLockResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6778,7 +7996,7 @@ func (m *SwitchWorkerRelayMasterRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6806,7 +8024,7 @@ func (m *SwitchWorkerRelayMasterRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6816,6 +8034,9 @@ func (m *SwitchWorkerRelayMasterRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6830,6 +8051,9 @@ func (m *SwitchWorkerRelayMasterRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6857,7 +8081,7 @@ func (m *SwitchWorkerRelayMasterResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6885,7 +8109,7 @@ func (m *SwitchWorkerRelayMasterResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6905,7 +8129,7 @@ func (m *SwitchWorkerRelayMasterResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -6915,6 +8139,9 @@ func (m *SwitchWorkerRelayMasterResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6934,7 +8161,7 @@ func (m *SwitchWorkerRelayMasterResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -6943,6 +8170,9 @@ func (m *SwitchWorkerRelayMasterResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -6960,6 +8190,9 @@ func (m *SwitchWorkerRelayMasterResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -6987,7 +8220,7 @@ func (m *OperateWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7015,7 +8248,7 @@ func (m *OperateWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Op |= (RelayOp(b) & 0x7F) << shift + m.Op |= RelayOp(b&0x7F) << shift if b < 0x80 { break } @@ -7034,7 +8267,7 @@ func (m *OperateWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7044,6 +8277,9 @@ func (m *OperateWorkerRelayRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7058,6 +8294,9 @@ func (m *OperateWorkerRelayRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -7085,7 +8324,7 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7113,7 +8352,7 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Op |= (RelayOp(b) & 0x7F) << shift + m.Op |= RelayOp(b&0x7F) << shift if b < 0x80 { break } @@ -7132,7 +8371,7 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7152,7 +8391,7 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7162,6 +8401,9 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7181,7 +8423,7 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7190,6 +8432,9 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7207,6 +8452,9 @@ func (m *OperateWorkerRelayResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -7234,7 +8482,7 @@ func (m *RefreshWorkerTasksRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7257,6 +8505,9 @@ func (m *RefreshWorkerTasksRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -7284,7 +8535,7 @@ func (m *RefreshWorkerTasksMsg) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7312,7 +8563,7 @@ func (m *RefreshWorkerTasksMsg) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7322,6 +8573,9 @@ func (m *RefreshWorkerTasksMsg) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7341,7 +8595,7 @@ func (m *RefreshWorkerTasksMsg) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7351,6 +8605,9 @@ func (m *RefreshWorkerTasksMsg) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7365,6 +8622,9 @@ func (m *RefreshWorkerTasksMsg) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -7392,7 +8652,7 @@ func (m *RefreshWorkerTasksResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7420,7 +8680,7 @@ func (m *RefreshWorkerTasksResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7440,7 +8700,7 @@ func (m *RefreshWorkerTasksResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7449,6 +8709,9 @@ func (m *RefreshWorkerTasksResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7466,6 +8729,9 @@ func (m *RefreshWorkerTasksResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -7493,7 +8759,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7521,7 +8787,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7531,6 +8797,9 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7550,7 +8819,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Op |= (SQLOp(b) & 0x7F) << shift + m.Op |= SQLOp(b&0x7F) << shift if b < 0x80 { break } @@ -7569,7 +8838,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7579,6 +8848,9 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7598,7 +8870,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7608,6 +8880,9 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7627,7 +8902,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7637,6 +8912,9 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7656,7 +8934,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7666,6 +8944,9 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7685,7 +8966,7 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7700,6 +8981,9 @@ func (m *HandleSQLsRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -7727,7 +9011,7 @@ func (m *HandleSQLsResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7755,7 +9039,7 @@ func (m *HandleSQLsResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7775,7 +9059,7 @@ func (m *HandleSQLsResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7785,6 +9069,9 @@ func (m *HandleSQLsResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7804,7 +9091,7 @@ func (m *HandleSQLsResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7813,6 +9100,9 @@ func (m *HandleSQLsResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7830,6 +9120,9 @@ func (m *HandleSQLsResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -7857,7 +9150,7 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7885,7 +9178,7 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7895,6 +9188,9 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7914,7 +9210,7 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -7934,7 +9230,7 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Time |= (int64(b) & 0x7F) << shift + m.Time |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -7953,7 +9249,7 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7963,6 +9259,9 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -7982,7 +9281,7 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -7992,6 +9291,9 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8006,6 +9308,9 @@ func (m *PurgeWorkerRelayRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -8033,7 +9338,7 @@ func (m *PurgeWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8061,7 +9366,7 @@ func (m *PurgeWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8081,7 +9386,7 @@ func (m *PurgeWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8091,6 +9396,9 @@ func (m *PurgeWorkerRelayResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8110,7 +9418,7 @@ func (m *PurgeWorkerRelayResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= (int(b) & 0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8119,6 +9427,9 @@ func (m *PurgeWorkerRelayResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8136,6 +9447,9 @@ func (m *PurgeWorkerRelayResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -8163,7 +9477,7 @@ func (m *CheckTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8191,7 +9505,7 @@ func (m *CheckTaskRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8201,6 +9515,9 @@ func (m *CheckTaskRequest) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8215,6 +9532,9 @@ func (m *CheckTaskRequest) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -8242,7 +9562,7 @@ func (m *CheckTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - wire |= (uint64(b) & 0x7F) << shift + wire |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8270,7 +9590,7 @@ func (m *CheckTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - v |= (int(b) & 0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } @@ -8290,7 +9610,7 @@ func (m *CheckTaskResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8300,6 +9620,9 @@ func (m *CheckTaskResponse) Unmarshal(dAtA []byte) error { return ErrInvalidLengthDmmaster } postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } if postIndex > l { return io.ErrUnexpectedEOF } @@ -8314,6 +9637,9 @@ func (m *CheckTaskResponse) Unmarshal(dAtA []byte) error { if skippy < 0 { return ErrInvalidLengthDmmaster } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmmaster + } if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } @@ -8380,10 +9706,13 @@ func skipDmmaster(dAtA []byte) (n int, err error) { break } } - iNdEx += length if length < 0 { return 0, ErrInvalidLengthDmmaster } + iNdEx += length + if iNdEx < 0 { + return 0, ErrInvalidLengthDmmaster + } return iNdEx, nil case 3: for { @@ -8412,6 +9741,9 @@ func skipDmmaster(dAtA []byte) (n int, err error) { return 0, err } iNdEx = start + next + if iNdEx < 0 { + return 0, ErrInvalidLengthDmmaster + } } return iNdEx, nil case 4: @@ -8430,94 +9762,3 @@ var ( ErrInvalidLengthDmmaster = fmt.Errorf("proto: negative length found during unmarshaling") ErrIntOverflowDmmaster = fmt.Errorf("proto: integer overflow") ) - -func init() { proto.RegisterFile("dmmaster.proto", fileDescriptorDmmaster) } - -var fileDescriptorDmmaster = []byte{ - // 1353 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x4f, 0xe3, 0x46, - 0x14, 0x8f, 0x13, 0xc8, 0x6e, 0x5e, 0x76, 0x11, 0xcc, 0x42, 0xe2, 0x18, 0x36, 0x4b, 0xdd, 0x6a, - 0x85, 0x7a, 0x58, 0x4a, 0xe8, 0x09, 0x69, 0xa5, 0x2e, 0x84, 0x55, 0x91, 0x42, 0x01, 0xa7, 0xa8, - 0xda, 0x4b, 0x25, 0x27, 0x19, 0x82, 0x95, 0xc4, 0x36, 0x1e, 0x07, 0x96, 0x56, 0x55, 0xa5, 0x1e, - 0x7a, 0x68, 0x2f, 0xad, 0x7a, 0xd8, 0x73, 0xbf, 0xcd, 0x1e, 0x2b, 0xf5, 0x0b, 0x54, 0xb4, 0x1f, - 0xa4, 0x9a, 0x3f, 0xb1, 0xc7, 0xff, 0xc2, 0xc2, 0x21, 0x37, 0xcf, 0x3c, 0xcf, 0xef, 0xfd, 0xde, - 0x9b, 0x37, 0x6f, 0x7e, 0x36, 0x2c, 0xf4, 0x46, 0x23, 0x93, 0xf8, 0xd8, 0x7b, 0xe1, 0x7a, 0x8e, - 0xef, 0xa0, 0xbc, 0xdb, 0xd1, 0x16, 0x7a, 0xa3, 0x2b, 0xc7, 0x1b, 0x4c, 0xe6, 0xb4, 0xb5, 0xbe, - 0xe3, 0xf4, 0x87, 0x78, 0xd3, 0x74, 0xad, 0x4d, 0xd3, 0xb6, 0x1d, 0xdf, 0xf4, 0x2d, 0xc7, 0x26, - 0xdc, 0xaa, 0x5f, 0x40, 0xed, 0xd0, 0xea, 0x7b, 0xa6, 0x8f, 0xbf, 0x61, 0x8b, 0x0c, 0x3c, 0x34, - 0xaf, 0x0d, 0x7c, 0x31, 0xc6, 0xc4, 0x47, 0x75, 0x80, 0x5d, 0xcb, 0x1e, 0x3a, 0xfd, 0xaf, 0xcc, - 0x11, 0x56, 0x95, 0x75, 0x65, 0xa3, 0x64, 0x48, 0x33, 0x68, 0x0d, 0x4a, 0x7c, 0x74, 0xec, 0x10, - 0x35, 0xbf, 0xae, 0x6c, 0x3c, 0x36, 0xc2, 0x09, 0x54, 0x81, 0x22, 0x27, 0xa2, 0x16, 0xd8, 0x4a, - 0x31, 0xd2, 0x8f, 0xa1, 0x7e, 0xea, 0xf6, 0xa2, 0x1e, 0xf7, 0x1c, 0xfb, 0xcc, 0xea, 0x4f, 0xfc, - 0x56, 0xa0, 0xd8, 0x65, 0x13, 0xc2, 0xa7, 0x18, 0x49, 0x88, 0xf9, 0x08, 0xe2, 0x17, 0xb0, 0xd8, - 0xf6, 0x4d, 0xcf, 0xff, 0xda, 0x24, 0x83, 0x09, 0x06, 0x82, 0x39, 0xdf, 0x24, 0x03, 0x81, 0xc0, - 0x9e, 0x91, 0x0a, 0x0f, 0xf8, 0x0a, 0xca, 0xb6, 0xb0, 0x51, 0x32, 0x26, 0x43, 0xfd, 0x02, 0x96, - 0x24, 0x04, 0xe2, 0x3a, 0x36, 0xc1, 0xd4, 0x9d, 0x87, 0xc9, 0x78, 0xe8, 0x33, 0x90, 0x87, 0x86, - 0x18, 0xa1, 0x45, 0x28, 0x8c, 0x48, 0x5f, 0x70, 0xa0, 0x8f, 0xa8, 0x11, 0x02, 0x17, 0xd6, 0x0b, - 0x1b, 0xe5, 0x86, 0xfa, 0xc2, 0xed, 0xbc, 0xd8, 0x73, 0x46, 0x23, 0xc7, 0x9e, 0x44, 0xc9, 0x41, - 0x43, 0x97, 0xdb, 0x50, 0xe3, 0x69, 0x38, 0x64, 0x3b, 0xf8, 0x41, 0x19, 0xd0, 0xaf, 0x41, 0x4b, - 0x5b, 0x74, 0x67, 0xc2, 0x5b, 0x71, 0xc2, 0x55, 0x4a, 0xf8, 0x64, 0x8c, 0xbd, 0xeb, 0xb6, 0x6f, - 0xfa, 0x63, 0x92, 0xe4, 0xfb, 0x2d, 0xa0, 0x23, 0x17, 0xd3, 0x4a, 0x91, 0xd3, 0xac, 0x41, 0xde, - 0x71, 0x99, 0xbb, 0x85, 0x06, 0x50, 0x0c, 0x6a, 0x3c, 0x72, 0x8d, 0xbc, 0xe3, 0xd2, 0x2d, 0xb0, - 0x69, 0xe1, 0x70, 0xbf, 0xec, 0x59, 0xde, 0x82, 0x42, 0x74, 0x0b, 0x7e, 0x57, 0xe0, 0x49, 0xc4, - 0x81, 0x08, 0x6a, 0x9a, 0x87, 0x30, 0xe0, 0x7c, 0x5a, 0xc0, 0x85, 0x30, 0xe0, 0xcf, 0x43, 0xbf, - 0x73, 0x2c, 0x60, 0x8d, 0x42, 0x09, 0x7f, 0xed, 0x71, 0x47, 0x76, 0x19, 0x72, 0x7a, 0x05, 0x4b, - 0x3c, 0xdd, 0xf7, 0xaf, 0x2c, 0x0f, 0x90, 0x0c, 0x31, 0x93, 0xd2, 0x7a, 0x0d, 0x15, 0x69, 0x2b, - 0x5b, 0x16, 0xf1, 0x25, 0xee, 0x76, 0x78, 0x96, 0x13, 0x5b, 0x12, 0xe3, 0x7e, 0x09, 0xd5, 0x04, - 0xce, 0x2c, 0x4a, 0x6d, 0x1f, 0x56, 0x98, 0x7d, 0xdf, 0xf3, 0x1c, 0xef, 0xfe, 0xf4, 0x7d, 0x91, - 0x06, 0x09, 0xe6, 0xce, 0xec, 0x3f, 0x8b, 0xb3, 0xaf, 0x04, 0xec, 0x19, 0x6c, 0x92, 0xfc, 0x1e, - 0x3c, 0x69, 0x9f, 0x3b, 0x57, 0xcd, 0x66, 0xab, 0xe5, 0x74, 0x07, 0xe4, 0x7e, 0x55, 0xf3, 0xab, - 0x02, 0x0f, 0x04, 0x02, 0x5a, 0x80, 0xfc, 0x41, 0x53, 0xac, 0xcb, 0x1f, 0x34, 0x03, 0xa4, 0xbc, - 0x84, 0xb4, 0x0c, 0xf3, 0xce, 0x95, 0x1d, 0xb4, 0x5a, 0x3e, 0xa0, 0x6f, 0x36, 0x9b, 0x2d, 0x5e, - 0xf1, 0x25, 0x83, 0x3d, 0xd3, 0xd0, 0xc9, 0xb5, 0xdd, 0xc5, 0x3d, 0x75, 0x9e, 0xcd, 0x8a, 0x11, - 0xd2, 0xe0, 0xe1, 0xd8, 0x16, 0x96, 0x22, 0xb3, 0x04, 0x63, 0xbd, 0x0b, 0xcb, 0xd1, 0x90, 0xee, - 0x9c, 0xc6, 0x8f, 0x60, 0x7e, 0x48, 0x97, 0x8a, 0x24, 0x96, 0x69, 0x12, 0x05, 0x9c, 0xc1, 0x2d, - 0xfa, 0xcf, 0x0a, 0x2c, 0x9f, 0xda, 0xf4, 0x79, 0x62, 0x10, 0x99, 0x8b, 0xc7, 0xaf, 0xc3, 0x23, - 0x0f, 0xbb, 0x43, 0xb3, 0x8b, 0x8f, 0x58, 0xc8, 0xdc, 0x4d, 0x64, 0x2e, 0xbb, 0xcd, 0xa0, 0x75, - 0x28, 0x9f, 0x39, 0x5e, 0x17, 0x1b, 0x78, 0xe4, 0x5c, 0x62, 0x75, 0x8e, 0x11, 0x97, 0xa7, 0xf4, - 0x31, 0xac, 0xc4, 0x78, 0xcc, 0xe4, 0xd0, 0xfe, 0xa9, 0x40, 0x6d, 0xd7, 0xc3, 0xe6, 0x80, 0xbf, - 0x10, 0x4b, 0x82, 0x14, 0x90, 0x12, 0x0d, 0x28, 0xad, 0x1c, 0x58, 0x8a, 0x68, 0x30, 0x14, 0xe2, - 0xa0, 0x29, 0xaa, 0x22, 0x32, 0x47, 0x11, 0xf1, 0x5b, 0xdc, 0x6d, 0x36, 0x5b, 0x22, 0x09, 0x93, - 0x21, 0xb5, 0x90, 0x81, 0xe5, 0x52, 0xcb, 0x3c, 0xb7, 0x88, 0xa1, 0xfe, 0x1d, 0x68, 0x69, 0x14, - 0x67, 0x92, 0x9f, 0x1d, 0xa8, 0xb7, 0xaf, 0x2c, 0xbf, 0x7b, 0x2e, 0xc9, 0x06, 0x7e, 0x0b, 0xde, - 0x9a, 0x23, 0xfd, 0x47, 0x78, 0x96, 0xb9, 0x76, 0x26, 0xe4, 0x0d, 0xa8, 0x89, 0xbb, 0x26, 0x45, - 0x66, 0xad, 0x4a, 0x37, 0x1c, 0x3b, 0x19, 0xcc, 0x2a, 0xae, 0xb8, 0xec, 0x1e, 0xf1, 0x4e, 0x01, - 0x2d, 0x0d, 0x54, 0x04, 0x34, 0x15, 0xf5, 0xc3, 0x2f, 0xce, 0x46, 0xfc, 0xe2, 0x54, 0xa5, 0x8b, - 0x33, 0xe2, 0x31, 0x64, 0xb6, 0x0a, 0x35, 0x03, 0x9f, 0x79, 0x98, 0x88, 0x7c, 0xd3, 0xab, 0x6f, - 0xd2, 0x08, 0xf5, 0x57, 0xb0, 0x92, 0x34, 0x1e, 0x12, 0x59, 0xdd, 0x29, 0xb2, 0xba, 0x4b, 0xee, - 0x80, 0x6e, 0x81, 0x96, 0x86, 0x7f, 0xcb, 0x4e, 0x6e, 0x47, 0x33, 0x59, 0x6e, 0xd4, 0x78, 0x56, - 0x52, 0xb8, 0x84, 0xa1, 0xbc, 0x57, 0x60, 0xe9, 0x4b, 0xd3, 0xee, 0x0d, 0x71, 0xfb, 0xa4, 0x45, - 0xa6, 0xdd, 0x43, 0x35, 0x96, 0xef, 0x3c, 0xcb, 0x77, 0x89, 0x22, 0xb7, 0x4f, 0x5a, 0xa1, 0x10, - 0x32, 0xbd, 0xfe, 0xa4, 0x15, 0xb1, 0x67, 0xaa, 0x9d, 0x3b, 0x81, 0x76, 0x9e, 0x63, 0x38, 0xe1, - 0x84, 0x94, 0x8b, 0xf9, 0x48, 0x2e, 0xea, 0x00, 0xe4, 0x62, 0x78, 0x6c, 0xfa, 0x3e, 0xf6, 0x6c, - 0xb5, 0xc8, 0x15, 0x79, 0x38, 0x43, 0xbb, 0x38, 0x39, 0x37, 0xbd, 0x9e, 0x65, 0xf7, 0xd5, 0x07, - 0x2c, 0xfa, 0x60, 0x4c, 0x95, 0x88, 0x1c, 0xc9, 0x4c, 0xea, 0xfe, 0x9d, 0x02, 0xd5, 0xe3, 0xb1, - 0xd7, 0x4f, 0x2b, 0xfb, 0xec, 0x96, 0xa6, 0xc1, 0x43, 0xcb, 0x36, 0xbb, 0xbe, 0x75, 0x89, 0x45, - 0x7d, 0x06, 0x63, 0xd6, 0xee, 0xac, 0x11, 0x66, 0x25, 0x5a, 0x30, 0xd8, 0x33, 0x7d, 0xff, 0xcc, - 0x1a, 0x62, 0xb6, 0x25, 0x3c, 0x95, 0xc1, 0x98, 0xdd, 0x77, 0xe3, 0x4e, 0xd3, 0x0a, 0x32, 0xc9, - 0x47, 0xfa, 0x5b, 0x50, 0x93, 0xc4, 0x66, 0x92, 0x93, 0xe7, 0xb0, 0xb8, 0x77, 0x8e, 0xbb, 0x83, - 0x5b, 0x34, 0xa5, 0xfe, 0x12, 0x96, 0xa4, 0xf7, 0xee, 0x4a, 0xad, 0xf1, 0x4b, 0x19, 0x8a, 0xbc, - 0xc7, 0xa1, 0x37, 0x50, 0x0a, 0xbe, 0x6e, 0xd0, 0x32, 0xab, 0xcd, 0xd8, 0xe7, 0x92, 0xb6, 0x12, - 0x9b, 0xe5, 0xee, 0xf4, 0x67, 0x3f, 0xfd, 0xfd, 0xdf, 0x1f, 0xf9, 0x9a, 0xbe, 0x4c, 0x3f, 0x1f, - 0xc9, 0xe6, 0xe5, 0x96, 0x39, 0x74, 0xcf, 0xcd, 0xad, 0x4d, 0x4a, 0x90, 0xec, 0x28, 0x9f, 0xa2, - 0x33, 0x28, 0x4b, 0xa2, 0x1d, 0x55, 0xa4, 0xe6, 0x20, 0xc3, 0x57, 0x13, 0xf3, 0xc2, 0xc1, 0x73, - 0xe6, 0x60, 0x5d, 0x5b, 0x4d, 0x73, 0xb0, 0xf9, 0x3d, 0xdd, 0xc2, 0x1f, 0xa8, 0x9f, 0x97, 0x00, - 0xa1, 0x8c, 0x46, 0x8c, 0x6d, 0x42, 0x99, 0x6b, 0x95, 0xf8, 0xb4, 0x70, 0x92, 0x43, 0x43, 0x28, - 0x4b, 0x8a, 0x13, 0x69, 0x31, 0x09, 0x2a, 0x69, 0x4c, 0x6d, 0x35, 0xd5, 0x26, 0x90, 0x3e, 0x61, - 0x74, 0xeb, 0x68, 0x2d, 0x46, 0x97, 0xb0, 0x57, 0x05, 0x5f, 0xb4, 0x0f, 0x10, 0x2a, 0x44, 0x54, - 0x8b, 0x2a, 0x46, 0xd9, 0x97, 0x96, 0x66, 0x0a, 0x48, 0xef, 0xc1, 0x23, 0x59, 0x76, 0x21, 0x96, - 0xc4, 0x14, 0x6d, 0xa9, 0xa9, 0x49, 0x43, 0x00, 0xf2, 0x1a, 0x1e, 0x47, 0xd4, 0x0c, 0x62, 0x2f, - 0xa7, 0x09, 0x2d, 0xad, 0x96, 0x62, 0x09, 0x70, 0x4e, 0x27, 0xdf, 0x31, 0xf2, 0x97, 0x27, 0x7a, - 0x1a, 0x66, 0x3c, 0xe5, 0x33, 0x56, 0xab, 0x67, 0x99, 0x03, 0xd8, 0x37, 0x50, 0xcd, 0xf8, 0x19, - 0x80, 0xf4, 0x70, 0x71, 0xd6, 0x9f, 0x02, 0x2d, 0xf3, 0xb8, 0x71, 0xc6, 0x49, 0xb1, 0xc2, 0x19, - 0x67, 0xea, 0x2c, 0xce, 0x38, 0x5b, 0xe3, 0xe8, 0x39, 0x5a, 0x89, 0x61, 0x1b, 0xe5, 0x95, 0x98, - 0xb8, 0x20, 0x78, 0x25, 0x26, 0xbb, 0xad, 0x9e, 0x43, 0x3d, 0xa8, 0x66, 0x48, 0x11, 0x1e, 0xf0, - 0x74, 0x8d, 0xa3, 0x7d, 0x3c, 0xf5, 0x1d, 0x29, 0xad, 0x95, 0xa4, 0x34, 0x60, 0x47, 0xe7, 0xa9, - 0x74, 0x12, 0x93, 0x4d, 0x99, 0xc7, 0x9f, 0xad, 0x2a, 0xf4, 0x1c, 0x3a, 0x82, 0xc5, 0x78, 0xe3, - 0x44, 0xec, 0xcc, 0x64, 0xf4, 0x79, 0x6d, 0x2d, 0xdd, 0x28, 0xef, 0x53, 0xf2, 0x12, 0xe6, 0x3c, - 0x33, 0x55, 0x04, 0xe7, 0x99, 0x2d, 0x02, 0x18, 0x4f, 0x94, 0xfc, 0xb3, 0xc5, 0x61, 0x33, 0xff, - 0x78, 0x4d, 0xad, 0xa7, 0x1d, 0x28, 0x05, 0xfd, 0x98, 0x77, 0xd1, 0x78, 0x1b, 0xe7, 0x5d, 0x34, - 0xd1, 0xb4, 0xf5, 0xdc, 0xee, 0xe2, 0xfb, 0x9b, 0xba, 0xf2, 0xd7, 0x4d, 0x5d, 0xf9, 0xe7, 0xa6, - 0xae, 0xfc, 0xf6, 0x6f, 0x3d, 0xd7, 0x29, 0xb2, 0xff, 0x6f, 0xdb, 0xff, 0x07, 0x00, 0x00, 0xff, - 0xff, 0x41, 0xaf, 0xf0, 0x55, 0xc3, 0x13, 0x00, 0x00, -} diff --git a/dm/pb/dmworker.pb.go b/dm/pb/dmworker.pb.go index 10a0a30d5c..463c7f66a3 100644 --- a/dm/pb/dmworker.pb.go +++ b/dm/pb/dmworker.pb.go @@ -2534,18 +2534,106 @@ func (m *ProcessResult) GetDetail() []byte { return nil } +// TError represents error used in dm +// NOTE: currently stack trace is not supported, `Message` is the `terror.Error.getMsg` result +// and `RawCause` is the `Error` result of error from `terror.Error.Cause()`. +type TError struct { + ErrCode int32 `protobuf:"varint,1,opt,name=ErrCode,proto3" json:"ErrCode,omitempty"` + ErrClass int32 `protobuf:"varint,2,opt,name=ErrClass,proto3" json:"ErrClass,omitempty"` + ErrScope int32 `protobuf:"varint,3,opt,name=ErrScope,proto3" json:"ErrScope,omitempty"` + ErrLevel int32 `protobuf:"varint,4,opt,name=ErrLevel,proto3" json:"ErrLevel,omitempty"` + Message string `protobuf:"bytes,5,opt,name=Message,proto3" json:"Message,omitempty"` + RawCause string `protobuf:"bytes,6,opt,name=RawCause,proto3" json:"RawCause,omitempty"` +} + +func (m *TError) Reset() { *m = TError{} } +func (m *TError) String() string { return proto.CompactTextString(m) } +func (*TError) ProtoMessage() {} +func (*TError) Descriptor() ([]byte, []int) { + return fileDescriptor_51a1b9e17fd67b10, []int{31} +} +func (m *TError) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *TError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_TError.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalTo(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *TError) XXX_Merge(src proto.Message) { + xxx_messageInfo_TError.Merge(m, src) +} +func (m *TError) XXX_Size() int { + return m.Size() +} +func (m *TError) XXX_DiscardUnknown() { + xxx_messageInfo_TError.DiscardUnknown(m) +} + +var xxx_messageInfo_TError proto.InternalMessageInfo + +func (m *TError) GetErrCode() int32 { + if m != nil { + return m.ErrCode + } + return 0 +} + +func (m *TError) GetErrClass() int32 { + if m != nil { + return m.ErrClass + } + return 0 +} + +func (m *TError) GetErrScope() int32 { + if m != nil { + return m.ErrScope + } + return 0 +} + +func (m *TError) GetErrLevel() int32 { + if m != nil { + return m.ErrLevel + } + return 0 +} + +func (m *TError) GetMessage() string { + if m != nil { + return m.Message + } + return "" +} + +func (m *TError) GetRawCause() string { + if m != nil { + return m.RawCause + } + return "" +} + // ProcessError represents error produced by a dm unit // NOTE: refine later, like add error scope field type ProcessError struct { - Type ErrorType `protobuf:"varint,1,opt,name=Type,proto3,enum=pb.ErrorType" json:"Type,omitempty"` - Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` + Type ErrorType `protobuf:"varint,1,opt,name=Type,proto3,enum=pb.ErrorType" json:"Type,omitempty"` + Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` + Error *TError `protobuf:"bytes,3,opt,name=error,proto3" json:"error,omitempty"` } func (m *ProcessError) Reset() { *m = ProcessError{} } func (m *ProcessError) String() string { return proto.CompactTextString(m) } func (*ProcessError) ProtoMessage() {} func (*ProcessError) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{31} + return fileDescriptor_51a1b9e17fd67b10, []int{32} } func (m *ProcessError) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2588,6 +2676,13 @@ func (m *ProcessError) GetMsg() string { return "" } +func (m *ProcessError) GetError() *TError { + if m != nil { + return m.Error + } + return nil +} + // DDLInfo represents a occurred DDL in a sub task // it been sent from dm-worker to dm-master // dm-master uses it to contruct a DDL lock and do syncing with other dm-workers @@ -2603,7 +2698,7 @@ func (m *DDLInfo) Reset() { *m = DDLInfo{} } func (m *DDLInfo) String() string { return proto.CompactTextString(m) } func (*DDLInfo) ProtoMessage() {} func (*DDLInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{32} + return fileDescriptor_51a1b9e17fd67b10, []int{33} } func (m *DDLInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2672,7 +2767,7 @@ func (m *DDLLockInfo) Reset() { *m = DDLLockInfo{} } func (m *DDLLockInfo) String() string { return proto.CompactTextString(m) } func (*DDLLockInfo) ProtoMessage() {} func (*DDLLockInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{33} + return fileDescriptor_51a1b9e17fd67b10, []int{34} } func (m *DDLLockInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2727,7 +2822,7 @@ func (m *ExecDDLRequest) Reset() { *m = ExecDDLRequest{} } func (m *ExecDDLRequest) String() string { return proto.CompactTextString(m) } func (*ExecDDLRequest) ProtoMessage() {} func (*ExecDDLRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{34} + return fileDescriptor_51a1b9e17fd67b10, []int{35} } func (m *ExecDDLRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2801,7 +2896,7 @@ func (m *BreakDDLLockRequest) Reset() { *m = BreakDDLLockRequest{} } func (m *BreakDDLLockRequest) String() string { return proto.CompactTextString(m) } func (*BreakDDLLockRequest) ProtoMessage() {} func (*BreakDDLLockRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{35} + return fileDescriptor_51a1b9e17fd67b10, []int{36} } func (m *BreakDDLLockRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2866,7 +2961,7 @@ func (m *SwitchRelayMasterRequest) Reset() { *m = SwitchRelayMasterReque func (m *SwitchRelayMasterRequest) String() string { return proto.CompactTextString(m) } func (*SwitchRelayMasterRequest) ProtoMessage() {} func (*SwitchRelayMasterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{36} + return fileDescriptor_51a1b9e17fd67b10, []int{37} } func (m *SwitchRelayMasterRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2904,7 +2999,7 @@ func (m *OperateRelayRequest) Reset() { *m = OperateRelayRequest{} } func (m *OperateRelayRequest) String() string { return proto.CompactTextString(m) } func (*OperateRelayRequest) ProtoMessage() {} func (*OperateRelayRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{37} + return fileDescriptor_51a1b9e17fd67b10, []int{38} } func (m *OperateRelayRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2951,7 +3046,7 @@ func (m *OperateRelayResponse) Reset() { *m = OperateRelayResponse{} } func (m *OperateRelayResponse) String() string { return proto.CompactTextString(m) } func (*OperateRelayResponse) ProtoMessage() {} func (*OperateRelayResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{38} + return fileDescriptor_51a1b9e17fd67b10, []int{39} } func (m *OperateRelayResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3024,7 +3119,7 @@ func (m *PurgeRelayRequest) Reset() { *m = PurgeRelayRequest{} } func (m *PurgeRelayRequest) String() string { return proto.CompactTextString(m) } func (*PurgeRelayRequest) ProtoMessage() {} func (*PurgeRelayRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{39} + return fileDescriptor_51a1b9e17fd67b10, []int{40} } func (m *PurgeRelayRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3088,7 +3183,7 @@ func (m *QueryWorkerConfigRequest) Reset() { *m = QueryWorkerConfigReque func (m *QueryWorkerConfigRequest) String() string { return proto.CompactTextString(m) } func (*QueryWorkerConfigRequest) ProtoMessage() {} func (*QueryWorkerConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{40} + return fileDescriptor_51a1b9e17fd67b10, []int{41} } func (m *QueryWorkerConfigRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3129,7 +3224,7 @@ func (m *QueryWorkerConfigResponse) Reset() { *m = QueryWorkerConfigResp func (m *QueryWorkerConfigResponse) String() string { return proto.CompactTextString(m) } func (*QueryWorkerConfigResponse) ProtoMessage() {} func (*QueryWorkerConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{41} + return fileDescriptor_51a1b9e17fd67b10, []int{42} } func (m *QueryWorkerConfigResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3204,7 +3299,7 @@ func (m *TaskMeta) Reset() { *m = TaskMeta{} } func (m *TaskMeta) String() string { return proto.CompactTextString(m) } func (*TaskMeta) ProtoMessage() {} func (*TaskMeta) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{42} + return fileDescriptor_51a1b9e17fd67b10, []int{43} } func (m *TaskMeta) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3274,7 +3369,7 @@ func (m *TaskLog) Reset() { *m = TaskLog{} } func (m *TaskLog) String() string { return proto.CompactTextString(m) } func (*TaskLog) ProtoMessage() {} func (*TaskLog) Descriptor() ([]byte, []int) { - return fileDescriptor_51a1b9e17fd67b10, []int{43} + return fileDescriptor_51a1b9e17fd67b10, []int{44} } func (m *TaskLog) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3376,6 +3471,7 @@ func init() { proto.RegisterType((*SubTaskError)(nil), "pb.SubTaskError") proto.RegisterType((*SubTaskErrorList)(nil), "pb.SubTaskErrorList") proto.RegisterType((*ProcessResult)(nil), "pb.ProcessResult") + proto.RegisterType((*TError)(nil), "pb.TError") proto.RegisterType((*ProcessError)(nil), "pb.ProcessError") proto.RegisterType((*DDLInfo)(nil), "pb.DDLInfo") proto.RegisterType((*DDLLockInfo)(nil), "pb.DDLLockInfo") @@ -3394,150 +3490,155 @@ func init() { func init() { proto.RegisterFile("dmworker.proto", fileDescriptor_51a1b9e17fd67b10) } var fileDescriptor_51a1b9e17fd67b10 = []byte{ - // 2286 bytes of a gzipped FileDescriptorProto + // 2367 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x19, 0x4d, 0x6f, 0x23, 0x59, - 0xd1, 0xdd, 0x6e, 0x3b, 0x76, 0xd9, 0xc9, 0x76, 0x5e, 0x66, 0x67, 0x3d, 0x66, 0x27, 0x84, 0x9e, - 0xd5, 0x6e, 0x36, 0x42, 0xd1, 0x6e, 0x00, 0x21, 0x01, 0x0b, 0xec, 0xc4, 0x99, 0x8c, 0xc1, 0x33, - 0x93, 0xb4, 0x27, 0xc0, 0x6d, 0xd5, 0x69, 0xbf, 0x38, 0xad, 0xb4, 0xbb, 0x7b, 0xfa, 0x23, 0x99, - 0x9c, 0x10, 0xe2, 0x88, 0x84, 0x90, 0x38, 0x21, 0xce, 0xfc, 0x0b, 0xee, 0x70, 0xdc, 0x23, 0x37, - 0xd0, 0xcc, 0x2f, 0xe0, 0xce, 0x01, 0x55, 0xbd, 0xd7, 0xdd, 0xaf, 0x13, 0xdb, 0x33, 0x42, 0xc3, - 0xc5, 0xea, 0xfa, 0x78, 0xf5, 0xaa, 0xea, 0xd5, 0xab, 0xaa, 0x57, 0x86, 0xb5, 0xc9, 0xec, 0x2a, - 0x8c, 0x2f, 0x78, 0xbc, 0x1b, 0xc5, 0x61, 0x1a, 0x32, 0x3d, 0x3a, 0xb5, 0x3e, 0x85, 0x8d, 0x71, - 0xea, 0xc4, 0xe9, 0x38, 0x3b, 0x7d, 0xee, 0x24, 0x17, 0x36, 0x7f, 0x91, 0xf1, 0x24, 0x65, 0x0c, - 0x8c, 0xd4, 0x49, 0x2e, 0x7a, 0xda, 0x96, 0xb6, 0xdd, 0xb6, 0xe9, 0xdb, 0xda, 0x05, 0x76, 0x12, - 0x4d, 0x9c, 0x94, 0xdb, 0xdc, 0x77, 0xae, 0x73, 0xce, 0x1e, 0xac, 0xb8, 0x61, 0x90, 0xf2, 0x20, - 0x95, 0xcc, 0x39, 0x68, 0x8d, 0x61, 0xe3, 0x89, 0x37, 0x8d, 0x6f, 0x2e, 0xd8, 0x04, 0x78, 0xe8, - 0x05, 0x7e, 0x38, 0x7d, 0xea, 0xcc, 0xb8, 0x5c, 0xa3, 0x60, 0xd8, 0x87, 0xd0, 0x16, 0xd0, 0x51, - 0x98, 0xf4, 0xf4, 0x2d, 0x6d, 0x7b, 0xd5, 0x2e, 0x11, 0xd6, 0x21, 0xbc, 0xff, 0x2c, 0xe2, 0x28, - 0xf4, 0x86, 0xc6, 0x7d, 0xd0, 0xc3, 0x88, 0xc4, 0xad, 0xed, 0xc1, 0x6e, 0x74, 0xba, 0x8b, 0xc4, - 0x67, 0x91, 0xad, 0x87, 0x11, 0x5a, 0x13, 0xe0, 0x66, 0xba, 0xb0, 0x06, 0xbf, 0xad, 0x97, 0x70, - 0xf7, 0xa6, 0xa0, 0x24, 0x0a, 0x83, 0x84, 0xb3, 0x6f, 0x83, 0x31, 0xe3, 0xa9, 0x43, 0xb2, 0x3a, - 0x7b, 0x3d, 0x94, 0xb5, 0x1f, 0xce, 0x66, 0x61, 0xf0, 0x4b, 0x72, 0x5e, 0xce, 0x67, 0x13, 0x97, - 0xdc, 0x57, 0x9f, 0xbb, 0xef, 0x1d, 0x68, 0xf8, 0xe1, 0x74, 0x38, 0xe8, 0xd5, 0xb7, 0xb4, 0xed, - 0xba, 0x2d, 0x00, 0xeb, 0x00, 0xee, 0x1d, 0x67, 0x3c, 0xbe, 0x16, 0x8c, 0xa8, 0x82, 0x17, 0x06, - 0x8a, 0xe3, 0x83, 0xd2, 0x2f, 0xf4, 0x5d, 0x8a, 0xd1, 0x55, 0x31, 0x1e, 0xf4, 0xe7, 0x89, 0xf9, - 0x9f, 0x8c, 0xb8, 0x0f, 0x75, 0x3f, 0x9c, 0x92, 0xfc, 0xce, 0x5e, 0x27, 0xb7, 0x62, 0x14, 0x4e, - 0x6d, 0xc4, 0x5b, 0x3b, 0x70, 0x47, 0x9c, 0xfc, 0x5b, 0x44, 0xc9, 0x36, 0x30, 0x52, 0x6b, 0x9c, - 0x3a, 0x69, 0x96, 0x2c, 0x31, 0xcb, 0xfa, 0x04, 0xd6, 0x89, 0xf3, 0x20, 0x8e, 0xc3, 0x78, 0x19, - 0xe3, 0x9f, 0x35, 0xe8, 0x3d, 0x76, 0x82, 0x89, 0x9f, 0xef, 0x3f, 0x3e, 0x1e, 0x2d, 0x93, 0xcc, - 0xee, 0x29, 0x67, 0xd2, 0x46, 0x6b, 0xc6, 0xc7, 0xa3, 0x32, 0x14, 0x9c, 0x78, 0x9a, 0xf4, 0xea, - 0x5b, 0x75, 0x64, 0xc7, 0x6f, 0x8c, 0xb8, 0xd3, 0x22, 0xe2, 0x0c, 0x92, 0x53, 0x22, 0x30, 0x5e, - 0x93, 0x17, 0xfe, 0x91, 0x93, 0xa6, 0x3c, 0x0e, 0x7a, 0x0d, 0x11, 0xaf, 0x25, 0xc6, 0xfa, 0x15, - 0xdc, 0x99, 0xe7, 0x59, 0x76, 0x17, 0x9a, 0x31, 0x4f, 0x32, 0x5f, 0xdc, 0x8b, 0x96, 0x2d, 0x21, - 0xc4, 0x8b, 0x5b, 0x28, 0xc3, 0x51, 0x42, 0xcc, 0x84, 0xfa, 0x2c, 0x99, 0x52, 0xa8, 0xb4, 0x6d, - 0xfc, 0xb4, 0xfe, 0xa9, 0xc1, 0x46, 0xc5, 0x97, 0xef, 0x4a, 0x32, 0xfb, 0x3e, 0xac, 0x26, 0xd2, - 0x95, 0x24, 0xba, 0x67, 0x6c, 0xd5, 0xb7, 0x3b, 0x7b, 0xeb, 0xe4, 0x2b, 0x95, 0x60, 0x57, 0xf9, - 0xd8, 0xe7, 0xd0, 0x89, 0xf1, 0x32, 0xcb, 0x65, 0x0d, 0x0a, 0x98, 0xf7, 0x70, 0x99, 0x5d, 0xa2, - 0x6d, 0x95, 0x87, 0xf5, 0xa1, 0x95, 0x84, 0x59, 0xec, 0xf2, 0xe1, 0xa0, 0xd7, 0x24, 0x15, 0x0a, - 0xd8, 0xfa, 0xab, 0x26, 0xa3, 0x45, 0xc6, 0xc0, 0x3b, 0x33, 0xf0, 0xbb, 0xd0, 0x95, 0x8a, 0x93, - 0x64, 0x69, 0x9f, 0xa9, 0xd8, 0x27, 0x76, 0xac, 0x70, 0xb1, 0x5d, 0x00, 0x32, 0x43, 0xac, 0x11, - 0xc6, 0xad, 0x15, 0xc6, 0x89, 0x15, 0x0a, 0x87, 0xf5, 0x17, 0x0d, 0x3a, 0xfb, 0xe7, 0xdc, 0xcd, - 0xbd, 0x73, 0x17, 0x9a, 0x91, 0x93, 0x24, 0x7c, 0x92, 0xeb, 0x2d, 0x20, 0xbc, 0xc0, 0x69, 0x98, - 0x3a, 0x3e, 0xa9, 0xdd, 0xb0, 0x05, 0x40, 0x81, 0x95, 0xb9, 0x2e, 0x4f, 0x92, 0xb3, 0xcc, 0x27, - 0xe5, 0x1b, 0xb6, 0x82, 0x41, 0x69, 0x67, 0x8e, 0xe7, 0xf3, 0x09, 0xc5, 0x64, 0xc3, 0x96, 0x10, - 0x66, 0xdc, 0x2b, 0x27, 0x0e, 0xbc, 0x60, 0x4a, 0x2a, 0x36, 0xec, 0x1c, 0xc4, 0x15, 0x13, 0x9e, - 0x3a, 0x9e, 0x4f, 0x8e, 0xee, 0xda, 0x12, 0xb2, 0xba, 0x00, 0x83, 0x6c, 0x16, 0x09, 0x2d, 0xad, - 0xdf, 0x6b, 0x00, 0xa3, 0xd0, 0x99, 0x48, 0xa5, 0x3f, 0x82, 0xd5, 0x33, 0x2f, 0xf0, 0x92, 0x73, - 0x3e, 0x79, 0x78, 0x9d, 0xf2, 0x84, 0x74, 0xaf, 0xdb, 0x55, 0x24, 0x2a, 0x4b, 0x5a, 0x0b, 0x16, - 0x91, 0x88, 0x14, 0x0c, 0x9e, 0x72, 0x14, 0x87, 0xd3, 0x98, 0x27, 0x89, 0x3c, 0x87, 0x02, 0xc6, - 0xb5, 0x98, 0x65, 0x44, 0x12, 0x97, 0x17, 0x4c, 0xc1, 0x58, 0xbf, 0xd3, 0x60, 0x75, 0x7c, 0xee, - 0xc4, 0x13, 0x2f, 0x98, 0x1e, 0xc6, 0x61, 0x16, 0xa1, 0x21, 0xa9, 0x13, 0x4f, 0x79, 0x5e, 0x53, - 0x24, 0x84, 0xb7, 0x77, 0x30, 0x18, 0xe1, 0xfe, 0x74, 0x7b, 0xf1, 0x1b, 0x77, 0x3e, 0xf3, 0xe2, - 0x24, 0xc5, 0xcb, 0x2b, 0x77, 0xce, 0x61, 0x94, 0x93, 0x5c, 0x07, 0x2e, 0xb9, 0x10, 0x57, 0x48, - 0x08, 0xd7, 0x64, 0x81, 0xa4, 0x34, 0x88, 0x52, 0xc0, 0xd6, 0x6f, 0xeb, 0x00, 0xe3, 0xeb, 0xc0, - 0x95, 0xee, 0xd9, 0x82, 0x0e, 0x99, 0x79, 0x70, 0xc9, 0x83, 0x34, 0x77, 0x8e, 0x8a, 0x42, 0x61, - 0x04, 0x3e, 0x8f, 0x72, 0xc7, 0x14, 0x30, 0xa6, 0x96, 0x98, 0xbb, 0x3c, 0x48, 0x91, 0x28, 0xaa, - 0x40, 0x89, 0x60, 0x16, 0x74, 0x67, 0x4e, 0x92, 0xf2, 0xb8, 0xe2, 0x9a, 0x0a, 0x8e, 0xed, 0x80, - 0xa9, 0xc2, 0x87, 0xa9, 0x37, 0x91, 0x49, 0xe8, 0x16, 0x1e, 0xe5, 0x91, 0x11, 0xb9, 0x3c, 0x71, - 0xdd, 0x2a, 0x38, 0x94, 0xa7, 0xc2, 0x24, 0x6f, 0x45, 0xc8, 0xbb, 0x89, 0x47, 0x79, 0xa7, 0x7e, - 0xe8, 0x5e, 0x78, 0xc1, 0x94, 0xdc, 0xde, 0x22, 0x57, 0x55, 0x70, 0xec, 0x0b, 0x30, 0xb3, 0x20, - 0xe6, 0x49, 0xe8, 0x5f, 0xf2, 0x09, 0x9d, 0x5e, 0xd2, 0x6b, 0x2b, 0xd9, 0x44, 0x3d, 0x57, 0xfb, - 0x16, 0xab, 0x72, 0x42, 0x20, 0xae, 0x8c, 0x3c, 0x85, 0xbf, 0xe9, 0xd0, 0x51, 0x52, 0xca, 0x2d, - 0x57, 0x69, 0x6f, 0xe9, 0x2a, 0x7d, 0x81, 0xab, 0xb6, 0xf2, 0x44, 0x96, 0x9d, 0x0e, 0xbc, 0x58, - 0x06, 0x8e, 0x8a, 0x2a, 0x38, 0x2a, 0x67, 0xa3, 0xa2, 0xd8, 0x36, 0xbc, 0xa7, 0x80, 0xca, 0xc9, - 0xdc, 0x44, 0xb3, 0x5d, 0x60, 0x84, 0xda, 0x77, 0x52, 0xf7, 0xfc, 0x24, 0x7a, 0x42, 0xda, 0xd0, - 0xf1, 0xb4, 0xec, 0x39, 0x14, 0xf6, 0x4d, 0x68, 0x24, 0xa9, 0x33, 0xe5, 0x74, 0x32, 0x79, 0x0d, - 0x43, 0x84, 0x2d, 0xf0, 0xec, 0xd3, 0x22, 0x43, 0xb6, 0x28, 0x4b, 0x91, 0xaf, 0x8f, 0xe2, 0x10, - 0x73, 0x87, 0x4d, 0x84, 0x3c, 0x69, 0x5a, 0xff, 0xd1, 0x61, 0xb5, 0x92, 0xd3, 0xe7, 0x96, 0xcc, - 0x62, 0x47, 0x7d, 0xc1, 0x8e, 0x5b, 0x60, 0x64, 0x81, 0x97, 0x92, 0xa7, 0xd6, 0xf6, 0xba, 0x48, - 0x3f, 0x09, 0xbc, 0xf4, 0xf9, 0x75, 0xc4, 0x6d, 0xa2, 0x28, 0x3a, 0x19, 0x6f, 0xd0, 0x89, 0x7d, - 0x06, 0x1b, 0x65, 0x24, 0x0c, 0x06, 0xa3, 0x51, 0xe8, 0x5e, 0x0c, 0x07, 0xd2, 0x7b, 0xf3, 0x48, - 0x8c, 0x89, 0x14, 0x4f, 0x11, 0xfd, 0xb8, 0x26, 0x92, 0xfc, 0x27, 0xd0, 0x70, 0x31, 0xfb, 0x92, - 0x97, 0x64, 0x19, 0x52, 0xd2, 0xf1, 0xe3, 0x9a, 0x2d, 0xe8, 0xec, 0x23, 0x30, 0x26, 0xd9, 0x2c, - 0x92, 0xbe, 0xa2, 0x8c, 0x5e, 0xe6, 0xc3, 0xc7, 0x35, 0x9b, 0xa8, 0xc8, 0xe5, 0x87, 0xce, 0xa4, - 0xd7, 0x2e, 0xb9, 0xca, 0x34, 0x89, 0x5c, 0x48, 0x45, 0x2e, 0x0c, 0x51, 0x0a, 0x57, 0xc9, 0x55, - 0x66, 0x0b, 0xe4, 0x42, 0xea, 0xc3, 0x16, 0x34, 0x13, 0x91, 0x6d, 0x7f, 0x0c, 0xeb, 0x15, 0xef, - 0x8f, 0xbc, 0x84, 0x5c, 0x25, 0xc8, 0x3d, 0x6d, 0x51, 0xe1, 0xcd, 0xd7, 0x6f, 0x02, 0x90, 0x4d, - 0xa2, 0x42, 0xc9, 0x4a, 0xa7, 0x95, 0x4d, 0xc2, 0x7d, 0x68, 0xa3, 0x2d, 0x4b, 0xc8, 0x68, 0xc4, - 0x22, 0x72, 0x04, 0x5d, 0xd2, 0xfe, 0x78, 0xb4, 0x80, 0x83, 0xed, 0xc1, 0x1d, 0x51, 0x77, 0x8a, - 0x1e, 0xdc, 0xc3, 0x46, 0x53, 0x5e, 0xac, 0xb9, 0x34, 0xcc, 0x88, 0x1c, 0xc5, 0x8d, 0x8f, 0x47, - 0x79, 0x4a, 0xce, 0x61, 0xeb, 0x7b, 0xd0, 0xc6, 0x1d, 0xc5, 0x76, 0xdb, 0xd0, 0x24, 0x42, 0xee, - 0x07, 0xb3, 0x70, 0xa7, 0x54, 0xc8, 0x96, 0x74, 0x74, 0x43, 0x59, 0x78, 0xe7, 0x18, 0xf2, 0x27, - 0x1d, 0xba, 0x6a, 0x65, 0xff, 0x7f, 0x05, 0xb9, 0x8c, 0x43, 0x43, 0x8d, 0xc3, 0x8f, 0xf3, 0x38, - 0x54, 0x3a, 0x86, 0xf2, 0xcc, 0xca, 0x30, 0x7c, 0x20, 0xc3, 0xb0, 0x49, 0x6c, 0xab, 0x79, 0x18, - 0xe6, 0x5c, 0x22, 0x0a, 0x1f, 0xc8, 0x28, 0x5c, 0x29, 0x99, 0x8a, 0x03, 0x2c, 0x82, 0xf0, 0x81, - 0x0c, 0xc2, 0x56, 0xc9, 0x54, 0x38, 0xb5, 0x88, 0xc1, 0x15, 0x68, 0x90, 0xf3, 0xac, 0x1f, 0x80, - 0xa9, 0xba, 0x86, 0x22, 0xf0, 0x63, 0x49, 0xac, 0x38, 0x5e, 0xed, 0x8c, 0xe4, 0xda, 0x17, 0xb0, - 0x5a, 0xb9, 0xc2, 0x58, 0xcc, 0xbd, 0x64, 0xdf, 0x09, 0x5c, 0xee, 0x17, 0x7d, 0x8e, 0x82, 0x51, - 0x8e, 0x54, 0x2f, 0x25, 0x4b, 0x11, 0x95, 0x23, 0x55, 0xba, 0x95, 0x7a, 0xa5, 0x5b, 0xd9, 0x87, - 0xae, 0xca, 0xcf, 0xbe, 0x05, 0x06, 0x1e, 0x80, 0x7c, 0xdb, 0x91, 0xb1, 0x44, 0x10, 0xa7, 0x82, - 0xbf, 0x79, 0x3c, 0xe8, 0x65, 0x3c, 0x7c, 0x05, 0x2b, 0x83, 0xc1, 0x68, 0x18, 0x9c, 0x85, 0xf3, - 0x5e, 0x29, 0x54, 0x76, 0xdc, 0x73, 0x3e, 0x73, 0xf2, 0x4e, 0x52, 0x40, 0xd4, 0xa9, 0x39, 0xa7, - 0x3e, 0x97, 0x61, 0x2b, 0x80, 0xa2, 0xed, 0x30, 0xca, 0xb6, 0xc3, 0xfa, 0x1c, 0x3a, 0x79, 0x76, - 0x5a, 0xb4, 0xc9, 0x1a, 0xe8, 0xf2, 0xd1, 0xd6, 0xb6, 0xf5, 0xe1, 0xc0, 0xf2, 0x61, 0xed, 0xe0, - 0x25, 0x77, 0x07, 0x83, 0xd1, 0x92, 0x07, 0x14, 0xaa, 0xe6, 0x8b, 0x74, 0x28, 0x55, 0xf3, 0xf3, - 0x0c, 0x68, 0xf0, 0x97, 0xdc, 0x25, 0xcd, 0x5a, 0x36, 0x7d, 0x53, 0xeb, 0x11, 0x3b, 0x2e, 0x3f, - 0x1c, 0x0e, 0x64, 0x81, 0x2a, 0x60, 0xeb, 0x37, 0x1a, 0x6c, 0x3c, 0x8c, 0xb9, 0x73, 0x21, 0xd5, - 0x5c, 0xb6, 0xa7, 0x05, 0xdd, 0x98, 0xcf, 0xc2, 0x4b, 0x3e, 0x52, 0x77, 0xae, 0xe0, 0xb0, 0xed, - 0xe4, 0x42, 0x7b, 0xa9, 0x42, 0x0e, 0x22, 0x25, 0xb9, 0xf0, 0x22, 0xa4, 0x18, 0x82, 0x22, 0x41, - 0xab, 0x0f, 0xbd, 0xf1, 0x95, 0x97, 0xba, 0xe7, 0x74, 0x77, 0x45, 0x71, 0x93, 0x7a, 0x58, 0x7b, - 0xb0, 0x21, 0x1f, 0xe0, 0x95, 0xf1, 0xc0, 0x37, 0x94, 0x77, 0x7c, 0xa7, 0xe8, 0xbd, 0xc5, 0xeb, - 0xcd, 0xca, 0xe0, 0x4e, 0x75, 0x8d, 0x7c, 0x30, 0x2c, 0x5b, 0xa4, 0xbc, 0x26, 0xf4, 0x05, 0xaf, - 0x89, 0xfa, 0xbc, 0xd7, 0x84, 0x51, 0x06, 0xd3, 0x15, 0xac, 0x1f, 0x65, 0xf1, 0xb4, 0xaa, 0x68, - 0x1f, 0x5a, 0x5e, 0xe0, 0xb8, 0xa9, 0x77, 0xc9, 0xe5, 0x35, 0x28, 0x60, 0xf2, 0xb1, 0x27, 0x07, - 0x0e, 0x75, 0x9b, 0xbe, 0x45, 0x9f, 0xea, 0x73, 0x4a, 0x4a, 0x45, 0x9f, 0x2a, 0x60, 0x0a, 0x47, - 0xd1, 0x88, 0x18, 0x32, 0x1c, 0x09, 0x42, 0xff, 0xd1, 0xf3, 0x48, 0x3c, 0x2d, 0xf7, 0xc3, 0xe0, - 0xcc, 0x9b, 0xe6, 0xfe, 0xfb, 0xa3, 0x26, 0xe7, 0x08, 0x55, 0xe2, 0x3b, 0x7b, 0x42, 0xa9, 0xef, - 0x36, 0xa3, 0xfa, 0x6e, 0x53, 0x87, 0x3e, 0x8d, 0xea, 0xd0, 0x27, 0x84, 0x16, 0xe6, 0x90, 0x27, - 0xe5, 0x68, 0x64, 0xfe, 0x48, 0xe6, 0x8d, 0xa9, 0x38, 0xcf, 0xdf, 0x75, 0x25, 0x7f, 0xe7, 0xa1, - 0x6b, 0x50, 0xbe, 0x10, 0xf3, 0x86, 0x5f, 0xc3, 0x8a, 0x9c, 0x55, 0xe0, 0x7d, 0xf3, 0x26, 0xb2, - 0x43, 0xd7, 0xa9, 0xc7, 0x13, 0xec, 0x62, 0xac, 0xd1, 0xcd, 0x35, 0x40, 0xdd, 0xca, 0x1b, 0x9a, - 0xe6, 0x7d, 0xb9, 0x9e, 0x26, 0x14, 0xc9, 0xe2, 0x01, 0x56, 0x44, 0xb2, 0x00, 0x91, 0x32, 0xe3, - 0x49, 0x82, 0x1a, 0x4b, 0x8b, 0x25, 0xb8, 0xf3, 0x15, 0x34, 0x85, 0x5d, 0x6c, 0x15, 0xda, 0xc3, - 0xe0, 0xd2, 0xf1, 0xbd, 0xc9, 0xb3, 0xc8, 0xac, 0xb1, 0x16, 0x18, 0xe3, 0x34, 0x8c, 0x4c, 0x8d, - 0xb5, 0xa1, 0x71, 0xe4, 0x64, 0x09, 0x37, 0x75, 0x06, 0xd0, 0xc4, 0x44, 0x3a, 0xe3, 0x66, 0x1d, - 0xd1, 0x34, 0x7b, 0x33, 0x0d, 0x44, 0x8b, 0x09, 0x8b, 0xd9, 0x60, 0x6b, 0x00, 0x5f, 0x66, 0x69, - 0x28, 0xd9, 0x9a, 0x3b, 0x3b, 0xd0, 0xa0, 0xf9, 0x05, 0x09, 0xfc, 0xf9, 0xf0, 0xc8, 0xac, 0xb1, - 0x0e, 0xac, 0xd8, 0x07, 0x47, 0xa3, 0x2f, 0xf7, 0x0f, 0x4c, 0x0d, 0xd7, 0x0e, 0x9f, 0xfe, 0xec, - 0x60, 0xff, 0xb9, 0xa9, 0xef, 0xfc, 0x82, 0x44, 0x4e, 0x31, 0x23, 0x76, 0xa5, 0x2e, 0x04, 0x9b, - 0x35, 0xb6, 0x02, 0xf5, 0xa7, 0xfc, 0xca, 0xd4, 0x68, 0x71, 0x16, 0xe0, 0x83, 0x51, 0xe8, 0x43, - 0xaa, 0x4d, 0xcc, 0x3a, 0x12, 0x50, 0xe1, 0x88, 0x4f, 0x4c, 0x83, 0x75, 0xa1, 0xf5, 0x48, 0xbe, - 0x00, 0xcd, 0xc6, 0xce, 0x33, 0x68, 0xe5, 0x85, 0x90, 0xbd, 0x07, 0x1d, 0x29, 0x1a, 0x51, 0x66, - 0x0d, 0xed, 0xa0, 0x72, 0x67, 0x6a, 0xa8, 0x22, 0x96, 0x34, 0x53, 0xc7, 0x2f, 0xac, 0x5b, 0x66, - 0x9d, 0xd4, 0xbe, 0x0e, 0x5c, 0xd3, 0x40, 0x46, 0xba, 0x42, 0xe6, 0x64, 0xe7, 0x87, 0xd0, 0x2e, - 0x92, 0x38, 0x2a, 0x7b, 0x12, 0x5c, 0x04, 0xe1, 0x55, 0x40, 0x38, 0x61, 0x20, 0xa6, 0xca, 0xf1, - 0xf1, 0xc8, 0xd4, 0x70, 0x43, 0x92, 0xff, 0x88, 0x7a, 0x0d, 0x53, 0xdf, 0x79, 0x02, 0x2b, 0xf2, - 0x82, 0x33, 0x06, 0x6b, 0x52, 0x19, 0x89, 0x31, 0x6b, 0x78, 0x0e, 0x68, 0x87, 0xd8, 0x4a, 0x43, - 0x7f, 0x92, 0x89, 0x02, 0xd6, 0x51, 0x9c, 0xf0, 0xad, 0x40, 0xd4, 0xf7, 0xfe, 0xdd, 0x82, 0xa6, - 0xb8, 0x44, 0xec, 0x00, 0xba, 0xea, 0x38, 0x94, 0x7d, 0x20, 0xe3, 0xf2, 0xe6, 0x80, 0xb4, 0xdf, - 0x47, 0xc2, 0xfc, 0x01, 0xa2, 0x55, 0x63, 0x43, 0x58, 0xab, 0xd2, 0xd8, 0xbd, 0x79, 0xfc, 0x6f, - 0x23, 0xea, 0x10, 0x56, 0x2b, 0xb3, 0x37, 0x46, 0xb3, 0xbc, 0x79, 0xe3, 0xb8, 0x37, 0x08, 0xfa, - 0x29, 0x74, 0x94, 0x61, 0x12, 0xbb, 0x8b, 0xcc, 0xb7, 0x27, 0x75, 0xfd, 0x0f, 0x6e, 0xe1, 0x0b, - 0x09, 0x5f, 0x00, 0x94, 0xc3, 0x1a, 0xf6, 0x7e, 0xc1, 0xa8, 0x0e, 0xf0, 0xfa, 0x77, 0x6f, 0xa2, - 0x8b, 0xe5, 0x27, 0x72, 0xd6, 0x53, 0x19, 0x58, 0xb2, 0xfb, 0x05, 0xff, 0xbc, 0x79, 0x68, 0x7f, - 0x73, 0x11, 0xb9, 0x10, 0xfb, 0x08, 0x40, 0x0e, 0x07, 0x8f, 0x47, 0x09, 0xfb, 0x10, 0xf9, 0x17, - 0x0d, 0x0b, 0xfb, 0x0b, 0xe7, 0xa0, 0x56, 0x8d, 0xed, 0x41, 0xf7, 0x11, 0x4f, 0xdd, 0xf3, 0xbc, - 0x6d, 0xa0, 0xe7, 0x84, 0x52, 0xe2, 0xfb, 0x1d, 0x89, 0x40, 0xc0, 0xaa, 0x6d, 0x6b, 0x9f, 0x69, - 0xec, 0x47, 0x00, 0x18, 0xa6, 0x59, 0xca, 0xb1, 0x0e, 0x32, 0x6a, 0x4d, 0x2a, 0x15, 0x7e, 0xe9, - 0x8e, 0xfb, 0xd0, 0x55, 0x0b, 0xb4, 0x08, 0xb6, 0x39, 0x25, 0x7b, 0xa9, 0x90, 0x27, 0xb0, 0x7e, - 0xab, 0xc4, 0x0a, 0x2f, 0x2c, 0xaa, 0xbc, 0x6f, 0xd2, 0x49, 0xad, 0xb0, 0x42, 0xa7, 0x39, 0x75, - 0x5a, 0x08, 0x99, 0x57, 0x8c, 0xad, 0x1a, 0xfb, 0x09, 0x40, 0x59, 0x2f, 0x45, 0xa0, 0xdc, 0xaa, - 0x9f, 0x4b, 0xb5, 0x38, 0x84, 0x75, 0xe5, 0xaf, 0x06, 0x51, 0xda, 0x44, 0xc4, 0xde, 0xfe, 0x07, - 0x62, 0xa9, 0x20, 0x5b, 0xce, 0x98, 0xd5, 0x1a, 0x29, 0xbc, 0xb3, 0xa8, 0xae, 0xf6, 0xef, 0x2f, - 0xa0, 0xaa, 0x2e, 0x52, 0xff, 0xd7, 0x10, 0x2e, 0x9a, 0xf3, 0x4f, 0xc7, 0x32, 0xc5, 0x1e, 0xf6, - 0xfe, 0xfe, 0x6a, 0x53, 0xfb, 0xfa, 0xd5, 0xa6, 0xf6, 0xaf, 0x57, 0x9b, 0xda, 0x1f, 0x5e, 0x6f, - 0xd6, 0xbe, 0x7e, 0xbd, 0x59, 0xfb, 0xc7, 0xeb, 0xcd, 0xda, 0x69, 0x93, 0xfe, 0x9c, 0xf9, 0xce, - 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc7, 0x27, 0x05, 0xa6, 0xae, 0x19, 0x00, 0x00, + 0xd1, 0xdd, 0x6e, 0x3b, 0x76, 0xd9, 0xc9, 0x74, 0x5e, 0x66, 0x67, 0x3d, 0x66, 0x27, 0x84, 0x9e, + 0xd5, 0x6e, 0x36, 0x42, 0xd1, 0x6e, 0x00, 0x21, 0x01, 0x0b, 0xec, 0xc4, 0x99, 0x4c, 0xc0, 0x99, + 0x49, 0xda, 0x13, 0xe0, 0xb6, 0xea, 0xb4, 0x5f, 0x9c, 0x56, 0xda, 0xdd, 0x3d, 0xfd, 0x91, 0x4c, + 0x4e, 0x08, 0x71, 0x44, 0x42, 0x48, 0x9c, 0x10, 0x67, 0x6e, 0xfc, 0x04, 0xee, 0x70, 0xdc, 0x23, + 0x37, 0xd0, 0xcc, 0x2f, 0xe0, 0xce, 0x01, 0x55, 0xbd, 0xd7, 0xdd, 0xaf, 0x13, 0xdb, 0x33, 0x42, + 0xb3, 0x17, 0xab, 0xeb, 0xe3, 0xd5, 0xab, 0xaa, 0x57, 0xaf, 0xaa, 0x5e, 0x19, 0x56, 0xc6, 0xd3, + 0xab, 0x30, 0xbe, 0xe0, 0xf1, 0x76, 0x14, 0x87, 0x69, 0xc8, 0xf4, 0xe8, 0xd4, 0xfa, 0x04, 0xd6, + 0x46, 0xa9, 0x13, 0xa7, 0xa3, 0xec, 0xf4, 0xb9, 0x93, 0x5c, 0xd8, 0xfc, 0x45, 0xc6, 0x93, 0x94, + 0x31, 0x30, 0x52, 0x27, 0xb9, 0xe8, 0x69, 0x1b, 0xda, 0x66, 0xdb, 0xa6, 0x6f, 0x6b, 0x1b, 0xd8, + 0x49, 0x34, 0x76, 0x52, 0x6e, 0x73, 0xdf, 0xb9, 0xce, 0x39, 0x7b, 0xb0, 0xe4, 0x86, 0x41, 0xca, + 0x83, 0x54, 0x32, 0xe7, 0xa0, 0x35, 0x82, 0xb5, 0x43, 0x6f, 0x12, 0xdf, 0x5c, 0xb0, 0x0e, 0xf0, + 0xc8, 0x0b, 0xfc, 0x70, 0xf2, 0xd4, 0x99, 0x72, 0xb9, 0x46, 0xc1, 0xb0, 0x0f, 0xa0, 0x2d, 0xa0, + 0xa3, 0x30, 0xe9, 0xe9, 0x1b, 0xda, 0xe6, 0xb2, 0x5d, 0x22, 0xac, 0x7d, 0x78, 0xef, 0x59, 0xc4, + 0x51, 0xe8, 0x0d, 0x8d, 0xfb, 0xa0, 0x87, 0x11, 0x89, 0x5b, 0xd9, 0x81, 0xed, 0xe8, 0x74, 0x1b, + 0x89, 0xcf, 0x22, 0x5b, 0x0f, 0x23, 0xb4, 0x26, 0xc0, 0xcd, 0x74, 0x61, 0x0d, 0x7e, 0x5b, 0x2f, + 0xe1, 0xde, 0x4d, 0x41, 0x49, 0x14, 0x06, 0x09, 0x67, 0xdf, 0x06, 0x63, 0xca, 0x53, 0x87, 0x64, + 0x75, 0x76, 0x7a, 0x28, 0x6b, 0x37, 0x9c, 0x4e, 0xc3, 0xe0, 0x97, 0xe4, 0xbc, 0x9c, 0xcf, 0x26, + 0x2e, 0xb9, 0xaf, 0x3e, 0x73, 0xdf, 0xbb, 0xd0, 0xf0, 0xc3, 0xc9, 0xc1, 0xa0, 0x57, 0xdf, 0xd0, + 0x36, 0xeb, 0xb6, 0x00, 0xac, 0x3d, 0xb8, 0x7f, 0x9c, 0xf1, 0xf8, 0x5a, 0x30, 0xa2, 0x0a, 0x5e, + 0x18, 0x28, 0x8e, 0x0f, 0x4a, 0xbf, 0xd0, 0x77, 0x29, 0x46, 0x57, 0xc5, 0x78, 0xd0, 0x9f, 0x25, + 0xe6, 0xff, 0x32, 0xe2, 0x01, 0xd4, 0xfd, 0x70, 0x42, 0xf2, 0x3b, 0x3b, 0x9d, 0xdc, 0x8a, 0x61, + 0x38, 0xb1, 0x11, 0x6f, 0x6d, 0xc1, 0x5d, 0x71, 0xf2, 0x6f, 0x11, 0x25, 0x9b, 0xc0, 0x48, 0xad, + 0x51, 0xea, 0xa4, 0x59, 0xb2, 0xc0, 0x2c, 0xeb, 0x63, 0x58, 0x25, 0xce, 0xbd, 0x38, 0x0e, 0xe3, + 0x45, 0x8c, 0x7f, 0xd6, 0xa0, 0xf7, 0xc4, 0x09, 0xc6, 0x7e, 0xbe, 0xff, 0xe8, 0x78, 0xb8, 0x48, + 0x32, 0xbb, 0xaf, 0x9c, 0x49, 0x1b, 0xad, 0x19, 0x1d, 0x0f, 0xcb, 0x50, 0x70, 0xe2, 0x49, 0xd2, + 0xab, 0x6f, 0xd4, 0x91, 0x1d, 0xbf, 0x31, 0xe2, 0x4e, 0x8b, 0x88, 0x33, 0x48, 0x4e, 0x89, 0xc0, + 0x78, 0x4d, 0x5e, 0xf8, 0x47, 0x4e, 0x9a, 0xf2, 0x38, 0xe8, 0x35, 0x44, 0xbc, 0x96, 0x18, 0xeb, + 0x57, 0x70, 0x77, 0x96, 0x67, 0xd9, 0x3d, 0x68, 0xc6, 0x3c, 0xc9, 0x7c, 0x71, 0x2f, 0x5a, 0xb6, + 0x84, 0x10, 0x2f, 0x6e, 0xa1, 0x0c, 0x47, 0x09, 0x31, 0x13, 0xea, 0xd3, 0x64, 0x42, 0xa1, 0xd2, + 0xb6, 0xf1, 0xd3, 0xfa, 0x97, 0x06, 0x6b, 0x15, 0x5f, 0xbe, 0x2b, 0xc9, 0xec, 0xfb, 0xb0, 0x9c, + 0x48, 0x57, 0x92, 0xe8, 0x9e, 0xb1, 0x51, 0xdf, 0xec, 0xec, 0xac, 0x92, 0xaf, 0x54, 0x82, 0x5d, + 0xe5, 0x63, 0x9f, 0x41, 0x27, 0xc6, 0xcb, 0x2c, 0x97, 0x35, 0x28, 0x60, 0xee, 0xe0, 0x32, 0xbb, + 0x44, 0xdb, 0x2a, 0x0f, 0xeb, 0x43, 0x2b, 0x09, 0xb3, 0xd8, 0xe5, 0x07, 0x83, 0x5e, 0x93, 0x54, + 0x28, 0x60, 0xeb, 0x6f, 0x9a, 0x8c, 0x16, 0x19, 0x03, 0xef, 0xcc, 0xc0, 0xef, 0x42, 0x57, 0x2a, + 0x4e, 0x92, 0xa5, 0x7d, 0xa6, 0x62, 0x9f, 0xd8, 0xb1, 0xc2, 0xc5, 0xb6, 0x01, 0xc8, 0x0c, 0xb1, + 0x46, 0x18, 0xb7, 0x52, 0x18, 0x27, 0x56, 0x28, 0x1c, 0xd6, 0x5f, 0x34, 0xe8, 0xec, 0x9e, 0x73, + 0x37, 0xf7, 0xce, 0x3d, 0x68, 0x46, 0x4e, 0x92, 0xf0, 0x71, 0xae, 0xb7, 0x80, 0xf0, 0x02, 0xa7, + 0x61, 0xea, 0xf8, 0xa4, 0x76, 0xc3, 0x16, 0x00, 0x05, 0x56, 0xe6, 0xba, 0x3c, 0x49, 0xce, 0x32, + 0x9f, 0x94, 0x6f, 0xd8, 0x0a, 0x06, 0xa5, 0x9d, 0x39, 0x9e, 0xcf, 0xc7, 0x14, 0x93, 0x0d, 0x5b, + 0x42, 0x98, 0x71, 0xaf, 0x9c, 0x38, 0xf0, 0x82, 0x09, 0xa9, 0xd8, 0xb0, 0x73, 0x10, 0x57, 0x8c, + 0x79, 0xea, 0x78, 0x3e, 0x39, 0xba, 0x6b, 0x4b, 0xc8, 0xea, 0x02, 0x0c, 0xb2, 0x69, 0x24, 0xb4, + 0xb4, 0x7e, 0xaf, 0x01, 0x0c, 0x43, 0x67, 0x2c, 0x95, 0xfe, 0x10, 0x96, 0xcf, 0xbc, 0xc0, 0x4b, + 0xce, 0xf9, 0xf8, 0xd1, 0x75, 0xca, 0x13, 0xd2, 0xbd, 0x6e, 0x57, 0x91, 0xa8, 0x2c, 0x69, 0x2d, + 0x58, 0x44, 0x22, 0x52, 0x30, 0x78, 0xca, 0x51, 0x1c, 0x4e, 0x62, 0x9e, 0x24, 0xf2, 0x1c, 0x0a, + 0x18, 0xd7, 0x62, 0x96, 0x11, 0x49, 0x5c, 0x5e, 0x30, 0x05, 0x63, 0xfd, 0x4e, 0x83, 0xe5, 0xd1, + 0xb9, 0x13, 0x8f, 0xbd, 0x60, 0xb2, 0x1f, 0x87, 0x59, 0x84, 0x86, 0xa4, 0x4e, 0x3c, 0xe1, 0x79, + 0x4d, 0x91, 0x10, 0xde, 0xde, 0xc1, 0x60, 0x88, 0xfb, 0xd3, 0xed, 0xc5, 0x6f, 0xdc, 0xf9, 0xcc, + 0x8b, 0x93, 0x14, 0x2f, 0xaf, 0xdc, 0x39, 0x87, 0x51, 0x4e, 0x72, 0x1d, 0xb8, 0xe4, 0x42, 0x5c, + 0x21, 0x21, 0x5c, 0x93, 0x05, 0x92, 0xd2, 0x20, 0x4a, 0x01, 0x5b, 0xbf, 0xad, 0x03, 0x8c, 0xae, + 0x03, 0x57, 0xba, 0x67, 0x03, 0x3a, 0x64, 0xe6, 0xde, 0x25, 0x0f, 0xd2, 0xdc, 0x39, 0x2a, 0x0a, + 0x85, 0x11, 0xf8, 0x3c, 0xca, 0x1d, 0x53, 0xc0, 0x98, 0x5a, 0x62, 0xee, 0xf2, 0x20, 0x45, 0xa2, + 0xa8, 0x02, 0x25, 0x82, 0x59, 0xd0, 0x9d, 0x3a, 0x49, 0xca, 0xe3, 0x8a, 0x6b, 0x2a, 0x38, 0xb6, + 0x05, 0xa6, 0x0a, 0xef, 0xa7, 0xde, 0x58, 0x26, 0xa1, 0x5b, 0x78, 0x94, 0x47, 0x46, 0xe4, 0xf2, + 0xc4, 0x75, 0xab, 0xe0, 0x50, 0x9e, 0x0a, 0x93, 0xbc, 0x25, 0x21, 0xef, 0x26, 0x1e, 0xe5, 0x9d, + 0xfa, 0xa1, 0x7b, 0xe1, 0x05, 0x13, 0x72, 0x7b, 0x8b, 0x5c, 0x55, 0xc1, 0xb1, 0xcf, 0xc1, 0xcc, + 0x82, 0x98, 0x27, 0xa1, 0x7f, 0xc9, 0xc7, 0x74, 0x7a, 0x49, 0xaf, 0xad, 0x64, 0x13, 0xf5, 0x5c, + 0xed, 0x5b, 0xac, 0xca, 0x09, 0x81, 0xb8, 0x32, 0xf2, 0x14, 0xfe, 0xae, 0x43, 0x47, 0x49, 0x29, + 0xb7, 0x5c, 0xa5, 0xbd, 0xa5, 0xab, 0xf4, 0x39, 0xae, 0xda, 0xc8, 0x13, 0x59, 0x76, 0x3a, 0xf0, + 0x62, 0x19, 0x38, 0x2a, 0xaa, 0xe0, 0xa8, 0x9c, 0x8d, 0x8a, 0x62, 0x9b, 0x70, 0x47, 0x01, 0x95, + 0x93, 0xb9, 0x89, 0x66, 0xdb, 0xc0, 0x08, 0xb5, 0xeb, 0xa4, 0xee, 0xf9, 0x49, 0x74, 0x48, 0xda, + 0xd0, 0xf1, 0xb4, 0xec, 0x19, 0x14, 0xf6, 0x4d, 0x68, 0x24, 0xa9, 0x33, 0xe1, 0x74, 0x32, 0x79, + 0x0d, 0x43, 0x84, 0x2d, 0xf0, 0xec, 0x93, 0x22, 0x43, 0xb6, 0x28, 0x4b, 0x91, 0xaf, 0x8f, 0xe2, + 0x10, 0x73, 0x87, 0x4d, 0x84, 0x3c, 0x69, 0x5a, 0xff, 0xd5, 0x61, 0xb9, 0x92, 0xd3, 0x67, 0x96, + 0xcc, 0x62, 0x47, 0x7d, 0xce, 0x8e, 0x1b, 0x60, 0x64, 0x81, 0x97, 0x92, 0xa7, 0x56, 0x76, 0xba, + 0x48, 0x3f, 0x09, 0xbc, 0xf4, 0xf9, 0x75, 0xc4, 0x6d, 0xa2, 0x28, 0x3a, 0x19, 0x6f, 0xd0, 0x89, + 0x7d, 0x0a, 0x6b, 0x65, 0x24, 0x0c, 0x06, 0xc3, 0x61, 0xe8, 0x5e, 0x1c, 0x0c, 0xa4, 0xf7, 0x66, + 0x91, 0x18, 0x13, 0x29, 0x9e, 0x22, 0xfa, 0x49, 0x4d, 0x24, 0xf9, 0x8f, 0xa1, 0xe1, 0x62, 0xf6, + 0x25, 0x2f, 0xc9, 0x32, 0xa4, 0xa4, 0xe3, 0x27, 0x35, 0x5b, 0xd0, 0xd9, 0x87, 0x60, 0x8c, 0xb3, + 0x69, 0x24, 0x7d, 0x45, 0x19, 0xbd, 0xcc, 0x87, 0x4f, 0x6a, 0x36, 0x51, 0x91, 0xcb, 0x0f, 0x9d, + 0x71, 0xaf, 0x5d, 0x72, 0x95, 0x69, 0x12, 0xb9, 0x90, 0x8a, 0x5c, 0x18, 0xa2, 0x14, 0xae, 0x92, + 0xab, 0xcc, 0x16, 0xc8, 0x85, 0xd4, 0x47, 0x2d, 0x68, 0x26, 0x22, 0xdb, 0xfe, 0x18, 0x56, 0x2b, + 0xde, 0x1f, 0x7a, 0x09, 0xb9, 0x4a, 0x90, 0x7b, 0xda, 0xbc, 0xc2, 0x9b, 0xaf, 0x5f, 0x07, 0x20, + 0x9b, 0x44, 0x85, 0x92, 0x95, 0x4e, 0x2b, 0x9b, 0x84, 0x07, 0xd0, 0x46, 0x5b, 0x16, 0x90, 0xd1, + 0x88, 0x79, 0xe4, 0x08, 0xba, 0xa4, 0xfd, 0xf1, 0x70, 0x0e, 0x07, 0xdb, 0x81, 0xbb, 0xa2, 0xee, + 0x14, 0x3d, 0xb8, 0x87, 0x8d, 0xa6, 0xbc, 0x58, 0x33, 0x69, 0x98, 0x11, 0x39, 0x8a, 0x1b, 0x1d, + 0x0f, 0xf3, 0x94, 0x9c, 0xc3, 0xd6, 0xf7, 0xa0, 0x8d, 0x3b, 0x8a, 0xed, 0x36, 0xa1, 0x49, 0x84, + 0xdc, 0x0f, 0x66, 0xe1, 0x4e, 0xa9, 0x90, 0x2d, 0xe9, 0xe8, 0x86, 0xb2, 0xf0, 0xce, 0x30, 0xe4, + 0x4f, 0x3a, 0x74, 0xd5, 0xca, 0xfe, 0x75, 0x05, 0xb9, 0x8c, 0x43, 0x43, 0x8d, 0xc3, 0x8f, 0xf2, + 0x38, 0x54, 0x3a, 0x86, 0xf2, 0xcc, 0xca, 0x30, 0x7c, 0x28, 0xc3, 0xb0, 0x49, 0x6c, 0xcb, 0x79, + 0x18, 0xe6, 0x5c, 0x22, 0x0a, 0x1f, 0xca, 0x28, 0x5c, 0x2a, 0x99, 0x8a, 0x03, 0x2c, 0x82, 0xf0, + 0xa1, 0x0c, 0xc2, 0x56, 0xc9, 0x54, 0x38, 0xb5, 0x88, 0xc1, 0x25, 0x68, 0x90, 0xf3, 0xac, 0x1f, + 0x80, 0xa9, 0xba, 0x86, 0x22, 0xf0, 0x23, 0x49, 0xac, 0x38, 0x5e, 0xed, 0x8c, 0xe4, 0xda, 0x17, + 0xb0, 0x5c, 0xb9, 0xc2, 0x58, 0xcc, 0xbd, 0x64, 0xd7, 0x09, 0x5c, 0xee, 0x17, 0x7d, 0x8e, 0x82, + 0x51, 0x8e, 0x54, 0x2f, 0x25, 0x4b, 0x11, 0x95, 0x23, 0x55, 0xba, 0x95, 0x7a, 0xa5, 0x5b, 0xf9, + 0xab, 0x06, 0xcd, 0xe7, 0xe2, 0x10, 0x7b, 0xb0, 0xb4, 0x17, 0xc7, 0xbb, 0xe1, 0x58, 0x9c, 0x63, + 0xc3, 0xce, 0x41, 0x0c, 0x31, 0xfc, 0xf4, 0x9d, 0x24, 0x91, 0x5d, 0x55, 0x01, 0x4b, 0xda, 0xc8, + 0x0d, 0x23, 0x2e, 0xdb, 0xaa, 0x02, 0x96, 0xb4, 0x21, 0xbf, 0xe4, 0xbe, 0x6c, 0xab, 0x0a, 0x18, + 0x77, 0x3b, 0xe4, 0x49, 0x82, 0x01, 0x22, 0x32, 0x51, 0x0e, 0xe2, 0x2a, 0xdb, 0xb9, 0xda, 0x75, + 0xb2, 0x84, 0xe7, 0x3d, 0x6c, 0x0e, 0x5b, 0x1c, 0xba, 0xaa, 0x79, 0xec, 0x5b, 0x60, 0x60, 0xbc, + 0xc8, 0xa7, 0x28, 0x9d, 0x0d, 0x11, 0x44, 0x10, 0xe1, 0x6f, 0x1e, 0xbe, 0x7a, 0x79, 0xcb, 0x36, + 0xf2, 0xe3, 0xa8, 0xd3, 0x89, 0x8a, 0x87, 0x64, 0xe5, 0x20, 0xbe, 0x84, 0xa5, 0xc1, 0x60, 0x78, + 0x10, 0x9c, 0x85, 0xb3, 0x9e, 0x5d, 0x54, 0x47, 0xdd, 0x73, 0x3e, 0x75, 0xf2, 0xd6, 0x58, 0x40, + 0xd4, 0x7a, 0x3a, 0xa7, 0x3e, 0x97, 0xf7, 0x50, 0x00, 0x45, 0x1f, 0x65, 0x94, 0x7d, 0x94, 0xf5, + 0x19, 0x74, 0xf2, 0x74, 0x3b, 0x6f, 0x93, 0x15, 0xd0, 0xe5, 0x2b, 0xb4, 0x6d, 0xeb, 0x07, 0x03, + 0xcb, 0x87, 0x95, 0xbd, 0x97, 0xdc, 0x1d, 0x0c, 0x86, 0x0b, 0x5e, 0x84, 0xa8, 0x9a, 0x2f, 0xf2, + 0xbb, 0x54, 0xcd, 0xcf, 0x53, 0xba, 0xc1, 0x5f, 0x72, 0x97, 0x34, 0x6b, 0xd9, 0xf4, 0x4d, 0xbd, + 0x54, 0xec, 0xb8, 0x7c, 0xff, 0x60, 0x20, 0x2b, 0x6e, 0x01, 0x5b, 0xbf, 0xd1, 0x60, 0xed, 0x51, + 0xcc, 0x9d, 0x0b, 0xa9, 0xe6, 0xa2, 0x3d, 0x2d, 0xe8, 0xc6, 0x7c, 0x1a, 0x5e, 0xf2, 0xa1, 0xba, + 0x73, 0x05, 0x87, 0xc7, 0xcd, 0x85, 0xf6, 0x52, 0x85, 0x1c, 0x44, 0x4a, 0x72, 0xe1, 0x45, 0x48, + 0x31, 0x04, 0x45, 0x82, 0x56, 0x1f, 0x7a, 0xa3, 0x2b, 0x2f, 0x75, 0xcf, 0x29, 0x19, 0x89, 0x6a, + 0x2d, 0xf5, 0xb0, 0x76, 0x60, 0x4d, 0x4e, 0x14, 0x2a, 0xf3, 0x8e, 0x6f, 0x28, 0x83, 0x89, 0x4e, + 0xf1, 0x98, 0x10, 0xcf, 0x51, 0x2b, 0x83, 0xbb, 0xd5, 0x35, 0xf2, 0x05, 0xb4, 0x68, 0x91, 0xf2, + 0x3c, 0xd2, 0xe7, 0x3c, 0x8f, 0xea, 0xb3, 0x9e, 0x47, 0x46, 0x99, 0x2d, 0xaf, 0x60, 0xf5, 0x28, + 0x8b, 0x27, 0x55, 0x45, 0xfb, 0xd0, 0xf2, 0x02, 0xc7, 0x4d, 0xbd, 0x4b, 0x2e, 0xef, 0x75, 0x01, + 0x93, 0x8f, 0x3d, 0x39, 0x41, 0xa9, 0xdb, 0xf4, 0x2d, 0x1a, 0x6f, 0x9f, 0x53, 0x96, 0x2d, 0x1a, + 0x6f, 0x01, 0x53, 0x38, 0x8a, 0xce, 0xca, 0x90, 0xe1, 0x48, 0x10, 0xfa, 0x8f, 0xde, 0x7b, 0xe2, + 0xad, 0xbc, 0x1b, 0x06, 0x67, 0xde, 0x24, 0xf7, 0xdf, 0x1f, 0x35, 0x39, 0x18, 0xa9, 0x12, 0xdf, + 0xd9, 0x9b, 0x50, 0x7d, 0x88, 0x1a, 0xd5, 0x87, 0xa8, 0x3a, 0xc5, 0x6a, 0x54, 0xa7, 0x58, 0x21, + 0xb4, 0x30, 0x29, 0x1e, 0x96, 0xb3, 0x9e, 0xd9, 0x33, 0xa6, 0x37, 0xd6, 0x96, 0xbc, 0x20, 0xd5, + 0x95, 0x82, 0x94, 0x87, 0xae, 0x41, 0x09, 0x50, 0x0c, 0x50, 0x7e, 0x0d, 0x4b, 0x72, 0xf8, 0x82, + 0xf7, 0xcd, 0x1b, 0xcb, 0x27, 0x87, 0x4e, 0x4d, 0xab, 0x60, 0x17, 0x73, 0x9a, 0x6e, 0xae, 0x01, + 0xea, 0x56, 0xde, 0xd0, 0x34, 0x7f, 0x68, 0xe8, 0x69, 0x42, 0x91, 0x2c, 0x5e, 0x94, 0x45, 0x24, + 0x0b, 0x10, 0x29, 0xd3, 0x6a, 0xb2, 0x93, 0xe0, 0xd6, 0x97, 0xd0, 0x14, 0x76, 0xb1, 0x65, 0x68, + 0x1f, 0x04, 0x97, 0x8e, 0xef, 0x8d, 0x9f, 0x45, 0x66, 0x8d, 0xb5, 0xc0, 0x18, 0xa5, 0x61, 0x64, + 0x6a, 0xac, 0x0d, 0x8d, 0x23, 0x4c, 0x7e, 0xa6, 0xce, 0x00, 0x9a, 0x58, 0x19, 0xa6, 0xdc, 0xac, + 0x23, 0x9a, 0x86, 0x89, 0xa6, 0x81, 0x68, 0x31, 0x32, 0x32, 0x1b, 0x6c, 0x05, 0xe0, 0x8b, 0x2c, + 0x0d, 0x25, 0x5b, 0x73, 0x6b, 0x0b, 0x1a, 0x34, 0x90, 0x21, 0x81, 0x3f, 0x3f, 0x38, 0x32, 0x6b, + 0xac, 0x03, 0x4b, 0xf6, 0xde, 0xd1, 0xf0, 0x8b, 0xdd, 0x3d, 0x53, 0xc3, 0xb5, 0x07, 0x4f, 0x7f, + 0xb6, 0xb7, 0xfb, 0xdc, 0xd4, 0xb7, 0x7e, 0x41, 0x22, 0x27, 0x98, 0x33, 0xbb, 0x52, 0x17, 0x82, + 0xcd, 0x1a, 0x5b, 0x82, 0xfa, 0x53, 0x7e, 0x65, 0x6a, 0xb4, 0x38, 0x0b, 0xf0, 0x05, 0x2c, 0xf4, + 0x21, 0xd5, 0xc6, 0x66, 0x1d, 0x09, 0xa8, 0x70, 0xc4, 0xc7, 0xa6, 0xc1, 0xba, 0xd0, 0x7a, 0x2c, + 0x9f, 0xb4, 0x66, 0x63, 0xeb, 0x19, 0xb4, 0xf2, 0xca, 0xce, 0xee, 0x40, 0x47, 0x8a, 0x46, 0x94, + 0x59, 0x43, 0x3b, 0xa8, 0x7e, 0x9b, 0x1a, 0xaa, 0x88, 0x35, 0xda, 0xd4, 0xf1, 0x0b, 0x0b, 0xb1, + 0x59, 0x27, 0xb5, 0xaf, 0x03, 0xd7, 0x34, 0x90, 0x91, 0xae, 0x90, 0x39, 0xde, 0xfa, 0x21, 0xb4, + 0x8b, 0x34, 0x8f, 0xca, 0x9e, 0x04, 0x17, 0x41, 0x78, 0x15, 0x10, 0x4e, 0x18, 0x88, 0xa9, 0x72, + 0x74, 0x3c, 0x34, 0x35, 0xdc, 0x90, 0xe4, 0x3f, 0xa6, 0xe6, 0xc9, 0xd4, 0xb7, 0x0e, 0x61, 0x49, + 0x5e, 0x70, 0xc6, 0x60, 0x45, 0x2a, 0x23, 0x31, 0x66, 0x0d, 0xcf, 0x01, 0xed, 0x10, 0x5b, 0x69, + 0xe8, 0x4f, 0x32, 0x51, 0xc0, 0x3a, 0x8a, 0x13, 0xbe, 0x15, 0x88, 0xfa, 0xce, 0x7f, 0x5a, 0xd0, + 0x14, 0x97, 0x88, 0xed, 0x41, 0x57, 0x9d, 0xef, 0xb2, 0xf7, 0x65, 0x5c, 0xde, 0x9c, 0xf8, 0xf6, + 0xfb, 0x48, 0x98, 0x3d, 0x11, 0xb5, 0x6a, 0xec, 0x00, 0x56, 0xaa, 0x34, 0x76, 0x7f, 0x16, 0xff, + 0xdb, 0x88, 0xda, 0x87, 0xe5, 0xca, 0x30, 0x91, 0xd1, 0x70, 0x72, 0xd6, 0x7c, 0xf1, 0x0d, 0x82, + 0x7e, 0x0a, 0x1d, 0x65, 0x3a, 0xc6, 0xee, 0x21, 0xf3, 0xed, 0xd1, 0x63, 0xff, 0xfd, 0x5b, 0xf8, + 0x42, 0xc2, 0xe7, 0x00, 0xe5, 0xf4, 0x89, 0xbd, 0x57, 0x30, 0xaa, 0x13, 0xc9, 0xfe, 0xbd, 0x9b, + 0xe8, 0x62, 0xf9, 0x89, 0x1c, 0x5e, 0x55, 0x26, 0xb0, 0xec, 0x41, 0xc1, 0x3f, 0x6b, 0xc0, 0xdb, + 0x5f, 0x9f, 0x47, 0x2e, 0xc4, 0x3e, 0x06, 0x90, 0xd3, 0xce, 0xe3, 0x61, 0xc2, 0x3e, 0x40, 0xfe, + 0x79, 0xd3, 0xcf, 0xfe, 0xdc, 0xc1, 0xae, 0x55, 0x63, 0x3b, 0xd0, 0x7d, 0xcc, 0x53, 0xf7, 0x3c, + 0x6f, 0x1b, 0xe8, 0x7d, 0xa4, 0x94, 0xf8, 0x7e, 0x47, 0x22, 0x10, 0xb0, 0x6a, 0x9b, 0xda, 0xa7, + 0x1a, 0xfb, 0x11, 0x00, 0x86, 0x69, 0x96, 0x72, 0xac, 0x83, 0x8c, 0x9a, 0x97, 0x4a, 0x85, 0x5f, + 0xb8, 0xe3, 0x2e, 0x74, 0xd5, 0x02, 0x2d, 0x82, 0x6d, 0x46, 0xc9, 0x5e, 0x28, 0xe4, 0x10, 0x56, + 0x6f, 0x95, 0x58, 0xe1, 0x85, 0x79, 0x95, 0xf7, 0x4d, 0x3a, 0xa9, 0x15, 0x56, 0xe8, 0x34, 0xa3, + 0x4e, 0x0b, 0x21, 0xb3, 0x8a, 0xb1, 0x55, 0x63, 0x3f, 0x01, 0x28, 0xeb, 0xa5, 0x08, 0x94, 0x5b, + 0xf5, 0x73, 0xa1, 0x16, 0xfb, 0xb0, 0xaa, 0xfc, 0x77, 0x22, 0x4a, 0x9b, 0x88, 0xd8, 0xdb, 0x7f, + 0xa9, 0x2c, 0x14, 0x64, 0xcb, 0xa1, 0xb9, 0x5a, 0x23, 0x85, 0x77, 0xe6, 0xd5, 0xd5, 0xfe, 0x83, + 0x39, 0x54, 0xd5, 0x45, 0xea, 0x1f, 0x35, 0xc2, 0x45, 0x33, 0xfe, 0xba, 0x59, 0xa4, 0xd8, 0xa3, + 0xde, 0x3f, 0x5e, 0xad, 0x6b, 0x5f, 0xbd, 0x5a, 0xd7, 0xfe, 0xfd, 0x6a, 0x5d, 0xfb, 0xc3, 0xeb, + 0xf5, 0xda, 0x57, 0xaf, 0xd7, 0x6b, 0xff, 0x7c, 0xbd, 0x5e, 0x3b, 0x6d, 0xd2, 0xbf, 0x4d, 0xdf, + 0xf9, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xce, 0x19, 0xc2, 0x7f, 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5517,6 +5618,56 @@ func (m *ProcessResult) MarshalTo(dAtA []byte) (int, error) { return i, nil } +func (m *TError) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *TError) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.ErrCode != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintDmworker(dAtA, i, uint64(m.ErrCode)) + } + if m.ErrClass != 0 { + dAtA[i] = 0x10 + i++ + i = encodeVarintDmworker(dAtA, i, uint64(m.ErrClass)) + } + if m.ErrScope != 0 { + dAtA[i] = 0x18 + i++ + i = encodeVarintDmworker(dAtA, i, uint64(m.ErrScope)) + } + if m.ErrLevel != 0 { + dAtA[i] = 0x20 + i++ + i = encodeVarintDmworker(dAtA, i, uint64(m.ErrLevel)) + } + if len(m.Message) > 0 { + dAtA[i] = 0x2a + i++ + i = encodeVarintDmworker(dAtA, i, uint64(len(m.Message))) + i += copy(dAtA[i:], m.Message) + } + if len(m.RawCause) > 0 { + dAtA[i] = 0x32 + i++ + i = encodeVarintDmworker(dAtA, i, uint64(len(m.RawCause))) + i += copy(dAtA[i:], m.RawCause) + } + return i, nil +} + func (m *ProcessError) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5543,6 +5694,16 @@ func (m *ProcessError) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintDmworker(dAtA, i, uint64(len(m.Msg))) i += copy(dAtA[i:], m.Msg) } + if m.Error != nil { + dAtA[i] = 0x1a + i++ + i = encodeVarintDmworker(dAtA, i, uint64(m.Error.Size())) + n18, err := m.Error.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n18 + } return i, nil } @@ -5988,11 +6149,11 @@ func (m *TaskLog) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintDmworker(dAtA, i, uint64(m.Task.Size())) - n18, err := m.Task.MarshalTo(dAtA[i:]) + n19, err := m.Task.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n18 + i += n19 } if m.Ts != 0 { dAtA[i] = 0x18 @@ -6781,6 +6942,35 @@ func (m *ProcessResult) Size() (n int) { return n } +func (m *TError) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.ErrCode != 0 { + n += 1 + sovDmworker(uint64(m.ErrCode)) + } + if m.ErrClass != 0 { + n += 1 + sovDmworker(uint64(m.ErrClass)) + } + if m.ErrScope != 0 { + n += 1 + sovDmworker(uint64(m.ErrScope)) + } + if m.ErrLevel != 0 { + n += 1 + sovDmworker(uint64(m.ErrLevel)) + } + l = len(m.Message) + if l > 0 { + n += 1 + l + sovDmworker(uint64(l)) + } + l = len(m.RawCause) + if l > 0 { + n += 1 + l + sovDmworker(uint64(l)) + } + return n +} + func (m *ProcessError) Size() (n int) { if m == nil { return 0 @@ -6794,6 +6984,10 @@ func (m *ProcessError) Size() (n int) { if l > 0 { n += 1 + l + sovDmworker(uint64(l)) } + if m.Error != nil { + l = m.Error.Size() + n += 1 + l + sovDmworker(uint64(l)) + } return n } @@ -11591,6 +11785,199 @@ func (m *ProcessResult) Unmarshal(dAtA []byte) error { } return nil } +func (m *TError) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: TError: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: TError: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrCode", wireType) + } + m.ErrCode = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ErrCode |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrClass", wireType) + } + m.ErrClass = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ErrClass |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrScope", wireType) + } + m.ErrScope = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ErrScope |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ErrLevel", wireType) + } + m.ErrLevel = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ErrLevel |= int32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Message", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthDmworker + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmworker + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Message = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RawCause", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthDmworker + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmworker + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RawCause = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipDmworker(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthDmworker + } + if (iNdEx + skippy) < 0 { + return ErrInvalidLengthDmworker + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *ProcessError) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -11671,6 +12058,42 @@ func (m *ProcessError) Unmarshal(dAtA []byte) error { } m.Msg = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Error", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDmworker + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDmworker + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Error == nil { + m.Error = &TError{} + } + if err := m.Error.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDmworker(dAtA[iNdEx:]) diff --git a/dm/proto/dmworker.proto b/dm/proto/dmworker.proto index 61cb4f7ea0..c91153b8c1 100644 --- a/dm/proto/dmworker.proto +++ b/dm/proto/dmworker.proto @@ -351,11 +351,24 @@ enum ErrorType { CheckFailed = 2; } +// TError represents error used in dm +// NOTE: currently stack trace is not supported, `Message` is the `terror.Error.getMsg` result +// and `RawCause` is the `Error` result of error from `terror.Error.Cause()`. +message TError { + int32 ErrCode = 1; + int32 ErrClass = 2; + int32 ErrScope = 3; + int32 ErrLevel = 4; + string Message = 5; + string RawCause = 6; +} + // ProcessError represents error produced by a dm unit // NOTE: refine later, like add error scope field message ProcessError { ErrorType Type = 1; string msg = 2; + TError error = 3; } // DDLInfo represents a occurred DDL in a sub task diff --git a/dm/unit/unit.go b/dm/unit/unit.go index ce69439745..563d466b42 100644 --- a/dm/unit/unit.go +++ b/dm/unit/unit.go @@ -16,8 +16,11 @@ package unit import ( "context" + "github.com/pingcap/errors" + "github.com/pingcap/dm/dm/config" "github.com/pingcap/dm/dm/pb" + "github.com/pingcap/dm/pkg/terror" ) // Unit defines interface for sub task process units, like syncer, loader, relay, etc. @@ -54,9 +57,20 @@ type Unit interface { // NewProcessError creates a new ProcessError // we can refine to add error scope field if needed -func NewProcessError(errorType pb.ErrorType, msg string) *pb.ProcessError { - return &pb.ProcessError{ +func NewProcessError(errorType pb.ErrorType, err error) *pb.ProcessError { + result := &pb.ProcessError{ Type: errorType, - Msg: msg, + Msg: errors.ErrorStack(err), + } + if e, ok := err.(*terror.Error); ok { + result.Error = &pb.TError{ + ErrCode: int32(e.Code()), + ErrClass: int32(e.Class()), + ErrScope: int32(e.Scope()), + ErrLevel: int32(e.Level()), + Message: terror.Message(e), + RawCause: terror.Message(e.Cause()), + } } + return result } diff --git a/dm/worker/relay.go b/dm/worker/relay.go index 80acbdef07..c10cdf3c28 100644 --- a/dm/worker/relay.go +++ b/dm/worker/relay.go @@ -17,7 +17,6 @@ import ( "context" "sync" - "github.com/golang/protobuf/proto" "github.com/pingcap/errors" "github.com/siddontang/go/sync2" "go.uber.org/zap" @@ -308,13 +307,13 @@ func (h *realRelayHolder) setResult(result *pb.ProcessResult) { } // Result returns the result of the relay +// Note this method will omit the `Error` field in `pb.ProcessError`, so no duplicated +// error message information will be displayed in `query-status`, as the `Msg` field +// contains enough error information. func (h *realRelayHolder) Result() *pb.ProcessResult { h.RLock() defer h.RUnlock() - if h.result == nil { - return nil - } - return proto.Clone(h.result).(*pb.ProcessResult) + return statusProcessResult(h.result) } // Update update relay config online diff --git a/dm/worker/relay_test.go b/dm/worker/relay_test.go index cc704dd7d4..ad225e213e 100644 --- a/dm/worker/relay_test.go +++ b/dm/worker/relay_test.go @@ -22,6 +22,7 @@ import ( "github.com/pingcap/dm/dm/config" "github.com/pingcap/dm/dm/pb" + "github.com/pingcap/dm/dm/unit" pkgstreamer "github.com/pingcap/dm/pkg/streamer" "github.com/pingcap/dm/pkg/utils" "github.com/pingcap/dm/relay" @@ -206,9 +207,7 @@ func (t *testRelay) testClose(c *C, holder *realRelayHolder) { processResult := &pb.ProcessResult{ IsCanceled: true, Errors: []*pb.ProcessError{ - { - Msg: "process error", - }, + unit.NewProcessError(pb.ErrorType_UnknownError, errors.New("process error")), }, } r.InjectProcessResult(*processResult) diff --git a/dm/worker/status.go b/dm/worker/status.go index 4b2f566876..069f1757d9 100644 --- a/dm/worker/status.go +++ b/dm/worker/status.go @@ -21,6 +21,7 @@ import ( "github.com/pingcap/dm/dm/pb" "github.com/golang/protobuf/jsonpb" + "github.com/golang/protobuf/proto" "go.uber.org/zap" ) @@ -178,3 +179,18 @@ func (w *Worker) Error(stName string) []*pb.SubTaskError { return error } + +// statusProcessResult returns a clone of *pb.ProcessResult, but omit the `Error` field, so no duplicated +// error message will be displayed in `query-status`, because the `Msg` field contains enough error information. +func statusProcessResult(pr *pb.ProcessResult) *pb.ProcessResult { + if pr == nil { + return nil + } + result := proto.Clone(pr).(*pb.ProcessResult) + if result != nil { + for i := range result.Errors { + result.Errors[i].Error = nil + } + } + return result +} diff --git a/dm/worker/subtask.go b/dm/worker/subtask.go index 1689e7d3ba..665b4ec6ae 100644 --- a/dm/worker/subtask.go +++ b/dm/worker/subtask.go @@ -29,7 +29,6 @@ import ( "github.com/pingcap/dm/syncer" "github.com/golang/protobuf/proto" - "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/siddontang/go/sync2" "go.uber.org/zap" @@ -170,7 +169,7 @@ func (st *SubTask) Run() { err := st.Init() if err != nil { st.l.Error("fail to initial subtask", log.ShortError(err)) - st.fail(errors.ErrorStack(err)) + st.fail(err) return } @@ -182,7 +181,7 @@ func (st *SubTask) run() { err := st.unitTransWaitCondition() if err != nil { st.l.Error("wait condition", log.ShortError(err)) - st.fail(errors.ErrorStack(err)) + st.fail(err) return } @@ -373,7 +372,7 @@ func (st *SubTask) setResult(result *pb.ProcessResult) { func (st *SubTask) Result() *pb.ProcessResult { st.RLock() defer st.RUnlock() - return proto.Clone(st.result).(*pb.ProcessResult) + return statusProcessResult(st.result) } // Close stops the sub task @@ -654,14 +653,11 @@ func (st *SubTask) unitTransWaitCondition() error { return nil } -func (st *SubTask) fail(message string) { +func (st *SubTask) fail(err error) { st.setStage(pb.Stage_Paused) st.setResult(&pb.ProcessResult{ Errors: []*pb.ProcessError{ - { - Type: pb.ErrorType_UnknownError, - Msg: message, - }, + unit.NewProcessError(pb.ErrorType_UnknownError, err), }, }) } diff --git a/dm/worker/subtask_test.go b/dm/worker/subtask_test.go index 6b2643e5e0..bdc5e882ca 100644 --- a/dm/worker/subtask_test.go +++ b/dm/worker/subtask_test.go @@ -99,7 +99,7 @@ func (m *MockUnit) Process(ctx context.Context, pr chan pb.ProcessResult) { pr <- pb.ProcessResult{} } else { pr <- pb.ProcessResult{ - Errors: append([]*pb.ProcessError{}, unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err))), + Errors: append([]*pb.ProcessError{}, unit.NewProcessError(pb.ErrorType_UnknownError, err)), } } } diff --git a/dm/worker/task_checker.go b/dm/worker/task_checker.go index 462fc2e645..7956872505 100644 --- a/dm/worker/task_checker.go +++ b/dm/worker/task_checker.go @@ -247,25 +247,23 @@ func isResumableError(err *pb.ProcessError) bool { "binlog checksum mismatch, data may be corrupted", "get event err EOF", } - parseRelayLogCode := fmt.Sprintf("code=%d", terror.ErrParserParseRelayLog.Code()) switch err.Type { case pb.ErrorType_ExecSQL: for _, msg := range unsupportedDDLMsgs { - if strings.Contains(err.Msg, msg) { + if err.Error != nil && strings.Contains(err.Error.RawCause, msg) { return false } } for _, msg := range unsupportedDMLMsgs { - if strings.Contains(err.Msg, msg) { + if err.Error != nil && strings.Contains(err.Error.RawCause, msg) { return false } } case pb.ErrorType_UnknownError: - // TODO: we need better mechanism to convert error in `ProcessError` to `terror.Error` - if strings.Contains(err.Msg, parseRelayLogCode) { + if err.Error != nil && err.Error.ErrCode == int32(terror.ErrParserParseRelayLog.Code()) { for _, msg := range parseRelayLogErrMsg { - if strings.Contains(err.Msg, msg) { + if strings.Contains(err.Error.Message, msg) { return false } } diff --git a/dm/worker/task_checker_test.go b/dm/worker/task_checker_test.go index b223b0ad12..c003978695 100644 --- a/dm/worker/task_checker_test.go +++ b/dm/worker/task_checker_test.go @@ -14,18 +14,28 @@ package worker import ( + "fmt" "time" "github.com/pingcap/check" + "github.com/pingcap/errors" + tmysql "github.com/pingcap/parser/mysql" "github.com/pingcap/dm/dm/config" "github.com/pingcap/dm/dm/pb" + "github.com/pingcap/dm/dm/unit" + "github.com/pingcap/dm/pkg/terror" ) var _ = check.Suite(&testTaskCheckerSuite{}) type testTaskCheckerSuite struct{} +var ( + unsupporteModifyColumnError = unit.NewProcessError(pb.ErrorType_ExecSQL, terror.ErrDBExecuteFailed.Delegate(&tmysql.SQLError{1105, "unsupported modify column length 20 is less than origin 40", tmysql.DefaultMySQLState})) + unknownProcessError = unit.NewProcessError(pb.ErrorType_UnknownError, errors.New("error mesage")) +) + func (s *testTaskCheckerSuite) TestResumeStrategy(c *check.C) { c.Assert(ResumeSkip.String(), check.Equals, resumeStrategy2Str[ResumeSkip]) c.Assert(ResumeStrategy(10000).String(), check.Equals, "unsupported resume strategy: 10000") @@ -43,7 +53,7 @@ func (s *testTaskCheckerSuite) TestResumeStrategy(c *check.C) { {&pb.SubTaskStatus{Name: taskName, Stage: pb.Stage_Running}, now, time.Duration(0), 1 * time.Millisecond, ResumeIgnore}, {&pb.SubTaskStatus{Name: taskName, Stage: pb.Stage_Paused}, now, time.Duration(0), 1 * time.Millisecond, ResumeIgnore}, {&pb.SubTaskStatus{Name: taskName, Stage: pb.Stage_Paused, Result: &pb.ProcessResult{IsCanceled: true}}, now, time.Duration(0), 1 * time.Millisecond, ResumeIgnore}, - {&pb.SubTaskStatus{Name: taskName, Stage: pb.Stage_Paused, Result: &pb.ProcessResult{IsCanceled: false, Errors: []*pb.ProcessError{{Type: pb.ErrorType_ExecSQL, Msg: "ERROR 1105 (HY000): unsupported modify column length 20 is less than origin 40"}}}}, now, time.Duration(0), 1 * time.Millisecond, ResumeNoSense}, + {&pb.SubTaskStatus{Name: taskName, Stage: pb.Stage_Paused, Result: &pb.ProcessResult{IsCanceled: false, Errors: []*pb.ProcessError{unsupporteModifyColumnError}}}, now, time.Duration(0), 1 * time.Millisecond, ResumeNoSense}, {&pb.SubTaskStatus{Name: taskName, Stage: pb.Stage_Paused, Result: &pb.ProcessResult{IsCanceled: false}}, now, time.Duration(0), 1 * time.Second, ResumeSkip}, {&pb.SubTaskStatus{Name: taskName, Stage: pb.Stage_Paused, Result: &pb.ProcessResult{IsCanceled: false}}, now, -2 * time.Millisecond, 1 * time.Millisecond, ResumeDispatch}, } @@ -108,7 +118,7 @@ func (s *testTaskCheckerSuite) TestCheck(c *check.C) { st.stage = pb.Stage_Paused st.result = &pb.ProcessResult{ IsCanceled: false, - Errors: []*pb.ProcessError{{Type: pb.ErrorType_UnknownError, Msg: "error message"}}, + Errors: []*pb.ProcessError{unknownProcessError}, } time.Sleep(1 * time.Millisecond) rtsc.check() @@ -135,7 +145,7 @@ func (s *testTaskCheckerSuite) TestCheck(c *check.C) { // test no sense strategy st.result = &pb.ProcessResult{ IsCanceled: false, - Errors: []*pb.ProcessError{{Type: pb.ErrorType_ExecSQL, Msg: "ERROR 1105 (HY000): unsupported modify column length 20 is less than origin 40"}}, + Errors: []*pb.ProcessError{unsupporteModifyColumnError}, } latestPausedTime = rtsc.bc.latestPausedTime[taskName] rtsc.check() @@ -173,7 +183,7 @@ func (s *testTaskCheckerSuite) TestCheck(c *check.C) { st.stage = pb.Stage_Paused st.result = &pb.ProcessResult{ IsCanceled: false, - Errors: []*pb.ProcessError{{Type: pb.ErrorType_UnknownError, Msg: "error message"}}, + Errors: []*pb.ProcessError{unknownProcessError}, } rtsc.check() latestResumeTime = rtsc.bc.latestResumeTime[taskName] @@ -242,7 +252,7 @@ func (s *testTaskCheckerSuite) TestCheckTaskIndependent(c *check.C) { stage: pb.Stage_Paused, result: &pb.ProcessResult{ IsCanceled: false, - Errors: []*pb.ProcessError{{Type: pb.ErrorType_ExecSQL, Msg: "ERROR 1105 (HY000): unsupported modify column length 20 is less than origin 40"}}, + Errors: []*pb.ProcessError{unsupporteModifyColumnError}, }, } rtsc.w.subTaskHolder.recordSubTask(st1) @@ -251,7 +261,7 @@ func (s *testTaskCheckerSuite) TestCheckTaskIndependent(c *check.C) { stage: pb.Stage_Paused, result: &pb.ProcessResult{ IsCanceled: false, - Errors: []*pb.ProcessError{{Type: pb.ErrorType_UnknownError, Msg: "error message"}}, + Errors: []*pb.ProcessError{unknownProcessError}, }, } rtsc.w.subTaskHolder.recordSubTask(st2) @@ -282,22 +292,29 @@ func (s *testTaskCheckerSuite) TestCheckTaskIndependent(c *check.C) { func (s *testTaskCheckerSuite) TestIsResumableError(c *check.C) { testCases := []struct { - err *pb.ProcessError + errorType pb.ErrorType + err error resumable bool }{ - {&pb.ProcessError{Type: pb.ErrorType_ExecSQL, Msg: "ERROR 1105 (HY000): unsupported modify column length 20 is less than origin 40"}, false}, - {&pb.ProcessError{Type: pb.ErrorType_ExecSQL, Msg: "ERROR 1105 (HY000): unsupported drop integer primary key"}, false}, - {&pb.ProcessError{Type: pb.ErrorType_ExecSQL, Msg: ""}, true}, - {&pb.ProcessError{Type: pb.ErrorType_ExecSQL, Msg: "[code=10006:class=database:scope=not-set:level=high] file test.t3.sql: execute statement failed: USE `test_abc`;: context canceled"}, true}, - {&pb.ProcessError{Type: pb.ErrorType_ExecSQL, Msg: "[code=10006:class=database:scope=not-set:level=high] execute statement failed: commit: Error 1062: Duplicate entry '5' for key 'PRIMARY'"}, false}, - {&pb.ProcessError{Type: pb.ErrorType_ExecSQL, Msg: "[code=10006:class=database:scope=not-set:level=high] execute statement failed: INSERT INTO `db`.`tbl` (`c1`,`c2`) VALUES (?,?);: Error 1406: Data too long for column 'c2' at row 1"}, false}, - {&pb.ProcessError{Type: pb.ErrorType_UnknownError, Msg: "[code=11038:class=functional:scope=internal:level=high] parse relay log file bin.000018 from offset 555 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file bin.000018 from offset 0 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004/bin.000018: binlog checksum mismatch, data may be corrupted"}, false}, - {&pb.ProcessError{Type: pb.ErrorType_UnknownError, Msg: "[code=11038:class=functional:scope=internal:level=high] parse relay log file bin.000018 from offset 500 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file bin.000018 from offset 0 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004/bin.000018: get event err EOF, need 1567488104 but got 316323"}, false}, - {&pb.ProcessError{Type: pb.ErrorType_UnknownError, Msg: ""}, true}, - {&pb.ProcessError{Type: pb.ErrorType_UnknownError, Msg: "unknown error"}, true}, + // only DM new error is checked + {pb.ErrorType_ExecSQL, &tmysql.SQLError{1105, "unsupported modify column length 20 is less than origin 40", tmysql.DefaultMySQLState}, true}, + {pb.ErrorType_ExecSQL, &tmysql.SQLError{1105, "unsupported drop integer primary key", tmysql.DefaultMySQLState}, true}, + {pb.ErrorType_ExecSQL, nil, true}, + {pb.ErrorType_ExecSQL, terror.ErrDBExecuteFailed.Generate("file test.t3.sql: execute statement failed: USE `test_abc`;: context canceled"), true}, + {pb.ErrorType_ExecSQL, terror.ErrDBExecuteFailed.Delegate(&tmysql.SQLError{1105, "unsupported modify column length 20 is less than origin 40", tmysql.DefaultMySQLState}, "alter table t modify col varchar(20)"), false}, + {pb.ErrorType_ExecSQL, terror.ErrDBExecuteFailed.Delegate(&tmysql.SQLError{1105, "unsupported drop integer primary key", tmysql.DefaultMySQLState}, "alter table t drop column id"), false}, + {pb.ErrorType_ExecSQL, terror.ErrDBExecuteFailed.Delegate(errors.New("Error 1062: Duplicate entry '5' for key 'PRIMARY'")), false}, + {pb.ErrorType_ExecSQL, terror.ErrDBExecuteFailed.Delegate(errors.New("INSERT INTO `db`.`tbl` (`c1`,`c2`) VALUES (?,?);: Error 1406: Data too long for column 'c2' at row 1")), false}, + // real error is generated by `Delegate` and multiple `Annotatef`, we use `New` to simplify it + {pb.ErrorType_UnknownError, terror.ErrParserParseRelayLog.New("parse relay log file bin.000018 from offset 555 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file bin.000018 from offset 0 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004/bin.000018: binlog checksum mismatch, data may be corrupted"), false}, + {pb.ErrorType_UnknownError, terror.ErrParserParseRelayLog.New("parse relay log file bin.000018 from offset 500 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file bin.000018 from offset 0 in dir /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004: parse relay log file /home/tidb/deploy/relay_log/d2e831df-b4ec-11e9-9237-0242ac110008.000004/bin.000018: get event err EOF, need 1567488104 but got 316323"), false}, + {pb.ErrorType_UnknownError, nil, true}, + {pb.ErrorType_UnknownError, errors.New("unknown error"), true}, } for _, tc := range testCases { - c.Assert(isResumableError(tc.err), check.Equals, tc.resumable) + err := unit.NewProcessError(tc.errorType, tc.err) + fmt.Printf("error: %v\n", err) + c.Assert(isResumableError(err), check.Equals, tc.resumable) } } diff --git a/loader/loader.go b/loader/loader.go index fc3ffccd72..20b9cf58c6 100644 --- a/loader/loader.go +++ b/loader/loader.go @@ -158,7 +158,7 @@ func (w *Worker) run(ctx context.Context, fileJobQueue chan *fileJob, workerWg * if err := w.conn.executeSQL(ctctx, sqls); err != nil { // expect pause rather than exit err = terror.WithScope(terror.Annotatef(err, "file %s", job.file), terror.ScopeDownstream) - runFatalChan <- unit.NewProcessError(pb.ErrorType_ExecSQL, errors.ErrorStack(err)) + runFatalChan <- unit.NewProcessError(pb.ErrorType_ExecSQL, err) return } w.loader.finishedDataSize.Add(job.offset - job.lastOffset) @@ -184,7 +184,7 @@ func (w *Worker) run(ctx context.Context, fileJobQueue chan *fileJob, workerWg * if err := w.restoreDataFile(ctx, filepath.Join(w.cfg.Dir, job.dataFile), job.offset, job.info); err != nil { // expect pause rather than exit err = terror.Annotatef(err, "restore data file (%v) failed", job.dataFile) - runFatalChan <- unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err)) + runFatalChan <- unit.NewProcessError(pb.ErrorType_UnknownError, err) return } } @@ -423,7 +423,7 @@ func (l *Loader) Process(ctx context.Context, pr chan pb.ProcessResult) { if err := l.getMydumpMetadata(); err != nil { loaderExitWithErrorCounter.WithLabelValues(l.cfg.Name).Inc() pr <- pb.ProcessResult{ - Errors: []*pb.ProcessError{unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err))}, + Errors: []*pb.ProcessError{unit.NewProcessError(pb.ErrorType_UnknownError, err)}, } return } @@ -447,7 +447,7 @@ func (l *Loader) Process(ctx context.Context, pr chan pb.ProcessResult) { if err != nil { loaderExitWithErrorCounter.WithLabelValues(l.cfg.Name).Inc() - errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err))) + errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, err)) } isCanceled := false diff --git a/mydumper/mydumper.go b/mydumper/mydumper.go index a4bf09ad92..2fa9f9946f 100644 --- a/mydumper/mydumper.go +++ b/mydumper/mydumper.go @@ -31,6 +31,7 @@ import ( "github.com/pingcap/dm/pkg/log" "github.com/pingcap/dm/pkg/terror" + "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/siddontang/go/sync2" "go.uber.org/zap" @@ -73,7 +74,7 @@ func (m *Mydumper) Process(ctx context.Context, pr chan pb.ProcessResult) { } pr <- pb.ProcessResult{ IsCanceled: false, - Errors: []*pb.ProcessError{unit.NewProcessError(pb.ErrorType_UnknownError, msg)}, + Errors: []*pb.ProcessError{unit.NewProcessError(pb.ErrorType_UnknownError, errors.New(msg))}, } failpoint.Return() }) @@ -100,7 +101,7 @@ func (m *Mydumper) Process(ctx context.Context, pr chan pb.ProcessResult) { if err != nil { mydumperExitWithErrorCounter.WithLabelValues(m.cfg.Name).Inc() - errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, fmt.Sprintf("%s. %s", err.Error(), output))) + errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, fmt.Errorf("%s. %s", err.Error(), output))) } else { select { case <-ctx.Done(): diff --git a/relay/relay.go b/relay/relay.go index c7ccba25dc..7ba8250e5e 100755 --- a/relay/relay.go +++ b/relay/relay.go @@ -193,7 +193,7 @@ func (r *Relay) Process(ctx context.Context, pr chan pb.ProcessResult) { relayExitWithErrorCounter.Inc() r.tctx.L().Error("process exit", zap.Error(err)) // TODO: add specified error type instead of pb.ErrorType_UnknownError - errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err))) + errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, err)) } isCanceled := false diff --git a/syncer/mode.go b/syncer/mode.go index a7efdde046..e6a938281b 100644 --- a/syncer/mode.go +++ b/syncer/mode.go @@ -16,7 +16,6 @@ package syncer import ( "time" - "github.com/pingcap/errors" "github.com/pingcap/failpoint" "go.uber.org/zap" @@ -40,7 +39,7 @@ func (s *Syncer) enableSafeModeInitializationPhase(tctx *tcontext.Context, safeM err := safeMode.Add(tctx, -1) // try to disable after 5 minutes if err != nil { // send error to the fatal chan to interrupt the process - s.runFatalChan <- unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err)) + s.runFatalChan <- unit.NewProcessError(pb.ErrorType_UnknownError, err) } }() diff --git a/syncer/syncer.go b/syncer/syncer.go index 8f941e1456..02a6cfcbe2 100644 --- a/syncer/syncer.go +++ b/syncer/syncer.go @@ -22,7 +22,6 @@ import ( "sync" "time" - "github.com/pingcap/errors" "github.com/pingcap/failpoint" "github.com/pingcap/parser" "github.com/pingcap/parser/ast" @@ -588,7 +587,7 @@ func (s *Syncer) Process(ctx context.Context, pr chan pb.ProcessResult) { if err != nil { syncerExitWithErrorCounter.WithLabelValues(s.cfg.Name).Inc() - errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err))) + errs = append(errs, unit.NewProcessError(pb.ErrorType_UnknownError, err)) } isCanceled := false @@ -904,7 +903,7 @@ func (s *Syncer) syncDDL(ctx *tcontext.Context, queueBucket string, db *Conn, dd s.jobWg.Done() if err != nil { s.execErrorDetected.Set(true) - s.runFatalChan <- unit.NewProcessError(pb.ErrorType_ExecSQL, errors.ErrorStack(err)) + s.runFatalChan <- unit.NewProcessError(pb.ErrorType_ExecSQL, err) continue } s.addCount(true, queueBucket, sqlJob.tp, int64(len(sqlJob.ddls))) @@ -934,7 +933,7 @@ func (s *Syncer) sync(ctx *tcontext.Context, queueBucket string, db *Conn, jobCh fatalF := func(err error, errType pb.ErrorType) { s.execErrorDetected.Set(true) - s.runFatalChan <- unit.NewProcessError(errType, errors.ErrorStack(err)) + s.runFatalChan <- unit.NewProcessError(errType, err) clearF() } @@ -2246,7 +2245,7 @@ func (s *Syncer) Resume(ctx context.Context, pr chan pb.ProcessResult) { pr <- pb.ProcessResult{ IsCanceled: false, Errors: []*pb.ProcessError{ - unit.NewProcessError(pb.ErrorType_UnknownError, errors.ErrorStack(err)), + unit.NewProcessError(pb.ErrorType_UnknownError, err), }, } return