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

expression: fix "values" function in non-insert statement (#8019) #8179

Merged
merged 3 commits into from
Nov 5, 2018
Merged

expression: fix "values" function in non-insert statement (#8019) #8179

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e0c135
expression: fix "values" function in non-insert statement (#8019)
zz-jason Nov 5, 2018
165995a
Merge branch 'release-2.0' into cherrypick/2.0-values-func
zz-jason Nov 5, 2018
e4d8859
Merge branch 'release-2.0' into cherrypick/2.0-values-func
XuHuaiyu Nov 5, 2018
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
21 changes: 21 additions & 0 deletions expression/builtin_other.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,9 @@ func (b *builtinValuesIntSig) Clone() builtinFunc {
// evalInt evals a builtinValuesIntSig.
// See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_values
func (b *builtinValuesIntSig) evalInt(_ types.Row) (int64, bool, error) {
if !b.ctx.GetSessionVars().StmtCtx.InInsertStmt {
return 0, true, nil
}
values := b.ctx.GetSessionVars().CurrInsertValues
if values == nil {
return 0, true, errors.New("Session current insert values is nil")
Expand Down Expand Up @@ -540,6 +543,9 @@ func (b *builtinValuesRealSig) Clone() builtinFunc {
// evalReal evals a builtinValuesRealSig.
// See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_values
func (b *builtinValuesRealSig) evalReal(_ types.Row) (float64, bool, error) {
if !b.ctx.GetSessionVars().StmtCtx.InInsertStmt {
return 0, true, nil
}
values := b.ctx.GetSessionVars().CurrInsertValues
if values == nil {
return 0, true, errors.New("Session current insert values is nil")
Expand Down Expand Up @@ -569,6 +575,9 @@ func (b *builtinValuesDecimalSig) Clone() builtinFunc {
// evalDecimal evals a builtinValuesDecimalSig.
// See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_values
func (b *builtinValuesDecimalSig) evalDecimal(_ types.Row) (*types.MyDecimal, bool, error) {
if !b.ctx.GetSessionVars().StmtCtx.InInsertStmt {
return nil, true, nil
}
values := b.ctx.GetSessionVars().CurrInsertValues
if values == nil {
return nil, true, errors.New("Session current insert values is nil")
Expand Down Expand Up @@ -598,6 +607,9 @@ func (b *builtinValuesStringSig) Clone() builtinFunc {
// evalString evals a builtinValuesStringSig.
// See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_values
func (b *builtinValuesStringSig) evalString(_ types.Row) (string, bool, error) {
if !b.ctx.GetSessionVars().StmtCtx.InInsertStmt {
return "", true, nil
}
values := b.ctx.GetSessionVars().CurrInsertValues
if values == nil {
return "", true, errors.New("Session current insert values is nil")
Expand Down Expand Up @@ -627,6 +639,9 @@ func (b *builtinValuesTimeSig) Clone() builtinFunc {
// evalTime evals a builtinValuesTimeSig.
// See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_values
func (b *builtinValuesTimeSig) evalTime(_ types.Row) (types.Time, bool, error) {
if !b.ctx.GetSessionVars().StmtCtx.InInsertStmt {
return types.Time{}, true, nil
}
values := b.ctx.GetSessionVars().CurrInsertValues
if values == nil {
return types.Time{}, true, errors.New("Session current insert values is nil")
Expand Down Expand Up @@ -656,6 +671,9 @@ func (b *builtinValuesDurationSig) Clone() builtinFunc {
// evalDuration evals a builtinValuesDurationSig.
// See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_values
func (b *builtinValuesDurationSig) evalDuration(_ types.Row) (types.Duration, bool, error) {
if !b.ctx.GetSessionVars().StmtCtx.InInsertStmt {
return types.Duration{}, true, nil
}
values := b.ctx.GetSessionVars().CurrInsertValues
if values == nil {
return types.Duration{}, true, errors.New("Session current insert values is nil")
Expand Down Expand Up @@ -685,6 +703,9 @@ func (b *builtinValuesJSONSig) Clone() builtinFunc {
// evalJSON evals a builtinValuesJSONSig.
// See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_values
func (b *builtinValuesJSONSig) evalJSON(_ types.Row) (json.BinaryJSON, bool, error) {
if !b.ctx.GetSessionVars().StmtCtx.InInsertStmt {
return json.BinaryJSON{}, true, nil
}
values := b.ctx.GetSessionVars().CurrInsertValues
if values == nil {
return json.BinaryJSON{}, true, errors.New("Session current insert values is nil")
Expand Down
31 changes: 23 additions & 8 deletions expression/builtin_other_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
package expression

import (
"fmt"
"math"
"time"

Expand All @@ -24,6 +23,7 @@ import (
"github.com/pingcap/tidb/sessionctx/stmtctx"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/types/json"
"github.com/pingcap/tidb/util/chunk"
"github.com/pingcap/tidb/util/hack"
"github.com/pingcap/tidb/util/testleak"
)
Expand Down Expand Up @@ -201,20 +201,35 @@ func (s *testEvaluatorSuite) TestGetVar(c *C) {

func (s *testEvaluatorSuite) TestValues(c *C) {
defer testleak.AfterTest(c)()

origin := s.ctx.GetSessionVars().StmtCtx.InInsertStmt
s.ctx.GetSessionVars().StmtCtx.InInsertStmt = false
defer func() {
s.ctx.GetSessionVars().StmtCtx.InInsertStmt = origin
}()

fc := &valuesFunctionClass{baseFunctionClass{ast.Values, 0, 0}, 1, types.NewFieldType(mysql.TypeVarchar)}
_, err := fc.getFunction(s.ctx, s.datumsToConstants(types.MakeDatums("")))
c.Assert(err, ErrorMatches, "*Incorrect parameter count in the call to native function 'values'")

sig, err := fc.getFunction(s.ctx, s.datumsToConstants(types.MakeDatums()))
c.Assert(err, IsNil)
_, err = evalBuiltinFunc(sig, nil)
c.Assert(err.Error(), Equals, "Session current insert values is nil")
s.ctx.GetSessionVars().CurrInsertValues = types.DatumRow(types.MakeDatums("1"))
_, err = evalBuiltinFunc(sig, nil)
c.Assert(err.Error(), Equals, fmt.Sprintf("Session current insert values len %d and column's offset %v don't match", 1, 1))

ret, err := evalBuiltinFunc(sig, chunk.Row{})
c.Assert(err, IsNil)
c.Assert(ret.IsNull(), IsTrue)

s.ctx.GetSessionVars().CurrInsertValues = chunk.MutRowFromDatums(types.MakeDatums("1")).ToRow()
ret, err = evalBuiltinFunc(sig, chunk.Row{})
c.Assert(err, IsNil)
c.Assert(ret.IsNull(), IsTrue)

currInsertValues := types.MakeDatums("1", "2")
s.ctx.GetSessionVars().CurrInsertValues = types.DatumRow(currInsertValues)
ret, err := evalBuiltinFunc(sig, nil)
s.ctx.GetSessionVars().StmtCtx.InInsertStmt = true
s.ctx.GetSessionVars().CurrInsertValues = chunk.MutRowFromDatums(currInsertValues).ToRow()
ret, err = evalBuiltinFunc(sig, chunk.Row{})
c.Assert(err, IsNil)

cmp, err := ret.CompareDatum(nil, &currInsertValues[1])
c.Assert(err, IsNil)
c.Assert(cmp, Equals, 0)
Expand Down
10 changes: 10 additions & 0 deletions expression/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3394,3 +3394,13 @@ func (s *testIntegrationSuite) TestDecimalMul(c *C) {
res := tk.MustQuery("select * from t;")
res.Check(testkit.Rows("0.55125221922461136"))
}

func (s *testIntegrationSuite) TestValuesInNonInsertStmt(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 bigint, b double, c decimal, d varchar(20), e datetime, f time, g json);`)
tk.MustExec(`insert into t values(1, 1.1, 2.2, "abc", "2018-10-24", NOW(), "12");`)
res := tk.MustQuery(`select values(a), values(b), values(c), values(d), values(e), values(f), values(g) from t;`)
res.Check(testkit.Rows(`<nil> <nil> <nil> <nil> <nil> <nil> <nil>`))
}