[SPARK-57173][SQL] Simplify regexp pattern-compile codegen by extracting a static Java helper#56223
Open
gengliangwang wants to merge 2 commits into
Open
[SPARK-57173][SQL] Simplify regexp pattern-compile codegen by extracting a static Java helper#56223gengliangwang wants to merge 2 commits into
gengliangwang wants to merge 2 commits into
Conversation
…ing a static Java helper
### What changes were proposed in this pull request?
Add `ExpressionImplUtils.compileRegexPattern(String regex, int flags, String
funcName)`, which wraps `Pattern.compile` and maps a `PatternSyntaxException` to
the user-facing INVALID_PARAMETER_VALUE.PATTERN error. Route both the shared
codegen (`RegExpUtils.initLastMatcherCode`, used by the whole regexp expression
family -- RLike, RegExpReplace, RegExpExtract, RegExpExtractAll, RegExpInStr,
etc.) and the eval helper (`RegExpUtils.getPatternAndLastRegex`) through it.
`initLastMatcherCode` previously emitted a 5-line inline
`try { Pattern.compile } catch (PatternSyntaxException)` block; it now emits a
single helper call. The per-stage mutable-state caching (`lastRegex` /
`pattern`) is preserved in the generated code.
### Why are the changes needed?
Part of SPARK-56908 (umbrella). This block is emitted by every regexp expression
in every stage that uses one; collapsing it to a single call shrinks the
generated Java across the whole family.
### Does this PR introduce _any_ user-facing change?
No. The compiled behavior is identical; only the emitted Java source text changes.
### How was this patch tested?
```
build/sbt "catalyst/testOnly *RegexpExpressionsSuite"
```
21/21 pass (exercised both with and without whole-stage codegen).
### Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Opus 4.8)
Co-authored-by: Isaac
…r limit Co-authored-by: Isaac
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
Add
ExpressionImplUtils.compileRegexPattern(String regex, int flags, String funcName), which wrapsPattern.compileand maps aPatternSyntaxExceptionto the user-facing INVALID_PARAMETER_VALUE.PATTERN error. Route both the shared codegen (RegExpUtils.initLastMatcherCode, used by the whole regexp expression family --RLike,RegExpReplace,RegExpExtract,RegExpExtractAll,RegExpInStr, etc.) and the eval helper (RegExpUtils.getPatternAndLastRegex) through it.initLastMatcherCodepreviously emitted a 5-line inlinetry { Pattern.compile(...) } catch (PatternSyntaxException)block; it now emits a single helper call. The per-stage mutable-state caching (lastRegex/pattern) is preserved in the generated code.Why are the changes needed?
Part of SPARK-56908 (umbrella). This block is emitted by every regexp expression in every stage that uses one; collapsing it to a single call shrinks the generated Java across the whole family, helping with the JVM 64KB method / constant-pool limits, Janino compile time, and JIT work.
Does this PR introduce any user-facing change?
No. The compiled behavior is identical; only the emitted Java source text changes.
How was this patch tested?
21/21 pass (exercised both with and without whole-stage codegen).
Was this patch authored or co-authored using generative AI tooling?
Generated-by: Claude Code (Opus 4.8)