update

Signed-off-by: Weizhen Wang <[email protected]>

Author: hawkingrei

pkg/planner/core/physical_plan_trace_test.go

@@ -146,45 +146,25 @@ func TestPhysicalOptimizerTrace(t *testing.T) {
 	otrace := sctx.GetSessionVars().StmtCtx.OptimizeTracer.Physical
 	require.NotNil(t, otrace)
 	elements := map[int]string{
-		25: "TableReader",
-		17: "HashAgg",
-		29: "TableReader",
+		8:  "TableReader",
+		28: "TableReader",
 		16: "HashJoin",
-		10: "Sort",
-		8:  "Projection",
-		23: "TableFullScan",
-		24: "HashAgg",
-		27: "TableReader",
-		26: "TableFullScan",
-		19: "HashAgg",
-		28: "TableFullScan",
-		15: "HashJoin",
-		14: "HashAgg",
-	}
-	final := map[int]struct{}{
-		23: {},
-		17: {},
-		25: {},
-		24: {},
-		28: {},
-		29: {},
-		16: {},
-		14: {},
-		10: {},
-		8:  {},
+		18: "TableReader",
+		17: "HashAgg",
+		11: "HashAgg",
+		15: "HashAgg",
+		27: "HashAgg",
+		29: "HashAgg",
 	}
+	final := map[int]struct{}{}
 	for _, c := range otrace.Candidates {
 		tp, ok := elements[c.ID]
-		if !ok || tp != c.TP {
-			t.FailNow()
-		}
+		require.Truef(t, ok, "ID: %d not found in elements", c.ID)
+		require.Equalf(t, tp, c.TP, "ID: %d, expected TP: %s, got TP: %s", c.ID, tp, c.TP)
 	}
 	require.Len(t, otrace.Candidates, len(elements))
 	for _, p := range otrace.Final {
-		_, ok := final[p.ID]
-		if !ok {
-			t.FailNow()
-		}
+		require.Contains(t, final, p.ID, "ID: %d not found in final", p.ID)
 	}
 	require.Len(t, otrace.Final, len(final))
 }