Skip to content

[SPARK-30245][SQL][FOLLOWUP] Improve regex expression when pattern not changed #27497

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

Closed
beliefer wants to merge 2 commits into from
Closed

[SPARK-30245][SQL][FOLLOWUP] Improve regex expression when pattern not changed #27497

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b43a871
Improve regex expression
beliefer Feb 8, 2020
6a8fda8
optimize code
beliefer Feb 8, 2020
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
15 changes: 13 additions & 2 deletions ...catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,20 @@ trait StringRegexExpression extends Expression
Pattern.compile(escape(str))
}

var lastPatternStr: String = null
Copy link
Member

@MaxGekk MaxGekk Feb 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can keep lastPattern as Pattern, and compare it to the current pattern via lastPattern.pattern() == patternStr. No need to keep lastPattern as a string.

Copy link
Contributor Author

@beliefer beliefer Feb 8, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your review.
Of course，I can do like this. I just followed the way of RegExpExtract and RegExpReplace here.

var compiledPattern: Pattern = null

def nullSafeMatch(input1: Any, input2: Any): Any = {
val s = input2.asInstanceOf[UTF8String].toString
val regex = if (cache == null) compile(s) else cache
val patternStr = input2.asInstanceOf[UTF8String].toString
val regex = if (cache == null) {
if (!(patternStr).equals(lastPatternStr)) {
Copy link
Member

@MaxGekk MaxGekk Feb 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any reasons to not use patternStr != lastPatternStr?

Copy link
Member

@MaxGekk MaxGekk Feb 8, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, I see this is a copy-paste from Java codegen

compiledPattern = compile(patternStr)
lastPatternStr = patternStr
}
compiledPattern
} else {
cache
}
if(regex == null) {
null
} else {
Expand Down