fix more

Signed-off-by: lance6716 <lance6716@gmail.com>
pingcap · Dec 4, 2023 · 1135139 · 1135139
1 parent 6938bef
commit 1135139
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/br/pkg/lightning/backend/external/BUILD.bazel b/br/pkg/lightning/backend/external/BUILD.bazel
@@ -64,7 +64,7 @@ go_test(
     ],
     embed = [":external"],
     flaky = True,
-    shard_count = 47,
+    shard_count = 48,
     deps = [
         "//br/pkg/lightning/backend/kv",
         "//br/pkg/lightning/common",

diff --git a/br/pkg/lightning/backend/external/iter.go b/br/pkg/lightning/backend/external/iter.go
@@ -23,6 +23,7 @@ import (
 	"github.com/pingcap/tidb/br/pkg/membuf"
 	"github.com/pingcap/tidb/br/pkg/storage"
 	"github.com/pingcap/tidb/pkg/util/logutil"
+	"github.com/pingcap/tidb/pkg/util/size"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 )
@@ -196,7 +197,7 @@ func newMergeIter[
 	if sampleKeySize == 0 || sampleKeySize/sampleKeyCnt == 0 {
 		i.checkHotspotPeriod = 10000
 	} else {
-		sizeThreshold := 32 * 1024 * 1024
+		sizeThreshold := int(32 * size.MB)
 		i.checkHotspotPeriod = max(1000, sizeThreshold/(sampleKeySize/sampleKeyCnt))
 	}
 	heap.Init(&i.h)