From d82a7471616f658351c6809464e1b033a856f153 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 31 Mar 2022 15:39:22 +0800 Subject: [PATCH 01/19] enable move_table case for test. --- tests/integration_tests/move_table/run.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/integration_tests/move_table/run.sh b/tests/integration_tests/move_table/run.sh index edc9e1da0a7..cb429394c73 100644 --- a/tests/integration_tests/move_table/run.sh +++ b/tests/integration_tests/move_table/run.sh @@ -9,10 +9,6 @@ CDC_BINARY=cdc.test SINK_TYPE=$1 function run() { - # TODO: remove after kafka-consumer/main.go is fixed - if [ "$SINK_TYPE" == "kafka" ]; then - return - fi rm -rf $WORK_DIR && mkdir -p $WORK_DIR From d968346b620521676288b8a68b527a53fc3281e5 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 31 Mar 2022 16:34:45 +0800 Subject: [PATCH 02/19] fix some log for debug help. --- cdc/sink/common/common.go | 6 ++---- cmd/kafka-consumer/main.go | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cdc/sink/common/common.go b/cdc/sink/common/common.go index 7fff1ec0082..e11e62a4e1f 100644 --- a/cdc/sink/common/common.go +++ b/cdc/sink/common/common.go @@ -83,10 +83,8 @@ func (c *UnresolvedTxnCache) Append(filter *filter.Filter, rows ...*model.RowCha // fail-fast check if len(txns) != 0 && txns[len(txns)-1].commitTs > row.CommitTs { log.Panic("the commitTs of the emit row is less than the received row", - zap.Stringer("table", row.Table), - zap.Uint64("emit row startTs", row.StartTs), - zap.Uint64("emit row commitTs", row.CommitTs), - zap.Uint64("last received row commitTs", txns[len(txns)-1].commitTs)) + zap.Uint64("last received row commitTs", txns[len(txns)-1].commitTs), + zap.Any("row", row)) } txns = append(txns, &txnsWithTheSameCommitTs{ commitTs: row.CommitTs, diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index 67628013d3a..e8a66e96615 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -570,7 +570,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram zap.Int32("partition", partition)) } if ts > resolvedTs { - log.Info("update sink resolved ts", + log.Debug("update sink resolved ts", zap.Uint64("ts", ts), zap.Int32("partition", partition)) atomic.StoreUint64(&sink.resolvedTs, ts) From fcad533bb2d43127c4699dd348a43e372b7702dd Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 31 Mar 2022 16:50:41 +0800 Subject: [PATCH 03/19] fix data race in pipeline sinkNode. --- cdc/processor/pipeline/sink.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdc/processor/pipeline/sink.go b/cdc/processor/pipeline/sink.go index 59e7b4567cb..e83f53c78f9 100755 --- a/cdc/processor/pipeline/sink.go +++ b/cdc/processor/pipeline/sink.go @@ -320,14 +320,14 @@ func (n *sinkNode) Receive(ctx pipeline.NodeContext) error { } func (n *sinkNode) HandleMessage(ctx context.Context, msg pmessage.Message) (bool, error) { - if n.status == TableStatusStopped { + if n.status.Load() == TableStatusStopped { return false, cerror.ErrTableProcessorStoppedSafely.GenWithStackByArgs() } switch msg.Tp { case pmessage.MessageTypePolymorphicEvent: event := msg.PolymorphicEvent if event.RawKV.OpType == model.OpTypeResolved { - if n.status == TableStatusInitializing { + if n.status.Load() == TableStatusInitializing { n.status.Store(TableStatusRunning) } failpoint.Inject("ProcessorSyncResolvedError", func() { From dd56224ff349e0e194e1e2df67ab5eff8c27b29e Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 31 Mar 2022 19:09:15 +0800 Subject: [PATCH 04/19] add a log to track. --- cmd/kafka-consumer/main.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index e8a66e96615..b0642ff2644 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -552,6 +552,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram if err != nil { log.Panic("emit row changed event failed", zap.Error(err)) } + log.Info("emit row", zap.Any("row", row), zap.Int32("partition", partition)) lastCommitTs, ok := sink.tablesMap.Load(row.Table.TableID) if !ok || lastCommitTs.(uint64) < row.CommitTs { sink.tablesMap.Store(row.Table.TableID, row.CommitTs) From a4c266b9b17091f2dc06a60a5fb21eb3b99fe7e6 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 31 Mar 2022 19:44:06 +0800 Subject: [PATCH 05/19] use last dml commit ts to prevent fall back,which cause mysql sink panic. --- cmd/kafka-consumer/main.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index b0642ff2644..928ac438c1c 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -464,6 +464,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram panic("sink should initialized") } + var lastDMLCommitTs uint64 for message := range claim.Messages() { var ( decoder codec.EventBatchDecoder @@ -531,6 +532,15 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram } } + if row.CommitTs < lastDMLCommitTs { + log.Warn("RowChangedEvent commitTs fallback, ignore it", + zap.Uint64("lastDMLCommitTs", lastDMLCommitTs), + zap.Any("row", row), + zap.Int32("partition", partition)) + continue + } + lastDMLCommitTs = row.CommitTs + globalResolvedTs := atomic.LoadUint64(&c.globalResolvedTs) if row.CommitTs <= globalResolvedTs || row.CommitTs <= sink.resolvedTs { log.Warn("RowChangedEvent fallback row, ignore it", From f6a46765365861b2f1b56a0a6891d7a37c27675e Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 31 Mar 2022 20:27:23 +0800 Subject: [PATCH 06/19] add a log to mq help debug commit ts order. --- cdc/sink/mq.go | 9 +++++++++ cmd/kafka-consumer/main.go | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/cdc/sink/mq.go b/cdc/sink/mq.go index 823b99fbead..3fb61ae26f6 100644 --- a/cdc/sink/mq.go +++ b/cdc/sink/mq.go @@ -67,6 +67,8 @@ type mqSink struct { role util.Role id model.ChangeFeedID + + lastDMLCommitTs uint64 } func newMqSink( @@ -165,6 +167,13 @@ func (k *mqSink) EmitRowChangedEvents(ctx context.Context, rows ...*model.RowCha return err } rowsCount++ + if row.CommitTs < k.lastDMLCommitTs { + log.Warn("RowChangedEvent commitTs fallback", + zap.Uint64("lastDMLCommitTs", k.lastDMLCommitTs), + zap.Any("role", row), + zap.Int32("partition", partition)) + } + k.lastDMLCommitTs = row.CommitTs } k.statistics.AddRowsCount(rowsCount) return nil diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index 928ac438c1c..ef210b76572 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -481,7 +481,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram if err != nil { return errors.Trace(err) } - + log.Info("Message claimed", zap.Int32("partition", message.Partition), zap.ByteString("key", message.Key), zap.ByteString("value", message.Value)) counter := 0 for { tp, hasNext, err := decoder.HasNext() From 05c692d45fd1a6b0a08d5ecabbbd8699d195991d Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Fri, 1 Apr 2022 13:27:49 +0800 Subject: [PATCH 07/19] change log level to debug for changefeed brrierTs check. --- cdc/owner/changefeed.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdc/owner/changefeed.go b/cdc/owner/changefeed.go index ad77426b400..30e3bda554b 100644 --- a/cdc/owner/changefeed.go +++ b/cdc/owner/changefeed.go @@ -211,7 +211,7 @@ func (c *changefeed) tick(ctx cdcContext.Context, state *orchestrator.Changefeed // This condition implies that the DDL resolved-ts has not yet reached checkpointTs, // which implies that it would be premature to schedule tables or to update status. // So we return here. - log.Info("barrierTs < checkpointTs, premature to schedule tables or update status", + log.Debug("barrierTs < checkpointTs, premature to schedule tables or update status", zap.String("changefeed", c.id), zap.Uint64("barrierTs", barrierTs), zap.Uint64("checkpointTs", checkpointTs)) return nil From 4857d2d78a1d2abfe8288d03be96393faaf540cc Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Fri, 1 Apr 2022 15:34:20 +0800 Subject: [PATCH 08/19] emit row changed event when receive resolved ts. --- cmd/kafka-consumer/main.go | 76 ++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 20 deletions(-) diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index ef210b76572..8956fead102 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -21,6 +21,7 @@ import ( "net/url" "os" "os/signal" + "sort" "strconv" "strings" "sync" @@ -453,9 +454,36 @@ func (c *Consumer) Cleanup(sarama.ConsumerGroupSession) error { return nil } +type eventsGroup struct { + events []*model.RowChangedEvent +} + +func newEventsGroup(tableID int64) *eventsGroup { + return &eventsGroup{ + events: make([]*model.RowChangedEvent, 0), + } +} + +func (g *eventsGroup) Append(e *model.RowChangedEvent) { + g.events = append(g.events, e) +} + +func (g *eventsGroup) Resolve(resolveTs uint64) []*model.RowChangedEvent { + sort.Slice(g.events, func(i, j int) bool { + return g.events[i].CommitTs < g.events[j].CommitTs + }) + + i := sort.Search(len(g.events), func(i int) bool { + return g.events[i].CommitTs > resolveTs + }) + result := g.events[:i] + g.events = g.events[i:] + + return result +} + // ConsumeClaim must start a consumer loop of ConsumerGroupClaim's Messages(). func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { - ctx := context.TODO() partition := claim.Partition() c.sinksMu.Lock() sink := c.sinks[partition] @@ -464,7 +492,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram panic("sink should initialized") } - var lastDMLCommitTs uint64 + eventGroups := make(map[int64]*eventsGroup) for message := range claim.Messages() { var ( decoder codec.EventBatchDecoder @@ -532,15 +560,6 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram } } - if row.CommitTs < lastDMLCommitTs { - log.Warn("RowChangedEvent commitTs fallback, ignore it", - zap.Uint64("lastDMLCommitTs", lastDMLCommitTs), - zap.Any("row", row), - zap.Int32("partition", partition)) - continue - } - lastDMLCommitTs = row.CommitTs - globalResolvedTs := atomic.LoadUint64(&c.globalResolvedTs) if row.CommitTs <= globalResolvedTs || row.CommitTs <= sink.resolvedTs { log.Warn("RowChangedEvent fallback row, ignore it", @@ -557,16 +576,15 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram if row.Table.IsPartition { partitionID = row.Table.TableID } - row.Table.TableID = c.fakeTableIDGenerator.generateFakeTableID(row.Table.Schema, row.Table.Table, partitionID) - err = sink.EmitRowChangedEvents(ctx, row) - if err != nil { - log.Panic("emit row changed event failed", zap.Error(err)) - } - log.Info("emit row", zap.Any("row", row), zap.Int32("partition", partition)) - lastCommitTs, ok := sink.tablesMap.Load(row.Table.TableID) - if !ok || lastCommitTs.(uint64) < row.CommitTs { - sink.tablesMap.Store(row.Table.TableID, row.CommitTs) + tableID := c.fakeTableIDGenerator.generateFakeTableID(row.Table.Schema, row.Table.Table, partitionID) + row.Table.TableID = tableID + + group, ok := eventGroups[tableID] + if !ok { + group = newEventsGroup(tableID) + eventGroups[tableID] = group } + group.Append(row) case model.MqMessageTypeResolved: ts, err := decoder.NextResolvedEvent() if err != nil { @@ -581,6 +599,24 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram zap.Int32("partition", partition)) } if ts > resolvedTs { + for tableID, group := range eventGroups { + events := group.Resolve(ts) + if events == nil { + continue + } + if err := sink.EmitRowChangedEvents(context.Background(), events...); err != nil { + log.Panic("emit row changed event failed", + zap.Any("events", events), + zap.Error(err), + zap.Int32("partition", partition)) + } + log.Info("emit events", zap.Any("row", events), zap.Int32("partition", partition)) + commitTs := events[len(events)-1].CommitTs + lastCommitTs, ok := sink.tablesMap.Load(tableID) + if !ok || lastCommitTs.(uint64) < commitTs { + sink.tablesMap.Store(tableID, commitTs) + } + } log.Debug("update sink resolved ts", zap.Uint64("ts", ts), zap.Int32("partition", partition)) From 93b3f646adb6a823f51f3a03a849a79247d69fe0 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Fri, 1 Apr 2022 15:59:43 +0800 Subject: [PATCH 09/19] fix consumer panic. --- cmd/kafka-consumer/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index 8956fead102..6aab6dd20e9 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -601,7 +601,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram if ts > resolvedTs { for tableID, group := range eventGroups { events := group.Resolve(ts) - if events == nil { + if len(events) == 0 { continue } if err := sink.EmitRowChangedEvents(context.Background(), events...); err != nil { From ad586c9d4732e5f515e11ed40298acc0ea33ab41 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Fri, 1 Apr 2022 16:12:58 +0800 Subject: [PATCH 10/19] add error to sarama metrics collector. --- cdc/sink/producer/kafka/metrics.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdc/sink/producer/kafka/metrics.go b/cdc/sink/producer/kafka/metrics.go index 5434d8c0ebb..d79d59e7996 100644 --- a/cdc/sink/producer/kafka/metrics.go +++ b/cdc/sink/producer/kafka/metrics.go @@ -225,7 +225,8 @@ func (sm *saramaMetricsMonitor) collectBrokers() { "use historical brokers to collect kafka broker level metrics", zap.String("changefeed", sm.changefeedID), zap.Any("role", sm.role), - zap.Duration("duration", time.Since(start))) + zap.Duration("duration", time.Since(start)), + zap.Error(err)) return } From 454c1ac510946d32d1ced113ccffcac687363de9 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Fri, 1 Apr 2022 18:18:16 +0800 Subject: [PATCH 11/19] ready for review. --- cdc/sink/mq.go | 9 --------- cmd/kafka-consumer/main.go | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/cdc/sink/mq.go b/cdc/sink/mq.go index 3fb61ae26f6..823b99fbead 100644 --- a/cdc/sink/mq.go +++ b/cdc/sink/mq.go @@ -67,8 +67,6 @@ type mqSink struct { role util.Role id model.ChangeFeedID - - lastDMLCommitTs uint64 } func newMqSink( @@ -167,13 +165,6 @@ func (k *mqSink) EmitRowChangedEvents(ctx context.Context, rows ...*model.RowCha return err } rowsCount++ - if row.CommitTs < k.lastDMLCommitTs { - log.Warn("RowChangedEvent commitTs fallback", - zap.Uint64("lastDMLCommitTs", k.lastDMLCommitTs), - zap.Any("role", row), - zap.Int32("partition", partition)) - } - k.lastDMLCommitTs = row.CommitTs } k.statistics.AddRowsCount(rowsCount) return nil diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index 6aab6dd20e9..37b7c75f533 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -509,7 +509,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram if err != nil { return errors.Trace(err) } - log.Info("Message claimed", zap.Int32("partition", message.Partition), zap.ByteString("key", message.Key), zap.ByteString("value", message.Value)) + counter := 0 for { tp, hasNext, err := decoder.HasNext() From 37f386dfbd893aee534e5873579102633371ccb3 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Fri, 1 Apr 2022 20:10:27 +0800 Subject: [PATCH 12/19] fix kafka consumer, remove useless log. --- cmd/kafka-consumer/main.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index 37b7c75f533..19a23b9075c 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -458,7 +458,7 @@ type eventsGroup struct { events []*model.RowChangedEvent } -func newEventsGroup(tableID int64) *eventsGroup { +func newEventsGroup() *eventsGroup { return &eventsGroup{ events: make([]*model.RowChangedEvent, 0), } @@ -581,7 +581,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram group, ok := eventGroups[tableID] if !ok { - group = newEventsGroup(tableID) + group = newEventsGroup() eventGroups[tableID] = group } group.Append(row) @@ -610,7 +610,6 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram zap.Error(err), zap.Int32("partition", partition)) } - log.Info("emit events", zap.Any("row", events), zap.Int32("partition", partition)) commitTs := events[len(events)-1].CommitTs lastCommitTs, ok := sink.tablesMap.Load(tableID) if !ok || lastCommitTs.(uint64) < commitTs { From fa57b8d2ed71f6929409853d9890caa13a42b225 Mon Sep 17 00:00:00 2001 From: Ling Jin <7138436+3AceShowHand@users.noreply.github.com> Date: Sat, 2 Apr 2022 14:28:58 +0800 Subject: [PATCH 13/19] Update cdc/sink/common/common.go Co-authored-by: Neil Shen --- cdc/sink/common/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdc/sink/common/common.go b/cdc/sink/common/common.go index e11e62a4e1f..16a2a48319c 100644 --- a/cdc/sink/common/common.go +++ b/cdc/sink/common/common.go @@ -83,7 +83,7 @@ func (c *UnresolvedTxnCache) Append(filter *filter.Filter, rows ...*model.RowCha // fail-fast check if len(txns) != 0 && txns[len(txns)-1].commitTs > row.CommitTs { log.Panic("the commitTs of the emit row is less than the received row", - zap.Uint64("last received row commitTs", txns[len(txns)-1].commitTs), + zap.Uint64("lastReceivedCommitTs", txns[len(txns)-1].commitTs), zap.Any("row", row)) } txns = append(txns, &txnsWithTheSameCommitTs{ From 158a2cd4951ef3e3676f57a2687c5ced2570573f Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Sat, 2 Apr 2022 15:42:19 +0800 Subject: [PATCH 14/19] sarama version to 1.29.0 --- go.mod | 14 +++++++------- go.sum | 46 ++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index d61eb9b18cd..822c6d1921d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/BurntSushi/toml v0.3.1 github.com/DATA-DOG/go-sqlmock v1.5.0 - github.com/Shopify/sarama v1.32.0 + github.com/Shopify/sarama v1.29.0 github.com/apache/pulsar-client-go v0.6.0 github.com/aws/aws-sdk-go v1.35.3 github.com/benbjohnson/clock v1.3.0 @@ -50,7 +50,7 @@ require ( github.com/pingcap/failpoint v0.0.0-20220303073211-00fea37feb66 github.com/pingcap/kvproto v0.0.0-20220328072018-6e75c12dbd73 github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee - github.com/pingcap/tidb v1.1.0-beta.0.20220329110428-fbaaa1117936 + github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912 github.com/pingcap/tidb-tools v6.0.0-alpha.0.20220317013353-dfc5146f4746+incompatible github.com/pingcap/tidb/parser v0.0.0-20220329110428-fbaaa1117936 github.com/prometheus/client_golang v1.11.0 @@ -66,13 +66,13 @@ 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.20220328083738-8489c3e8c3d9 + github.com/tikv/client-go/v2 v2.0.1-0.20220329092050-6bf6951325ad github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800 github.com/tikv/pd/client v0.0.0-20220307081149-841fa61e9710 github.com/tinylib/msgp v1.1.6 github.com/uber-go/atomic v1.4.0 github.com/vmihailenco/msgpack/v5 v5.3.5 - github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c + github.com/xdg/scram v1.0.3 go.etcd.io/etcd/api/v3 v3.5.2 go.etcd.io/etcd/client/pkg/v3 v3.5.2 go.etcd.io/etcd/client/v3 v3.5.2 @@ -85,7 +85,7 @@ require ( go.uber.org/zap v1.21.0 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220318055525-2edf467146b5 + golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f golang.org/x/text v0.3.7 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 golang.org/x/tools v0.1.10 // indirect @@ -133,7 +133,7 @@ require ( github.com/danieljoos/wincred v1.0.2 // indirect github.com/danjacques/gofslock v0.0.0-20191023191349-0a45f885bc37 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgraph-io/ristretto v0.1.0 // indirect + github.com/dgraph-io/ristretto v0.1.1-0.20211108053508-297c39e6640f // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect github.com/dvsekhvalnov/jose2go v0.0.0-20180829124132-7f401d37b68a // indirect @@ -238,7 +238,7 @@ require ( github.com/valyala/fasttemplate v1.2.1 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f // indirect - github.com/xdg/stringprep v1.0.0 // indirect + github.com/xdg/stringprep v1.0.3 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/xitongsys/parquet-go v1.6.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect diff --git a/go.sum b/go.sum index 1dbb0404682..caa8fd5b348 100644 --- a/go.sum +++ b/go.sum @@ -98,10 +98,10 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/ReneKroon/ttlcache/v2 v2.3.0/go.mod h1:zbo6Pv/28e21Z8CzzqgYRArQYGYtjONRxaAKGxzQvG4= github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= -github.com/Shopify/sarama v1.32.0 h1:P+RUjEaRU0GMMbYexGMDyrMkLhbbBVUVISDywi+IlFU= -github.com/Shopify/sarama v1.32.0/go.mod h1:+EmJJKZWVT/faR9RcOxJerP+LId4iWdQPBGLy1Y1Njs= -github.com/Shopify/toxiproxy/v2 v2.3.0 h1:62YkpiP4bzdhKMH+6uC5E95y608k3zDwdzuBMsnn3uQ= -github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoHYDirfUfpIm0c= +github.com/Shopify/sarama v1.29.0 h1:ARid8o8oieau9XrHI55f/L3EoRAhm9px6sonbD7yuUE= +github.com/Shopify/sarama v1.29.0/go.mod h1:2QpgD79wpdAESqNQMxNc0KYMkycd4slxGdV3TWSVqrU= +github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM= github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= @@ -269,8 +269,8 @@ github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= github.com/dgraph-io/ristretto v0.0.1/go.mod h1:T40EBc7CJke8TkpiYfGGKAeFjSaxuFXhuXRyumBd6RE= -github.com/dgraph-io/ristretto v0.1.0 h1:Jv3CGQHp9OjuMBSne1485aDpUkTKEcUqF+jm/LuerPI= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= +github.com/dgraph-io/ristretto v0.1.1-0.20211108053508-297c39e6640f h1:NBGp2JpfMtXmanFWt6f3gEdBtnLO5LupRvm3w4TXrvs= +github.com/dgraph-io/ristretto v0.1.1-0.20211108053508-297c39e6640f/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgryski/go-farm v0.0.0-20190104051053-3adb47b1fb0f/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= @@ -330,8 +330,8 @@ github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9 github.com/form3tech-oss/jwt-go v3.2.5+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= -github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= -github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= +github.com/frankban/quicktest v1.11.3 h1:8sXhOn0uLys67V8EsXLc6eszDs8VXWxL3iRvebPhedY= +github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= @@ -740,7 +740,7 @@ github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0 github.com/klauspost/compress v1.10.5/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.10.8/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.15.1 h1:y9FcTHGyrebwfP0ZZqFiaxTaiDnUrGkJkI+f583BL1A= github.com/klauspost/compress v1.15.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= @@ -921,6 +921,7 @@ github.com/phf/go-queue v0.0.0-20170504031614-9abe38d0371d/go.mod h1:lXfE4PvvTW5 github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.6.0+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pingcap/badger v1.5.1-0.20210831093107-2f6cb8008145/go.mod h1:LyrqUOHZrUDf9oGi1yoz1+qw9ckSIhQb5eMa1acOLNQ= @@ -980,8 +981,8 @@ github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d/go.mod h1:7j18ezaW 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.20211023132847-efa94595c071/go.mod h1:Ci7ABF58a4jn6YtaHi7655jP409edqC2JxWWFRqOubg= -github.com/pingcap/tidb v1.1.0-beta.0.20220329110428-fbaaa1117936 h1:WGorhVcanLTZY0kOBpyDEMDpKuf5nUSdit2h2nnwyhI= -github.com/pingcap/tidb v1.1.0-beta.0.20220329110428-fbaaa1117936/go.mod h1:u9+BuRjsVPgGCvgFQbvjTCveo6vm+eGzsBmTAvZpm64= +github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912 h1:PwQDbJTwYHd2mB11p86njp2RiQJ7a8u6Vqu6+Gip4MI= +github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo= github.com/pingcap/tidb-dashboard v0.0.0-20210716172320-2226872e3296/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ= github.com/pingcap/tidb-dashboard v0.0.0-20220117082709-e8076b5c79ba/go.mod h1:4hk/3owVGWdvI9Kx6yCqqvM1T5PVgwyQNyMQxD3rwfc= @@ -1169,8 +1170,8 @@ 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.0-alpha.0.20211011083157-49c8dd23f1f0/go.mod h1:00plYwQsQ5kBUmafHO+JkjznGgFaBokMZl82TZIbsQk= -github.com/tikv/client-go/v2 v2.0.1-0.20220328083738-8489c3e8c3d9 h1:TgSywPECh84B5S6Z97jhMdQVrezPwUbOKbCZFie2kPI= -github.com/tikv/client-go/v2 v2.0.1-0.20220328083738-8489c3e8c3d9/go.mod h1:0scaG+seu7L56apm+Gjz9vckyO7ABIzM6T7n00mrIXs= +github.com/tikv/client-go/v2 v2.0.1-0.20220329092050-6bf6951325ad h1:Imm87gW7/Pra/NdUc7D3wkdtlZgo/iw0lSLIWZPiMS0= +github.com/tikv/client-go/v2 v2.0.1-0.20220329092050-6bf6951325ad/go.mod h1:0scaG+seu7L56apm+Gjz9vckyO7ABIzM6T7n00mrIXs= github.com/tikv/pd v1.1.0-beta.0.20210323121136-78679e5e209d/go.mod h1:Jw9KG11C/23Rr7DW4XWQ7H5xOgGZo6DFL1OKAF4+Igw= github.com/tikv/pd v1.1.0-beta.0.20210818082359-acba1da0018d/go.mod h1:rammPjeZgpvfrQRPkijcx8tlxF1XM5+m6kRXrkDzCAA= github.com/tikv/pd v1.1.0-beta.0.20220303060546-3695d8164800 h1:lIfIwqe1HPa0suhMpiI200nYxau+rXWXTqZxSGg1HS4= @@ -1211,7 +1212,6 @@ github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxW github.com/unrolled/render v1.0.1/go.mod h1:gN9T0NhL4Bfbwu8ann7Ry/TGHYfosul+J0obPf6NBdM= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/urfave/negroni v0.3.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= @@ -1230,13 +1230,10 @@ github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAh github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f h1:9DDCDwOyEy/gId+IEMrFHLuQ5R/WV0KNxWLler8X2OY= github.com/wangjohn/quickselect v0.0.0-20161129230411-ed8402a42d5f/go.mod h1:8sdOQnirw1PrcnTJYkmW1iOHtUmblMmGdUOHyWYycLI= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c h1:u40Z8hqBAAQyv+vATcGgV0YCnDjqSL7/q/JyPhhJSPk= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= -github.com/xdg/stringprep v1.0.0 h1:d9X0esnoa3dFsV0FG35rAT0RIhYFlPq7MiP+DW89La0= -github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= +github.com/xdg/scram v1.0.3 h1:nTadYh2Fs4BK2xdldEa2g5bbaZp0/+1nJMMPtPxS/to= +github.com/xdg/scram v1.0.3/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= +github.com/xdg/stringprep v1.0.3 h1:cmL5Enob4W83ti/ZHuZLuKD/xqJfus4fVPwE+/BDm+4= +github.com/xdg/stringprep v1.0.3/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= @@ -1382,6 +1379,7 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201217014255-9d1352758620/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= @@ -1485,12 +1483,12 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1618,8 +1616,8 @@ golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220318055525-2edf467146b5 h1:saXMvIOKvRFwbOMicHXr0B1uwoxq9dGmLe5ExMES6c4= -golang.org/x/sys v0.0.0-20220318055525-2edf467146b5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY= +golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= From fb19214718e2a5f9427b7d08e423b908b852b1a8 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Wed, 6 Apr 2022 15:04:15 +0800 Subject: [PATCH 15/19] bump tidb to 0406 to fix unstable ddl test. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 822c6d1921d..6e9871642d8 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/pingcap/failpoint v0.0.0-20220303073211-00fea37feb66 github.com/pingcap/kvproto v0.0.0-20220328072018-6e75c12dbd73 github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee - github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912 + github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4 github.com/pingcap/tidb-tools v6.0.0-alpha.0.20220317013353-dfc5146f4746+incompatible github.com/pingcap/tidb/parser v0.0.0-20220329110428-fbaaa1117936 github.com/prometheus/client_golang v1.11.0 diff --git a/go.sum b/go.sum index caa8fd5b348..8ac38aa6f96 100644 --- a/go.sum +++ b/go.sum @@ -983,6 +983,8 @@ github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4/go.mod h1:sDCsM39c github.com/pingcap/tidb v1.1.0-beta.0.20211023132847-efa94595c071/go.mod h1:Ci7ABF58a4jn6YtaHi7655jP409edqC2JxWWFRqOubg= github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912 h1:PwQDbJTwYHd2mB11p86njp2RiQJ7a8u6Vqu6+Gip4MI= github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= +github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4 h1:t0R70yuwPXL/z4+xsgh9jdRLKaXj6wVchig34QTZQqA= +github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo= github.com/pingcap/tidb-dashboard v0.0.0-20210716172320-2226872e3296/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ= github.com/pingcap/tidb-dashboard v0.0.0-20220117082709-e8076b5c79ba/go.mod h1:4hk/3owVGWdvI9Kx6yCqqvM1T5PVgwyQNyMQxD3rwfc= From 257ba8be0dc8decbabc4e9d446a7b0b2f51b3a85 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Wed, 6 Apr 2022 15:28:43 +0800 Subject: [PATCH 16/19] fix go mod tidy. --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 8ac38aa6f96..944980ced35 100644 --- a/go.sum +++ b/go.sum @@ -981,8 +981,6 @@ github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d/go.mod h1:7j18ezaW 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.20211023132847-efa94595c071/go.mod h1:Ci7ABF58a4jn6YtaHi7655jP409edqC2JxWWFRqOubg= -github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912 h1:PwQDbJTwYHd2mB11p86njp2RiQJ7a8u6Vqu6+Gip4MI= -github.com/pingcap/tidb v1.1.0-beta.0.20220402073429-9b358bc73912/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4 h1:t0R70yuwPXL/z4+xsgh9jdRLKaXj6wVchig34QTZQqA= github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo= From 48c8d391dec89ec3517bc1cbda45e8727a05f062 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Wed, 6 Apr 2022 17:57:06 +0800 Subject: [PATCH 17/19] fix line width in kafka consumer. --- cmd/kafka-consumer/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/kafka-consumer/main.go b/cmd/kafka-consumer/main.go index 19a23b9075c..2e5836afa5a 100644 --- a/cmd/kafka-consumer/main.go +++ b/cmd/kafka-consumer/main.go @@ -484,6 +484,7 @@ func (g *eventsGroup) Resolve(resolveTs uint64) []*model.RowChangedEvent { // ConsumeClaim must start a consumer loop of ConsumerGroupClaim's Messages(). func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { + ctx := context.Background() partition := claim.Partition() c.sinksMu.Lock() sink := c.sinks[partition] @@ -576,7 +577,8 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram if row.Table.IsPartition { partitionID = row.Table.TableID } - tableID := c.fakeTableIDGenerator.generateFakeTableID(row.Table.Schema, row.Table.Table, partitionID) + tableID := c.fakeTableIDGenerator. + generateFakeTableID(row.Table.Schema, row.Table.Table, partitionID) row.Table.TableID = tableID group, ok := eventGroups[tableID] @@ -604,7 +606,7 @@ func (c *Consumer) ConsumeClaim(session sarama.ConsumerGroupSession, claim saram if len(events) == 0 { continue } - if err := sink.EmitRowChangedEvents(context.Background(), events...); err != nil { + if err := sink.EmitRowChangedEvents(ctx, events...); err != nil { log.Panic("emit row changed event failed", zap.Any("events", events), zap.Error(err), From ad2339c279c82d2898f95780e23eac8209c47353 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 7 Apr 2022 16:29:06 +0800 Subject: [PATCH 18/19] replace tidb version. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6e9871642d8..1ede0b1ca7f 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,7 @@ require ( github.com/pingcap/failpoint v0.0.0-20220303073211-00fea37feb66 github.com/pingcap/kvproto v0.0.0-20220328072018-6e75c12dbd73 github.com/pingcap/log v0.0.0-20211215031037-e024ba4eb0ee - github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4 + github.com/pingcap/tidb v1.1.0-beta.0.20220407075432-5c6248d6ec88 github.com/pingcap/tidb-tools v6.0.0-alpha.0.20220317013353-dfc5146f4746+incompatible github.com/pingcap/tidb/parser v0.0.0-20220329110428-fbaaa1117936 github.com/prometheus/client_golang v1.11.0 diff --git a/go.sum b/go.sum index 944980ced35..18861a291d3 100644 --- a/go.sum +++ b/go.sum @@ -983,6 +983,8 @@ github.com/pingcap/sysutil v0.0.0-20220114020952-ea68d2dbf5b4/go.mod h1:sDCsM39c github.com/pingcap/tidb v1.1.0-beta.0.20211023132847-efa94595c071/go.mod h1:Ci7ABF58a4jn6YtaHi7655jP409edqC2JxWWFRqOubg= github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4 h1:t0R70yuwPXL/z4+xsgh9jdRLKaXj6wVchig34QTZQqA= github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= +github.com/pingcap/tidb v1.1.0-beta.0.20220407075432-5c6248d6ec88 h1:LReFFkjdcmUiuo0I/9u2PqasWZsWwMeWZ/zc1ZxxHVM= +github.com/pingcap/tidb v1.1.0-beta.0.20220407075432-5c6248d6ec88/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo= github.com/pingcap/tidb-dashboard v0.0.0-20210716172320-2226872e3296/go.mod h1:OCXbZTBTIMRcIt0jFsuCakZP+goYRv6IjawKbwLS2TQ= github.com/pingcap/tidb-dashboard v0.0.0-20220117082709-e8076b5c79ba/go.mod h1:4hk/3owVGWdvI9Kx6yCqqvM1T5PVgwyQNyMQxD3rwfc= From 0d1015b25aeabb4c46f58f9d8b744cca50b10656 Mon Sep 17 00:00:00 2001 From: 3AceShowHand Date: Thu, 7 Apr 2022 16:59:54 +0800 Subject: [PATCH 19/19] fix go mod tidy. --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 18861a291d3..333f1ffacbe 100644 --- a/go.sum +++ b/go.sum @@ -981,8 +981,6 @@ github.com/pingcap/sysutil v0.0.0-20211208032423-041a72e5860d/go.mod h1:7j18ezaW 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.20211023132847-efa94595c071/go.mod h1:Ci7ABF58a4jn6YtaHi7655jP409edqC2JxWWFRqOubg= -github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4 h1:t0R70yuwPXL/z4+xsgh9jdRLKaXj6wVchig34QTZQqA= -github.com/pingcap/tidb v1.1.0-beta.0.20220406065431-b37b3b1afcd4/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= github.com/pingcap/tidb v1.1.0-beta.0.20220407075432-5c6248d6ec88 h1:LReFFkjdcmUiuo0I/9u2PqasWZsWwMeWZ/zc1ZxxHVM= github.com/pingcap/tidb v1.1.0-beta.0.20220407075432-5c6248d6ec88/go.mod h1:KHwOlURugOyhlhxpBbSYy1UROkof5rnYdTS6eVRI7sA= github.com/pingcap/tidb-dashboard v0.0.0-20210312062513-eef5d6404638/go.mod h1:OzFN8H0EDMMqeulPhPMw2i2JaiZWOKFQ7zdRPhENNgo=