-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-9152][SQL] Implement code generation for Like and RLike #7561
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.
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
Closed
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
69f0fb6
Add code generation for Like and RLike.
viirya 6cffe3c
For comments.
viirya a0fb76e
For comments.
viirya 46d946f
Merge remote-tracking branch 'upstream/master' into like_rlike_codegen
viirya aea58e0
For comments.
viirya 48e5536
Merge remote-tracking branch 'upstream/master' into like_rlike_codegen
viirya 696d451
Check expression foldable.
viirya 8092a68
Merge remote-tracking branch 'upstream/master' into like_rlike_codegen
viirya 50df9a8
Use nullSafeCodeGen.
viirya 0086723
Merge remote-tracking branch 'upstream/master' into like_rlike_codegen
viirya ccd1b43
For comments.
viirya fe5641b
Add test for NonFoldableLiteral.
viirya File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
47 changes: 47 additions & 0 deletions
47
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/StringUtils.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.catalyst.util | ||
|
|
||
| import java.util.regex.Pattern | ||
|
|
||
| object StringUtils { | ||
|
|
||
| // replace the _ with .{1} exactly match 1 time of any character | ||
| // replace the % with .*, match 0 or more times with any character | ||
| def escapeLikeRegex(v: String): String = { | ||
| if (!v.isEmpty) { | ||
| "(?s)" + (' ' +: v.init).zip(v).flatMap { | ||
| case (prev, '\\') => "" | ||
| case ('\\', c) => | ||
| c match { | ||
| case '_' => "_" | ||
| case '%' => "%" | ||
| case _ => Pattern.quote("\\" + c) | ||
| } | ||
| case (prev, c) => | ||
| c match { | ||
| case '_' => "." | ||
| case '%' => ".*" | ||
| case _ => Pattern.quote(Character.toString(c)) | ||
| } | ||
| }.mkString | ||
| } else { | ||
| v | ||
| } | ||
| } | ||
| } |
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
34 changes: 34 additions & 0 deletions
34
sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/util/StringUtilsSuite.scala
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.sql.catalyst.util | ||
|
|
||
| import org.apache.spark.SparkFunSuite | ||
| import org.apache.spark.sql.catalyst.util.StringUtils._ | ||
|
|
||
| class StringUtilsSuite extends SparkFunSuite { | ||
|
|
||
| test("escapeLikeRegex") { | ||
| assert(escapeLikeRegex("abdef") === "(?s)\\Qa\\E\\Qb\\E\\Qd\\E\\Qe\\E\\Qf\\E") | ||
| assert(escapeLikeRegex("a\\__b") === "(?s)\\Qa\\E_.\\Qb\\E") | ||
| assert(escapeLikeRegex("a_%b") === "(?s)\\Qa\\E..*\\Qb\\E") | ||
| assert(escapeLikeRegex("a%\\%b") === "(?s)\\Qa\\E.*%\\Qb\\E") | ||
| assert(escapeLikeRegex("a%") === "(?s)\\Qa\\E.*") | ||
| assert(escapeLikeRegex("**") === "(?s)\\Q*\\E\\Q*\\E") | ||
| assert(escapeLikeRegex("a_b") === "(?s)\\Qa\\E.\\Qb\\E") | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please put all the coding above in a static context. Then you can call it from
codeGenand the interpreted code and we avoid duplicated coding.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure I get your point. I think we don't want to call
escapein the generated java codes?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That is exactly what we want.
escapeis totally independent from the expression itself, isn't it? This simplifies the codegen, removes duplicated code and has no negative impact.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK. I got your point. I was thinking to have inlined a java version of escape for better performance. I will put the current
escapecodes to other place and reuse it.