diff --git a/dm/dumpling/dumpling.go b/dm/dumpling/dumpling.go index f94000c9dfd..87b31bd1273 100644 --- a/dm/dumpling/dumpling.go +++ b/dm/dumpling/dumpling.go @@ -277,6 +277,8 @@ func (m *Dumpling) status() *pb.DumpStatus { FinishedBytes: dumpStatus.FinishedBytes, FinishedRows: dumpStatus.FinishedRows, EstimateTotalRows: dumpStatus.EstimateTotalRows, + Progress: dumpStatus.Progress, + Bps: int64(dumpStatus.CurrentSpeedBPS), } var estimateProgress string if s.FinishedRows >= s.EstimateTotalRows { @@ -290,6 +292,8 @@ func (m *Dumpling) status() *pb.DumpStatus { zap.Int64("estimated_total_rows", int64(s.EstimateTotalRows)), zap.Int64("finished_rows", int64(s.FinishedRows)), zap.String("estimated_progress", estimateProgress), + zap.String("new progress", s.Progress), + zap.Int64("bps", s.Bps), ) return s } diff --git a/dm/dumpling/dumpling_test.go b/dm/dumpling/dumpling_test.go index 94f480d676a..cff0fdcebeb 100644 --- a/dm/dumpling/dumpling_test.go +++ b/dm/dumpling/dumpling_test.go @@ -32,6 +32,7 @@ import ( "github.com/pingcap/tiflow/dm/pkg/log" "github.com/pingcap/tiflow/engine/pkg/promutil" "github.com/prometheus/client_golang/prometheus" + "github.com/stretchr/testify/require" ) var _ = Suite(&testDumplingSuite{}) @@ -130,8 +131,9 @@ func (t *testDumplingSuite) TestDefaultConfig(c *C) { c.Assert(dumpling.dumpConfig.Rows, Not(Equals), export.UnspecifiedSize) } -func (t *testDumplingSuite) TestCallStatus(c *C) { - m := NewDumpling(t.cfg) +func TestCallStatus(t *testing.T) { + cfg := genDumpCfg(t) + m := NewDumpling(cfg) m.metricProxies = defaultMetricProxies ctx := context.Background() @@ -146,10 +148,12 @@ func (t *testDumplingSuite) TestCallStatus(c *C) { dumpConf.PromRegistry = tidbpromutil.NewDefaultRegistry() s := m.Status(nil).(*pb.DumpStatus) - c.Assert(s.CompletedTables, Equals, float64(0)) - c.Assert(s.FinishedBytes, Equals, float64(0)) - c.Assert(s.FinishedRows, Equals, float64(0)) - c.Assert(s.EstimateTotalRows, Equals, float64(0)) + require.Equal(t, s.CompletedTables, float64(0)) + require.Equal(t, s.FinishedBytes, float64(0)) + require.Equal(t, s.FinishedRows, float64(0)) + require.Equal(t, s.EstimateTotalRows, float64(0)) + require.Equal(t, s.Progress, "") + require.Equal(t, s.Bps, int64(0)) // NewDumper is the only way we can set conf to Dumper, but it will return error. so we just ignore the error dumpling, _ := export.NewDumper(ctx, dumpConf) @@ -157,10 +161,12 @@ func (t *testDumplingSuite) TestCallStatus(c *C) { m.Close() s = m.Status(nil).(*pb.DumpStatus) - c.Assert(s.CompletedTables, Equals, float64(0)) - c.Assert(s.FinishedBytes, Equals, float64(0)) - c.Assert(s.FinishedRows, Equals, float64(0)) - c.Assert(s.EstimateTotalRows, Equals, float64(0)) + require.Equal(t, s.CompletedTables, float64(0)) + require.Equal(t, s.FinishedBytes, float64(0)) + require.Equal(t, s.FinishedRows, float64(0)) + require.Equal(t, s.EstimateTotalRows, float64(0)) + require.Equal(t, s.Progress, "") + require.Equal(t, s.Bps, int64(0)) } func (t *testDumplingSuite) TestParseArgsWontOverwrite(c *C) { @@ -208,3 +214,24 @@ func (t *testDumplingSuite) TestConstructArgs(c *C) { c.Assert(exportCfg.SessionParams, NotNil) c.Assert(exportCfg.SessionParams["time_zone"], Equals, "+01:00") } + +func genDumpCfg(t *testing.T) *config.SubTaskConfig { + t.Helper() + + dir := t.TempDir() + return &config.SubTaskConfig{ + Name: "dumpling_ut", + Timezone: "UTC", + From: config.GetDBConfigForTest(), + LoaderConfig: config.LoaderConfig{ + Dir: dir, + }, + BAList: &filter.Rules{ + DoDBs: []string{testDumplingSchemaName}, + DoTables: []*filter.Table{{ + Schema: testDumplingSchemaName, + Name: testDumplingTableName, + }}, + }, + } +} diff --git a/dm/loader/lightning.go b/dm/loader/lightning.go index 8ce445b52e5..dabfea9750b 100644 --- a/dm/loader/lightning.go +++ b/dm/loader/lightning.go @@ -24,6 +24,7 @@ import ( "github.com/pingcap/tidb/br/pkg/lightning" "github.com/pingcap/tidb/br/pkg/lightning/checkpoints" lcfg "github.com/pingcap/tidb/br/pkg/lightning/config" + "github.com/pingcap/tidb/dumpling/export" tidbpromutil "github.com/pingcap/tidb/util/promutil" "github.com/pingcap/tiflow/dm/config" "github.com/pingcap/tiflow/dm/pb" @@ -74,7 +75,7 @@ type LightningLoader struct { metaBinlog atomic.String metaBinlogGTID atomic.String - statusRecorder *statusRecorder + speedRecorder *export.SpeedRecorder } // NewLightning creates a new Loader importing data with lightning. @@ -91,7 +92,7 @@ func NewLightning(cfg *config.SubTaskConfig, cli *clientv3.Client, workerName st lightningGlobalConfig: lightningCfg, core: lightning.New(lightningCfg), logger: logger.WithFields(zap.String("task", cfg.Name), zap.String("unit", "lightning-load")), - statusRecorder: newStatusRecorder(), + speedRecorder: export.NewSpeedRecorder(), } return loader } @@ -465,7 +466,7 @@ func (l *LightningLoader) Update(ctx context.Context, cfg *config.SubTaskConfig) func (l *LightningLoader) status() *pb.LoadStatus { finished, total := l.core.Status() progress := percent(finished, total, l.finish.Load()) - currentSpeed := l.statusRecorder.getSpeed(finished) + currentSpeed := int64(l.speedRecorder.GetSpeed(float64(finished))) l.logger.Info("progress status of lightning", zap.Int64("finished_bytes", finished), @@ -474,12 +475,12 @@ func (l *LightningLoader) status() *pb.LoadStatus { zap.Int64("current speed (bytes / seconds)", currentSpeed), ) s := &pb.LoadStatus{ - FinishedBytes: finished, - TotalBytes: total, - Progress: progress, - MetaBinlog: l.metaBinlog.Load(), - MetaBinlogGTID: l.metaBinlogGTID.Load(), - CurrentSpeedBytesPerSecond: currentSpeed, + FinishedBytes: finished, + TotalBytes: total, + Progress: progress, + MetaBinlog: l.metaBinlog.Load(), + MetaBinlogGTID: l.metaBinlogGTID.Load(), + Bps: currentSpeed, } return s } diff --git a/dm/loader/loader.go b/dm/loader/loader.go index 2fe752eff7c..178b44aae04 100644 --- a/dm/loader/loader.go +++ b/dm/loader/loader.go @@ -28,6 +28,7 @@ import ( "github.com/pingcap/errors" "github.com/pingcap/failpoint" cm "github.com/pingcap/tidb-tools/pkg/column-mapping" + "github.com/pingcap/tidb/dumpling/export" "github.com/pingcap/tidb/util/filter" regexprrouter "github.com/pingcap/tidb/util/regexpr-router" router "github.com/pingcap/tidb/util/table-router" @@ -445,7 +446,7 @@ type Loader struct { dbTableDataFinishedSize map[string]map[string]*atomic.Int64 dbTableDataLastFinishedSize map[string]map[string]*atomic.Int64 dbTableDataLastUpdatedTime atomic.Time - statusRecorder *statusRecorder + speedRecorder *export.SpeedRecorder metaBinlog atomic.String metaBinlogGTID atomic.String @@ -466,14 +467,14 @@ type Loader struct { // NewLoader creates a new Loader. func NewLoader(cfg *config.SubTaskConfig, cli *clientv3.Client, workerName string) *Loader { loader := &Loader{ - cfg: cfg, - cli: cli, - db2Tables: make(map[string]Tables2DataFiles), - tableInfos: make(map[string]*tableInfo), - workerWg: new(sync.WaitGroup), - logger: log.With(zap.String("task", cfg.Name), zap.String("unit", "load")), - workerName: workerName, - statusRecorder: newStatusRecorder(), + cfg: cfg, + cli: cli, + db2Tables: make(map[string]Tables2DataFiles), + tableInfos: make(map[string]*tableInfo), + workerWg: new(sync.WaitGroup), + logger: log.With(zap.String("task", cfg.Name), zap.String("unit", "load")), + workerName: workerName, + speedRecorder: export.NewSpeedRecorder(), } loader.fileJobQueueClosed.Store(true) // not open yet return loader diff --git a/dm/loader/status.go b/dm/loader/status.go index d046ebdaf5a..0e370efcac5 100644 --- a/dm/loader/status.go +++ b/dm/loader/status.go @@ -14,7 +14,6 @@ package loader import ( - "sync" "time" "github.com/pingcap/tiflow/dm/pb" @@ -22,60 +21,20 @@ import ( "go.uber.org/zap" ) -type statusRecorder struct { - mu sync.Mutex - lastFinished int64 - lastUpdateTime time.Time - speedBPS int64 -} - -func newStatusRecorder() *statusRecorder { - return &statusRecorder{ - lastUpdateTime: time.Now(), - } -} - -func (s *statusRecorder) getSpeed(finished int64) int64 { - s.mu.Lock() - defer s.mu.Unlock() - - if finished == s.lastFinished { - // for finished bytes does not get forwarded, use old speed to avoid - // display zero. We may find better strategy in future. - return s.speedBPS - } - - now := time.Now() - elapsed := int64(now.Sub(s.lastUpdateTime).Seconds()) - if elapsed == 0 { - elapsed = 1 - } - currentSpeed := (finished - s.lastFinished) / elapsed - if currentSpeed == 0 { - currentSpeed = 1 - } - - s.lastFinished = finished - s.lastUpdateTime = now - s.speedBPS = currentSpeed - - return currentSpeed -} - // Status implements Unit.Status. func (l *Loader) Status(_ *binlog.SourceStatus) interface{} { finishedSize := l.finishedDataSize.Load() totalSize := l.totalDataSize.Load() progress := percent(finishedSize, totalSize, l.finish.Load()) - currentSpeed := l.statusRecorder.getSpeed(finishedSize) + currentSpeed := int64(l.speedRecorder.GetSpeed(float64(finishedSize))) s := &pb.LoadStatus{ - FinishedBytes: finishedSize, - TotalBytes: totalSize, - Progress: progress, - MetaBinlog: l.metaBinlog.Load(), - MetaBinlogGTID: l.metaBinlogGTID.Load(), - CurrentSpeedBytesPerSecond: currentSpeed, + FinishedBytes: finishedSize, + TotalBytes: totalSize, + Progress: progress, + MetaBinlog: l.metaBinlog.Load(), + MetaBinlogGTID: l.metaBinlogGTID.Load(), + Bps: currentSpeed, } go l.printStatus() return s diff --git a/dm/loader/status_test.go b/dm/loader/status_test.go index 16e17d752cf..c0e54380014 100644 --- a/dm/loader/status_test.go +++ b/dm/loader/status_test.go @@ -17,13 +17,14 @@ import ( "sync" . "github.com/pingcap/check" + "github.com/pingcap/tidb/dumpling/export" "github.com/pingcap/tiflow/dm/config" "github.com/pingcap/tiflow/dm/pkg/log" "go.uber.org/atomic" ) func (*testLoaderSuite) TestConcurrentStatus(c *C) { - l := &Loader{statusRecorder: newStatusRecorder()} + l := &Loader{speedRecorder: export.NewSpeedRecorder()} l.cfg = &config.SubTaskConfig{} l.logger = log.L() l.finishedDataSize.Store(100) diff --git a/dm/pb/dmworker.pb.go b/dm/pb/dmworker.pb.go index 21536b9f6fa..8e8568751ef 100644 --- a/dm/pb/dmworker.pb.go +++ b/dm/pb/dmworker.pb.go @@ -688,6 +688,8 @@ type DumpStatus struct { FinishedBytes float64 `protobuf:"fixed64,3,opt,name=finishedBytes,proto3" json:"finishedBytes,omitempty"` FinishedRows float64 `protobuf:"fixed64,4,opt,name=finishedRows,proto3" json:"finishedRows,omitempty"` EstimateTotalRows float64 `protobuf:"fixed64,5,opt,name=estimateTotalRows,proto3" json:"estimateTotalRows,omitempty"` + Bps int64 `protobuf:"varint,6,opt,name=bps,proto3" json:"bps,omitempty"` + Progress string `protobuf:"bytes,7,opt,name=progress,proto3" json:"progress,omitempty"` } func (m *DumpStatus) Reset() { *m = DumpStatus{} } @@ -758,14 +760,28 @@ func (m *DumpStatus) GetEstimateTotalRows() float64 { return 0 } +func (m *DumpStatus) GetBps() int64 { + if m != nil { + return m.Bps + } + return 0 +} + +func (m *DumpStatus) GetProgress() string { + if m != nil { + return m.Progress + } + return "" +} + // LoadStatus represents status for load unit type LoadStatus struct { - FinishedBytes int64 `protobuf:"varint,1,opt,name=finishedBytes,proto3" json:"finishedBytes,omitempty"` - TotalBytes int64 `protobuf:"varint,2,opt,name=totalBytes,proto3" json:"totalBytes,omitempty"` - Progress string `protobuf:"bytes,3,opt,name=progress,proto3" json:"progress,omitempty"` - MetaBinlog string `protobuf:"bytes,4,opt,name=metaBinlog,proto3" json:"metaBinlog,omitempty"` - MetaBinlogGTID string `protobuf:"bytes,5,opt,name=metaBinlogGTID,proto3" json:"metaBinlogGTID,omitempty"` - CurrentSpeedBytesPerSecond int64 `protobuf:"varint,6,opt,name=currentSpeedBytesPerSecond,proto3" json:"currentSpeedBytesPerSecond,omitempty"` + FinishedBytes int64 `protobuf:"varint,1,opt,name=finishedBytes,proto3" json:"finishedBytes,omitempty"` + TotalBytes int64 `protobuf:"varint,2,opt,name=totalBytes,proto3" json:"totalBytes,omitempty"` + Progress string `protobuf:"bytes,3,opt,name=progress,proto3" json:"progress,omitempty"` + MetaBinlog string `protobuf:"bytes,4,opt,name=metaBinlog,proto3" json:"metaBinlog,omitempty"` + MetaBinlogGTID string `protobuf:"bytes,5,opt,name=metaBinlogGTID,proto3" json:"metaBinlogGTID,omitempty"` + Bps int64 `protobuf:"varint,6,opt,name=bps,proto3" json:"bps,omitempty"` } func (m *LoadStatus) Reset() { *m = LoadStatus{} } @@ -836,9 +852,9 @@ func (m *LoadStatus) GetMetaBinlogGTID() string { return "" } -func (m *LoadStatus) GetCurrentSpeedBytesPerSecond() int64 { +func (m *LoadStatus) GetBps() int64 { if m != nil { - return m.CurrentSpeedBytesPerSecond + return m.Bps } return 0 } @@ -927,6 +943,7 @@ func (m *ShardingGroup) GetUnsynced() []string { // SyncStatus represents status for sync unit type SyncStatus struct { + // totalEvents/totalTps/recentTps has been deprecated now TotalEvents int64 `protobuf:"varint,1,opt,name=totalEvents,proto3" json:"totalEvents,omitempty"` TotalTps int64 `protobuf:"varint,2,opt,name=totalTps,proto3" json:"totalTps,omitempty"` RecentTps int64 `protobuf:"varint,3,opt,name=recentTps,proto3" json:"recentTps,omitempty"` @@ -941,6 +958,9 @@ type SyncStatus struct { SecondsBehindMaster int64 `protobuf:"varint,12,opt,name=secondsBehindMaster,proto3" json:"secondsBehindMaster,omitempty"` BlockDDLOwner string `protobuf:"bytes,13,opt,name=blockDDLOwner,proto3" json:"blockDDLOwner,omitempty"` ConflictMsg string `protobuf:"bytes,14,opt,name=conflictMsg,proto3" json:"conflictMsg,omitempty"` + TotalRows int64 `protobuf:"varint,15,opt,name=totalRows,proto3" json:"totalRows,omitempty"` + TotalRps int64 `protobuf:"varint,16,opt,name=totalRps,proto3" json:"totalRps,omitempty"` + RecentRps int64 `protobuf:"varint,17,opt,name=recentRps,proto3" json:"recentRps,omitempty"` } func (m *SyncStatus) Reset() { *m = SyncStatus{} } @@ -1074,6 +1094,27 @@ func (m *SyncStatus) GetConflictMsg() string { return "" } +func (m *SyncStatus) GetTotalRows() int64 { + if m != nil { + return m.TotalRows + } + return 0 +} + +func (m *SyncStatus) GetTotalRps() int64 { + if m != nil { + return m.TotalRps + } + return 0 +} + +func (m *SyncStatus) GetRecentRps() int64 { + if m != nil { + return m.RecentRps + } + return 0 +} + // SourceStatus represents status for source runing on dm-worker type SourceStatus struct { Source string `protobuf:"bytes,1,opt,name=source,proto3" json:"source,omitempty"` @@ -3519,186 +3560,187 @@ func init() { func init() { proto.RegisterFile("dmworker.proto", fileDescriptor_51a1b9e17fd67b10) } var fileDescriptor_51a1b9e17fd67b10 = []byte{ - // 2856 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x3a, 0xcd, 0x6f, 0x24, 0x47, - 0xf5, 0xd3, 0x3d, 0xdf, 0x6f, 0xc6, 0xde, 0x76, 0xad, 0x77, 0x7f, 0x93, 0xc9, 0xee, 0xc4, 0xe9, - 0x8d, 0xf2, 0x73, 0xac, 0x60, 0x25, 0x26, 0x28, 0x28, 0x12, 0xf9, 0x58, 0x7b, 0xe3, 0xdd, 0xe0, - 0x8d, 0x77, 0x7b, 0x1c, 0x73, 0x42, 0xa2, 0xdd, 0x53, 0x1e, 0x37, 0xee, 0xe9, 0xee, 0xed, 0xee, - 0xb1, 0xe5, 0x03, 0xe2, 0x82, 0xb8, 0xc2, 0x05, 0x24, 0x10, 0x1c, 0x40, 0x42, 0xe2, 0xc4, 0x81, - 0x3f, 0x80, 0x23, 0x70, 0x8c, 0x38, 0x71, 0x44, 0xd9, 0xff, 0x81, 0x33, 0x7a, 0xaf, 0xaa, 0xba, - 0xab, 0xe7, 0xc3, 0x9b, 0x45, 0xe2, 0xd6, 0xef, 0xa3, 0x5e, 0xbd, 0x7a, 0xdf, 0x6f, 0x6c, 0x58, - 0x1d, 0x4d, 0x2e, 0xa3, 0xe4, 0x9c, 0x27, 0xdb, 0x71, 0x12, 0x65, 0x11, 0x33, 0xe3, 0x13, 0x7b, - 0x13, 0xd8, 0xd3, 0x29, 0x4f, 0xae, 0x86, 0x99, 0x9b, 0x4d, 0x53, 0x87, 0x3f, 0x9b, 0xf2, 0x34, - 0x63, 0x0c, 0x6a, 0xa1, 0x3b, 0xe1, 0x3d, 0x63, 0xc3, 0xd8, 0x6c, 0x3b, 0xf4, 0x6d, 0xc7, 0xb0, - 0xbe, 0x1b, 0x4d, 0x26, 0x51, 0xf8, 0x3d, 0x92, 0xe1, 0xf0, 0x34, 0x8e, 0xc2, 0x94, 0xb3, 0xdb, - 0xd0, 0x48, 0x78, 0x3a, 0x0d, 0x32, 0xe2, 0x6e, 0x39, 0x12, 0x62, 0x16, 0x54, 0x27, 0xe9, 0xb8, - 0x67, 0x92, 0x08, 0xfc, 0x44, 0xce, 0x34, 0x9a, 0x26, 0x1e, 0xef, 0x55, 0x09, 0x29, 0x21, 0xc4, - 0x0b, 0xbd, 0x7a, 0x35, 0x81, 0x17, 0x90, 0xfd, 0x27, 0x03, 0x6e, 0x96, 0x94, 0x7b, 0xe9, 0x1b, - 0xdf, 0x83, 0xae, 0xb8, 0x43, 0x48, 0xa0, 0x7b, 0x3b, 0x3b, 0xd6, 0x76, 0x7c, 0xb2, 0x3d, 0xd4, - 0xf0, 0x4e, 0x89, 0x8b, 0xbd, 0x0f, 0x2b, 0xe9, 0xf4, 0xe4, 0xc8, 0x4d, 0xcf, 0xe5, 0xb1, 0xda, - 0x46, 0x75, 0xb3, 0xb3, 0xb3, 0x46, 0xc7, 0x74, 0x82, 0x53, 0xe6, 0xb3, 0xff, 0x60, 0x40, 0x67, - 0xf7, 0x8c, 0x7b, 0x12, 0x46, 0x45, 0x63, 0x37, 0x4d, 0xf9, 0x48, 0x29, 0x2a, 0x20, 0xb6, 0x0e, - 0xf5, 0x2c, 0xca, 0xdc, 0x80, 0x54, 0xad, 0x3b, 0x02, 0x60, 0x03, 0x80, 0x74, 0xea, 0x79, 0x3c, - 0x4d, 0x4f, 0xa7, 0x01, 0xa9, 0x5a, 0x77, 0x34, 0x0c, 0x4a, 0x3b, 0x75, 0xfd, 0x80, 0x8f, 0xc8, - 0x4c, 0x75, 0x47, 0x42, 0xac, 0x07, 0xcd, 0x4b, 0x37, 0x09, 0xfd, 0x70, 0xdc, 0xab, 0x13, 0x41, - 0x81, 0x78, 0x62, 0xc4, 0x33, 0xd7, 0x0f, 0x7a, 0x8d, 0x0d, 0x63, 0xb3, 0xeb, 0x48, 0xc8, 0xfe, - 0xd2, 0x00, 0xd8, 0x9b, 0x4e, 0x62, 0xa9, 0xe6, 0x06, 0x74, 0x48, 0x83, 0x23, 0xf7, 0x24, 0xe0, - 0x29, 0xe9, 0x5a, 0x75, 0x74, 0x14, 0xdb, 0x84, 0x1b, 0x5e, 0x34, 0x89, 0x03, 0x9e, 0xf1, 0x91, - 0xe4, 0x42, 0xd5, 0x0d, 0x67, 0x16, 0xcd, 0xde, 0x80, 0x95, 0x53, 0x3f, 0xf4, 0xd3, 0x33, 0x3e, - 0xba, 0x7f, 0x95, 0x71, 0x61, 0x72, 0xc3, 0x29, 0x23, 0x99, 0x0d, 0x5d, 0x85, 0x70, 0xa2, 0xcb, - 0x94, 0x1e, 0x64, 0x38, 0x25, 0x1c, 0x7b, 0x1b, 0xd6, 0x78, 0x9a, 0xf9, 0x13, 0x37, 0xe3, 0x47, - 0xa8, 0x0a, 0x31, 0xd6, 0x89, 0x71, 0x9e, 0x60, 0xff, 0xdb, 0x00, 0x38, 0x88, 0xdc, 0x91, 0x7c, - 0xd2, 0x9c, 0x1a, 0xe2, 0x51, 0x33, 0x6a, 0x0c, 0x00, 0xe8, 0x95, 0x82, 0xc5, 0x24, 0x16, 0x0d, - 0xc3, 0xfa, 0xd0, 0x8a, 0x93, 0x68, 0x9c, 0xf0, 0x34, 0x95, 0x21, 0x9b, 0xc3, 0x78, 0x76, 0xc2, - 0x33, 0xf7, 0xbe, 0x1f, 0x06, 0xd1, 0x58, 0x06, 0xae, 0x86, 0x61, 0x6f, 0xc2, 0x6a, 0x01, 0xed, - 0x1f, 0x3d, 0xda, 0x23, 0xdd, 0xdb, 0xce, 0x0c, 0x96, 0x7d, 0x08, 0x7d, 0x6f, 0x9a, 0x24, 0x3c, - 0xcc, 0x86, 0x31, 0x97, 0x8a, 0x3d, 0xe1, 0xc9, 0x90, 0x7b, 0x51, 0x38, 0x22, 0xbf, 0x55, 0x9d, - 0x6b, 0x38, 0xec, 0x5f, 0x18, 0xb0, 0x32, 0x3c, 0x73, 0x93, 0x91, 0x1f, 0x8e, 0xf7, 0x93, 0x68, - 0x1a, 0xa3, 0xd7, 0x33, 0x37, 0x19, 0xf3, 0x4c, 0xa6, 0xaf, 0x84, 0x30, 0xa9, 0xf7, 0xf6, 0x0e, - 0xf0, 0x9d, 0x55, 0x4c, 0x6a, 0xfc, 0x16, 0x76, 0x4a, 0xd2, 0xec, 0x20, 0xf2, 0xdc, 0xcc, 0x8f, - 0x42, 0xf9, 0xcc, 0x32, 0x92, 0x12, 0xf7, 0x2a, 0xf4, 0x28, 0xf2, 0xaa, 0x94, 0xb8, 0x04, 0xa1, - 0x7d, 0xa6, 0xa1, 0xa4, 0xd4, 0x89, 0x92, 0xc3, 0xf6, 0x6f, 0x6b, 0x00, 0xc3, 0xab, 0xd0, 0x9b, - 0x89, 0xb1, 0x07, 0x17, 0x3c, 0xcc, 0xca, 0x31, 0x26, 0x50, 0x28, 0x4c, 0x84, 0x5c, 0xac, 0x5c, - 0x91, 0xc3, 0xec, 0x0e, 0xb4, 0x13, 0xee, 0xf1, 0x30, 0x43, 0x62, 0x95, 0x88, 0x05, 0x02, 0xa3, - 0x69, 0xe2, 0xa6, 0x19, 0x4f, 0x4a, 0xce, 0x28, 0xe1, 0xd8, 0x16, 0x58, 0x3a, 0xbc, 0x9f, 0xf9, - 0x23, 0xe9, 0x90, 0x39, 0x3c, 0xca, 0xa3, 0x47, 0x28, 0x79, 0x0d, 0x21, 0x4f, 0xc7, 0xa1, 0x3c, - 0x1d, 0x26, 0x79, 0x4d, 0x21, 0x6f, 0x16, 0x8f, 0xf2, 0x4e, 0x82, 0xc8, 0x3b, 0xf7, 0xc3, 0x31, - 0x39, 0xa0, 0x45, 0xa6, 0x2a, 0xe1, 0xd8, 0x77, 0xc0, 0x9a, 0x86, 0x09, 0x4f, 0xa3, 0xe0, 0x82, - 0x8f, 0xc8, 0x8f, 0x69, 0xaf, 0xad, 0x95, 0x1d, 0xdd, 0xc3, 0xce, 0x1c, 0xab, 0xe6, 0x21, 0x10, - 0x95, 0x46, 0x7a, 0x68, 0x00, 0x70, 0x42, 0x8a, 0x1c, 0x5d, 0xc5, 0xbc, 0xd7, 0x11, 0x51, 0x5a, - 0x60, 0xd8, 0x3b, 0x70, 0x33, 0xa5, 0x38, 0x4a, 0xef, 0xf3, 0x33, 0x3f, 0x1c, 0x3d, 0x26, 0x5b, - 0xf4, 0xba, 0x64, 0xe2, 0x45, 0x24, 0x8c, 0x18, 0x52, 0x7c, 0x6f, 0xef, 0xe0, 0xf0, 0x32, 0xe4, - 0x49, 0x6f, 0x45, 0x44, 0x4c, 0x09, 0x89, 0xee, 0xf6, 0xa2, 0xf0, 0x34, 0xf0, 0xbd, 0xec, 0x71, - 0x3a, 0xee, 0xad, 0x12, 0x8f, 0x8e, 0xb2, 0x7f, 0x63, 0x40, 0x57, 0xaf, 0xc1, 0x5a, 0x77, 0x30, - 0x96, 0x74, 0x07, 0x53, 0xef, 0x0e, 0xec, 0xad, 0xbc, 0x0b, 0x88, 0xaa, 0x4e, 0x76, 0x7a, 0x92, - 0x44, 0x58, 0x2e, 0x1d, 0x22, 0xe4, 0x8d, 0xe1, 0x5d, 0xe8, 0x24, 0x3c, 0x70, 0xaf, 0xf2, 0x72, - 0x8e, 0xfc, 0x37, 0x90, 0xdf, 0x29, 0xd0, 0x8e, 0xce, 0x63, 0xff, 0xcd, 0x84, 0x8e, 0x46, 0x9c, - 0x8b, 0x31, 0xe3, 0x6b, 0xc6, 0x98, 0xb9, 0x24, 0xc6, 0x36, 0x94, 0x4a, 0xd3, 0x93, 0x3d, 0x3f, - 0x91, 0x69, 0xa7, 0xa3, 0x72, 0x8e, 0x52, 0x50, 0xeb, 0x28, 0xac, 0xca, 0x1a, 0xa8, 0x85, 0xf4, - 0x2c, 0x9a, 0x6d, 0x03, 0x23, 0xd4, 0xae, 0x9b, 0x79, 0x67, 0x5f, 0xc4, 0xd2, 0xcb, 0x0d, 0x0a, - 0x95, 0x05, 0x14, 0xf6, 0x1a, 0xd4, 0xd3, 0xcc, 0x1d, 0x73, 0x0a, 0xe9, 0xd5, 0x9d, 0x36, 0x85, - 0x20, 0x22, 0x1c, 0x81, 0xd7, 0x8c, 0xdf, 0x7a, 0x81, 0xf1, 0xed, 0x3f, 0x57, 0x61, 0xa5, 0xd4, - 0x35, 0x17, 0x4d, 0x17, 0xc5, 0x8d, 0xe6, 0x92, 0x1b, 0x37, 0xa0, 0x36, 0x0d, 0x7d, 0xe1, 0xec, - 0xd5, 0x9d, 0x2e, 0xd2, 0xbf, 0x08, 0xfd, 0x0c, 0xa3, 0xd8, 0x21, 0x8a, 0xa6, 0x53, 0xed, 0x45, - 0x01, 0xf1, 0x0e, 0xdc, 0x2c, 0x52, 0x68, 0x6f, 0xef, 0xe0, 0x20, 0xf2, 0xce, 0xf3, 0x0a, 0xbd, - 0x88, 0xc4, 0x98, 0x98, 0x2d, 0xa8, 0x14, 0x3c, 0xac, 0x88, 0xe9, 0xe2, 0xff, 0xa1, 0xee, 0x61, - 0xb7, 0x27, 0x2b, 0xc9, 0x80, 0xd2, 0xda, 0xff, 0xc3, 0x8a, 0x23, 0xe8, 0xec, 0x0d, 0xa8, 0x8d, - 0xa6, 0x93, 0x58, 0xda, 0x6a, 0x15, 0xf9, 0x8a, 0xf6, 0xfb, 0xb0, 0xe2, 0x10, 0x15, 0xb9, 0x82, - 0xc8, 0x1d, 0xf5, 0xda, 0x05, 0x57, 0xd1, 0xd1, 0x90, 0x0b, 0xa9, 0xc8, 0x85, 0xb9, 0x4d, 0x79, - 0x2e, 0xb9, 0x8a, 0x32, 0x8b, 0x5c, 0x48, 0x65, 0xef, 0x01, 0x5c, 0xb8, 0x81, 0x3f, 0x12, 0x45, - 0xbd, 0x43, 0xbc, 0xeb, 0xc8, 0x7b, 0x9c, 0x63, 0x65, 0xd4, 0x6b, 0x7c, 0xf7, 0x5b, 0xd0, 0x48, - 0x45, 0xf8, 0x7f, 0x08, 0x6b, 0x25, 0x9f, 0x1d, 0xf8, 0x29, 0x19, 0x58, 0x90, 0x7b, 0xc6, 0xb2, - 0x81, 0x48, 0x9d, 0x1f, 0x00, 0x90, 0x25, 0x1e, 0x24, 0x49, 0x94, 0xa8, 0xc1, 0xcc, 0xc8, 0x07, - 0x33, 0xfb, 0x2e, 0xb4, 0xd1, 0x02, 0xd7, 0x90, 0xf1, 0xe9, 0xcb, 0xc8, 0x31, 0x74, 0xe9, 0xcd, - 0x4f, 0x0f, 0x96, 0x70, 0xb0, 0x1d, 0x58, 0x17, 0xd3, 0x91, 0x48, 0x82, 0x27, 0x51, 0xea, 0x93, - 0x25, 0x44, 0x3a, 0x2e, 0xa4, 0x61, 0x03, 0xe2, 0x28, 0x6e, 0xf8, 0xf4, 0x40, 0x75, 0x7b, 0x05, - 0xdb, 0xdf, 0x82, 0x36, 0xde, 0x28, 0xae, 0xdb, 0x84, 0x06, 0x11, 0x94, 0x1d, 0xac, 0xdc, 0x09, - 0x52, 0x21, 0x47, 0xd2, 0xed, 0x9f, 0x19, 0xd0, 0x11, 0x45, 0x4e, 0x9c, 0x7c, 0xd9, 0x1a, 0xb7, - 0x51, 0x3a, 0xae, 0xaa, 0x84, 0x2e, 0x71, 0x1b, 0x80, 0xca, 0x94, 0x60, 0xa8, 0x15, 0x41, 0x51, - 0x60, 0x1d, 0x8d, 0x03, 0x1d, 0x53, 0x40, 0x0b, 0x4c, 0xfb, 0x2b, 0x13, 0xba, 0xd2, 0xa5, 0x82, - 0xe5, 0x7f, 0x94, 0xac, 0x32, 0x9f, 0x6a, 0x7a, 0x3e, 0xbd, 0xa9, 0xf2, 0xa9, 0x5e, 0x3c, 0xa3, - 0x88, 0xa2, 0x22, 0x9d, 0xee, 0xc9, 0x74, 0x6a, 0x10, 0xdb, 0x8a, 0x4a, 0x27, 0xc5, 0x25, 0xb2, - 0xe9, 0x9e, 0xcc, 0xa6, 0x66, 0xc1, 0x94, 0x87, 0x54, 0x9e, 0x4c, 0xf7, 0x64, 0x32, 0xb5, 0x0a, - 0xa6, 0xdc, 0xcd, 0x2a, 0x97, 0xee, 0x37, 0xa1, 0x4e, 0xee, 0xb4, 0x3f, 0x00, 0x4b, 0x37, 0x0d, - 0xe5, 0xc4, 0x9b, 0x92, 0x58, 0x0a, 0x05, 0x8d, 0xc9, 0x91, 0x67, 0x9f, 0xc1, 0x4a, 0xa9, 0x14, - 0x61, 0x67, 0xf6, 0xd3, 0x5d, 0x37, 0xf4, 0x78, 0x90, 0xef, 0x07, 0x1a, 0x46, 0x0b, 0x32, 0xb3, - 0x90, 0x2c, 0x45, 0x94, 0x82, 0x4c, 0x9b, 0xf2, 0xab, 0xa5, 0x29, 0xff, 0x1f, 0x06, 0x74, 0xf5, - 0x03, 0xb8, 0x28, 0x3c, 0x48, 0x92, 0xdd, 0x68, 0x24, 0xbc, 0x59, 0x77, 0x14, 0x88, 0xa1, 0x8f, - 0x9f, 0x81, 0x9b, 0xa6, 0x32, 0x02, 0x73, 0x58, 0xd2, 0x86, 0x5e, 0x14, 0xab, 0xbd, 0x2d, 0x87, - 0x25, 0xed, 0x80, 0x5f, 0xf0, 0x40, 0x36, 0xa8, 0x1c, 0xc6, 0xdb, 0x1e, 0xf3, 0x34, 0xc5, 0x30, - 0x11, 0x75, 0x55, 0x81, 0x78, 0xca, 0x71, 0x2f, 0x77, 0xdd, 0x69, 0xca, 0xe5, 0x6c, 0x95, 0xc3, - 0x68, 0x16, 0xdc, 0x2f, 0xdd, 0x24, 0x9a, 0x86, 0x6a, 0xa2, 0xd2, 0x30, 0xf6, 0x25, 0xac, 0x3d, - 0x99, 0x26, 0x63, 0x4e, 0x41, 0xac, 0xd6, 0xd5, 0x3e, 0xb4, 0xfc, 0xd0, 0xf5, 0x32, 0xff, 0x82, - 0x4b, 0x4b, 0xe6, 0x30, 0xc6, 0x6f, 0xe6, 0x4f, 0xb8, 0x1c, 0x29, 0xe9, 0x1b, 0xf9, 0x4f, 0xfd, - 0x80, 0x53, 0x5c, 0xcb, 0x27, 0x29, 0x98, 0x52, 0x54, 0xf4, 0x64, 0xb9, 0x8c, 0x0a, 0xc8, 0xfe, - 0xb5, 0x09, 0xfd, 0xc3, 0x98, 0x27, 0x6e, 0xc6, 0xc5, 0x02, 0x3c, 0xf4, 0xce, 0xf8, 0xc4, 0x55, - 0x2a, 0xdc, 0x01, 0x33, 0x8a, 0xe9, 0x72, 0x19, 0xef, 0x82, 0x7c, 0x18, 0x3b, 0x66, 0x14, 0x93, - 0x12, 0x6e, 0x7a, 0x2e, 0x6d, 0x4b, 0xdf, 0x4b, 0xb7, 0xe1, 0x3e, 0xb4, 0x46, 0x6e, 0xe6, 0x9e, - 0xb8, 0x29, 0x57, 0x36, 0x55, 0x30, 0x2d, 0x8e, 0xb8, 0x67, 0x49, 0x8b, 0x0a, 0x80, 0x24, 0xd1, - 0x6d, 0xd2, 0x9a, 0x12, 0x42, 0xee, 0xd3, 0x60, 0x9a, 0x9e, 0x91, 0x19, 0x5b, 0x8e, 0x00, 0x50, - 0x97, 0x3c, 0xe6, 0x5b, 0xb2, 0x5d, 0x0c, 0x00, 0x4e, 0x93, 0x68, 0x22, 0x0a, 0x0b, 0x35, 0xa0, - 0x96, 0xa3, 0x61, 0x14, 0xfd, 0x48, 0xac, 0x15, 0x50, 0xd0, 0x05, 0xc6, 0xce, 0x60, 0xe5, 0xf8, - 0x5d, 0x19, 0xf6, 0x8f, 0x79, 0xe6, 0xb2, 0xbe, 0x66, 0x0e, 0x40, 0x73, 0x20, 0x45, 0x1a, 0xe3, - 0x85, 0xd5, 0x43, 0x95, 0x9c, 0xaa, 0x56, 0x72, 0x94, 0x05, 0x6b, 0x14, 0xe2, 0xf4, 0x6d, 0xbf, - 0x07, 0xeb, 0xd2, 0x23, 0xc7, 0xef, 0xe2, 0xad, 0x4b, 0x7d, 0x21, 0xc8, 0xe2, 0x7a, 0xfb, 0xaf, - 0x06, 0xdc, 0x9a, 0x39, 0xf6, 0xd2, 0xbf, 0x2b, 0xbc, 0x0f, 0x35, 0x5c, 0xe3, 0x7a, 0x55, 0x4a, - 0xcd, 0x7b, 0x78, 0xc7, 0x42, 0x91, 0xdb, 0x08, 0x3c, 0x08, 0xb3, 0xe4, 0xca, 0xa1, 0x03, 0xfd, - 0xcf, 0xa0, 0x9d, 0xa3, 0x50, 0xee, 0x39, 0xbf, 0x52, 0xd5, 0xf7, 0x9c, 0x5f, 0xe1, 0x44, 0x71, - 0xe1, 0x06, 0x53, 0x61, 0x1a, 0xd9, 0x60, 0x4b, 0x86, 0x75, 0x04, 0xfd, 0x03, 0xf3, 0xdb, 0x86, - 0xfd, 0x23, 0xe8, 0x3d, 0x74, 0xc3, 0x51, 0x20, 0xe3, 0x51, 0x14, 0x05, 0x69, 0x82, 0x57, 0x35, - 0x13, 0x74, 0x50, 0x0a, 0x51, 0xaf, 0x89, 0xc6, 0x3b, 0xd0, 0x3e, 0x51, 0xed, 0x50, 0x1a, 0xbe, - 0x40, 0x50, 0xcc, 0x3c, 0x0b, 0x52, 0xb9, 0xfe, 0xd1, 0xb7, 0x7d, 0x0b, 0x6e, 0xee, 0xf3, 0x4c, - 0xdc, 0xbd, 0x7b, 0x3a, 0x96, 0x37, 0xdb, 0x9b, 0xb0, 0x5e, 0x46, 0x4b, 0xe3, 0x5a, 0x50, 0xf5, - 0x4e, 0xf3, 0x56, 0xe3, 0x9d, 0x8e, 0xed, 0x21, 0xdc, 0x15, 0xd3, 0xd2, 0xf4, 0x04, 0x55, 0xc0, - 0xd2, 0xf7, 0x45, 0x3c, 0x72, 0x33, 0xae, 0x1e, 0xb1, 0x03, 0xeb, 0xa9, 0xa0, 0xed, 0x9e, 0x8e, - 0x8f, 0xa2, 0x49, 0x30, 0xcc, 0x12, 0x3f, 0x54, 0x32, 0x16, 0xd2, 0xec, 0x03, 0x18, 0x2c, 0x13, - 0x2a, 0x15, 0xe9, 0x41, 0x53, 0xfe, 0xa8, 0x22, 0xdd, 0xac, 0xc0, 0x79, 0x3f, 0xdb, 0x63, 0xe8, - 0xef, 0xf3, 0x6c, 0x6e, 0x66, 0x2a, 0xca, 0x0e, 0xde, 0xf1, 0x79, 0xd1, 0x1e, 0x73, 0x98, 0x7d, - 0x03, 0xba, 0xa7, 0x7e, 0x90, 0xf1, 0x44, 0xee, 0x1c, 0x73, 0xb1, 0x5e, 0x22, 0xdb, 0x3f, 0xa9, - 0x82, 0x35, 0x7b, 0x4d, 0xee, 0x27, 0x63, 0x61, 0xd5, 0x30, 0x4b, 0x55, 0x83, 0x41, 0x6d, 0x82, - 0x85, 0x5d, 0xe6, 0x0c, 0x7e, 0x17, 0x89, 0x56, 0x5b, 0x92, 0x68, 0x9b, 0x70, 0x43, 0x4e, 0x7f, - 0x91, 0xda, 0x6b, 0xe4, 0x02, 0x31, 0x83, 0xc6, 0x81, 0x79, 0x06, 0x45, 0xeb, 0x86, 0xa8, 0x37, - 0x8b, 0x48, 0xda, 0x34, 0xde, 0xfc, 0x1a, 0xd3, 0x78, 0x2c, 0x08, 0xe2, 0xa7, 0x1f, 0x69, 0xb2, - 0x96, 0x10, 0xbe, 0x80, 0xc4, 0xde, 0x86, 0xb5, 0x98, 0x87, 0xb8, 0x10, 0x6b, 0xfc, 0x6d, 0xe2, - 0x9f, 0x27, 0xe0, 0x33, 0xa9, 0x55, 0x6a, 0xbc, 0x20, 0x9e, 0x39, 0x83, 0xb6, 0x7f, 0x6f, 0xc0, - 0xad, 0xc2, 0x0d, 0xf4, 0x93, 0xd6, 0x0b, 0xb6, 0xd3, 0x3e, 0xb4, 0xd2, 0xc4, 0x23, 0x4e, 0xd5, - 0x39, 0x15, 0x4c, 0x95, 0x3c, 0xcd, 0x04, 0x4d, 0xb6, 0x19, 0x05, 0xbf, 0xd8, 0x37, 0x3d, 0x68, - 0x4e, 0xca, 0xed, 0x53, 0x82, 0xf6, 0x5f, 0x0c, 0x78, 0x75, 0x61, 0x54, 0xfe, 0x17, 0x3f, 0x8f, - 0x42, 0xee, 0xba, 0x54, 0x16, 0xb3, 0xeb, 0xb7, 0x04, 0x9c, 0x37, 0x3e, 0x82, 0x95, 0xac, 0xb0, - 0x0c, 0x57, 0x3f, 0x8f, 0xbe, 0x52, 0x3e, 0xa8, 0x19, 0xcf, 0x29, 0xf3, 0xdb, 0xe7, 0xf0, 0x4a, - 0x49, 0xff, 0x52, 0xe5, 0xda, 0xa1, 0x29, 0x1c, 0x79, 0xb9, 0xac, 0x5f, 0xb7, 0x35, 0xc1, 0x62, - 0xea, 0x25, 0xaa, 0x93, 0xf3, 0x95, 0x12, 0xd1, 0x2c, 0x27, 0xa2, 0xfd, 0x3b, 0x13, 0x6e, 0xcc, - 0x5c, 0xc5, 0x56, 0xc1, 0xf4, 0x47, 0xd2, 0x91, 0xa6, 0x3f, 0x5a, 0x9a, 0x54, 0xba, 0x73, 0xab, - 0x33, 0xce, 0xc5, 0x32, 0x92, 0x78, 0x7b, 0x6e, 0xe6, 0xca, 0x2e, 0xad, 0xc0, 0x92, 0xdb, 0xeb, - 0x33, 0x6e, 0xef, 0x41, 0x73, 0x94, 0x66, 0x74, 0x4a, 0xe4, 0x8e, 0x02, 0xb1, 0x00, 0x53, 0x34, - 0xd2, 0x0f, 0x35, 0x62, 0xee, 0x29, 0x10, 0x6c, 0x3b, 0x5f, 0xbd, 0x5a, 0xd7, 0xda, 0x44, 0x72, - 0xe5, 0x53, 0x4f, 0x5b, 0x96, 0x0e, 0x9c, 0x7a, 0xb4, 0x88, 0x82, 0x72, 0x44, 0x3d, 0x9b, 0x29, - 0x73, 0xd2, 0x21, 0x2f, 0x1d, 0x4f, 0x6f, 0xa9, 0x61, 0x58, 0x84, 0xd2, 0xcd, 0x72, 0x44, 0x94, - 0xe6, 0xe1, 0x5f, 0x1a, 0x70, 0x57, 0xb5, 0xcc, 0xc5, 0x81, 0x70, 0x4f, 0x6b, 0x61, 0xf3, 0x92, - 0x64, 0x2b, 0xa3, 0x29, 0xfa, 0x93, 0x20, 0x10, 0xeb, 0x8f, 0xa9, 0xa6, 0x68, 0x85, 0x29, 0x45, - 0x46, 0x75, 0xa6, 0x44, 0xaf, 0x93, 0xb6, 0x8f, 0xc4, 0xcf, 0xe9, 0x35, 0x47, 0x00, 0xf6, 0x67, - 0x30, 0x58, 0xa6, 0xd7, 0xcb, 0xda, 0x63, 0xeb, 0x1c, 0x1a, 0x62, 0xee, 0x61, 0x2b, 0xd0, 0x7e, - 0x14, 0x52, 0x0e, 0x1d, 0xc6, 0x56, 0x85, 0xb5, 0xa0, 0x36, 0xcc, 0xa2, 0xd8, 0x32, 0x58, 0x1b, - 0xea, 0x4f, 0x70, 0xf0, 0xb5, 0x4c, 0x06, 0xd0, 0xc0, 0xc2, 0x38, 0xe1, 0x56, 0x15, 0xd1, 0xc3, - 0xcc, 0x4d, 0x32, 0xab, 0x86, 0x68, 0xd1, 0xc1, 0xac, 0x3a, 0x5b, 0x05, 0xf8, 0x64, 0x9a, 0x45, - 0x92, 0xad, 0x81, 0xb4, 0x3d, 0x1e, 0xf0, 0x8c, 0x5b, 0xcd, 0xad, 0x1f, 0xd3, 0x91, 0x31, 0x76, - 0xda, 0xae, 0xbc, 0x8b, 0x60, 0xab, 0xc2, 0x9a, 0x50, 0xfd, 0x9c, 0x5f, 0x5a, 0x06, 0xeb, 0x40, - 0xd3, 0x99, 0x86, 0xa1, 0x1f, 0x8e, 0xc5, 0x7d, 0x74, 0xf5, 0xc8, 0xaa, 0x22, 0x01, 0x15, 0x8a, - 0xf9, 0xc8, 0xaa, 0xb1, 0x2e, 0xb4, 0x3e, 0x95, 0xbf, 0x93, 0x5b, 0x75, 0x24, 0x21, 0x1b, 0x9e, - 0x69, 0x20, 0x89, 0x2e, 0x47, 0xa8, 0x89, 0x10, 0x9d, 0x42, 0xa8, 0xb5, 0x75, 0x08, 0x2d, 0xb5, - 0xe4, 0xb1, 0x1b, 0xd0, 0x91, 0x3a, 0x20, 0xca, 0xaa, 0xe0, 0x83, 0xa8, 0x2f, 0x5b, 0x06, 0x3e, - 0x1e, 0xd7, 0x35, 0xcb, 0xc4, 0x2f, 0xdc, 0xc9, 0xac, 0x2a, 0x19, 0xe4, 0x2a, 0xf4, 0xac, 0x1a, - 0x32, 0xd2, 0x6c, 0x6f, 0x8d, 0xb6, 0x1e, 0x43, 0x93, 0x3e, 0x0f, 0x71, 0x64, 0x59, 0x95, 0xf2, - 0x24, 0xc6, 0xaa, 0xa0, 0x4d, 0xf1, 0x76, 0xc1, 0x6d, 0xa0, 0x6d, 0xe8, 0x39, 0x02, 0x36, 0x51, - 0x05, 0x61, 0x27, 0x81, 0xa8, 0x6e, 0xfd, 0xd4, 0x80, 0x96, 0x9a, 0xca, 0xd9, 0x4d, 0xb8, 0xa1, - 0x8c, 0x24, 0x51, 0x42, 0xe2, 0x3e, 0xcf, 0x04, 0xc2, 0x32, 0xe8, 0x82, 0x1c, 0x34, 0xd1, 0xae, - 0x0e, 0x9f, 0x44, 0x17, 0x5c, 0x62, 0xaa, 0x78, 0x25, 0x2e, 0x81, 0x12, 0xae, 0xe1, 0x01, 0x84, - 0x29, 0xd5, 0xad, 0x3a, 0xbb, 0x0d, 0x0c, 0xc1, 0xc7, 0xfe, 0x18, 0xc3, 0x49, 0x8c, 0xca, 0xa9, - 0xd5, 0xd8, 0xfa, 0x18, 0x5a, 0x6a, 0x22, 0xd5, 0xf4, 0x50, 0xa8, 0x5c, 0x0f, 0x81, 0xb0, 0x8c, - 0xe2, 0x62, 0x89, 0x31, 0xb7, 0x8e, 0x69, 0x93, 0xc3, 0x81, 0x4e, 0xb3, 0x8c, 0xc4, 0xc8, 0xf0, - 0x3a, 0xf7, 0x63, 0xe9, 0x70, 0x1e, 0x07, 0xae, 0x97, 0x07, 0xd8, 0x05, 0x4f, 0x32, 0xab, 0x8a, - 0xdf, 0x8f, 0xc2, 0x1f, 0x72, 0x0f, 0x23, 0x0c, 0xdd, 0xe0, 0xa7, 0x99, 0x55, 0xdf, 0x3a, 0x80, - 0xce, 0xb1, 0x2a, 0xf4, 0x87, 0x31, 0x3e, 0x40, 0x29, 0x57, 0x60, 0xad, 0x0a, 0xde, 0x49, 0xd1, - 0x99, 0x63, 0x2d, 0x83, 0xad, 0xc1, 0x0a, 0x7a, 0xa3, 0x40, 0x99, 0x5b, 0x4f, 0x81, 0xcd, 0x97, - 0x28, 0x34, 0x5a, 0xa1, 0xb0, 0x55, 0x41, 0x4d, 0x3e, 0xe7, 0x97, 0xf8, 0x4d, 0x3e, 0x7c, 0x34, - 0x0e, 0xa3, 0x84, 0x13, 0x4d, 0xf9, 0x90, 0x7e, 0x8a, 0x43, 0x44, 0x75, 0xeb, 0x78, 0xa6, 0x98, - 0x1f, 0xc6, 0x5a, 0xb8, 0x13, 0x6c, 0x55, 0x28, 0xf8, 0x48, 0x8a, 0x40, 0x48, 0x03, 0x92, 0x18, - 0x81, 0x31, 0xf1, 0xa2, 0xdd, 0x80, 0xbb, 0x89, 0x80, 0xab, 0x3b, 0x7f, 0x6c, 0x40, 0x43, 0xcc, - 0xac, 0xec, 0x63, 0xe8, 0x68, 0x7f, 0x74, 0x64, 0x54, 0x69, 0xe7, 0xff, 0x44, 0xda, 0xff, 0xbf, - 0x39, 0xbc, 0x28, 0x0f, 0x76, 0x85, 0x7d, 0x04, 0x50, 0xec, 0xa8, 0xec, 0x16, 0x0d, 0x3e, 0xb3, - 0x3b, 0x6b, 0xbf, 0x47, 0xbf, 0x6e, 0x2c, 0xf8, 0x83, 0xaa, 0x5d, 0x61, 0xdf, 0x85, 0x15, 0x59, - 0x83, 0x44, 0x68, 0xb1, 0x81, 0xb6, 0x61, 0x2c, 0xd8, 0x3e, 0xaf, 0x15, 0xf6, 0x69, 0x2e, 0x4c, - 0x84, 0x0f, 0xeb, 0x2d, 0x58, 0x57, 0x84, 0x98, 0x57, 0x96, 0x2e, 0x32, 0x76, 0x85, 0xed, 0x43, - 0x47, 0xac, 0x1b, 0xa2, 0xb2, 0xde, 0x41, 0xde, 0x65, 0xfb, 0xc7, 0xb5, 0x0a, 0xed, 0x42, 0x57, - 0xdf, 0x10, 0x18, 0x59, 0x72, 0xc1, 0x2a, 0x21, 0x84, 0x2c, 0x5a, 0x26, 0xec, 0x0a, 0x73, 0xe1, - 0xf6, 0xe2, 0x39, 0x9f, 0xbd, 0x5e, 0xfc, 0x0c, 0xbb, 0x64, 0xb1, 0xe8, 0xdb, 0xd7, 0xb1, 0xe4, - 0x57, 0x7c, 0x1f, 0x7a, 0xf9, 0xe5, 0x79, 0x58, 0xcb, 0xa8, 0x18, 0x48, 0xd5, 0x96, 0xac, 0x06, - 0xfd, 0xd7, 0x96, 0xd2, 0x73, 0xf1, 0x47, 0xb0, 0x56, 0x30, 0x44, 0xc2, 0x7c, 0xec, 0xee, 0xdc, - 0xb9, 0x92, 0x59, 0x07, 0xcb, 0xc8, 0xb9, 0xd4, 0x1f, 0x14, 0xcb, 0x6d, 0x59, 0xf2, 0xeb, 0xba, - 0x6f, 0x17, 0x4b, 0xb7, 0xaf, 0x63, 0x51, 0x37, 0xdc, 0xef, 0xfd, 0xfd, 0xab, 0x81, 0xf1, 0xe5, - 0x57, 0x03, 0xe3, 0x5f, 0x5f, 0x0d, 0x8c, 0x9f, 0x3f, 0x1f, 0x54, 0xbe, 0x7c, 0x3e, 0xa8, 0xfc, - 0xf3, 0xf9, 0xa0, 0x72, 0xd2, 0xa0, 0x7f, 0x2b, 0xf8, 0xe6, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, - 0xff, 0xf4, 0xa4, 0xa8, 0x68, 0x20, 0x00, 0x00, + // 2880 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x3a, 0xcd, 0x6f, 0x24, 0x57, + 0xf1, 0xd3, 0xdd, 0xf3, 0x59, 0x33, 0xb6, 0xdb, 0x6f, 0xbd, 0xfb, 0x9b, 0x38, 0xbb, 0x13, 0xa7, + 0x37, 0xca, 0xcf, 0xb1, 0x82, 0x95, 0x98, 0xa0, 0xa0, 0x48, 0x90, 0x64, 0xed, 0x8d, 0x77, 0x83, + 0x37, 0xde, 0x6d, 0x3b, 0xcb, 0x09, 0x89, 0x76, 0xcf, 0xf3, 0xb8, 0x71, 0x4f, 0x77, 0x6f, 0x77, + 0x8f, 0x2d, 0x1f, 0x10, 0x17, 0xc4, 0x15, 0x2e, 0x20, 0x81, 0xb8, 0x80, 0x84, 0xc4, 0x89, 0x03, + 0x7f, 0x00, 0x47, 0xc8, 0x31, 0xe2, 0xc4, 0x11, 0x65, 0xff, 0x06, 0xae, 0x08, 0x55, 0xbd, 0xf7, + 0xba, 0x5f, 0xcf, 0x87, 0x37, 0x8b, 0xc4, 0xad, 0xeb, 0xe3, 0x55, 0xd5, 0xab, 0xaf, 0x57, 0x35, + 0x36, 0x2c, 0x0f, 0xc7, 0x97, 0x71, 0x7a, 0xce, 0xd3, 0xed, 0x24, 0x8d, 0xf3, 0x98, 0x99, 0xc9, + 0x89, 0xb3, 0x09, 0xec, 0xc9, 0x84, 0xa7, 0x57, 0x47, 0xb9, 0x97, 0x4f, 0x32, 0x97, 0x3f, 0x9b, + 0xf0, 0x2c, 0x67, 0x0c, 0xea, 0x91, 0x37, 0xe6, 0x7d, 0x63, 0xc3, 0xd8, 0xec, 0xb8, 0xf4, 0xed, + 0x24, 0xb0, 0xb6, 0x1b, 0x8f, 0xc7, 0x71, 0xf4, 0x7d, 0x92, 0xe1, 0xf2, 0x2c, 0x89, 0xa3, 0x8c, + 0xb3, 0x5b, 0xd0, 0x4c, 0x79, 0x36, 0x09, 0x73, 0xe2, 0x6e, 0xbb, 0x12, 0x62, 0x36, 0x58, 0xe3, + 0x6c, 0xd4, 0x37, 0x49, 0x04, 0x7e, 0x22, 0x67, 0x16, 0x4f, 0x52, 0x9f, 0xf7, 0x2d, 0x42, 0x4a, + 0x08, 0xf1, 0xc2, 0xae, 0x7e, 0x5d, 0xe0, 0x05, 0xe4, 0xfc, 0xc9, 0x80, 0x1b, 0x15, 0xe3, 0x5e, + 0x5a, 0xe3, 0x7b, 0xd0, 0x13, 0x3a, 0x84, 0x04, 0xd2, 0xdb, 0xdd, 0xb1, 0xb7, 0x93, 0x93, 0xed, + 0x23, 0x0d, 0xef, 0x56, 0xb8, 0xd8, 0xfb, 0xb0, 0x94, 0x4d, 0x4e, 0x8e, 0xbd, 0xec, 0x5c, 0x1e, + 0xab, 0x6f, 0x58, 0x9b, 0xdd, 0x9d, 0x55, 0x3a, 0xa6, 0x13, 0xdc, 0x2a, 0x9f, 0xf3, 0x07, 0x03, + 0xba, 0xbb, 0x67, 0xdc, 0x97, 0x30, 0x1a, 0x9a, 0x78, 0x59, 0xc6, 0x87, 0xca, 0x50, 0x01, 0xb1, + 0x35, 0x68, 0xe4, 0x71, 0xee, 0x85, 0x64, 0x6a, 0xc3, 0x15, 0x00, 0x1b, 0x00, 0x64, 0x13, 0xdf, + 0xe7, 0x59, 0x76, 0x3a, 0x09, 0xc9, 0xd4, 0x86, 0xab, 0x61, 0x50, 0xda, 0xa9, 0x17, 0x84, 0x7c, + 0x48, 0x6e, 0x6a, 0xb8, 0x12, 0x62, 0x7d, 0x68, 0x5d, 0x7a, 0x69, 0x14, 0x44, 0xa3, 0x7e, 0x83, + 0x08, 0x0a, 0xc4, 0x13, 0x43, 0x9e, 0x7b, 0x41, 0xd8, 0x6f, 0x6e, 0x18, 0x9b, 0x3d, 0x57, 0x42, + 0xce, 0xbf, 0x0d, 0x80, 0xbd, 0xc9, 0x38, 0x91, 0x66, 0x6e, 0x40, 0x97, 0x2c, 0x38, 0xf6, 0x4e, + 0x42, 0x9e, 0x91, 0xad, 0x96, 0xab, 0xa3, 0xd8, 0x26, 0xac, 0xf8, 0xf1, 0x38, 0x09, 0x79, 0xce, + 0x87, 0x92, 0x0b, 0x4d, 0x37, 0xdc, 0x69, 0x34, 0x7b, 0x03, 0x96, 0x4e, 0x83, 0x28, 0xc8, 0xce, + 0xf8, 0xf0, 0xde, 0x55, 0xce, 0x85, 0xcb, 0x0d, 0xb7, 0x8a, 0x64, 0x0e, 0xf4, 0x14, 0xc2, 0x8d, + 0x2f, 0x33, 0xba, 0x90, 0xe1, 0x56, 0x70, 0xec, 0x6d, 0x58, 0xe5, 0x59, 0x1e, 0x8c, 0xbd, 0x9c, + 0x1f, 0xa3, 0x29, 0xc4, 0xd8, 0x20, 0xc6, 0x59, 0x02, 0xc6, 0xfe, 0x24, 0xc9, 0xe8, 0x9e, 0x96, + 0x8b, 0x9f, 0x6c, 0x1d, 0xda, 0x49, 0x1a, 0x8f, 0x52, 0x9e, 0x65, 0xfd, 0x16, 0xa5, 0x44, 0x01, + 0x3b, 0x5f, 0x18, 0x00, 0x07, 0xb1, 0x37, 0x94, 0x0e, 0x98, 0x31, 0x5a, 0xb8, 0x60, 0xca, 0xe8, + 0x01, 0x00, 0xf9, 0x44, 0xb0, 0x98, 0xc4, 0xa2, 0x61, 0x2a, 0x0a, 0xad, 0xaa, 0x42, 0x3c, 0x3b, + 0xe6, 0xb9, 0x77, 0x2f, 0x88, 0xc2, 0x78, 0x24, 0xd3, 0x5c, 0xc3, 0xb0, 0x37, 0x61, 0xb9, 0x84, + 0xf6, 0x8f, 0x1f, 0xee, 0xd1, 0x4d, 0x3b, 0xee, 0x14, 0x76, 0xf6, 0x9a, 0xce, 0x2f, 0x0d, 0x58, + 0x3a, 0x3a, 0xf3, 0xd2, 0x61, 0x10, 0x8d, 0xf6, 0xd3, 0x78, 0x92, 0x60, 0xd4, 0x73, 0x2f, 0x1d, + 0xf1, 0x5c, 0x96, 0xaf, 0x84, 0xb0, 0xa8, 0xf7, 0xf6, 0x0e, 0xd0, 0x72, 0x0b, 0x8b, 0x1a, 0xbf, + 0xc5, 0xcd, 0xd3, 0x2c, 0x3f, 0x88, 0x7d, 0x2f, 0x0f, 0xe2, 0x48, 0x1a, 0x5e, 0x45, 0x52, 0xe1, + 0x5e, 0x45, 0x3e, 0x65, 0x9e, 0x45, 0x85, 0x4b, 0x10, 0xde, 0x78, 0x12, 0x49, 0x4a, 0x83, 0x28, + 0x05, 0xec, 0xfc, 0xab, 0x0e, 0x70, 0x74, 0x15, 0xf9, 0x53, 0x39, 0x76, 0xff, 0x82, 0x47, 0x79, + 0x35, 0xc7, 0x04, 0x0a, 0x85, 0x89, 0x94, 0x4b, 0x94, 0x73, 0x0b, 0x98, 0xdd, 0x86, 0x4e, 0xca, + 0x7d, 0x1e, 0xe5, 0x48, 0xb4, 0x88, 0x58, 0x22, 0x30, 0x9b, 0xc6, 0x5e, 0x96, 0xf3, 0xb4, 0xe2, + 0xde, 0x0a, 0x8e, 0x6d, 0x81, 0xad, 0xc3, 0xfb, 0x79, 0x30, 0x94, 0x2e, 0x9e, 0xc1, 0xa3, 0x3c, + 0xba, 0x84, 0x92, 0xd7, 0x14, 0xf2, 0x74, 0x1c, 0xca, 0xd3, 0x61, 0x92, 0x27, 0xb2, 0x6c, 0x06, + 0x8f, 0xf2, 0x4e, 0xc2, 0xd8, 0x3f, 0x0f, 0xa2, 0x11, 0x05, 0xa0, 0x4d, 0xae, 0xaa, 0xe0, 0xd8, + 0x77, 0xc0, 0x9e, 0x44, 0x29, 0xcf, 0xe2, 0xf0, 0x82, 0x0f, 0x29, 0x8e, 0x59, 0xbf, 0xa3, 0xb5, + 0x1d, 0x3d, 0xc2, 0xee, 0x0c, 0xab, 0x16, 0x21, 0x10, 0x9d, 0x46, 0x46, 0x68, 0x00, 0x70, 0x42, + 0x86, 0x1c, 0x5f, 0x25, 0xbc, 0xdf, 0x15, 0x79, 0x57, 0x62, 0xd8, 0x3b, 0x70, 0x23, 0xe3, 0x7e, + 0x1c, 0x0d, 0xb3, 0x7b, 0xfc, 0x2c, 0x88, 0x86, 0x8f, 0xc8, 0x17, 0xfd, 0x1e, 0xb9, 0x78, 0x1e, + 0x09, 0x33, 0x86, 0x0c, 0xdf, 0xdb, 0x3b, 0x38, 0xbc, 0x8c, 0x78, 0xda, 0x5f, 0x12, 0x19, 0x53, + 0x41, 0x62, 0xb8, 0xfd, 0x38, 0x3a, 0x0d, 0x03, 0x3f, 0x7f, 0x94, 0x8d, 0xfa, 0xcb, 0xc4, 0xa3, + 0xa3, 0x30, 0xa4, 0x79, 0x51, 0xd6, 0x2b, 0x22, 0xa4, 0x05, 0xa2, 0x48, 0x06, 0x37, 0xc9, 0xfa, + 0xb6, 0x96, 0x0c, 0xae, 0x9e, 0x0c, 0x48, 0x5c, 0xd5, 0x93, 0xc1, 0x4d, 0x32, 0xe7, 0xb7, 0x06, + 0xf4, 0xf4, 0xde, 0xae, 0xbd, 0x3a, 0xc6, 0x82, 0x57, 0xc7, 0xd4, 0x5f, 0x1d, 0xf6, 0x56, 0xf1, + 0xba, 0x88, 0xd7, 0x82, 0xfc, 0xff, 0x38, 0x8d, 0xb1, 0x0d, 0xbb, 0x44, 0x28, 0x1e, 0x9c, 0x77, + 0xa1, 0x9b, 0xf2, 0xd0, 0xbb, 0x2a, 0x9e, 0x09, 0xe4, 0x5f, 0x41, 0x7e, 0xb7, 0x44, 0xbb, 0x3a, + 0x8f, 0xf3, 0x37, 0x13, 0xba, 0x1a, 0x71, 0x26, 0x77, 0x8d, 0xaf, 0x99, 0xbb, 0xe6, 0x82, 0xdc, + 0xdd, 0x50, 0x26, 0x4d, 0x4e, 0xf6, 0x82, 0x54, 0x96, 0xb3, 0x8e, 0x2a, 0x38, 0x2a, 0xc5, 0xa2, + 0xa3, 0xb0, 0xdb, 0x6b, 0xa0, 0x56, 0x2a, 0xd3, 0x68, 0xb6, 0x0d, 0x8c, 0x50, 0xbb, 0x5e, 0xee, + 0x9f, 0x7d, 0x9e, 0xc8, 0xec, 0x69, 0x52, 0x0a, 0xce, 0xa1, 0xb0, 0xd7, 0xa0, 0x91, 0xe5, 0xde, + 0x88, 0x53, 0xa9, 0x2c, 0xef, 0x74, 0x28, 0xb5, 0x11, 0xe1, 0x0a, 0xbc, 0xe6, 0xfc, 0xf6, 0x0b, + 0x9c, 0xef, 0xfc, 0xd9, 0x82, 0xa5, 0xca, 0x6b, 0x3c, 0x6f, 0x6a, 0x29, 0x35, 0x9a, 0x0b, 0x34, + 0x6e, 0x40, 0x7d, 0x12, 0x05, 0x22, 0xd8, 0xcb, 0x3b, 0x3d, 0xa4, 0x7f, 0x1e, 0x05, 0x39, 0x56, + 0x87, 0x4b, 0x14, 0xcd, 0xa6, 0xfa, 0x8b, 0x12, 0xe2, 0x1d, 0xb8, 0x51, 0x96, 0xe6, 0xde, 0xde, + 0xc1, 0x41, 0xec, 0x9f, 0x17, 0xbd, 0x7c, 0x1e, 0x89, 0x31, 0x31, 0xb3, 0x50, 0x8b, 0x79, 0x50, + 0x13, 0x53, 0xcb, 0xff, 0x43, 0xc3, 0xc7, 0x29, 0x82, 0xbc, 0x24, 0x13, 0x4a, 0x1b, 0x2b, 0x1e, + 0xd4, 0x5c, 0x41, 0x67, 0x6f, 0x40, 0x7d, 0x38, 0x19, 0x27, 0xd2, 0x57, 0xcb, 0xc8, 0x57, 0x3e, + 0xeb, 0x0f, 0x6a, 0x2e, 0x51, 0x91, 0x2b, 0x8c, 0xbd, 0x61, 0xbf, 0x53, 0x72, 0x95, 0x6f, 0x1f, + 0x72, 0x21, 0x15, 0xb9, 0xb0, 0x67, 0x50, 0xff, 0x90, 0x5c, 0x65, 0xfb, 0x46, 0x2e, 0xa4, 0xb2, + 0xf7, 0x00, 0x2e, 0xbc, 0x30, 0x18, 0x8a, 0xc7, 0xa2, 0x4b, 0xbc, 0x6b, 0xc8, 0xfb, 0xb4, 0xc0, + 0xca, 0xac, 0xd7, 0xf8, 0xee, 0xb5, 0xa1, 0x99, 0x89, 0xf4, 0xff, 0x2e, 0xac, 0x56, 0x62, 0x76, + 0x10, 0x64, 0xe4, 0x60, 0x41, 0xee, 0x1b, 0x8b, 0x06, 0x2d, 0x75, 0x7e, 0x00, 0x40, 0x9e, 0xb8, + 0x9f, 0xa6, 0x71, 0xaa, 0x06, 0x3e, 0xa3, 0x18, 0xf8, 0x9c, 0x3b, 0xd0, 0x41, 0x0f, 0x5c, 0x43, + 0xc6, 0xab, 0x2f, 0x22, 0x27, 0xd0, 0xa3, 0x3b, 0x3f, 0x39, 0x58, 0xc0, 0xc1, 0x76, 0x60, 0x4d, + 0x4c, 0x5d, 0xa2, 0x08, 0x1e, 0xc7, 0x59, 0x40, 0x9e, 0x10, 0xe5, 0x38, 0x97, 0x86, 0xbd, 0x8c, + 0xa3, 0xb8, 0xa3, 0x27, 0x07, 0x6a, 0x2e, 0x50, 0xb0, 0xf3, 0x2d, 0xe8, 0xa0, 0x46, 0xa1, 0x6e, + 0x13, 0x9a, 0x44, 0x50, 0x7e, 0xb0, 0x8b, 0x20, 0x48, 0x83, 0x5c, 0x49, 0x77, 0x7e, 0x6e, 0x40, + 0x57, 0x34, 0x39, 0x71, 0xf2, 0x65, 0x7b, 0xdc, 0x46, 0xe5, 0xb8, 0xea, 0x12, 0xba, 0xc4, 0x6d, + 0x00, 0x6a, 0x53, 0x82, 0xa1, 0x5e, 0x26, 0x45, 0x89, 0x75, 0x35, 0x0e, 0x0c, 0x4c, 0x09, 0xcd, + 0x71, 0xed, 0xaf, 0x4d, 0xe8, 0xc9, 0x90, 0x0a, 0x96, 0xff, 0x51, 0xb1, 0xca, 0x7a, 0xaa, 0xeb, + 0xf5, 0xf4, 0xa6, 0xaa, 0xa7, 0x46, 0x79, 0x8d, 0x32, 0x8b, 0xca, 0x72, 0xba, 0x2b, 0xcb, 0xa9, + 0x49, 0x6c, 0x4b, 0xaa, 0x9c, 0x14, 0x97, 0xa8, 0xa6, 0xbb, 0xb2, 0x9a, 0x5a, 0x25, 0x53, 0x91, + 0x52, 0x45, 0x31, 0xdd, 0x95, 0xc5, 0xd4, 0x2e, 0x99, 0x8a, 0x30, 0xab, 0x5a, 0xba, 0xd7, 0x82, + 0x06, 0x85, 0xd3, 0xf9, 0x00, 0x6c, 0xdd, 0x35, 0x54, 0x13, 0x6f, 0x4a, 0x62, 0x25, 0x15, 0x34, + 0x26, 0x57, 0x9e, 0x7d, 0x06, 0x4b, 0x95, 0x56, 0x84, 0x2f, 0x7e, 0x90, 0xed, 0x7a, 0x91, 0xcf, + 0xc3, 0x62, 0xef, 0xd0, 0x30, 0x5a, 0x92, 0x99, 0xa5, 0x64, 0x29, 0xa2, 0x92, 0x64, 0xda, 0xf6, + 0x60, 0x55, 0xb6, 0x87, 0xbf, 0x1b, 0xd0, 0xd3, 0x0f, 0xe0, 0x02, 0x72, 0x3f, 0x4d, 0x77, 0xe3, + 0xa1, 0x88, 0x66, 0xc3, 0x55, 0x20, 0xa6, 0x3e, 0x7e, 0x86, 0x5e, 0x96, 0xc9, 0x0c, 0x2c, 0x60, + 0x49, 0x3b, 0xf2, 0xe3, 0x44, 0xed, 0x83, 0x05, 0x2c, 0x69, 0x07, 0xfc, 0x82, 0x87, 0xf2, 0x81, + 0x2a, 0x60, 0xd4, 0xf6, 0x88, 0x67, 0x19, 0xa6, 0x89, 0xe8, 0xab, 0x0a, 0xc4, 0x53, 0xae, 0x77, + 0xb9, 0xeb, 0x4d, 0x32, 0x2e, 0x67, 0xb6, 0x02, 0x46, 0xb7, 0xe0, 0xde, 0xea, 0xa5, 0xf1, 0x24, + 0x52, 0x93, 0x9a, 0x86, 0x71, 0x2e, 0x61, 0xf5, 0xf1, 0x24, 0x1d, 0x71, 0x4a, 0x62, 0xb5, 0x06, + 0xaf, 0x43, 0x3b, 0x88, 0x3c, 0x3f, 0x0f, 0x2e, 0xb8, 0xf4, 0x64, 0x01, 0x63, 0xfe, 0xe6, 0xc1, + 0x98, 0xcb, 0x51, 0x95, 0xbe, 0x91, 0xff, 0x34, 0x08, 0x39, 0xe5, 0xb5, 0xbc, 0x92, 0x82, 0xa9, + 0x44, 0xc5, 0x9b, 0x2c, 0x97, 0x5c, 0x01, 0x39, 0xbf, 0x31, 0x61, 0xfd, 0x30, 0xe1, 0xa9, 0x97, + 0x73, 0xb1, 0x58, 0x1f, 0xf9, 0x67, 0x7c, 0xec, 0x29, 0x13, 0x6e, 0x83, 0x19, 0x27, 0xa4, 0x5c, + 0xe6, 0xbb, 0x20, 0x1f, 0x26, 0xae, 0x19, 0x27, 0x64, 0x84, 0x97, 0x9d, 0x4b, 0xdf, 0xd2, 0xf7, + 0xc2, 0x2d, 0x7b, 0x1d, 0xda, 0x43, 0x2f, 0xf7, 0x4e, 0xbc, 0x8c, 0x2b, 0x9f, 0x2a, 0x98, 0x16, + 0x52, 0xdc, 0xdf, 0xa4, 0x47, 0x05, 0x40, 0x92, 0x48, 0x9b, 0xf4, 0xa6, 0x84, 0x90, 0xfb, 0x34, + 0x9c, 0x64, 0x67, 0xe4, 0xc6, 0xb6, 0x2b, 0x00, 0xb4, 0xa5, 0xc8, 0xf9, 0xb6, 0x7c, 0x2e, 0x06, + 0x00, 0xa7, 0x69, 0x3c, 0x16, 0x8d, 0x85, 0x1e, 0xa0, 0xb6, 0xab, 0x61, 0x14, 0xfd, 0x58, 0xac, + 0x2b, 0x50, 0xd2, 0x05, 0xc6, 0xc9, 0x61, 0xe9, 0xe9, 0xbb, 0x32, 0xed, 0x1f, 0xf1, 0xdc, 0x63, + 0xeb, 0x9a, 0x3b, 0x00, 0xdd, 0x81, 0x14, 0xe9, 0x8c, 0x17, 0x76, 0x0f, 0xd5, 0x72, 0x2c, 0xad, + 0xe5, 0x28, 0x0f, 0xd6, 0x29, 0xc5, 0xe9, 0xdb, 0x79, 0x0f, 0xd6, 0x64, 0x44, 0x9e, 0xbe, 0x8b, + 0x5a, 0x17, 0xc6, 0x42, 0x90, 0x85, 0x7a, 0xe7, 0xaf, 0x06, 0xdc, 0x9c, 0x3a, 0xf6, 0xd2, 0xbf, + 0x57, 0xbc, 0x0f, 0x75, 0x5c, 0xf8, 0xfa, 0x16, 0x95, 0xe6, 0x5d, 0xd4, 0x31, 0x57, 0xe4, 0x36, + 0x02, 0xf7, 0xa3, 0x3c, 0xbd, 0x72, 0xe9, 0xc0, 0xfa, 0xa7, 0xd0, 0x29, 0x50, 0x28, 0xf7, 0x9c, + 0x5f, 0xa9, 0xee, 0x7b, 0xce, 0xaf, 0x70, 0xa2, 0xb8, 0xf0, 0xc2, 0x89, 0x70, 0x8d, 0x7c, 0x60, + 0x2b, 0x8e, 0x75, 0x05, 0xfd, 0x03, 0xf3, 0xdb, 0x86, 0xf3, 0x63, 0xe8, 0x3f, 0xf0, 0xa2, 0x61, + 0x28, 0xf3, 0x51, 0x34, 0x05, 0xe9, 0x82, 0x57, 0x35, 0x17, 0x74, 0x51, 0x0a, 0x51, 0xaf, 0xc9, + 0xc6, 0xdb, 0xd0, 0x39, 0x51, 0xcf, 0xa1, 0x74, 0x7c, 0x89, 0xa0, 0x9c, 0x79, 0x16, 0x66, 0x72, + 0xad, 0xa4, 0x6f, 0xe7, 0x26, 0xdc, 0xd8, 0xe7, 0xb9, 0xd0, 0xbd, 0x7b, 0x3a, 0x92, 0x9a, 0x9d, + 0x4d, 0x58, 0xab, 0xa2, 0xa5, 0x73, 0x6d, 0xb0, 0xfc, 0xd3, 0xe2, 0xa9, 0xf1, 0x4f, 0x47, 0xce, + 0x11, 0xdc, 0x11, 0xd3, 0xd2, 0xe4, 0x04, 0x4d, 0xc0, 0xd6, 0xf7, 0x79, 0x32, 0xf4, 0x72, 0xae, + 0x2e, 0xb1, 0x03, 0x6b, 0x99, 0xa0, 0xed, 0x9e, 0x8e, 0x8e, 0xe3, 0x71, 0x78, 0x94, 0xa7, 0x41, + 0xa4, 0x64, 0xcc, 0xa5, 0x39, 0x07, 0x30, 0x58, 0x24, 0x54, 0x1a, 0xd2, 0x87, 0x96, 0xfc, 0xb1, + 0x46, 0x86, 0x59, 0x81, 0xb3, 0x71, 0x76, 0x46, 0xb0, 0xbe, 0xcf, 0xf3, 0x99, 0x99, 0xa9, 0x6c, + 0x3b, 0xa8, 0xe3, 0xb3, 0xf2, 0x79, 0x2c, 0x60, 0xf6, 0x0d, 0xe8, 0x9d, 0x06, 0x61, 0xce, 0x53, + 0xb9, 0x73, 0xcc, 0xe4, 0x7a, 0x85, 0xec, 0xfc, 0xd4, 0x02, 0x7b, 0x5a, 0x4d, 0x11, 0x27, 0x63, + 0x6e, 0xd7, 0x30, 0x2b, 0x5d, 0x83, 0x41, 0x7d, 0x8c, 0x8d, 0x5d, 0xd6, 0x0c, 0x7e, 0x97, 0x85, + 0x56, 0x5f, 0x50, 0x68, 0x9b, 0xb0, 0x22, 0xa7, 0xbf, 0x58, 0xed, 0x35, 0x72, 0x81, 0x98, 0x42, + 0xe3, 0xc0, 0x3c, 0x85, 0xa2, 0x75, 0x43, 0xf4, 0x9b, 0x79, 0x24, 0x6d, 0x1a, 0x6f, 0x7d, 0x8d, + 0x69, 0x3c, 0x11, 0x04, 0xf1, 0x93, 0x92, 0x74, 0x59, 0x5b, 0x08, 0x9f, 0x43, 0x62, 0x6f, 0xc3, + 0x6a, 0xc2, 0x23, 0x5c, 0xb4, 0x35, 0xfe, 0x0e, 0xf1, 0xcf, 0x12, 0xf0, 0x9a, 0xf4, 0x54, 0x6a, + 0xbc, 0x20, 0xae, 0x39, 0x85, 0x76, 0x7e, 0x6f, 0xc0, 0xcd, 0x32, 0x0c, 0xf4, 0x53, 0xd9, 0x0b, + 0xb6, 0xd3, 0x75, 0x68, 0x67, 0xa9, 0x4f, 0x9c, 0xea, 0xe5, 0x54, 0x30, 0x75, 0xf2, 0x2c, 0x17, + 0x34, 0xf9, 0xcc, 0x28, 0xf8, 0xc5, 0xb1, 0xe9, 0x43, 0x6b, 0x5c, 0x7d, 0x3e, 0x25, 0xe8, 0xfc, + 0xc5, 0x80, 0x57, 0xe7, 0x66, 0xe5, 0x7f, 0xf1, 0xb3, 0x2b, 0x14, 0xa1, 0xcb, 0x64, 0x33, 0xbb, + 0x7e, 0x4b, 0xc0, 0x79, 0xe3, 0x43, 0x58, 0xca, 0x4b, 0xcf, 0x70, 0xf5, 0xb3, 0xeb, 0x2b, 0xd5, + 0x83, 0x9a, 0xf3, 0xdc, 0x2a, 0xbf, 0x73, 0x0e, 0xaf, 0x54, 0xec, 0xaf, 0x74, 0xae, 0x1d, 0x9a, + 0xc2, 0x91, 0x97, 0xcb, 0xfe, 0x75, 0x4b, 0x13, 0x2c, 0xa6, 0x5e, 0xa2, 0xba, 0x05, 0x5f, 0xa5, + 0x10, 0xcd, 0x6a, 0x21, 0x3a, 0xbf, 0x33, 0x61, 0x65, 0x4a, 0x15, 0x5b, 0x06, 0x33, 0x18, 0xca, + 0x40, 0x9a, 0xc1, 0x70, 0x61, 0x51, 0xe9, 0xc1, 0xb5, 0xa6, 0x82, 0x8b, 0x6d, 0x24, 0xf5, 0xf7, + 0xbc, 0xdc, 0x93, 0xaf, 0xb4, 0x02, 0x2b, 0x61, 0x6f, 0x4c, 0x85, 0xbd, 0x0f, 0xad, 0x61, 0x96, + 0xd3, 0x29, 0x51, 0x3b, 0x0a, 0xc4, 0x06, 0x4c, 0xd9, 0x48, 0x3f, 0x00, 0x89, 0xb9, 0xa7, 0x44, + 0xb0, 0xed, 0x62, 0xf5, 0x6a, 0x5f, 0xeb, 0x13, 0xc9, 0x55, 0x4c, 0x3d, 0x1d, 0xd9, 0x3a, 0x70, + 0xea, 0xd1, 0x32, 0x0a, 0xaa, 0x19, 0xf5, 0x6c, 0xaa, 0xcd, 0xc9, 0x80, 0xbc, 0x74, 0x3e, 0xbd, + 0xa5, 0x86, 0x61, 0x91, 0x4a, 0x37, 0xaa, 0x19, 0x51, 0x99, 0x87, 0x7f, 0x65, 0xc0, 0x1d, 0xf5, + 0x64, 0xce, 0x4f, 0x84, 0xbb, 0xda, 0x13, 0x36, 0x2b, 0x49, 0x3e, 0x65, 0x34, 0x45, 0x7f, 0x1c, + 0x86, 0x62, 0xfd, 0x31, 0xd5, 0x14, 0xad, 0x30, 0x95, 0xcc, 0xb0, 0xa6, 0x5a, 0xf4, 0x1a, 0x59, + 0xfb, 0x50, 0xfc, 0x4c, 0x5f, 0x77, 0x05, 0xe0, 0x7c, 0x0a, 0x83, 0x45, 0x76, 0xbd, 0xac, 0x3f, + 0xb6, 0xce, 0xa1, 0x29, 0xe6, 0x1e, 0xb6, 0x04, 0x9d, 0x87, 0x11, 0xd5, 0xd0, 0x61, 0x62, 0xd7, + 0x58, 0x1b, 0xea, 0x47, 0x79, 0x9c, 0xd8, 0x06, 0xeb, 0x40, 0xe3, 0x31, 0x0e, 0xbe, 0xb6, 0xc9, + 0x00, 0x9a, 0xd8, 0x18, 0xc7, 0xdc, 0xb6, 0x10, 0x7d, 0x94, 0x7b, 0x69, 0x6e, 0xd7, 0x11, 0x2d, + 0x5e, 0x30, 0xbb, 0xc1, 0x96, 0x01, 0x3e, 0x9e, 0xe4, 0xb1, 0x64, 0x6b, 0x22, 0x6d, 0x8f, 0x87, + 0x3c, 0xe7, 0x76, 0x6b, 0xeb, 0x27, 0x74, 0x64, 0x84, 0x2f, 0x6d, 0x4f, 0xea, 0x22, 0xd8, 0xae, + 0xb1, 0x16, 0x58, 0x9f, 0xf1, 0x4b, 0xdb, 0x60, 0x5d, 0x68, 0xb9, 0x93, 0x28, 0x0a, 0xa2, 0x91, + 0xd0, 0x47, 0xaa, 0x87, 0xb6, 0x85, 0x04, 0x34, 0x28, 0xe1, 0x43, 0xbb, 0xce, 0x7a, 0xd0, 0xfe, + 0x44, 0xfe, 0xa2, 0x6e, 0x37, 0x90, 0x84, 0x6c, 0x78, 0xa6, 0x89, 0x24, 0x52, 0x8e, 0x50, 0x0b, + 0x21, 0x3a, 0x85, 0x50, 0x7b, 0xeb, 0x10, 0xda, 0x6a, 0xc9, 0x63, 0x2b, 0xd0, 0x95, 0x36, 0x20, + 0xca, 0xae, 0xe1, 0x85, 0xe8, 0x5d, 0xb6, 0x0d, 0xbc, 0x3c, 0xae, 0x6b, 0xb6, 0x89, 0x5f, 0xb8, + 0x93, 0xd9, 0x16, 0x39, 0xe4, 0x2a, 0xf2, 0xed, 0x3a, 0x32, 0xd2, 0x6c, 0x6f, 0x0f, 0xb7, 0x1e, + 0x41, 0x8b, 0x3e, 0x0f, 0x71, 0x64, 0x59, 0x96, 0xf2, 0x24, 0xc6, 0xae, 0xa1, 0x4f, 0x51, 0xbb, + 0xe0, 0x36, 0xd0, 0x37, 0x74, 0x1d, 0x01, 0x9b, 0x68, 0x82, 0xf0, 0x93, 0x40, 0x58, 0x5b, 0x3f, + 0x33, 0xa0, 0xad, 0xa6, 0x72, 0x76, 0x03, 0x56, 0x94, 0x93, 0x24, 0x4a, 0x48, 0xdc, 0xe7, 0xb9, + 0x40, 0xd8, 0x06, 0x29, 0x28, 0x40, 0x13, 0xfd, 0xea, 0xf2, 0x71, 0x7c, 0xc1, 0x25, 0xc6, 0x42, + 0x95, 0xb8, 0x04, 0x4a, 0xb8, 0x8e, 0x07, 0x10, 0xa6, 0x52, 0xb7, 0x1b, 0xec, 0x16, 0x30, 0x04, + 0x1f, 0x05, 0x23, 0x4c, 0x27, 0x31, 0x2a, 0x67, 0x76, 0x73, 0xeb, 0x23, 0x68, 0xab, 0x89, 0x54, + 0xb3, 0x43, 0xa1, 0x0a, 0x3b, 0x04, 0xc2, 0x36, 0x4a, 0xc5, 0x12, 0x63, 0x6e, 0x3d, 0xa5, 0x4d, + 0x0e, 0x07, 0x3a, 0xcd, 0x33, 0x12, 0x23, 0xd3, 0xeb, 0x3c, 0x48, 0x64, 0xc0, 0x79, 0x12, 0x7a, + 0x7e, 0x91, 0x60, 0x17, 0x3c, 0xcd, 0x6d, 0x0b, 0xbf, 0x1f, 0x46, 0x3f, 0xe2, 0x3e, 0x66, 0x18, + 0x86, 0x21, 0xc8, 0x72, 0xbb, 0xb1, 0x75, 0x00, 0xdd, 0xa7, 0xaa, 0xd1, 0x1f, 0x26, 0x78, 0x01, + 0x65, 0x5c, 0x89, 0xb5, 0x6b, 0xa8, 0x93, 0xb2, 0xb3, 0xc0, 0xda, 0x06, 0x5b, 0x85, 0x25, 0x8c, + 0x46, 0x89, 0x32, 0xb7, 0x9e, 0x00, 0x9b, 0x6d, 0x51, 0xe8, 0xb4, 0xd2, 0x60, 0xbb, 0x86, 0x96, + 0x7c, 0xc6, 0x2f, 0xf1, 0x9b, 0x62, 0xf8, 0x70, 0x14, 0xc5, 0x29, 0x27, 0x9a, 0x8a, 0x21, 0xfd, + 0x14, 0x87, 0x08, 0x6b, 0xeb, 0xe9, 0x54, 0x33, 0x3f, 0x4c, 0xb4, 0x74, 0x27, 0xd8, 0xae, 0x51, + 0xf2, 0x91, 0x14, 0x81, 0x90, 0x0e, 0x24, 0x31, 0x02, 0x63, 0xa2, 0xa2, 0xdd, 0x90, 0x7b, 0xa9, + 0x80, 0xad, 0x9d, 0x3f, 0x36, 0xa1, 0x29, 0x66, 0x56, 0xf6, 0x11, 0x74, 0xb5, 0x3f, 0x66, 0x32, + 0xea, 0xb4, 0xb3, 0x7f, 0x7a, 0x5d, 0xff, 0xbf, 0x19, 0xbc, 0x68, 0x0f, 0x4e, 0x8d, 0x7d, 0x08, + 0x50, 0xee, 0xa8, 0xec, 0x26, 0x0d, 0x3e, 0xd3, 0x3b, 0xeb, 0x7a, 0x9f, 0x7e, 0xdd, 0x98, 0xf3, + 0x87, 0x5a, 0xa7, 0xc6, 0xbe, 0x07, 0x4b, 0xb2, 0x07, 0x89, 0xd4, 0x62, 0x03, 0x6d, 0xc3, 0x98, + 0xb3, 0x7d, 0x5e, 0x2b, 0xec, 0x93, 0x42, 0x98, 0x48, 0x1f, 0xd6, 0x9f, 0xb3, 0xae, 0x08, 0x31, + 0xaf, 0x2c, 0x5c, 0x64, 0x9c, 0x1a, 0xdb, 0x87, 0xae, 0x58, 0x37, 0x44, 0x67, 0xbd, 0x8d, 0xbc, + 0x8b, 0xf6, 0x8f, 0x6b, 0x0d, 0xda, 0x85, 0x9e, 0xbe, 0x21, 0x30, 0xf2, 0xe4, 0x9c, 0x55, 0x42, + 0x08, 0x99, 0xb7, 0x4c, 0x38, 0x35, 0xe6, 0xc1, 0xad, 0xf9, 0x73, 0x3e, 0x7b, 0xbd, 0xfc, 0x19, + 0x76, 0xc1, 0x62, 0xb1, 0xee, 0x5c, 0xc7, 0x52, 0xa8, 0xf8, 0x01, 0xf4, 0x0b, 0xe5, 0x45, 0x5a, + 0xcb, 0xac, 0x18, 0x48, 0xd3, 0x16, 0xac, 0x06, 0xeb, 0xaf, 0x2d, 0xa4, 0x17, 0xe2, 0x8f, 0x61, + 0xb5, 0x64, 0x88, 0x85, 0xfb, 0xd8, 0x9d, 0x99, 0x73, 0x15, 0xb7, 0x0e, 0x16, 0x91, 0x0b, 0xa9, + 0x3f, 0x2c, 0x97, 0xdb, 0xaa, 0xe4, 0xd7, 0xf5, 0xd8, 0xce, 0x97, 0xee, 0x5c, 0xc7, 0xa2, 0x34, + 0xdc, 0xeb, 0x7f, 0xf1, 0xd5, 0xc0, 0xf8, 0xf2, 0xab, 0x81, 0xf1, 0xcf, 0xaf, 0x06, 0xc6, 0x2f, + 0x9e, 0x0f, 0x6a, 0x5f, 0x3e, 0x1f, 0xd4, 0xfe, 0xf1, 0x7c, 0x50, 0x3b, 0x69, 0xd2, 0xbf, 0x2b, + 0x7c, 0xf3, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x83, 0xfc, 0xb2, 0x14, 0xc0, 0x20, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -4345,6 +4387,18 @@ func (m *DumpStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.Progress) > 0 { + i -= len(m.Progress) + copy(dAtA[i:], m.Progress) + i = encodeVarintDmworker(dAtA, i, uint64(len(m.Progress))) + i-- + dAtA[i] = 0x3a + } + if m.Bps != 0 { + i = encodeVarintDmworker(dAtA, i, uint64(m.Bps)) + i-- + dAtA[i] = 0x30 + } if m.EstimateTotalRows != 0 { i -= 8 encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.EstimateTotalRows)))) @@ -4397,8 +4451,8 @@ func (m *LoadStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.CurrentSpeedBytesPerSecond != 0 { - i = encodeVarintDmworker(dAtA, i, uint64(m.CurrentSpeedBytesPerSecond)) + if m.Bps != 0 { + i = encodeVarintDmworker(dAtA, i, uint64(m.Bps)) i-- dAtA[i] = 0x30 } @@ -4520,6 +4574,25 @@ func (m *SyncStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.RecentRps != 0 { + i = encodeVarintDmworker(dAtA, i, uint64(m.RecentRps)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x88 + } + if m.TotalRps != 0 { + i = encodeVarintDmworker(dAtA, i, uint64(m.TotalRps)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x80 + } + if m.TotalRows != 0 { + i = encodeVarintDmworker(dAtA, i, uint64(m.TotalRows)) + i-- + dAtA[i] = 0x78 + } if len(m.ConflictMsg) > 0 { i -= len(m.ConflictMsg) copy(dAtA[i:], m.ConflictMsg) @@ -6669,6 +6742,13 @@ func (m *DumpStatus) Size() (n int) { if m.EstimateTotalRows != 0 { n += 9 } + if m.Bps != 0 { + n += 1 + sovDmworker(uint64(m.Bps)) + } + l = len(m.Progress) + if l > 0 { + n += 1 + l + sovDmworker(uint64(l)) + } return n } @@ -6696,8 +6776,8 @@ func (m *LoadStatus) Size() (n int) { if l > 0 { n += 1 + l + sovDmworker(uint64(l)) } - if m.CurrentSpeedBytesPerSecond != 0 { - n += 1 + sovDmworker(uint64(m.CurrentSpeedBytesPerSecond)) + if m.Bps != 0 { + n += 1 + sovDmworker(uint64(m.Bps)) } return n } @@ -6798,6 +6878,15 @@ func (m *SyncStatus) Size() (n int) { if l > 0 { n += 1 + l + sovDmworker(uint64(l)) } + if m.TotalRows != 0 { + n += 1 + sovDmworker(uint64(m.TotalRows)) + } + if m.TotalRps != 0 { + n += 2 + sovDmworker(uint64(m.TotalRps)) + } + if m.RecentRps != 0 { + n += 2 + sovDmworker(uint64(m.RecentRps)) + } return n } @@ -8388,6 +8477,57 @@ func (m *DumpStatus) Unmarshal(dAtA []byte) error { v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:])) iNdEx += 8 m.EstimateTotalRows = float64(math.Float64frombits(v)) + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Bps", wireType) + } + m.Bps = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Bps |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Progress", 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.Progress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDmworker(dAtA[iNdEx:]) @@ -8574,9 +8714,9 @@ func (m *LoadStatus) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 6: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CurrentSpeedBytesPerSecond", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Bps", wireType) } - m.CurrentSpeedBytesPerSecond = 0 + m.Bps = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDmworker @@ -8586,7 +8726,7 @@ func (m *LoadStatus) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.CurrentSpeedBytesPerSecond |= int64(b&0x7F) << shift + m.Bps |= int64(b&0x7F) << shift if b < 0x80 { break } @@ -9237,6 +9377,63 @@ func (m *SyncStatus) Unmarshal(dAtA []byte) error { } m.ConflictMsg = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 15: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TotalRows", wireType) + } + m.TotalRows = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TotalRows |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 16: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TotalRps", wireType) + } + m.TotalRps = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TotalRps |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 17: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field RecentRps", wireType) + } + m.RecentRps = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmworker + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.RecentRps |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipDmworker(dAtA[iNdEx:]) diff --git a/dm/proto/dmworker.proto b/dm/proto/dmworker.proto index 1794b571184..1dba4c26044 100644 --- a/dm/proto/dmworker.proto +++ b/dm/proto/dmworker.proto @@ -116,6 +116,8 @@ message DumpStatus { double finishedBytes = 3; double finishedRows = 4; double estimateTotalRows = 5; + int64 bps = 6; + string progress = 7; } // LoadStatus represents status for load unit @@ -125,7 +127,7 @@ message LoadStatus { string progress = 3; string metaBinlog = 4; string metaBinlogGTID = 5; - int64 currentSpeedBytesPerSecond = 6; + int64 bps = 6; } // ShardingGroup represents a DDL sharding group, this is used by SyncStatus, and is differ from ShardingGroup in syncer pkg @@ -144,6 +146,7 @@ message ShardingGroup { // SyncStatus represents status for sync unit message SyncStatus { + // totalEvents/totalTps/recentTps has been deprecated now int64 totalEvents = 1; int64 totalTps = 2; int64 recentTps = 3; @@ -158,6 +161,9 @@ message SyncStatus { int64 secondsBehindMaster = 12; // sync unit delay seconds behind master. string blockDDLOwner = 13; // block ddl upstream info, format "task-`upstreamDatabase`.`upstreamTable`" string conflictMsg = 14; // block ddl conflict reason + int64 totalRows = 15; + int64 totalRps = 16; + int64 recentRps = 17; } // SourceStatus represents status for source runing on dm-worker diff --git a/dm/syncer/status.go b/dm/syncer/status.go index c4b69e9314d..4544646f145 100644 --- a/dm/syncer/status.go +++ b/dm/syncer/status.go @@ -31,8 +31,11 @@ func (s *Syncer) Status(sourceStatus *binlog.SourceStatus) interface{} { syncerLocation := s.checkpoint.FlushedGlobalPoint() st := &pb.SyncStatus{ TotalEvents: s.count.Load(), - TotalTps: s.totalTps.Load(), - RecentTps: s.tps.Load(), + TotalTps: s.totalRps.Load(), + RecentTps: s.rps.Load(), + TotalRows: s.count.Load(), + TotalRps: s.totalRps.Load(), + RecentRps: s.rps.Load(), SyncerBinlog: syncerLocation.Position.String(), SecondsBehindMaster: s.secondsBehindMaster.Load(), } @@ -108,10 +111,11 @@ func (s *Syncer) printStatus(sourceStatus *binlog.SourceStatus) { totalBinlogSize := s.binlogSizeCount.Load() lastBinlogSize := s.lastBinlogSizeCount.Load() - tps, totalTps := int64(0), int64(0) + rps, totalRps := int64(0), int64(0) if seconds > 0 && totalSeconds > 0 { - tps = (total - last) / seconds - totalTps = total / totalSeconds + // todo: use speed recorder count rps + rps = (total - last) / seconds + totalRps = total / totalSeconds s.currentLocationMu.RLock() currentLocation := s.currentLocationMu.currentLocation @@ -143,9 +147,9 @@ func (s *Syncer) printStatus(sourceStatus *binlog.SourceStatus) { } s.tctx.L().Info("binlog replication status", - zap.Int64("total_events", total), - zap.Int64("total_tps", totalTps), - zap.Int64("tps", tps), + zap.Int64("total_rows", total), + zap.Int64("total_rps", totalRps), + zap.Int64("rps", rps), zap.Stringer("master_position", latestMasterPos), log.WrapStringerField("master_gtid", latestMasterGTIDSet), zap.Stringer("checkpoint", s.checkpoint)) @@ -153,6 +157,6 @@ func (s *Syncer) printStatus(sourceStatus *binlog.SourceStatus) { s.lastCount.Store(total) s.lastBinlogSizeCount.Store(totalBinlogSize) s.lastTime.Store(time.Now()) - s.totalTps.Store(totalTps) - s.tps.Store(tps) + s.totalRps.Store(totalRps) + s.rps.Store(rps) } diff --git a/dm/syncer/syncer.go b/dm/syncer/syncer.go index fd9e66b3bc5..d0808a1045d 100644 --- a/dm/syncer/syncer.go +++ b/dm/syncer/syncer.go @@ -186,8 +186,8 @@ type Syncer struct { lastCount atomic.Int64 count atomic.Int64 - totalTps atomic.Int64 - tps atomic.Int64 + totalRps atomic.Int64 + rps atomic.Int64 filteredInsert atomic.Int64 filteredUpdate atomic.Int64 diff --git a/dm/tests/print_status/run.sh b/dm/tests/print_status/run.sh index 79b3213e5e2..c3bafe08d4c 100755 --- a/dm/tests/print_status/run.sh +++ b/dm/tests/print_status/run.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -eu +set -eux cur=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) source $cur/../_utils/test_prepare @@ -62,6 +62,16 @@ function check_print_status() { fi echo "checking print status" + # check dump unit print status + dump_status_file=$WORK_DIR/worker1/log/dump_status.log + grep -o "progress status of dumpling" $WORK_DIR/worker1/log/dm-worker.log >$dump_status_file + dump_status_count=$(wc -l $dump_status_file | awk '{print $1}') + [ $dump_status_count -ge 1 ] + # bps must not be zero + grep -o '\[bps=0' $WORK_DIR/worker1/log/dm-worker.log >$dump_status_file || true + dump_status_count=$(wc -l $dump_status_file | awk '{print $1}') + [ $dump_status_count -eq 0 ] + # check load unit print status status_file=$WORK_DIR/worker1/log/loader_status.log grep -oP "\[unit=lightning-load\] \[IsCanceled=false\] \[finished_bytes=59637\] \[total_bytes=59637\] \[progress=.*\]" $WORK_DIR/worker1/log/dm-worker.log >$status_file @@ -74,7 +84,7 @@ function check_print_status() { # check sync unit print status status_file2=$WORK_DIR/worker1/log/syncer_status.log #grep -oP "syncer.*\Ktotal events = [0-9]+, total tps = [0-9]+, recent tps = [0-9]+, master-binlog = .*" $WORK_DIR/worker1/log/dm-worker.log > $status_file2 - grep -oP "\[total_events=[0-9]+\] \[total_tps=[0-9]+\] \[tps=[0-9]+\] \[master_position=.*\]" $WORK_DIR/worker1/log/dm-worker.log >$status_file2 + grep -oP "\[total_rows=[0-9]+\] \[total_rps=[0-9]+\] \[rps=[0-9]+\] \[master_position=.*\]" $WORK_DIR/worker1/log/dm-worker.log >$status_file2 status_count2=$(wc -l $status_file2 | awk '{print $1}') [ $status_count2 -ge 1 ] echo "check sync unit print status success" diff --git a/engine/executor/dm/api_test.go b/engine/executor/dm/api_test.go index 9a6c20224a8..b2039e9bc16 100644 --- a/engine/executor/dm/api_test.go +++ b/engine/executor/dm/api_test.go @@ -41,6 +41,8 @@ func TestQueryStatusAPI(t *testing.T) { FinishedBytes: 100, FinishedRows: 10, EstimateTotalRows: 1000, + Bps: 1000, + Progress: "20.00 %", } loadStatus = &pb.LoadStatus{ FinishedBytes: 4, @@ -48,11 +50,12 @@ func TestQueryStatusAPI(t *testing.T) { Progress: "4%", MetaBinlog: "mysql-bin.000002, 8", MetaBinlogGTID: "1-2-3", + Bps: 1000, } syncStatus = &pb.SyncStatus{ - TotalEvents: 10, - TotalTps: 10, - RecentTps: 10, + TotalRows: 10, + TotalRps: 10, + RecentRps: 10, MasterBinlog: "mysql-bin.000002, 4", MasterBinlogGtid: "1-2-20", SyncerBinlog: "mysql-bin.000001, 432", diff --git a/engine/jobmaster/dm/api_test.go b/engine/jobmaster/dm/api_test.go index 79a0f0dfb70..e456ba51511 100644 --- a/engine/jobmaster/dm/api_test.go +++ b/engine/jobmaster/dm/api_test.go @@ -68,6 +68,8 @@ func TestQueryStatusAPI(t *testing.T) { FinishedBytes: 100, FinishedRows: 10, EstimateTotalRows: 1000, + Bps: 1000, + Progress: "20.00 %", } loadStatus = &pb.LoadStatus{ FinishedBytes: 4, @@ -75,11 +77,12 @@ func TestQueryStatusAPI(t *testing.T) { Progress: "4%", MetaBinlog: "mysql-bin.000002, 8", MetaBinlogGTID: "1-2-3", + Bps: 1000, } syncStatus = &pb.SyncStatus{ - TotalEvents: 10, - TotalTps: 10, - RecentTps: 10, + TotalRows: 10, + TotalRps: 10, + RecentRps: 10, MasterBinlog: "mysql-bin.000002, 4", MasterBinlogGtid: "1-2-20", SyncerBinlog: "mysql-bin.000001, 432", @@ -241,7 +244,9 @@ func TestQueryStatusAPI(t *testing.T) { "completedTables": 1, "finishedBytes": 100, "finishedRows": 10, - "estimateTotalRows": 1000 + "estimateTotalRows": 1000, + "bps": 1000, + "progress": "20.00 %" } } }, @@ -261,7 +266,8 @@ func TestQueryStatusAPI(t *testing.T) { "totalBytes": 100, "progress": "4%", "metaBinlog": "mysql-bin.000002, 8", - "metaBinlogGTID": "1-2-3" + "metaBinlogGTID": "1-2-3", + "bps": 1000 } } }, @@ -287,9 +293,6 @@ func TestQueryStatusAPI(t *testing.T) { ] }, "status": { - "totalEvents": 10, - "totalTps": 10, - "recentTps": 10, "masterBinlog": "mysql-bin.000002, 4", "masterBinlogGtid": "1-2-20", "syncerBinlog": "mysql-bin.000001, 432", @@ -298,7 +301,10 @@ func TestQueryStatusAPI(t *testing.T) { "ALTER TABLE db.tb ADD COLUMN a INT" ], "binlogType": "remote", - "secondsBehindMaster": 10 + "secondsBehindMaster": 10, + "totalRows": 10, + "totalRps": 10, + "recentRps": 10 } } }, @@ -328,7 +334,9 @@ func TestQueryStatusAPI(t *testing.T) { "completedTables": 1, "finishedBytes": 100, "finishedRows": 10, - "estimateTotalRows": 1000 + "estimateTotalRows": 1000, + "bps": 1000, + "progress": "20.00 %" } }, { @@ -342,7 +350,8 @@ func TestQueryStatusAPI(t *testing.T) { "totalBytes": 100, "progress": "4%", "metaBinlog": "mysql-bin.000002, 8", - "metaBinlogGTID": "1-2-3" + "metaBinlogGTID": "1-2-3", + "bps": 1000 } } ], @@ -358,7 +367,9 @@ func TestQueryStatusAPI(t *testing.T) { "completedTables": 1, "finishedBytes": 100, "finishedRows": 10, - "estimateTotalRows": 1000 + "estimateTotalRows": 1000, + "bps": 1000, + "progress": "20.00 %" } }, { @@ -372,13 +383,15 @@ func TestQueryStatusAPI(t *testing.T) { "totalBytes": 100, "progress": "4%", "metaBinlog": "mysql-bin.000002, 8", - "metaBinlogGTID": "1-2-3" + "metaBinlogGTID": "1-2-3", + "bps": 1000 } } ] } }` status, err := json.MarshalIndent(jobStatus, "", "\t") + require.NoError(t, err) require.Equal(t, expectedStatus, string(status)) } diff --git a/go.mod b/go.mod index cbf6d989703..2b1c1c15fcc 100644 --- a/go.mod +++ b/go.mod @@ -55,11 +55,11 @@ require ( github.com/pingcap/check v0.0.0-20211026125417-57bd13f7b5f0 github.com/pingcap/errors v0.11.5-0.20220729040631-518f63d66278 github.com/pingcap/failpoint v0.0.0-20220423142525-ae43b7f4e5c3 - github.com/pingcap/kvproto v0.0.0-20221014081430-26e28e6a281a - github.com/pingcap/log v1.1.0 - github.com/pingcap/tidb v1.1.0-beta.0.20221026094757-0f6baa3f9b3e + github.com/pingcap/kvproto v0.0.0-20221026112947-f8d61344b172 + github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81 + github.com/pingcap/tidb v1.1.0-beta.0.20221101122759-863d35290cc4 github.com/pingcap/tidb-tools v6.1.1-0.20220715000306-1d2f00da8c3e+incompatible - github.com/pingcap/tidb/parser v0.0.0-20221026094757-0f6baa3f9b3e + github.com/pingcap/tidb/parser v0.0.0-20221101122759-863d35290cc4 github.com/prometheus/client_golang v1.13.0 github.com/prometheus/client_model v0.2.0 github.com/r3labs/diff v1.1.0 @@ -73,9 +73,9 @@ require ( github.com/swaggo/gin-swagger v1.2.0 github.com/swaggo/swag v1.6.6-0.20200529100950-7c765ddd0476 github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954 - github.com/tikv/client-go/v2 v2.0.1-0.20221017092635-91be9c6ce6c0 + github.com/tikv/client-go/v2 v2.0.1-0.20221031063202-30e803b7082c github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800 - github.com/tikv/pd/client v0.0.0-20221010134149-d50e5fe43f14 + github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 github.com/tinylib/msgp v1.1.6 github.com/uber-go/atomic v1.4.0 github.com/vmihailenco/msgpack/v5 v5.3.5 diff --git a/go.sum b/go.sum index 2385438dbea..7b6bf4fc03b 100644 --- a/go.sum +++ b/go.sum @@ -984,31 +984,31 @@ github.com/pingcap/kvproto v0.0.0-20220302110454-c696585a961b/go.mod h1:IOdRDPLy github.com/pingcap/kvproto v0.0.0-20220304032058-ccd676426a27/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20220328072018-6e75c12dbd73/go.mod h1:IOdRDPLyda8GX2hE/jO7gqaCV/PNFh8BZQCQZXfIOqI= github.com/pingcap/kvproto v0.0.0-20220429093005-2839fa5a1ed6/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI= -github.com/pingcap/kvproto v0.0.0-20220818063303-5c20f55db5ad/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI= -github.com/pingcap/kvproto v0.0.0-20221014081430-26e28e6a281a h1:McYxPhA8SHqfUtLfQHHN0fQl4dy93IkhlX4Pp2MKIFA= -github.com/pingcap/kvproto v0.0.0-20221014081430-26e28e6a281a/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI= +github.com/pingcap/kvproto v0.0.0-20221026112947-f8d61344b172 h1:FYgKV9znRQmzVrrJDZ0gUfMIvKLAMU1tu1UKJib8bEQ= +github.com/pingcap/kvproto v0.0.0-20221026112947-f8d61344b172/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI= github.com/pingcap/log v0.0.0-20191012051959-b742a5d432e9/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20200511115504-543df19646ad/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20210317133921-96f4fcab92a4/go.mod h1:4rbK1p9ILyIfb6hU7OG2CiWSqMXnp3JMbiaVJ6mvoY8= github.com/pingcap/log v0.0.0-20210625125904-98ed8e2eb1c7/go.mod h1:8AanEdAHATuRurdGxZXBz0At+9avep+ub7U1AGYLIMM= github.com/pingcap/log v0.0.0-20210906054005-afc726e70354/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4= github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4= -github.com/pingcap/log v1.1.0 h1:ELiPxACz7vdo1qAvvaWJg1NrYFoY6gqAh/+Uo6aXdD8= github.com/pingcap/log v1.1.0/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4= +github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81 h1:URLoJ61DmmY++Sa/yyPEQHG2s/ZBeV1FbIswHEMrdoY= +github.com/pingcap/log v1.1.1-0.20221015072633-39906604fb81/go.mod h1:DWQW5jICDR7UJh4HtxXSM20Churx4CQL0fwL/SoOSA4= github.com/pingcap/parser v0.0.0-20210415081931-48e7f467fd74/go.mod h1:xZC8I7bug4GJ5KtHhgAikjTfU4kBv1Sbo3Pf1MZ6lVw= github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d/go.mod h1:7j18ezaWTao2LHOyMlsc2Dg1vW+mDY9dEbPzVyOlaeM= github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4 h1:HYbcxtnkN3s5tqrZ/z3eJS4j3Db8wMphEm1q10lY/TM= github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4/go.mod h1:sDCsM39cGiv2vwunZkaFA917vVkqDTGSPbbV7z4Oops= github.com/pingcap/tidb v1.1.0-beta.0.20220511160835-98c31070d958/go.mod h1:luW4sIZoLHY3bCWuKqyqk2QgMvF+/M7nWOXf/me0+fY= -github.com/pingcap/tidb v1.1.0-beta.0.20221026094757-0f6baa3f9b3e h1:4iVdSlpmGxe3sV0S3WCsVvOoTbBbnRae0vY5ItQ8tnk= -github.com/pingcap/tidb v1.1.0-beta.0.20221026094757-0f6baa3f9b3e/go.mod h1:sPyevZENUGVBuBTkNwAsMSDkwVEcM6j4jPpHXIaCFSw= +github.com/pingcap/tidb v1.1.0-beta.0.20221101122759-863d35290cc4 h1:Mak6/wSVY/1ClvwzTYUdvWqmWbLmfPWajz70aS9PS4E= +github.com/pingcap/tidb v1.1.0-beta.0.20221101122759-863d35290cc4/go.mod h1:lhtdZBXqJGbk2/Fr8JnT9KhXxEKy8h0vrDwdna/ou3g= github.com/pingcap/tidb-dashboard v0.0.0-20220117082709-e8076b5c79ba/go.mod h1:4hk/3owVGWdvI9Kx6yCqqvM1T5PVgwyQNyMQxD3rwfc= github.com/pingcap/tidb-tools v6.1.1-0.20220715000306-1d2f00da8c3e+incompatible h1:ftmrSd7avCEdTOkWx3O0UkS4yTBrlKQweRF8uqz9+No= github.com/pingcap/tidb-tools v6.1.1-0.20220715000306-1d2f00da8c3e+incompatible/go.mod h1:XGdcy9+yqlDSEMTpOXnwf3hiTeqrV6MN/u1se9N8yIM= github.com/pingcap/tidb/parser v0.0.0-20211011031125-9b13dc409c5e/go.mod h1:e1MGCA9Sg3T8jid8PKAEq5eYVuMMCq4n8gJ+Kqp4Plg= github.com/pingcap/tidb/parser v0.0.0-20220511160835-98c31070d958/go.mod h1:ElJiub4lRy6UZDb+0JHDkGEdr6aOli+ykhyej7VCLoI= -github.com/pingcap/tidb/parser v0.0.0-20221026094757-0f6baa3f9b3e h1:b3OIm3UqItQWWVw8v6qY4i9DUoiCNBYblklbnjf1+PQ= -github.com/pingcap/tidb/parser v0.0.0-20221026094757-0f6baa3f9b3e/go.mod h1:wjvp+T3/T9XYt0nKqGX3Kc1AKuyUcfno6LTc6b2A6ew= +github.com/pingcap/tidb/parser v0.0.0-20221101122759-863d35290cc4 h1:Waesm4dhghoJIaJk+FBOWkYoeaB4SwnDchD0U4hER6A= +github.com/pingcap/tidb/parser v0.0.0-20221101122759-863d35290cc4/go.mod h1:wjvp+T3/T9XYt0nKqGX3Kc1AKuyUcfno6LTc6b2A6ew= github.com/pingcap/tipb v0.0.0-20220215045658-d12dec7a7609/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= github.com/pingcap/tipb v0.0.0-20221020071514-cd933387bcb5 h1:Yoo8j5xQGxjlsC3yt0ndsiAz0WZXED9rzsKmEN0U0DY= github.com/pingcap/tipb v0.0.0-20221020071514-cd933387bcb5/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs= @@ -1189,13 +1189,13 @@ github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJH github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tikv/client-go/v2 v2.0.1-0.20220510032238-ff5e35ac2869/go.mod h1:0scaG+seu7L56apm+Gjz9vckyO7ABIzM6T7n00mrIXs= -github.com/tikv/client-go/v2 v2.0.1-0.20221017092635-91be9c6ce6c0 h1:5KLqhDGLc/mtemdS/odfOP717rn8ttsTj3jzZ8TZn9A= -github.com/tikv/client-go/v2 v2.0.1-0.20221017092635-91be9c6ce6c0/go.mod h1:9hmGJFrWdehClHg0lv2cYgzvCUEhwLZkH67/PHl75tg= +github.com/tikv/client-go/v2 v2.0.1-0.20221031063202-30e803b7082c h1:NvQHWk0GeXSLEBbmGMPnDMc0to0a3ogzgIRbTKw8MHI= +github.com/tikv/client-go/v2 v2.0.1-0.20221031063202-30e803b7082c/go.mod h1:X9s4ct/MLk1sFqe5mU79KClKegLFDTa/FCx3hzexGtk= github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800 h1:lIfIwqe1HPa0suhMpiI200nYxau+rXWXTqZxSGg1HS4= github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800/go.mod h1:J/dj1zpEE9b7idgONGFttnXM+ncl88LmnkD/xDbq0hA= github.com/tikv/pd/client v0.0.0-20220307081149-841fa61e9710/go.mod h1:AtvppPwkiyUgQlR1W9qSqfTB+OsOIu19jDCOxOsPkmU= -github.com/tikv/pd/client v0.0.0-20221010134149-d50e5fe43f14 h1:REQOR1XraH1fT9BCoNBPZs1CAe+w7VPLU+d+si7DLYo= -github.com/tikv/pd/client v0.0.0-20221010134149-d50e5fe43f14/go.mod h1:E/7+Fkqzwsrp4duzJ2gLPqFl6awU7QG+5yFRXaQwimM= +github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07 h1:ckPpxKcl75mO2N6a4cJXiZH43hvcHPpqc9dh1TmH1nc= +github.com/tikv/pd/client v0.0.0-20221031025758-80f0d8ca4d07/go.mod h1:CipBxPfxPUME+BImx9MUYXCnAVLS3VJUr3mnSJwh40A= github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek=