planner: correct unit test for outer join simplification with cast (p…

…ingcap#12782)

planner/core/integration_test.go

@@ -216,3 +216,25 @@ func (s *testIntegrationSuite) TestAntiJoinConstProp(c *C) {
 		"1 <nil>",
 	))
 }
+
+func (s *testIntegrationSuite) TestSimplifyOuterJoinWithCast(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t")
+	tk.MustExec("create table t(a int not null, b datetime default null)")
+
+	var input []string
+	var output []struct {
+		SQL  string
+		Plan []string
+	}
+	s.testData.GetTestCases(c, &input, &output)
+	for i, tt := range input {
+		s.testData.OnRecord(func() {
+			output[i].SQL = tt
+			output[i].Plan = s.testData.ConvertRowsToStrings(tk.MustQuery(tt).Rows())
+		})
+		tk.MustQuery(tt).Check(testkit.Rows(output[i].Plan...))
+	}
+}

planner/core/physical_plan_test.go

@@ -1073,40 +1073,3 @@ func testDAGPlanBuilderSplitAvg(c *C, root core.PhysicalPlan) {
 		testDAGPlanBuilderSplitAvg(c, son)
 	}
 }
-
-func (s *testPlanSuite) TestSimplifyOuterJoinWithCast(c *C) {
-	defer testleak.AfterTest(c)()
-	store, dom, err := newStoreWithBootstrap()
-	c.Assert(err, IsNil)
-	defer func() {
-		dom.Close()
-		store.Close()
-	}()
-	se, err := session.CreateSession4Test(store)
-	c.Assert(err, IsNil)
-	_, err = se.Execute(context.Background(), "use test")
-	c.Assert(err, IsNil)
-
-	var input []string
-	var output []struct {
-		SQL  string
-		Best string
-	}
-	s.testData.GetTestCases(c, &input, &output)
-	for i, test := range input {
-		comment := Commentf("case:%v sql:%s", i, test)
-		stmt, err := s.ParseOneStmt(test, "", "")
-		c.Assert(err, IsNil, comment)
-
-		p, err := planner.Optimize(context.Background(), se, stmt, s.is)
-		c.Assert(err, IsNil)
-		s.testData.OnRecord(func() {
-			output[i].SQL = test
-			output[i].Best = core.ToString(p)
-		})
-		c.Assert(core.ToString(p), Equals, output[i].Best)
-
-		warnings := se.GetSessionVars().StmtCtx.GetWarnings()
-		c.Assert(warnings, HasLen, 0, comment)
-	}
-}

planner/core/testdata/integration_suite_in.json

@@ -4,12 +4,12 @@
     "cases": [
       // Limit should be pushed down into IndexLookUpReader, row count of IndexLookUpReader and TableScan should be 1.00.
       "explain select * from tbl use index(idx_b_c) where b > 1 limit 2,1",
-	  // Projection atop IndexLookUpReader, Limit should be pushed down into IndexLookUpReader, and Projection should have row count 1.00 as well.
+      // Projection atop IndexLookUpReader, Limit should be pushed down into IndexLookUpReader, and Projection should have row count 1.00 as well.
       "explain select * from tbl use index(idx_b_c) where b > 1 order by b desc limit 2,1",
-	  // Limit should be pushed down into IndexLookUpReader when Selection on top of IndexScan.
-	  "explain select * from tbl use index(idx_b_c) where b > 1 and c > 1 limit 2,1",
-	  // Limit should NOT be pushed down into IndexLookUpReader when Selection on top of TableScan.
-	  "explain select * from tbl use index(idx_b_c) where b > 1 and a > 1 limit 2,1"
+      // Limit should be pushed down into IndexLookUpReader when Selection on top of IndexScan.
+      "explain select * from tbl use index(idx_b_c) where b > 1 and c > 1 limit 2,1",
+      // Limit should NOT be pushed down into IndexLookUpReader when Selection on top of TableScan.
+      "explain select * from tbl use index(idx_b_c) where b > 1 and a > 1 limit 2,1"
     ]
   },
   {
@@ -18,5 +18,12 @@
       // fix #12385
       "explain select * from t t1 left join t t2 on t1.a=t2.a where from_unixtime(t2.b);"
     ]
+  },
+  {
+    "name": "TestSimplifyOuterJoinWithCast",
+    "cases": [
+      // LeftOuterJoin should no be simplified to InnerJoin.
+      "explain select * from t t1 left join t t2 on t1.a = t2.a where cast(t1.b as date) >= '2019-01-01'"
+    ]
   }
 ]

planner/core/testdata/integration_suite_out.json

@@ -61,5 +61,21 @@
         ]
       }
     ]
+  },
+  {
+    "Name": "TestSimplifyOuterJoinWithCast",
+    "Cases": [
+      {
+        "SQL": "explain select * from t t1 left join t t2 on t1.a = t2.a where cast(t1.b as date) >= '2019-01-01'",
+        "Plan": [
+          "HashLeftJoin_8 10000.00 root left outer join, inner:TableReader_13, equal:[eq(Column#1, Column#4)]",
+          "├─Selection_9 8000.00 root ge(cast(Column#2), 2019-01-01 00:00:00.000000)",
+          "│ └─TableReader_11 10000.00 root data:TableScan_10",
+          "│   └─TableScan_10 10000.00 cop[tikv] table:t1, range:[-inf,+inf], keep order:false, stats:pseudo",
+          "└─TableReader_13 10000.00 root data:TableScan_12",
+          "  └─TableScan_12 10000.00 cop[tikv] table:t2, range:[-inf,+inf], keep order:false, stats:pseudo"
+        ]
+      }
+    ]
   }
 ]

planner/core/testdata/plan_suite_in.json

@@ -481,11 +481,5 @@
     "cases": [
       "select t1.a, (select count(t2.a) from t t2 where t2.g in (select t3.d from t t3 where t3.c = t1.a)) as agg_col from t t1;"
     ]
-  },
-  {
-    "name": "TestSimplifyOuterJoinWithCast",
-    "cases": [
-      "select * from t t1 left join t t2 on t1.a = t2.a where cast(t1.c_str as float) = '2.3'"
-    ]
   }
 ]

planner/core/testdata/plan_suite_out.json

@@ -1241,14 +1241,5 @@
         "Best": "Apply{IndexReader(Index(t.f)[[NULL,+inf]])->IndexMergeJoin{IndexReader(Index(t.c_d_e)[[NULL,+inf]]->HashAgg)->HashAgg->IndexReader(Index(t.g)[[NULL,+inf]])}(Column#29,Column#23)}->HashAgg"
       }
     ]
-  },
-  {
-    "Name": "TestSimplifyOuterJoinWithCast",
-    "Cases": [
-      {
-        "SQL": "select * from t t1 left join t t2 on t1.a = t2.a where cast(t1.c_str as float) = '2.3'",
-        "Best": "MergeLeftOuterJoin{TableReader(Table(t))->Sel([eq(cast(Column#6), 2.3)])->TableReader(Table(t))}(Column#1,Column#13)"
-      }
-    ]
   }
 ]