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

Fallback to CPU when && found in character class #5658

Merged
merged 2 commits into from
May 26, 2022
Merged

Fallback to CPU when && found in character class #5658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a788b53
Fall to cpu when && found in character class
anthony-chang May 26, 2022
f4a2ee7
Merge branch 'branch-22.06' of github.com:nvidia/spark-rapids into fa…
anthony-chang May 26, 2022
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
8 changes: 8 additions & 0 deletions sql-plugin/src/main/scala/com/nvidia/spark/rapids/RegexParser.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,14 @@ class RegexParser(pattern: String) {
RegexEscaped(ch)
case other => other
}
case '&' =>
peek() match {
case Some('&') =>
throw new RegexUnsupportedException("" +
"cuDF does not support class intersection operator &&", Some(pos))
case _ => // ignore
}
RegexChar('&')
case ch =>
RegexChar(ch)
}
Expand Down
9 changes: 9 additions & 0 deletions tests/src/test/scala/com/nvidia/spark/rapids/RegularExpressionTranspilerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,15 @@ class RegularExpressionTranspilerSuite extends FunSuite with Arm {
"cuDF does not support null characters in regular expressions"))
}

test("cuDF does not support class intersection &&") {
val patterns = Seq("[a&&b]", "[&&1]")
patterns.foreach(pattern =>
assertUnsupported(pattern, RegexFindMode,
"cuDF does not support class intersection operator &&"))

assertCpuGpuMatchesRegexpReplace(Seq("a&&b", "[a&b&c]"), Seq("a&&b", "b&c"))
}

test("octal digits - find") {
val patterns = Seq(raw"\07", raw"\077", raw"\0177", raw"\01772", raw"\0200",
raw"\0376", raw"\0377", raw"\02002")
Expand Down