From 6debfd289ce5bac3f1284cb62f17438a70a34a7e Mon Sep 17 00:00:00 2001 From: Zhi Qi <30543181+LittleFall@users.noreply.github.com> Date: Tue, 28 Jun 2022 14:02:39 +0800 Subject: [PATCH] cherry pick #35759 to release-5.2 Signed-off-by: ti-srebot --- expression/expression.go | 2 +- expression/expression_test.go | 29 +++++++++++++++++++++++++++++ planner/core/integration_test.go | 19 +++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/expression/expression.go b/expression/expression.go index b79aea6e9502a..de43e55d123f9 100644 --- a/expression/expression.go +++ b/expression/expression.go @@ -802,7 +802,7 @@ func evaluateExprWithNull(ctx sessionctx.Context, schema *Schema, expr Expressio for i, arg := range x.GetArgs() { args[i] = evaluateExprWithNull(ctx, schema, arg) } - return NewFunctionInternal(ctx, x.FuncName.L, x.RetType, args...) + return NewFunctionInternal(ctx, x.FuncName.L, x.RetType.Clone(), args...) case *Column: if !schema.Contains(x) { return x diff --git a/expression/expression_test.go b/expression/expression_test.go index 40eed2c946207..0972b26f1f549 100644 --- a/expression/expression_test.go +++ b/expression/expression_test.go @@ -54,7 +54,36 @@ func (s *testEvaluatorSuite) TestEvaluateExprWithNull(c *C) { c.Assert(res.Equal(s.ctx, NewOne()), IsTrue) } +<<<<<<< HEAD func (s *testEvaluatorSuite) TestConstant(c *C) { +======= +func TestEvaluateExprWithNullNoChangeRetType(t *testing.T) { + ctx := createContext(t) + tblInfo := newTestTableBuilder("").add("col_str", mysql.TypeString, 0).build() + schema := tableInfoToSchemaForTest(tblInfo) + + castStrAsJSON := BuildCastFunction(ctx, schema.Columns[0], types.NewFieldType(mysql.TypeJSON)) + jsonConstant := &Constant{Value: types.NewDatum("123"), RetType: types.NewFieldType(mysql.TypeJSON)} + + // initially has ParseToJSONFlag + flagInCast := castStrAsJSON.(*ScalarFunction).RetType.GetFlag() + require.True(t, mysql.HasParseToJSONFlag(flagInCast)) + + // cast's ParseToJSONFlag removed by `DisableParseJSONFlag4Expr` + eq, err := newFunctionForTest(ctx, ast.EQ, jsonConstant, castStrAsJSON) + require.NoError(t, err) + flagInCast = eq.(*ScalarFunction).GetArgs()[1].(*ScalarFunction).RetType.GetFlag() + require.False(t, mysql.HasParseToJSONFlag(flagInCast)) + + // after EvaluateExprWithNull, this flag should be still false + EvaluateExprWithNull(ctx, schema, eq) + flagInCast = eq.(*ScalarFunction).GetArgs()[1].(*ScalarFunction).RetType.GetFlag() + require.False(t, mysql.HasParseToJSONFlag(flagInCast)) +} + +func TestConstant(t *testing.T) { + ctx := createContext(t) +>>>>>>> 1f40fc72a... expression: use cloned RetType at `evaluateExprWithNull` when it may be changed. (#35759) sc := &stmtctx.StatementContext{TimeZone: time.Local} c.Assert(NewZero().IsCorrelated(), IsFalse) c.Assert(NewZero().ConstItem(sc), IsTrue) diff --git a/planner/core/integration_test.go b/planner/core/integration_test.go index 5ef266bbeefe2..b087f95ab6fd9 100644 --- a/planner/core/integration_test.go +++ b/planner/core/integration_test.go @@ -4489,3 +4489,22 @@ func (s *testIntegrationSerialSuite) TestKeepPrunedConds(c *C) { " └─Selection 0.01 cop[tikv] eq(test.t.b, 1), eq(test.t.c, 1)", " └─IndexFullScan 10000.00 cop[tikv] table:t, partition:part_202103, index:idx(a, b, c) keep order:false, stats:pseudo")) } + +func TestIssue25813(t *testing.T) { + store, clean := testkit.CreateMockStore(t) + defer clean() + tk := testkit.NewTestKit(t, store) + tk.MustExec("use test") + tk.MustExec("create table t(a json);") + tk.MustExec("insert into t values('{\"id\": \"ish\"}');") + tk.MustQuery("select t2.a from t t1 left join t t2 on t1.a=t2.a where t2.a->'$.id'='ish';").Check(testkit.Rows("{\"id\": \"ish\"}")) + + tk.MustQuery("explain format = 'brief' select * from t t1 left join t t2 on t1.a=t2.a where t2.a->'$.id'='ish';").Check(testkit.Rows( + "Selection 8000.00 root eq(json_extract(test.t.a, \"$.id\"), cast(\"ish\", json BINARY))", + "└─HashJoin 10000.00 root left outer join, equal:[eq(test.t.a, test.t.a)]", + " ├─TableReader(Build) 8000.00 root data:Selection", + " │ └─Selection 8000.00 cop[tikv] not(isnull(cast(test.t.a, var_string(4294967295))))", + " │ └─TableFullScan 10000.00 cop[tikv] table:t2 keep order:false, stats:pseudo", + " └─TableReader(Probe) 10000.00 root data:TableFullScan", + " └─TableFullScan 10000.00 cop[tikv] table:t1 keep order:false, stats:pseudo")) +}