dumpling : add a function for the variable call of dm

dumpling/export/status.go

@@ -15,8 +15,7 @@ import (
 const logProgressTick = 2 * time.Minute
 
 func (d *Dumper) runLogProgress(tctx *tcontext.Context) {
-	conf := d.conf
-	totalTables := float64(calculateTableCount(conf.Tables))
+	midd := d.GetParameters()
 	logProgressTicker := time.NewTicker(logProgressTick)
 	lastCheckpoint := time.Now()
 	lastBytes := float64(0)
@@ -29,25 +28,41 @@ func (d *Dumper) runLogProgress(tctx *tcontext.Context) {
 		case <-logProgressTicker.C:
 			nanoseconds := float64(time.Since(lastCheckpoint).Nanoseconds())
 
-			completedTables := ReadCounter(finishedTablesCounter, conf.Labels)
-			finishedBytes := ReadGauge(finishedSizeGauge, conf.Labels)
-			finishedRows := ReadGauge(finishedRowsGauge, conf.Labels)
-			estimateTotalRows := ReadCounter(estimateTotalRowsCounter, conf.Labels)
-
 			tctx.L().Info("progress",
-				zap.String("tables", fmt.Sprintf("%.0f/%.0f (%.1f%%)", completedTables, totalTables, completedTables/totalTables*100)),
-				zap.String("finished rows", fmt.Sprintf("%.0f", finishedRows)),
-				zap.String("estimate total rows", fmt.Sprintf("%.0f", estimateTotalRows)),
-				zap.String("finished size", units.HumanSize(finishedBytes)),
-				zap.Float64("average speed(MiB/s)", (finishedBytes-lastBytes)/(1048576e-9*nanoseconds)),
+				zap.String("tables", fmt.Sprintf("%.0f/%.0f (%.1f%%)", midd.CompletedTables, midd.TotalTables, midd.CompletedTables/midd.TotalTables*100)),
+				zap.String("finished rows", fmt.Sprintf("%.0f", midd.FinishedRows)),
+				zap.String("estimate total rows", fmt.Sprintf("%.0f", midd.EstimateTotalRows)),
+				zap.String("finished size", units.HumanSize(midd.FinishedBytes)),
+				zap.Float64("average speed(MiB/s)", (midd.FinishedBytes-lastBytes)/(1048576e-9*nanoseconds)),
 			)
 
 			lastCheckpoint = time.Now()
-			lastBytes = finishedBytes
+			lastBytes = midd.FinishedBytes
 		}
 	}
 }
 
+type Midparams struct {
+	TotalTables       float64
+	CompletedTables   float64
+	FinishedBytes     float64
+	FinishedRows      float64
+	EstimateTotalRows float64
+}
+
+func (d *Dumper) GetParameters() (midparams *Midparams) {
+	conf := d.conf
+	mid := &Midparams{}
+	if mid.TotalTables == 0 {
+		mid.TotalTables = float64(calculateTableCount(conf.Tables))
+	}
+	mid.CompletedTables = ReadCounter(finishedTablesCounter, conf.Labels)
+	mid.FinishedBytes = ReadGauge(finishedSizeGauge, conf.Labels)
+	mid.FinishedRows = ReadGauge(finishedRowsGauge, conf.Labels)
+	mid.EstimateTotalRows = ReadCounter(estimateTotalRowsCounter, conf.Labels)
+	return mid
+}
+
 func calculateTableCount(m DatabaseTables) int {
 	cnt := 0
 	for _, tables := range m {

dumpling/export/status_test.go

@@ -0,0 +1,32 @@
+// Copyright 2021 PingCAP, Inc. Licensed under Apache-2.0.
+
+package export
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestGetParameters(t *testing.T) {
+	conf := defaultConfigForTest(t)
+	d := &Dumper{conf: conf}
+	InitMetricsVector(conf.Labels)
+
+	mid := d.GetParameters()
+	require.EqualValues(t, float64(0), mid.CompletedTables)
+	require.EqualValues(t, float64(0), mid.FinishedBytes)
+	require.EqualValues(t, float64(0), mid.FinishedRows)
+	require.EqualValues(t, float64(0), mid.EstimateTotalRows)
+
+	AddCounter(finishedTablesCounter, conf.Labels, 10)
+	AddGauge(finishedSizeGauge, conf.Labels, 20)
+	AddGauge(finishedRowsGauge, conf.Labels, 30)
+	AddCounter(estimateTotalRowsCounter, conf.Labels, 40)
+
+	mid = d.GetParameters()
+	require.EqualValues(t, float64(10), mid.CompletedTables)
+	require.EqualValues(t, float64(20), mid.FinishedBytes)
+	require.EqualValues(t, float64(30), mid.FinishedRows)
+	require.EqualValues(t, float64(40), mid.EstimateTotalRows)
+}