Skip to content

Commit 21d2679

Browse files
authored
domain: fix play replay dump cannot save the table in the foreign key's reference (pingcap#56512) (pingcap#56566)
close pingcap#56458
1 parent 5db81ef commit 21d2679

File tree

4 files changed

+97
-5
lines changed

4 files changed

+97
-5
lines changed

pkg/domain/extract.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,10 @@ func (w *extractWorker) handleIsView(ctx context.Context, p *extractPlanPackage)
285285
if tne.err != nil {
286286
return tne.err
287287
}
288-
r := tne.getTablesAndViews()
288+
r, err := tne.getTablesAndViews()
289+
if err != nil {
290+
return err
291+
}
289292
for t := range r {
290293
p.tables[t] = struct{}{}
291294
}

pkg/domain/plan_replayer_dump.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ type tableNameExtractor struct {
9696
err error
9797
}
9898

99-
func (tne *tableNameExtractor) getTablesAndViews() map[tableNamePair]struct{} {
99+
func (tne *tableNameExtractor) getTablesAndViews() (map[tableNamePair]struct{}, error) {
100100
r := make(map[tableNamePair]struct{})
101101
for tablePair := range tne.names {
102102
if tablePair.IsView {
@@ -108,8 +108,21 @@ func (tne *tableNameExtractor) getTablesAndViews() map[tableNamePair]struct{} {
108108
if !ok {
109109
r[tablePair] = struct{}{}
110110
}
111+
// if the table has a foreign key, we need to add the referenced table to the list
112+
tblInfo, err := tne.is.TableByName(model.NewCIStr(tablePair.DBName), model.NewCIStr(tablePair.TableName))
113+
if err != nil {
114+
return nil, err
115+
}
116+
for _, fk := range tblInfo.Meta().ForeignKeys {
117+
key := tableNamePair{
118+
DBName: fk.RefSchema.L,
119+
TableName: fk.RefTable.L,
120+
IsView: false,
121+
}
122+
r[key] = struct{}{}
123+
}
111124
}
112-
return r
125+
return r, nil
113126
}
114127

115128
func (*tableNameExtractor) Enter(in ast.Node) (ast.Node, bool) {
@@ -771,7 +784,7 @@ func extractTableNames(ctx context.Context, sctx sessionctx.Context,
771784
if tableExtractor.err != nil {
772785
return nil, tableExtractor.err
773786
}
774-
return tableExtractor.getTablesAndViews(), nil
787+
return tableExtractor.getTablesAndViews()
775788
}
776789

777790
func getStatsForTable(do *Domain, pair tableNamePair, historyStatsTS uint64) (*util.JSONTable, []string, error) {

pkg/server/handler/optimizor/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ go_test(
4343
"statistics_handler_test.go",
4444
],
4545
flaky = True,
46-
shard_count = 5,
46+
shard_count = 6,
4747
deps = [
4848
":optimizor",
4949
"//pkg/config",

pkg/server/handler/optimizor/plan_replayer_test.go

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,55 @@ func prepareData4PlanReplayer(t *testing.T, client *testserverclient.TestServerC
248248
return filename, filename3
249249
}
250250

251+
func TestIssue56458(t *testing.T) {
252+
store := testkit.CreateMockStore(t)
253+
dom, err := session.GetDomain(store)
254+
require.NoError(t, err)
255+
// 1. setup and prepare plan replayer files by manual command and capture
256+
server, client := prepareServerAndClientForTest(t, store, dom)
257+
defer server.Close()
258+
259+
filename := prepareData4Issue56458(t, client, dom)
260+
defer os.RemoveAll(replayer.GetPlanReplayerDirName())
261+
262+
// 2. check the contents of the plan replayer zip files.
263+
var filesInReplayer []string
264+
collectFileNameAndAssertFileSize := func(f *zip.File) {
265+
// collect file name
266+
filesInReplayer = append(filesInReplayer, f.Name)
267+
}
268+
269+
// 2-1. check the plan replayer file from manual command
270+
resp0, err := client.FetchStatus(filepath.Join("/plan_replayer/dump/", filename))
271+
require.NoError(t, err)
272+
defer func() {
273+
require.NoError(t, resp0.Body.Close())
274+
}()
275+
body, err := io.ReadAll(resp0.Body)
276+
require.NoError(t, err)
277+
forEachFileInZipBytes(t, body, collectFileNameAndAssertFileSize)
278+
slices.Sort(filesInReplayer)
279+
require.Equal(t, []string{
280+
"config.toml",
281+
"debug_trace/debug_trace0.json",
282+
"explain.txt",
283+
"global_bindings.sql",
284+
"meta.txt",
285+
"schema/planreplayer.t.schema.txt",
286+
"schema/planreplayer.v.schema.txt",
287+
"schema/schema_meta.txt",
288+
"session_bindings.sql",
289+
"sql/sql0.sql",
290+
"sql_meta.toml",
291+
"stats/planreplayer.t.json",
292+
"stats/planreplayer.v.json",
293+
"statsMem/planreplayer.t.txt",
294+
"statsMem/planreplayer.v.txt",
295+
"table_tiflash_replica.txt",
296+
"variables.toml",
297+
}, filesInReplayer)
298+
}
299+
251300
func TestIssue43192(t *testing.T) {
252301
store := testkit.CreateMockStore(t)
253302
dom, err := session.GetDomain(store)
@@ -343,6 +392,33 @@ func prepareData4Issue43192(t *testing.T, client *testserverclient.TestServerCli
343392
return filename
344393
}
345394

395+
func prepareData4Issue56458(t *testing.T, client *testserverclient.TestServerClient, dom *domain.Domain) string {
396+
h := dom.StatsHandle()
397+
db, err := sql.Open("mysql", client.GetDSN())
398+
require.NoError(t, err, "Error connecting")
399+
defer func() {
400+
err := db.Close()
401+
require.NoError(t, err)
402+
}()
403+
tk := testkit.NewDBTestKit(t, db)
404+
405+
tk.MustExec("create database planReplayer")
406+
tk.MustExec("use planReplayer")
407+
tk.MustExec("CREATE TABLE v(id INT PRIMARY KEY AUTO_INCREMENT);")
408+
tk.MustExec("create table t(a int, b int, INDEX ia (a), INDEX ib (b), author_id int, FOREIGN KEY (author_id) REFERENCES v(id) ON DELETE CASCADE);")
409+
err = h.HandleDDLEvent(<-h.DDLEventCh())
410+
require.NoError(t, err)
411+
tk.MustExec("create global binding for select a, b from t where a in (1, 2, 3) using select a, b from t use index (ib) where a in (1, 2, 3)")
412+
rows := tk.MustQuery("plan replayer dump explain select a, b from t where a in (1, 2, 3)")
413+
require.True(t, rows.Next(), "unexpected data")
414+
var filename string
415+
require.NoError(t, rows.Scan(&filename))
416+
require.NoError(t, rows.Close())
417+
rows = tk.MustQuery("select @@tidb_last_plan_replayer_token")
418+
require.True(t, rows.Next(), "unexpected data")
419+
return filename
420+
}
421+
346422
func forEachFileInZipBytes(t *testing.T, b []byte, fn func(file *zip.File)) {
347423
br := bytes.NewReader(b)
348424
z, err := zip.NewReader(br, int64(len(b)))

0 commit comments

Comments
 (0)