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

Add support for regular expressions containing hexadecimal digits greater than 0x7f #5442

Merged
merged 3 commits into from
May 12, 2022
Merged

Add support for regular expressions containing hexadecimal digits greater than 0x7f #5442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fda31a2
Convert hex digits greater than 0x7f to direct unicode char
anthony-chang May 9, 2022
f8a819a
Add integration tests for hex digits
anthony-chang May 10, 2022
b9a2523
Improve tests
anthony-chang May 11, 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
14 changes: 14 additions & 0 deletions integration_tests/src/main/python/string_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,20 @@ def test_regexp_extract_idx_0():
'regexp_extract(a, "^([a-d]*)[0-9]*([a-d]*)\\z", 0)'),
conf=_regexp_conf)

def test_regexp_hexadecimal_digits():
gen = mk_str_gen(
'[abcd]\\\\x00\\\\x7f\\\\x80\\\\xff\\\\x{10ffff}\\\\x{00eeee}[\\\\xa0-\\\\xb0][abcd]')
assert_gpu_and_cpu_are_equal_collect(
lambda spark: unary_op_df(spark, gen).selectExpr(
'rlike(a, "\\\\x7f")',
'rlike(a, "\\\\x80")',
'rlike(a, "\\\\x{00eeee}")',
'regexp_extract(a, "([a-d]+)\\\\xa0([a-d]+)", 1)',
'regexp_replace(a, "\\\\xff", "")',
'regexp_replace(a, "\\\\x{10ffff}", "")',
),
conf=_regexp_conf)

def test_regexp_whitespace():
gen = mk_str_gen('\u001e[abcd]\t\n{1,3} [0-9]\n {1,3}\x0b\t[abcd]\r\f[0-9]{0,10}')
assert_gpu_and_cpu_are_equal_collect(
Expand Down
8 changes: 4 additions & 4 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 @@ -628,11 +628,11 @@ class CudfRegexTranspiler(mode: RegexMode) {
case RegexHexDigit(digits) =>
val codePoint = Integer.parseInt(digits, 16)
if (codePoint >= 128) {
// see https://github.com/NVIDIA/spark-rapids/issues/4866
throw new RegexUnsupportedException(
"cuDF does not support hex digits > 0x7F")
// cuDF only supports 0x00 to 0x7f hexidecimal chars
RegexChar(codePoint.toChar)
} else {
RegexHexDigit(String.format("%02x", Int.box(codePoint)))
}
RegexHexDigit(String.format("%02x", Int.box(codePoint)))

case RegexEscaped(ch) => ch match {
case 'D' =>
Expand Down
15 changes: 4 additions & 11 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,14 +150,6 @@ class RegularExpressionTranspilerSuite extends FunSuite with Arm {
"cuDF does not support octal digits 0o177 < n <= 0o377"))
}

test("cuDF does not support hex digits > 0x7F") {
// see https://github.com/NVIDIA/spark-rapids/issues/4866
val patterns = Seq(raw"\x80", raw"\xff", raw"\xFF", raw"\x{ABC}")
patterns.foreach(pattern =>
assertUnsupported(pattern, RegexFindMode,
"cuDF does not support hex digits > 0x7F"))
}

test("cuDF does not support octal digits in character classes") {
// see https://github.com/NVIDIA/spark-rapids/issues/4862
val patterns = Seq(raw"[\02]", raw"[\012]", raw"[\0177]")
Expand All @@ -184,10 +176,11 @@ class RegularExpressionTranspilerSuite extends FunSuite with Arm {
"\u0007\u003f\u007f", "\u007f", "\u007f2"))
}

test("hex digits < 0x7F - find") {
val patterns = Seq(raw"\x07", raw"\x3f", raw"\x7F", raw"\x7f", raw"\x{7}", raw"\x{0007f}")
test("hex digits - find") {
val patterns = Seq(raw"\x07", raw"\x3f", raw"\x7F", raw"\x7f", raw"\x{7}", raw"\x{0007f}",
raw"\x80", raw"\xff", raw"\x{0008f}", raw"\x{10FFFF}", raw"\x{00eeee}")
assertCpuGpuMatchesRegexpFind(patterns, Seq("", "\u0007", "a\u0007b",
"\u0007\u003f\u007f", "\u007f", "\u007f2"))
"\u0007\u003f\u007f", "\u0080", "a\u00fe\u00ffb", "ab\ueeeecd"))
}

test("string anchors - find") {
Expand Down