From eddfd26a8fb569f8091cf633b414fa33e8df55a8 Mon Sep 17 00:00:00 2001 From: wjhuang2016 Date: Wed, 26 Jul 2023 13:38:14 +0800 Subject: [PATCH] try Signed-off-by: wjhuang2016 --- br/pkg/lightning/backend/remote/remote.go | 17 ----------------- ddl/disttask_flow.go | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/br/pkg/lightning/backend/remote/remote.go b/br/pkg/lightning/backend/remote/remote.go index df1522bffd1d9..eeabfb7d098c2 100644 --- a/br/pkg/lightning/backend/remote/remote.go +++ b/br/pkg/lightning/backend/remote/remote.go @@ -1717,16 +1717,6 @@ func (remote *Backend) writeToTiKV(ctx context.Context, j *regionJob) error { return errors.Trace(err) } requests[i].Chunk.(*sst.WriteRequest_Batch).Batch.Pairs = pairs[:count] - - var prevKey []byte - for _, pair := range pairs[:count] { - if len(prevKey) > 0 && bytes.Compare(prevKey, pair.Key) >= 0 { - log.FromContext(context.Background()).Error("", zap.ByteString("prevKey", prevKey), zap.ByteString("key", pair.Key)) - return errors.New("write batch keys are not in order") - } - prevKey = pair.Key - } - if err := clients[i].Send(requests[i]); err != nil { res := sst.WriteResponse{} newErr := clients[i].RecvMsg(&res) @@ -1752,7 +1742,6 @@ func (remote *Backend) writeToTiKV(ctx context.Context, j *regionJob) error { var remainingStartKey []byte startTime := time.Now() - var prevKey []byte for iter.Next() { key := kv.Key(iter.Key()) if key.Cmp(j.keyRange.start) < 0 { @@ -1762,12 +1751,6 @@ func (remote *Backend) writeToTiKV(ctx context.Context, j *regionJob) error { break } - if len(prevKey) > 0 && bytes.Compare(prevKey, key) >= 0 { - log.FromContext(context.Background()).Error("", zap.Any("prevKey", prevKey), zap.Any("key", key)) - return errors.New("write batch keys are not in order") - } - prevKey = key.Clone() - //readableKey := hex.EncodeToString(iter.Key()) //_, _, vals, err := tablecodec.DecodeIndexKey(iter.Key()) //log.FromContext(ctx).Info("iter", zap.String("key", readableKey), zap.String("colVal", vals[0]), zap.Error(err)) diff --git a/ddl/disttask_flow.go b/ddl/disttask_flow.go index fda14d3840b96..0d8b204fe6334 100644 --- a/ddl/disttask_flow.go +++ b/ddl/disttask_flow.go @@ -252,7 +252,7 @@ func (h *litBackfillFlowHandle) splitSubtaskRanges(ctx context.Context, taskHand return nil, err } if len(splitKey) == 0 { - endKey = lastKey + endKey = lastKey.Next() } else { endKey = splitKey.Clone() }