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

Jump to bottom

Add match_phrase_prefix #661

Merged

penghuo merged 37 commits into opensearch-project:main from Bit-Quill:integ-match_phrase_prefix-#186

Jul 11, 2022

Collaborator

MaxKsyunz commented Jun 28, 2022 •

edited

Description

Add support for match_phrase_prefix in SQL and PPL.

Issues Resolved

Check List

New functionality includes testing.
- All tests pass, including unit test, integration test and doctest
New functionality has been documented.
- New functionality has javadoc added
- New functionality has user manual doc added
Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

MaxKsyunz and others added 30 commits

June 3, 2022 17:55


          Add an integration test for match_phrase_prefix with required parameters

d03f3fe

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Update SQL ANTLR files to support match_phrase_prefix.

b5a6832

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          SQL parser test for match_phrase_prefix with required arguments.

9d77381

Change generateQueries signature to use more appropriate Map type.

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          The rest of the match_phrase_prefix owl with required parameters.

05e74fa

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Checkstyle fix.

898a31c

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Add a license header.

bb946c2

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Merge pull request #68 from Bit-Quill/dev-match_phrase_prefix-#186-re…

0aec6ed

…quired

Add match_phrase_prefix to SQL with required parameters.


          Make MATCH_PHRASE_PREFIX_MAX_NUM_PARAMETERS public.

f9c90a3

Private constants look odd.

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Add support for boost parameter in match_phrase.

885ba5b

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Add SQL parser unit tests for optional parameters.

3b113e8

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Add support for optional parameters for match_phrase_prefix.

ac3fdd5

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Add unit test for AstExpressionBuilderTest that includes all parameters.

efaa0bf

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Add DSL.namedArgument(String, String)

22a2d0c

A convenience method to simplify writing tests.

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          ExpressionAnalyzer test for match_phrase_prefix with all parameters.

d92da11

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Support correct max number of optional parameters.

0c49775

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Address checkstyle issues.

f68eb9e

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Merge pull request #70 from Bit-Quill/dev-match_phrase_prefix-#186-sq…

b4177a6

…l-opt

match_phrase_prefix in SQL with optional parameters


          Merge branch 'integ-match_phrase_prefix-#186' into dev-match_phrase_p…

7d4a953

…refix-#186

# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	core/src/main/java/org/opensearch/sql/expression/function/OpenSearchFunctions.java
#	core/src/test/java/org/opensearch/sql/analysis/ExpressionAnalyzerTest.java
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java
#	opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java
#	sql/src/main/antlr/OpenSearchSQLLexer.g4
#	sql/src/main/antlr/OpenSearchSQLParser.g4


          Update getRelevanceFunctionResolver usage to pass field argument type.

a485765

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          match_phrase_prefix PPL required parameters integration test.

7b7a096

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          match_phrase_prefix with required parameters in PPL.

ea512f8

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Integration test for match_phrase_prefix in PPL with all parameters.

2c65764

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          match_phrase_prefix SQL integration tests.

9f38d72

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Merge pull request #73 from Bit-Quill/dev-match_phrase_prefix-#186-pp…

0fe8f78

…l-req

Add match_phrase_prefix support to where command in PPL


          Add FilterQueryBuilderTest test for match_phrase_prefix with analyzer

0925c1d

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Fix flaky tests

9dc2655

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          match_phrase_prefix documentation for SQL and PPL

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Merge pull request #76 from Bit-Quill/dev-match_phrase_prefix-#186-sq…

27bf42c

…l-itests

Add integration tests for match_phrase_prefix in SQL


          Improve PPL documentation for match_phrase_prefix

451b829

- match_phrase was used in a couple places.
- some optional parameters were missing.

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Add integration tests for match_phrase_prefix in PPL

11b8617

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>

MaxKsyunz and others added 6 commits

June 23, 2022 09:48


          Merge pull request #77 from Bit-Quill/dev-match_phrase_prefix-#186-docs

6e61c0d

match_phrase_prefix documentation for SQL and PPL


          Merge pull request #78 from Bit-Quill/dev-match_phrase_prefix-#186-pp…

e01a287

…l_it

Integration tests for match_phrase_prefix in PPL


          Merge branch 'integ-match_phrase_prefix-#186' into dev-match_phrase_p…

bff94be

…refix-#186

# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/DSL.java
#	docs/user/dql/functions.rst
#	docs/user/ppl/functions/relevance.rst


          Remove an empty unit test.

224432f

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Updated incorrect references to match_phrase.

e9f2af3

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>


          Merge pull request #79 from Bit-Quill/dev-match_phrase_prefix-#186

Add support for match_phrase_prefix in SQL and PPL

MaxKsyunz requested a review from a team as a code owner

June 28, 2022 07:52


          Merge remote-tracking branch 'upstream/main' into integ-match_phrase_…

b51eae4

…prefix-#186

Signed-off-by: MaxKsyunz <maxk@bitquilltech.com>

# Conflicts:
#	core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java
#	docs/user/dql/functions.rst
#	opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java
#	ppl/src/main/antlr/OpenSearchPPLLexer.g4
#	ppl/src/main/antlr/OpenSearchPPLParser.g4
#	sql/src/main/antlr/OpenSearchSQLParser.g4

acarbonetto previously approved these changes

View reviewed changes

MaxKsyunz dismissed acarbonetto’s stale review via

b51eae4

June 29, 2022 06:46

acarbonetto approved these changes

View reviewed changes

dai-chen approved these changes

View reviewed changes

Collaborator

dai-chen left a comment

Thanks for your changes!

...opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java

+                      .put("slop", (b, v) -> b.slop(Integer.parseInt(v.stringValue())))
+                      .put("max_expansions", (b, v) -> b.maxExpansions(Integer.parseInt(v.stringValue())))
+                      .put("zero_terms_query", (b, v) -> b.zeroTermsQuery(
+                          org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(v.stringValue())))

Collaborator

dai-chen Jul 8, 2022

np: use import statement instead?

penghuo approved these changes

View reviewed changes

Collaborator

penghuo left a comment

Thanks for the change!

penghuo merged commit e180d56 into opensearch-project:main

MaxKsyunz deleted the integ-match_phrase_prefix-#186 branch

July 26, 2022 01:44

acarbonetto mentioned this pull request

Support match_phrase_prefix function in SQL/PPL query engine #186

Closed

5 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment