Merge branch 'master' into temp_table_placement

pingcap · Oct 15, 2021 · ce6ec61 · ce6ec61
2 parents 827fcf9 + db056cf
commit ce6ec61
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/expression/builtin_time_vec.go b/expression/builtin_time_vec.go
@@ -1943,12 +1943,11 @@ func (b *builtinHourSig) vecEvalInt(input *chunk.Chunk, result *chunk.Column) er
 	result.ResizeInt64(n, false)
 	result.MergeNulls(buf)
 	i64s := result.Int64s()
-	ds := buf.GoDurations()
 	for i := 0; i < n; i++ {
 		if result.IsNull(i) {
 			continue
 		}
-		i64s[i] = int64(ds[i].Hours())
+		i64s[i] = int64(buf.GetDuration(i, int(types.UnspecifiedFsp)).Hour())
 	}
 	return nil
 }

diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -10393,3 +10393,16 @@ func (s *testIntegrationSuite) TestIdentity(c *C) {
 	tk.MustExec(`INSERT INTO identity VALUES (NULL);`)
 	tk.MustQuery("SELECT @@identity, LAST_INSERT_ID()").Check(testkit.Rows("3 3"))
 }
+
+func (s *testIntegrationSuite) TestIssue28643(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 time(4));")
+	tk.MustExec("insert into t values(\"-838:59:59.000000\");")
+	tk.MustExec("insert into t values(\"838:59:59.000000\");")
+	tk.MustExec("set tidb_enable_vectorized_expression = on;")
+	tk.MustQuery("select hour(a) from t;").Check(testkit.Rows("838", "838"))
+	tk.MustExec("set tidb_enable_vectorized_expression = off;")
+	tk.MustQuery("select hour(a) from t;").Check(testkit.Rows("838", "838"))
+}