Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

topsql: make unit test stable #32463

Merged
merged 10 commits into from
Feb 21, 2022
47 changes: 26 additions & 21 deletions util/topsql/topsql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ func TestTopSQLReporter(t *testing.T) {
defer wg.Wait()
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

sqlMap := make(map[string]string)
sql2plan := make(map[string]string)
for _, req := range reqs {
Expand All @@ -143,29 +142,35 @@ func TestTopSQLReporter(t *testing.T) {
}
})
}
server.WaitCollectCnt(1, time.Second*5)
records := server.GetLatestRecords()
checkSQLPlanMap := map[string]struct{}{}
for _, req := range records {
require.Greater(t, len(req.Items), 0)
require.Greater(t, req.Items[0].CpuTimeMs, uint32(0))
sqlMeta, exist := server.GetSQLMetaByDigestBlocking(req.SqlDigest, time.Second)
require.True(t, exist)
expectedNormalizedSQL, exist := sqlMap[string(req.SqlDigest)]
require.True(t, exist)
require.Equal(t, expectedNormalizedSQL, sqlMeta.NormalizedSql)

expectedNormalizedPlan := sql2plan[expectedNormalizedSQL]
if expectedNormalizedPlan == "" || len(req.PlanDigest) == 0 {
require.Len(t, req.PlanDigest, 0)
continue
for retry := 0; retry < 5; retry++ {
server.WaitCollectCnt(1, time.Second*5)
records := server.GetLatestRecords()
for _, req := range records {
require.Greater(t, len(req.Items), 0)
require.Greater(t, req.Items[0].CpuTimeMs, uint32(0))
sqlMeta, exist := server.GetSQLMetaByDigestBlocking(req.SqlDigest, time.Second)
require.True(t, exist)
expectedNormalizedSQL, exist := sqlMap[string(req.SqlDigest)]
require.True(t, exist)
require.Equal(t, expectedNormalizedSQL, sqlMeta.NormalizedSql)

expectedNormalizedPlan := sql2plan[expectedNormalizedSQL]
if expectedNormalizedPlan == "" || len(req.PlanDigest) == 0 {
require.Len(t, req.PlanDigest, 0)
checkSQLPlanMap[expectedNormalizedSQL] = struct{}{}
continue
}
normalizedPlan, exist := server.GetPlanMetaByDigestBlocking(req.PlanDigest, time.Second)
require.True(t, exist)
require.Equal(t, expectedNormalizedPlan, normalizedPlan)
checkSQLPlanMap[expectedNormalizedSQL] = struct{}{}
}
if len(checkSQLPlanMap) == len(reqs) {
break
}
normalizedPlan, exist := server.GetPlanMetaByDigestBlocking(req.PlanDigest, time.Second)
require.True(t, exist)
require.Equal(t, expectedNormalizedPlan, normalizedPlan)
checkSQLPlanMap[expectedNormalizedSQL] = struct{}{}
}
require.Equal(t, 2, len(checkSQLPlanMap))
require.Equal(t, len(reqs), len(checkSQLPlanMap))
}

func TestMaxSQLAndPlanTest(t *testing.T) {
Expand Down