restore: fix CI

pkg/logutil/rate.go

@@ -11,7 +11,7 @@ import (
 	"go.uber.org/zap"
 )
 
-// Rater is a trivial rate tracer.
+// TrivialRater is a trivial rate tracer.
 // It doesn't record any time sequence, and always
 // return the average speed over all the time.
 // TODO: replace it with Prometheus.
@@ -20,6 +20,7 @@ type TrivialRater struct {
 	current uint64
 }
 
+// NewTrivialRater make a trivial rater.
 func NewTrivialRater() TrivialRater {
 	return TrivialRater{
 		start:   time.Now(),
@@ -37,7 +38,7 @@ func (r *TrivialRater) Rate(unit time.Duration) float64 {
 	return float64(atomic.LoadUint64(&r.current)) / float64(time.Since(r.start)/unit)
 }
 
-// Log log the current rate(in ops per second) to the info level.
+// L make a logger with the current speed.
 func (r *TrivialRater) L() *zap.Logger {
 	return log.With(zap.String("speed", fmt.Sprintf("%.2f ops/s", r.Rate(time.Second))))
 }

pkg/restore/util.go

@@ -378,6 +378,7 @@ func SplitRangesAndThen(
 	}))
 }
 
+// SplitRanges is the synchronous version of SplitRangesAndThen.
 func SplitRanges(
 	ctx context.Context,
 	client *Client,

pkg/rtree/logging.go

@@ -9,6 +9,7 @@ import (
 	"go.uber.org/zap/zapcore"
 
 	"github.com/docker/go-units"
+
 	"github.com/pingcap/br/pkg/logutil"
 	"github.com/pingcap/br/pkg/redact"
 )
@@ -56,7 +57,7 @@ func (rs rangesMarshaler) MarshalLogObject(encoder zapcore.ObjectEncoder) error
 
 	encoder.AddInt("file-count", totalFile)
 	encoder.AddUint64("kv-paris-count", totalKV)
-	encoder.AddString("after-compress-size", units.HumanSize(float64(totalBytes)))
-	encoder.AddString("data-size", units.HumanSize(float64(totalSize)))
+	encoder.AddString("data-size", units.HumanSize(float64(totalBytes)))
+	encoder.AddString("after-compress-size", units.HumanSize(float64(totalSize)))
 	return nil
 }

pkg/rtree/logging_test.go

@@ -23,15 +23,14 @@ func (s *testLoggingSuite) TestLogRanges(c *C) {
 		count  int
 		expect string
 	}{
-		{0, `{"ranges": {"total": 0, "ranges": [], "totalFiles": 0, "totalKVs": 0, "totalBytes": 0, "totalSize": 0}}`},
-		{1, `{"ranges": {"total": 1, "ranges": ["[30, 31)"], "totalFiles": 1, "totalKVs": 0, "totalBytes": 0, "totalSize": 0}}`},
-		{2, `{"ranges": {"total": 2, "ranges": ["[30, 31)", "[31, 32)"], "totalFiles": 2, "totalKVs": 1, "totalBytes": 1, "totalSize": 1}}`},
-		{3, `{"ranges": {"total": 3, "ranges": ["[30, 31)", "[31, 32)", "[32, 33)"], "totalFiles": 3, "totalKVs": 3, "totalBytes": 3, "totalSize": 3}}`},
-		{4, `{"ranges": {"total": 4, "ranges": ["[30, 31)", "[31, 32)", "[32, 33)", "[33, 34)"], "totalFiles": 4, "totalKVs": 6, "totalBytes": 6, "totalSize": 6}}`},
-		{5, `{"ranges": {"total": 5, "ranges": ["[30, 31)", "(skip 3)", "[34, 35)"], "totalFiles": 5, "totalKVs": 10, "totalBytes": 10, "totalSize": 10}}`},
-		{6, `{"ranges": {"total": 6, "ranges": ["[30, 31)", "(skip 4)", "[35, 36)"], "totalFiles": 6, "totalKVs": 15, "totalBytes": 15, "totalSize": 15}}`},
-		{1024, `{"ranges": {"total": 1024, "ranges": ["[30, 31)", "(skip 1022)", "[31303233, 31303234)"], "totalFiles": 1024, "totalKVs": 523776, "totalBytes": 523776, "totalSize": 523776}}`},
-	}
+		{0, `{"ranges": {"total": 0, "ranges": [], "file-count": 0, "kv-paris-count": 0, "data-size": "0B", "after-compress-size": "0B"}}`},
+		{1, `{"ranges": {"total": 1, "ranges": ["[30, 31)"], "file-count": 1, "kv-paris-count": 0, "data-size": "0B", "after-compress-size": "0B"}}`},
+		{2, `{"ranges": {"total": 2, "ranges": ["[30, 31)", "[31, 32)"], "file-count": 2, "kv-paris-count": 1, "data-size": "1B", "after-compress-size": "0B"}}`},
+		{3, `{"ranges": {"total": 3, "ranges": ["[30, 31)", "[31, 32)", "[32, 33)"], "file-count": 3, "kv-paris-count": 3, "data-size": "3B", "after-compress-size": "0B"}}`},
+		{4, `{"ranges": {"total": 4, "ranges": ["[30, 31)", "[31, 32)", "[32, 33)", "[33, 34)"], "file-count": 4, "kv-paris-count": 6, "data-size": "6B", "after-compress-size": "0B"}}`},
+		{5, `{"ranges": {"total": 5, "ranges": ["[30, 31)", "(skip 3)", "[34, 35)"], "file-count": 5, "kv-paris-count": 10, "data-size": "10B", "after-compress-size": "0B"}}`},
+		{6, `{"ranges": {"total": 6, "ranges": ["[30, 31)", "(skip 4)", "[35, 36)"], "file-count": 6, "kv-paris-count": 15, "data-size": "15B", "after-compress-size": "0B"}}`},
+		{1024, `{"ranges": {"total": 1024, "ranges": ["[30, 31)", "(skip 1022)", "[31303233, 31303234)"], "file-count": 1024, "kv-paris-count": 523776, "data-size": "523.8kB", "after-compress-size": "0B"}}`}}
 
 	encoder := zapcore.NewConsoleEncoder(zapcore.EncoderConfig{})
 	for _, cs := range cases {

pkg/task/restore.go

@@ -149,11 +149,11 @@ func (cfg *RestoreConfig) ParseFromFlags(flags *pflag.FlagSet) error {
 	}
 	cfg.PDConcurrency, err = flags.GetUint(FlagPDConcurrency)
 	if err != nil {
-		return errors.Wrapf(err, "failed to get flag %s", FlagPDConcurrency)
+		return errors.Annotatef(err, "failed to get flag %s", FlagPDConcurrency)
 	}
 	cfg.BatchFlushInterval, err = flags.GetDuration(FlagBatchFlushInterval)
 	if err != nil {
-		return errors.Wrapf(err, "failed to get flag %s", FlagBatchFlushInterval)
+		return errors.Annotatef(err, "failed to get flag %s", FlagBatchFlushInterval)
 	}
 	return nil
 }