Skip to content

Commit 3889d53

Browse files
committed
fix comments
1 parent 4b485e0 commit 3889d53

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ br_bins:
530530

531531
.PHONY: data_parsers
532532
data_parsers: tools/bin/vfsgendev pkg/lightning/mydump/parser_generated.go lightning_web
533-
PATH="$(GOPATH)/bin":"$(PATH)":"$(TOOLS)" protoc -I. -I"$(GOPATH)/pkg/mod" pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto --gogofaster_out=.
533+
PATH="$(GOPATH)/bin":"$(PATH)":"$(TOOLS)" protoc -I. -I"$(GOMODCACHE)" pkg/lightning/checkpoints/checkpointspb/file_checkpoints.proto --gogofaster_out=.
534534
tools/bin/vfsgendev -source='"github.com/pingcap/tidb/lightning/pkg/web".Res' && mv res_vfsdata.go lightning/pkg/web/
535535

536536
.PHONY: build_dumpling

Makefile.common

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
PROJECT=tidb
1616
GOPATH ?= $(shell go env GOPATH)
17+
GOMODCACHE ?= $(shell go env GOMODCACHE)
1718
P=8
1819

1920
# Ensure GOPATH is set before running build process.
@@ -132,4 +133,4 @@ ifneq ("$(CI)", "")
132133
endif
133134
BAZEL_INSTRUMENTATION_FILTER := --instrument_test_targets --instrumentation_filter=//pkg/...,//br/...,//dumpling/...
134135

135-
NOGO_FLAG=true
136+
NOGO_FLAG=true

lightning/pkg/importer/import.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1990,6 +1990,11 @@ type deliverResult struct {
19901990
}
19911991

19921992
func saveCheckpoint(rc *Controller, t *TableImporter, engineID int32, chunk *checkpoints.ChunkCheckpoint) {
1993+
// we save the XXXBase every time a chunk is finished.
1994+
// Note, it's possible some chunk with larger autoID range finished first, so
1995+
// the saved XXXBase is larger, when chunks with smaller autoID range finished
1996+
// it might have no effect on the saved XXXBase, but it's OK, we only need
1997+
// the largest.
19931998
rc.saveCpCh <- saveCp{
19941999
tableName: t.tableName,
19952000
merger: &checkpoints.RebaseCheckpointMerger{

0 commit comments

Comments
 (0)