-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Optimize scalar string functions #14833
Open
bziobrowski
wants to merge
11
commits into
apache:master
Choose a base branch
from
bziobrowski:optimize_string_functions
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
e7c6088
Optimize scalar string functions.
bziobrowski 4adf34f
Fixed file header.
bziobrowski 3342760
Merge remote-tracking branch 'origin/master' into optimize_string_fun…
bziobrowski 577c36b
Added tests for var and const functions.
bziobrowski 274372e
Renamed regexp functions.
bziobrowski c543f3e
Added missing @ScalarFunction annotation.
bziobrowski 590dc4d
Merge remote-tracking branch 'origin/master' into optimize_string_fun…
bziobrowski 5d6aa61
Merge remote-tracking branch 'origin/master' into optimize_string_fun…
bziobrowski 9df823d
Fixed tests.
bziobrowski 83d93c1
Fixed tests.
bziobrowski ef82ced
Force CI rebuild.
bziobrowski 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 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
77 changes: 77 additions & 0 deletions
77
...main/java/org/apache/pinot/common/function/scalar/regexp/RegexpExtractConstFunctions.java
This file contains 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,77 @@ | ||
/** | ||
* 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.pinot.common.function.scalar.regexp; | ||
|
||
import java.util.regex.Matcher; | ||
import java.util.regex.Pattern; | ||
import org.apache.pinot.spi.annotations.ScalarFunction; | ||
|
||
|
||
/** | ||
* Optimized implementation of regexp_extract that assumes pattern is constant. | ||
*/ | ||
public class RegexpExtractConstFunctions { | ||
|
||
private Matcher _matcher; | ||
|
||
/** | ||
* @param value | ||
* @param regexp | ||
* @return the matched result. | ||
*/ | ||
@ScalarFunction | ||
public String regexpExtract(String value, String regexp) { | ||
return regexpExtract(value, regexp, 0, ""); | ||
} | ||
|
||
/** | ||
* @param value | ||
* @param regexp | ||
* @param group | ||
* @return the matched result. | ||
*/ | ||
@ScalarFunction | ||
public String regexpExtract(String value, String regexp, int group) { | ||
return regexpExtract(value, regexp, group, ""); | ||
} | ||
|
||
/** | ||
* Regular expression that extract first matched substring. | ||
* | ||
* @param value input value | ||
* @param regexp regular expression | ||
* @param group the group number within the regular expression to extract. | ||
* @param defaultValue the default value if no match found | ||
* @return the matched result | ||
*/ | ||
@ScalarFunction | ||
public String regexpExtract(String value, String regexp, int group, String defaultValue) { | ||
if (_matcher == null) { | ||
Pattern p = Pattern.compile(regexp); | ||
_matcher = p.matcher(""); | ||
} | ||
|
||
_matcher.reset(value); | ||
if (_matcher.find() && _matcher.groupCount() >= group) { | ||
return _matcher.group(group); | ||
} else { | ||
return defaultValue; | ||
} | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
How is the new implementation of LTRIM better than this implementation ?
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.
The new implementation shares the matcher, instead of allocating a new one per call.