From c9d7dfec98da8f5dd7729a426f34b0a5f508d7c6 Mon Sep 17 00:00:00 2001 From: Jiaan Geng Date: Fri, 28 Jun 2019 22:33:51 +0800 Subject: [PATCH] adjust code. --- .../spark/sql/catalyst/expressions/regexpExpressions.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala index b6a1c2a7da3df..bfa751bb4c8e4 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala @@ -180,8 +180,8 @@ case class Like( val pattern = ctx.addMutableState(patternClass, "patternLike", v => s"""$v = $patternClass.compile("$regexStr");""") - // We don't use nullSafeCodeGen here because we don't want to re-evaluate right again. - val eval = left.genCode(ctx) + // We don't use nullSafeCodeGen here because we don't want to re-evaluate pattern again. + val eval = input.genCode(ctx) ev.copy(code = code""" ${eval.code} boolean ${ev.isNull} = ${eval.isNull}; @@ -204,7 +204,7 @@ case class Like( s""" String $patternStr = $eval2.toString(); String $escapeStr = $eval3.toString(); - $patternClass $pattern = $patternClass.compile($escapeFunc($rightStr, $escapeStr)); + $patternClass $pattern = $patternClass.compile($escapeFunc($patternStr, $escapeStr)); ${ev.value} = $pattern.matcher($eval1.toString()).matches(); """ })