executor: fix wrong index hash join when hash col is enum (#28032) (#…

…28082)
pingcap · Oct 13, 2021 · 3f04cf7 · 3f04cf7
1 parent a086b18
commit 3f04cf7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/executor/builder.go b/executor/builder.go
@@ -2612,6 +2612,7 @@ func (b *executorBuilder) buildIndexLookUpJoin(v *plannercore.PhysicalIndexJoin)
 	for i, col := range v.OuterHashKeys {
 		outerTypes[col.Index] = outerTypes[col.Index].Clone()
 		outerTypes[col.Index].Collate = innerTypes[v.InnerHashKeys[i].Index].Collate
+		outerTypes[col.Index].Flag = col.RetType.Flag
 	}
 
 	var (

diff --git a/executor/index_lookup_join_test.go b/executor/index_lookup_join_test.go
@@ -348,6 +348,19 @@ func (s *testSuite5) TestIssue24547(c *C) {
 	tk.MustExec("delete a from a inner join b on a.k1 = b.k1 and a.k2 = b.k2 where b.k2 <> '333'")
 }
 
+func (s *testSuite5) TestIssue27893(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists t1")
+	tk.MustExec("drop table if exists t2")
+	tk.MustExec("create table t1 (a enum('x','y'))")
+	tk.MustExec("create table t2 (a int, key(a))")
+	tk.MustExec("insert into t1 values('x')")
+	tk.MustExec("insert into t2 values(1)")
+	tk.MustQuery("select /*+ inl_join(t2) */ count(*) from t1 join t2 on t1.a = t2.a").Check(testkit.Rows("1"))
+	tk.MustQuery("select /*+ inl_hash_join(t2) */ count(*) from t1 join t2 on t1.a = t2.a").Check(testkit.Rows("1"))
+}
+
 func (s *testSuite5) TestPartitionTableIndexJoinAndIndexReader(c *C) {
 	if israce.RaceEnabled {
 		c.Skip("exhaustive types test, skip race test")