expression: check corCol in DisableParseJSONFlag4Expr (#10224)

expression/util.go

@@ -542,12 +542,16 @@ func ColumnSliceIsIntersect(s1, s2 []*Column) bool {
 
 // DisableParseJSONFlag4Expr disables ParseToJSONFlag for `expr` except Column.
 // We should not *PARSE* a string as JSON under some scenarios. ParseToJSONFlag
-// is 0 for JSON column yet, so we can skip it. Moreover, Column.RetType refers
-// to the infoschema, if we modify it, data race may happen if another goroutine
-// read from the infoschema at the same time.
+// is 0 for JSON column yet(as well as JSON correlated column), so we can skip
+// it. Moreover, Column.RetType refers to the infoschema, if we modify it, data
+// race may happen if another goroutine read from the infoschema at the same
+// time.
 func DisableParseJSONFlag4Expr(expr Expression) {
 	if _, isColumn := expr.(*Column); isColumn {
 		return
 	}
+	if _, isCorCol := expr.(*CorrelatedColumn); isCorCol {
+		return
+	}
 	expr.GetType().Flag &= ^mysql.ParseToJSONFlag
 }

expression/util_test.go

@@ -92,6 +92,27 @@ func isLogicOrFunction(e Expression) bool {
 	return false
 }
 
+func (s *testUtilSuite) TestDisableParseJSONFlag4Expr(c *check.C) {
+	var expr Expression
+	expr = &Column{RetType: newIntFieldType()}
+	ft := expr.GetType()
+	ft.Flag |= mysql.ParseToJSONFlag
+	DisableParseJSONFlag4Expr(expr)
+	c.Assert(mysql.HasParseToJSONFlag(ft.Flag), check.IsTrue)
+
+	expr = &CorrelatedColumn{Column: Column{RetType: newIntFieldType()}}
+	ft = expr.GetType()
+	ft.Flag |= mysql.ParseToJSONFlag
+	DisableParseJSONFlag4Expr(expr)
+	c.Assert(mysql.HasParseToJSONFlag(ft.Flag), check.IsTrue)
+
+	expr = &ScalarFunction{RetType: newIntFieldType()}
+	ft = expr.GetType()
+	ft.Flag |= mysql.ParseToJSONFlag
+	DisableParseJSONFlag4Expr(expr)
+	c.Assert(mysql.HasParseToJSONFlag(ft.Flag), check.IsFalse)
+}
+
 func BenchmarkExtractColumns(b *testing.B) {
 	conditions := []Expression{
 		newFunction(ast.EQ, newColumn(0), newColumn(1)),
@@ -126,3 +147,12 @@ func BenchmarkExprFromSchema(b *testing.B) {
 	}
 	b.ReportAllocs()
 }
+
+func newIntFieldType() *types.FieldType {
+	return &types.FieldType{
+		Tp:      mysql.TypeLonglong,
+		Flen:    mysql.MaxIntWidth,
+		Decimal: 0,
+		Flag:    mysql.BinaryFlag,
+	}
+}