Skip to content

Commit b91629d

Browse files
lcwangchaoti-chi-bot
authored andcommitted
This is an automated cherry-pick of pingcap#56540
Signed-off-by: ti-chi-bot <[email protected]>
1 parent 445db0f commit b91629d

File tree

6 files changed

+1625
-5
lines changed

6 files changed

+1625
-5
lines changed

pkg/executor/show.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ func constructResultOfShowCreateTable(ctx sessionctx.Context, dbName *model.CISt
13411341
restoreCtx.WriteKeyWord("TTL_JOB_INTERVAL")
13421342
restoreCtx.WritePlain("=")
13431343
if len(tableInfo.TTLInfo.JobInterval) == 0 {
1344-
restoreCtx.WriteString(model.DefaultJobInterval.String())
1344+
restoreCtx.WriteString(model.DefaultJobIntervalStr)
13451345
} else {
13461346
restoreCtx.WriteString(tableInfo.TTLInfo.JobInterval)
13471347
}

pkg/meta/model/BUILD.bazel

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
2+
3+
go_library(
4+
name = "model",
5+
srcs = [
6+
"bdr.go",
7+
"column.go",
8+
"db.go",
9+
"flags.go",
10+
"index.go",
11+
"job.go",
12+
"job_args.go",
13+
"placement.go",
14+
"reorg.go",
15+
"resource_group.go",
16+
"table.go",
17+
],
18+
importpath = "github.com/pingcap/tidb/pkg/meta/model",
19+
visibility = ["//visibility:public"],
20+
deps = [
21+
"//pkg/parser/ast",
22+
"//pkg/parser/auth",
23+
"//pkg/parser/charset",
24+
"//pkg/parser/duration",
25+
"//pkg/parser/model",
26+
"//pkg/parser/mysql",
27+
"//pkg/parser/terror",
28+
"//pkg/parser/types",
29+
"//pkg/util/intest",
30+
"@com_github_pingcap_errors//:errors",
31+
"@com_github_tikv_pd_client//http",
32+
],
33+
)
34+
35+
go_test(
36+
name = "model_test",
37+
timeout = "short",
38+
srcs = [
39+
"bdr_test.go",
40+
"column_test.go",
41+
"index_test.go",
42+
"job_args_test.go",
43+
"job_test.go",
44+
"placement_test.go",
45+
"table_test.go",
46+
],
47+
embed = [":model"],
48+
flaky = True,
49+
shard_count = 50,
50+
deps = [
51+
"//pkg/parser/ast",
52+
"//pkg/parser/charset",
53+
"//pkg/parser/duration",
54+
"//pkg/parser/model",
55+
"//pkg/parser/mysql",
56+
"//pkg/parser/terror",
57+
"//pkg/parser/types",
58+
"@com_github_stretchr_testify//require",
59+
"@com_github_tikv_pd_client//http",
60+
],
61+
)

0 commit comments

Comments
 (0)