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.

Sign up for GitHub

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

Jump to bottom

executor: fix hash join between datetime and timestamp (#25915) #25988

Merged
merged 2 commits into from
Jul 16, 2021
Merged

executor: fix hash join between datetime and timestamp (#25915) #25988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ac0c8b
cherry pick #25915 to release-4.0
sylzd Jul 6, 2021
d11da84
Merge branch 'release-4.0' into release-4.0-dc53b520bf7f
ti-chi-bot Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions executor/join_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2547,3 +2547,20 @@ func (s *testSuiteJoinSerial) TestIssue20219(c *C) {
tk.MustQuery("select /*+ inl_join(s)*/ t.a from t left join s on t.a = s.a;").Check(testkit.Rows("i", "j"))
tk.MustQuery("show warnings").Check(testkit.Rows())
}

func (s *testSuiteJoinSerial) TestIssue25902(c *C) {
tk := testkit.NewTestKitWithInit(c, s.store)
tk.MustExec("drop table if exists tt1,tt2,tt3; ")
tk.MustExec("create table tt1 (ts timestamp);")
tk.MustExec("create table tt2 (ts varchar(32));")
tk.MustExec("create table tt3 (ts datetime);")
tk.MustExec("insert into tt1 values (\"2001-01-01 00:00:00\");")
tk.MustExec("insert into tt2 values (\"2001-01-01 00:00:00\");")
tk.MustExec("insert into tt3 values (\"2001-01-01 00:00:00\");")
tk.MustQuery("select * from tt1 where ts in (select ts from tt2);").Check(testkit.Rows("2001-01-01 00:00:00"))
tk.MustQuery("select * from tt1 where ts in (select ts from tt3);").Check(testkit.Rows("2001-01-01 00:00:00"))
tk.MustExec("set @tmp=(select @@session.time_zone);")
tk.MustExec("set @@session.time_zone = '+10:00';")
tk.MustQuery("select * from tt1 where ts in (select ts from tt2);").Check(testkit.Rows())
tk.MustExec("set @@session.time_zone = @tmp;")
}
18 changes: 2 additions & 16 deletions util/codec/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,7 @@ func encodeHashChunkRowIdx(sc *stmtctx.StatementContext, row chunk.Row, tp *type
case mysql.TypeDate, mysql.TypeDatetime, mysql.TypeTimestamp:
flag = uintFlag
t := row.GetTime(idx)
// Encoding timestamp need to consider timezone.
// If it's not in UTC, transform to UTC first.
if t.Type() == mysql.TypeTimestamp && sc.TimeZone != time.UTC {
err = t.ConvertTimeZone(sc.TimeZone, time.UTC)
if err != nil {
return
}
}

var v uint64
v, err = t.ToPackedUint()
if err != nil {
Expand Down Expand Up @@ -497,14 +490,7 @@ func HashChunkSelected(sc *stmtctx.StatementContext, h []hash.Hash64, chk *chunk
isNull[i] = true
} else {
buf[0] = uintFlag
// Encoding timestamp need to consider timezone.
// If it's not in UTC, transform to UTC first.
if t.Type() == mysql.TypeTimestamp && sc.TimeZone != time.UTC {
err = t.ConvertTimeZone(sc.TimeZone, time.UTC)
if err != nil {
return
}
}

var v uint64
v, err = t.ToPackedUint()
if err != nil {
Expand Down