Skip to content

Commit 22ca2b8

Browse files
authored
ddl: revert 'query from min job id' (pingcap#54180)
ref pingcap#53246
1 parent 4327c93 commit 22ca2b8

37 files changed

+55
-348
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ gen_mock: mockgen
496496
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/util/sqlexec RestrictedSQLExecutor > pkg/util/sqlexec/mock/restricted_sql_executor_mock.go
497497
tools/bin/mockgen -package mockstorage github.com/pingcap/tidb/br/pkg/storage ExternalStorage > br/pkg/mock/storage/storage.go
498498
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/ddl SchemaLoader > pkg/ddl/mock/schema_loader_mock.go
499-
tools/bin/mockgen -package mock github.com/pingcap/tidb/pkg/ddl/systable Manager > pkg/ddl/mock/systable_manager_mock.go
500499

501500
# There is no FreeBSD environment for GitHub actions. So cross-compile on Linux
502501
# but that doesn't work with CGO_ENABLED=1, so disable cgo. The reason to have

pkg/ddl/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ go_library(
7171
"//pkg/config",
7272
"//pkg/ddl/copr",
7373
"//pkg/ddl/ingest",
74+
"//pkg/ddl/internal/session",
7475
"//pkg/ddl/label",
7576
"//pkg/ddl/logutil",
7677
"//pkg/ddl/placement",
7778
"//pkg/ddl/resourcegroup",
78-
"//pkg/ddl/session",
7979
"//pkg/ddl/syncer",
8080
"//pkg/ddl/systable",
8181
"//pkg/ddl/util",
@@ -270,11 +270,11 @@ go_test(
270270
"//pkg/config",
271271
"//pkg/ddl/copr",
272272
"//pkg/ddl/ingest",
273+
"//pkg/ddl/internal/session",
273274
"//pkg/ddl/logutil",
274275
"//pkg/ddl/mock",
275276
"//pkg/ddl/placement",
276277
"//pkg/ddl/schematracker",
277-
"//pkg/ddl/session",
278278
"//pkg/ddl/syncer",
279279
"//pkg/ddl/testutil",
280280
"//pkg/ddl/util",

pkg/ddl/backfilling.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525

2626
"github.com/pingcap/errors"
2727
"github.com/pingcap/failpoint"
28+
sess "github.com/pingcap/tidb/pkg/ddl/internal/session"
2829
"github.com/pingcap/tidb/pkg/ddl/logutil"
29-
sess "github.com/pingcap/tidb/pkg/ddl/session"
3030
ddlutil "github.com/pingcap/tidb/pkg/ddl/util"
3131
"github.com/pingcap/tidb/pkg/expression"
3232
exprctx "github.com/pingcap/tidb/pkg/expression/context"

pkg/ddl/backfilling_operators.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/pingcap/tidb/br/pkg/storage"
3131
"github.com/pingcap/tidb/pkg/ddl/copr"
3232
"github.com/pingcap/tidb/pkg/ddl/ingest"
33-
"github.com/pingcap/tidb/pkg/ddl/session"
33+
"github.com/pingcap/tidb/pkg/ddl/internal/session"
3434
"github.com/pingcap/tidb/pkg/disttask/framework/proto"
3535
"github.com/pingcap/tidb/pkg/disttask/operator"
3636
"github.com/pingcap/tidb/pkg/kv"

pkg/ddl/backfilling_scheduler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"github.com/pingcap/errors"
2525
"github.com/pingcap/tidb/pkg/ddl/copr"
2626
"github.com/pingcap/tidb/pkg/ddl/ingest"
27+
sess "github.com/pingcap/tidb/pkg/ddl/internal/session"
2728
ddllogutil "github.com/pingcap/tidb/pkg/ddl/logutil"
28-
sess "github.com/pingcap/tidb/pkg/ddl/session"
2929
distsqlctx "github.com/pingcap/tidb/pkg/distsql/context"
3030
"github.com/pingcap/tidb/pkg/errctx"
3131
"github.com/pingcap/tidb/pkg/kv"

pkg/ddl/cluster.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/pingcap/failpoint"
2929
"github.com/pingcap/kvproto/pkg/errorpb"
3030
"github.com/pingcap/kvproto/pkg/kvrpcpb"
31+
sess "github.com/pingcap/tidb/pkg/ddl/internal/session"
3132
"github.com/pingcap/tidb/pkg/ddl/logutil"
32-
sess "github.com/pingcap/tidb/pkg/ddl/session"
3333
"github.com/pingcap/tidb/pkg/domain/infosync"
3434
"github.com/pingcap/tidb/pkg/infoschema"
3535
"github.com/pingcap/tidb/pkg/kv"

pkg/ddl/column.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/pingcap/errors"
2929
"github.com/pingcap/failpoint"
3030
"github.com/pingcap/tidb/pkg/config"
31+
sess "github.com/pingcap/tidb/pkg/ddl/internal/session"
3132
"github.com/pingcap/tidb/pkg/ddl/logutil"
32-
sess "github.com/pingcap/tidb/pkg/ddl/session"
3333
"github.com/pingcap/tidb/pkg/expression"
3434
exprctx "github.com/pingcap/tidb/pkg/expression/context"
3535
"github.com/pingcap/tidb/pkg/infoschema"

pkg/ddl/ddl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
"github.com/pingcap/kvproto/pkg/kvrpcpb"
3636
"github.com/pingcap/tidb/pkg/config"
3737
"github.com/pingcap/tidb/pkg/ddl/ingest"
38+
sess "github.com/pingcap/tidb/pkg/ddl/internal/session"
3839
"github.com/pingcap/tidb/pkg/ddl/logutil"
39-
sess "github.com/pingcap/tidb/pkg/ddl/session"
4040
"github.com/pingcap/tidb/pkg/ddl/syncer"
4141
"github.com/pingcap/tidb/pkg/ddl/util"
4242
"github.com/pingcap/tidb/pkg/disttask/framework/proto"

pkg/ddl/ddl_history.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"strconv"
2323

2424
"github.com/pingcap/errors"
25+
sess "github.com/pingcap/tidb/pkg/ddl/internal/session"
2526
"github.com/pingcap/tidb/pkg/ddl/logutil"
26-
sess "github.com/pingcap/tidb/pkg/ddl/session"
2727
"github.com/pingcap/tidb/pkg/ddl/util"
2828
"github.com/pingcap/tidb/pkg/kv"
2929
"github.com/pingcap/tidb/pkg/meta"

pkg/ddl/ddl_history_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/ngaut/pools"
2626
"github.com/pingcap/tidb/pkg/ddl"
27-
"github.com/pingcap/tidb/pkg/ddl/session"
27+
"github.com/pingcap/tidb/pkg/ddl/internal/session"
2828
"github.com/pingcap/tidb/pkg/kv"
2929
"github.com/pingcap/tidb/pkg/meta"
3030
"github.com/pingcap/tidb/pkg/parser/model"

0 commit comments

Comments
 (0)