From 6be103268b39d7dc7039ea9765240b5ad680e25f Mon Sep 17 00:00:00 2001 From: tangenta Date: Wed, 26 Jul 2023 14:20:19 +0800 Subject: [PATCH 1/3] fix miss one key inconsistency --- br/pkg/lightning/backend/remote/remote.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/br/pkg/lightning/backend/remote/remote.go b/br/pkg/lightning/backend/remote/remote.go index eeabfb7d098c2..aefb3f5d26063 100644 --- a/br/pkg/lightning/backend/remote/remote.go +++ b/br/pkg/lightning/backend/remote/remote.go @@ -319,7 +319,7 @@ func generateRanges(splitKeys [][]byte, start, end kv.Key) []Range { } ranges = append(ranges, Range{start: splitKeys[i], end: endK}) } - ranges[len(ranges)-1].end = end + ranges[len(ranges)-1].end = end.Next() for _, r := range ranges { log.FromContext(context.Background()).Info("range", zap.String("start", hex.EncodeToString(r.start)), zap.String("end", hex.EncodeToString(r.end))) } @@ -1643,8 +1643,8 @@ func (remote *Backend) writeToTiKV(ctx context.Context, j *regionJob) error { begin := time.Now() region := j.region.Region - firstKey := codec.EncodeBytes([]byte{}, j.keyRange.start) - lastKey := codec.EncodeBytes([]byte{}, j.keyRange.end) + firstKey := codec.EncodeBytes([]byte{}, j.writeBatch[0].key) + lastKey := codec.EncodeBytes([]byte{}, j.writeBatch[len(j.writeBatch)-1].key) u := uuid.New() meta := &sst.SSTMeta{ @@ -1744,12 +1744,6 @@ func (remote *Backend) writeToTiKV(ctx context.Context, j *regionJob) error { startTime := time.Now() for iter.Next() { key := kv.Key(iter.Key()) - if key.Cmp(j.keyRange.start) < 0 { - continue - } - if key.Cmp(j.keyRange.end) > 0 { - break - } //readableKey := hex.EncodeToString(iter.Key()) //_, _, vals, err := tablecodec.DecodeIndexKey(iter.Key()) From 13b946ced795dda381353ad3b1736aee74903b24 Mon Sep 17 00:00:00 2001 From: tangenta Date: Wed, 26 Jul 2023 14:24:57 +0800 Subject: [PATCH 2/3] fix build --- br/pkg/lightning/backend/remote/remote.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/br/pkg/lightning/backend/remote/remote.go b/br/pkg/lightning/backend/remote/remote.go index aefb3f5d26063..b4c5c9c02a1e5 100644 --- a/br/pkg/lightning/backend/remote/remote.go +++ b/br/pkg/lightning/backend/remote/remote.go @@ -1743,8 +1743,6 @@ func (remote *Backend) writeToTiKV(ctx context.Context, j *regionJob) error { var remainingStartKey []byte startTime := time.Now() for iter.Next() { - key := kv.Key(iter.Key()) - //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)) From 2f9dc76d6e0426d6a31bbd6d678ee8f54800c469 Mon Sep 17 00:00:00 2001 From: tangenta Date: Wed, 26 Jul 2023 14:29:45 +0800 Subject: [PATCH 3/3] revert unnecessary change --- br/pkg/lightning/backend/remote/remote.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/br/pkg/lightning/backend/remote/remote.go b/br/pkg/lightning/backend/remote/remote.go index b4c5c9c02a1e5..0773c7d41c44d 100644 --- a/br/pkg/lightning/backend/remote/remote.go +++ b/br/pkg/lightning/backend/remote/remote.go @@ -319,7 +319,7 @@ func generateRanges(splitKeys [][]byte, start, end kv.Key) []Range { } ranges = append(ranges, Range{start: splitKeys[i], end: endK}) } - ranges[len(ranges)-1].end = end.Next() + ranges[len(ranges)-1].end = end for _, r := range ranges { log.FromContext(context.Background()).Info("range", zap.String("start", hex.EncodeToString(r.start)), zap.String("end", hex.EncodeToString(r.end))) }