Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions expression/builtin_compare.go
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,14 @@ func (c *greatestFunctionClass) getFunction(ctx sessionctx.Context, args []Expre
}
switch tp {
case types.ETInt:
// adjust unsigned flag
greastInitUnsignedFlag := false
if isEqualsInitUnsignedFlag(greastInitUnsignedFlag, args) {
bf.tp.Flag &= ^mysql.UnsignedFlag
} else {
bf.tp.Flag |= mysql.UnsignedFlag
}

sig = &builtinGreatestIntSig{bf}
sig.setPbCode(tipb.ScalarFuncSig_GreatestInt)
case types.ETReal:
Expand Down Expand Up @@ -745,6 +753,14 @@ func (c *leastFunctionClass) getFunction(ctx sessionctx.Context, args []Expressi
}
switch tp {
case types.ETInt:
// adjust unsigned flag
leastInitUnsignedFlag := true
if isEqualsInitUnsignedFlag(leastInitUnsignedFlag, args) {
bf.tp.Flag |= mysql.UnsignedFlag
} else {
bf.tp.Flag &= ^mysql.UnsignedFlag
}

sig = &builtinLeastIntSig{bf}
sig.setPbCode(tipb.ScalarFuncSig_LeastInt)
case types.ETReal:
Expand Down Expand Up @@ -2880,3 +2896,15 @@ func CompareJSON(sctx sessionctx.Context, lhsArg, rhsArg Expression, lhsRow, rhs
}
return int64(json.CompareBinary(arg0, arg1)), false, nil
}

// isEqualsInitUnsignedFlag can adjust unsigned flag for greatest/least function.
// For greatest, returns unsigned result if there is at least one argument is unsigned.
// For least, returns signed result if there is at least one argument is signed.
func isEqualsInitUnsignedFlag(initUnsigned bool, args []Expression) bool {
for _, arg := range args {
if initUnsigned != mysql.HasUnsignedFlag(arg.GetType().Flag) {
return false
}
}
return true
}
10 changes: 10 additions & 0 deletions expression/builtin_compare_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@ func TestGreatestLeastFunc(t *testing.T) {
sc := ctx.GetSessionVars().StmtCtx
originIgnoreTruncate := sc.IgnoreTruncate
sc.IgnoreTruncate = true
decG := &types.MyDecimal{}
decL := &types.MyDecimal{}
defer func() {
sc.IgnoreTruncate = originIgnoreTruncate
}()
Expand All @@ -290,6 +292,14 @@ func TestGreatestLeastFunc(t *testing.T) {
isNil bool
getErr bool
}{
{
[]interface{}{int64(-9223372036854775808), uint64(9223372036854775809)},
decG.FromUint(9223372036854775809), decL.FromInt(-9223372036854775808), false, false,
},
{
[]interface{}{uint64(9223372036854775808), uint64(9223372036854775809)},
uint64(9223372036854775809), uint64(9223372036854775808), false, false,
},
{
[]interface{}{1, 2, 3, 4},
int64(4), int64(1), false, false,
Expand Down
9 changes: 9 additions & 0 deletions expression/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10648,3 +10648,12 @@ func (s *testIntegrationSuite) TestIssue29513(c *C) {
tk.MustQuery("select '123' union select cast(a as char) from t;").Sort().Check(testkit.Rows("123", "45678"))
tk.MustQuery("select '123' union select cast(a as char(2)) from t;").Sort().Check(testkit.Rows("123", "45"))
}

func (s *testIntegrationSuite) TestIssue30101(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t1;")
tk.MustExec("create table t1(c1 bigint unsigned, c2 bigint unsigned);")
tk.MustExec("insert into t1 values(9223372036854775808, 9223372036854775809);")
tk.MustQuery("select greatest(c1, c2) from t1;").Sort().Check(testkit.Rows("9223372036854775809"))
}
7 changes: 7 additions & 0 deletions expression/typeinfer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,13 @@ func (s *InferTypeSuite) createTestCase4CompareFuncs() []typeInferTestCase {

{"interval(c_int_d, c_int_d, c_int_d)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, mysql.MaxIntWidth, 0},
{"interval(c_int_d, c_float_d, c_double_d)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, mysql.MaxIntWidth, 0},

{"greatest(c_bigint_d, c_ubigint_d, c_int_d)", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, mysql.MaxIntWidth, 0},
{"greatest(c_ubigint_d, c_ubigint_d, c_uint_d)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag | mysql.UnsignedFlag, mysql.MaxIntWidth, 0},
{"greatest(c_uint_d, c_int_d)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag | mysql.UnsignedFlag, 11, 0},
{"least(c_bigint_d, c_ubigint_d, c_int_d)", mysql.TypeNewDecimal, charset.CharsetBin, mysql.BinaryFlag, mysql.MaxIntWidth, 0},
{"least(c_ubigint_d, c_ubigint_d, c_uint_d)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag | mysql.UnsignedFlag, mysql.MaxIntWidth, 0},
{"least(c_uint_d, c_int_d)", mysql.TypeLonglong, charset.CharsetBin, mysql.BinaryFlag, 11, 0},
}
}

Expand Down