forked from opensearch-project/sql
-
Notifications
You must be signed in to change notification settings - Fork 0
Add position() function to PPL #179
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
3aa77a5
Add position function to PPL
margarit-h 6d5b7c5
Fix a test
margarit-h 3294092
Fix more tests
margarit-h 26927cd
Edit a doc
margarit-h 3888005
Edit a doc
margarit-h 0749582
Update docs/user/ppl/functions/string.rst
margarit-h 8227419
Changes based on upstream SQL PR comments
margarit-h 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
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
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 |
|---|---|---|
|
|
@@ -150,6 +150,31 @@ Example:: | |
| +---------------------+---------------------+ | ||
|
|
||
|
|
||
| POSITION | ||
| ------ | ||
|
|
||
| Description | ||
| >>>>>>>>>>> | ||
|
|
||
| Usage: The syntax `POSITION(substr IN str)` returns the position of the first occurrence of substring `substr` in string `str`. Returns `0` if `substr` is not in `str`. Returns `NULL` if any argument is `NULL`. | ||
|
|
||
| Argument type: STRING, STRING | ||
|
|
||
| Return type integer: | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
|
||
| (STRING IN STRING) -> INTEGER | ||
|
|
||
| Example:: | ||
|
|
||
| os> source=people | eval `POSITION('world' IN 'helloworld')` = POSITION('world' IN 'helloworld'), `POSITION('invalid' IN 'helloworld')`= POSITION('invalid' IN 'helloworld') | fields `POSITION('world' IN 'helloworld')`, `POSITION('invalid' IN 'helloworld')` | ||
| fetched rows / total rows = 1/1 | ||
| +-------------------------------------+---------------------------------------+ | ||
| | POSITION('world' IN 'helloworld') | POSITION('invalid' IN 'helloworld') | | ||
| |-------------------------------------+---------------------------------------| | ||
| | 6 | 0 | | ||
| +-------------------------------------+---------------------------------------+ | ||
|
|
||
|
|
||
| RIGHT | ||
| ----- | ||
|
|
||
|
|
||
103 changes: 103 additions & 0 deletions
103
integ-test/src/test/java/org/opensearch/sql/ppl/PositionFunctionIT.java
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,103 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.sql.ppl; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BEER; | ||
| import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_CALCS; | ||
| import static org.opensearch.sql.util.MatcherUtils.rows; | ||
| import static org.opensearch.sql.util.MatcherUtils.schema; | ||
| import static org.opensearch.sql.util.MatcherUtils.verifyDataRows; | ||
| import static org.opensearch.sql.util.MatcherUtils.verifySchema; | ||
|
|
||
| public class PositionFunctionIT extends PPLIntegTestCase { | ||
| @Override | ||
| public void init() throws IOException { | ||
| loadIndex(Index.CALCS); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_position_function() throws IOException { | ||
| String query = "source=" + TEST_INDEX_CALCS | ||
| + " | eval f=position('ON', str1) | fields f"; | ||
|
|
||
| var result = executeQuery(query); | ||
|
|
||
| assertEquals(17, result.getInt("total")); | ||
| verifyDataRows(result, | ||
| rows(7), rows(7), | ||
| rows(2), rows(0), | ||
| rows(0), rows(0), | ||
| rows(0), rows(0), | ||
| rows(0), rows(0), | ||
| rows(0), rows(0), | ||
| rows(0), rows(0), | ||
| rows(0), rows(0), | ||
| rows(0)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_position_function_with_fields_only() throws IOException { | ||
| String query = "source=" + TEST_INDEX_CALCS | ||
| + " | eval f=position(str3 IN str2) | where str2 IN ('one', 'two', 'three')| fields f"; | ||
|
|
||
| var result = executeQuery(query); | ||
|
|
||
| assertEquals(3, result.getInt("total")); | ||
| verifyDataRows(result, rows(3), rows(0), rows(4)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_position_function_with_string_literals() throws IOException { | ||
| String query = "source=" + TEST_INDEX_CALCS | ||
| + " | eval f=position('world' IN 'hello world') | where str2='one' | fields f"; | ||
|
|
||
| var result = executeQuery(query); | ||
|
|
||
| assertEquals(1, result.getInt("total")); | ||
| verifyDataRows(result, rows(7)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_position_function_with_nulls() throws IOException { | ||
| String query = "source=" + TEST_INDEX_CALCS | ||
| + " | eval f=position('ee' IN str2) | where isnull(str2) | fields str2,f"; | ||
|
|
||
| var result = executeQuery(query); | ||
|
|
||
| assertEquals(4, result.getInt("total")); | ||
| verifyDataRows(result, | ||
| rows(null, null), | ||
| rows(null, null), | ||
| rows(null, null), | ||
| rows(null, null)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_position_function_with_function_as_arg() throws IOException { | ||
| String query = "source=" + TEST_INDEX_CALCS | ||
| + " | eval f=position(upper(str3) IN str1) | where like(str1, 'BINDING SUPPLIES') | fields f"; | ||
|
|
||
| var result = executeQuery(query); | ||
|
|
||
| assertEquals(1, result.getInt("total")); | ||
| verifyDataRows(result, rows(15)); | ||
| } | ||
|
|
||
| @Test | ||
| public void test_position_function_with_function_in_where_clause() throws IOException { | ||
| String query = "source=" + TEST_INDEX_CALCS | ||
| + " | where position(str3 IN str2)=1 | fields str2"; | ||
|
|
||
| var result = executeQuery(query); | ||
|
|
||
| assertEquals(2, result.getInt("total")); | ||
| verifyDataRows(result, rows("eight"), rows("eleven")); | ||
| } | ||
| } |
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
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
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.