Skip to content
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

[Backport 2.x Manually][Fix] add non-null check for queryBuilder in NeuralQueryEnricherProcessor #618

Conversation

zhichao-aws
Copy link
Member

Description

The automatic backport for #615 failed. Backport it manually.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as 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.

opensearch-trigger-bot bot and others added 30 commits October 24, 2022 11:54
…ject#29)

Updated buildscript repos to contain mavenLocal and added groupId
to publishZip publishing task.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 5264f8f)
…earch-project#33)

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 38de48d)
Adds prefix "opensearch" to plugin name to conform with OpenSearch
plugin standards.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit e6d1b54)
…he tests failing on windows. (opensearch-project#44)

Signed-off-by: Navneet Verma <navneev@amazon.com>
…pensearch-project#27) (opensearch-project#46)

Signed-off-by: Zan Niu <zaniu@amazon.com>
Signed-off-by: Navneet Verma <navneev@amazon.com>
…ject#41)

Signed-off-by: Navneet Verma <navneev@amazon.com>
(cherry picked from commit d707db3)

Co-authored-by: Navneet Verma <navneev@amazon.com>
Adds a series of integration tests for neural query type. Adds shared
functionality to base class as well as a utility class. Increase test
cluster heap to 1 GB.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit e30285b)
Updated processor test to use Lucene engine. Refactored ingest document
to refresh after ingestion and confirm doc gets indexed.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 0b8c0d1)
Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 868e29e)
Brings query up one level from plugin to neuralsearch.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 99e648b)
Adds 2.4.0.0 release notes. Copied content from draft release notes on
GitHub and fixed the broken links. Made minor changes to some of the
titles of the PRs.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit d586de1)
Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit e5df635)
Update release features to experimental in the release notes.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 7b78d16)
Fixes bug caching model load in integ test. This leads to a new model
being loaded for each test. Now, only one model will be loaded,
preventing CB exceptions.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 6068858)
…ject#72) (opensearch-project#77)

* Optimize error prompt when inference list is empty
* Add empty inference list check to avoid exception

Signed-off-by: Zan Niu <zaniu@amazon.com>
(cherry picked from commit dd52bef)

Co-authored-by: zane-neo <zaniu@amazon.com>
…arch-project#80)

Signed-off-by: Navneet Verma <navneev@amazon.com>

Signed-off-by: Navneet Verma <navneev@amazon.com>
(cherry picked from commit 39b10ba)

Co-authored-by: Navneet Verma <navneev@amazon.com>
Adds filter option for query type. Filtering support was introduced in
the k-NN plugin in 2.4. Breaks backwards compatibility with OpenSearch
2.4, however, given that 2.4 is experimental, this is okay. Backwards
  compatibility issues will only arise during mixed cluster upgrade.

Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit de551e2)
Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
…nterface. (opensearch-project#90)

Signed-off-by: Navneet Verma <navneev@amazon.com>

Signed-off-by: Navneet Verma <navneev@amazon.com>
…t#94) (opensearch-project#97)

Signed-off-by: Navneet Verma <navneev@amazon.com>

Signed-off-by: Navneet Verma <navneev@amazon.com>
(cherry picked from commit ad311c0)

Co-authored-by: Navneet Verma <navneev@amazon.com>
Add basic retry mechanism for neural search inference

(cherry picked from commit b207176)
Signed-off-by: John Mazanec <jmazane@amazon.com>

Co-authored-by: zane-neo <zaniu@amazon.com>
(cherry picked from commit 6f31e51)
Signed-off-by: John Mazanec <jmazane@amazon.com>

Co-authored-by: Daniel (dB.) Doubrovkine <dblock@dblock.org>
Signed-off-by: John Mazanec <jmazane@amazon.com>
(cherry picked from commit 63f0236)
…ject#107)

Updates defaul ml commons setting
"plugins.ml_commons.only_run_on_ml_node" to false. This prevents
integration tests from failing when an ml node is not explicitly added.

Also, make native memory circuit breaker 100 for tests

Signed-off-by: John Mazanec <jmazane@amazon.com>
…#121)

* Increment version to 2.6.0-SNAPSHOT
* Enable ignore failures for forbidden API

Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
…search-project#132)

Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com>
…t#137)

Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit 96ce34e)

Co-authored-by: Heemin Kim <heemin@amazon.com>
Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit d1ffa1e)

Co-authored-by: Heemin Kim <heemin@amazon.com>
heemin32 and others added 14 commits October 6, 2023 16:16
Signed-off-by: Heemin Kim <heemin@amazon.com>
(cherry picked from commit 0f73cc6)

Signed-off-by: Heemin Kim <heemin@amazon.com>
…ch-project#438) (opensearch-project#441)

* add serialization and deserialization

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* hash, equals. + UT

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* tidy

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add test

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

---------

Signed-off-by: zhichao-aws <zhichaog@amazon.com>
(cherry picked from commit 51e6c00)

Co-authored-by: zhichao-aws <zhichaog@amazon.com>
* Adding development guide readme file

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
(cherry picked from commit c3e336f)

Co-authored-by: Martin Gaievski <gaievski@amazon.com>
…ect#483) (opensearch-project#484)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit cda2f82)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
…opensearch-project#489)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
(cherry picked from commit 00c5589)

Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>
* Increment version to 2.12.0-SNAPSHOT

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
…ery (opensearch-project#490) (opensearch-project#496)

* Adding null check for case when hybrid query wrapped into bool query

(cherry picked from commit b3c73bd)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
…oject#478)

* rm bounded linear feature query

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* deprecate max_token_score

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add changelog

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* tidy

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* fix ut

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add ut

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

* add deprecation annotation

Signed-off-by: zhichao-aws <zhichaog@amazon.com>

---------

Signed-off-by: zhichao-aws <zhichaog@amazon.com>
…eries (opensearch-project#498) (opensearch-project#501)

* Fixed nested field case


(cherry picked from commit 3991fe7)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
…nsearch-project#504) (opensearch-project#506)

Signed-off-by: Navneet Verma <navneev@amazon.com>
(cherry picked from commit c338b94)

Co-authored-by: Navneet Verma <navneev@amazon.com>
* Backporting changes from main branch

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
…-project#524) (opensearch-project#527)

* Allow multiple identical sub-queries in hybrid query, removed validation for total hits


(cherry picked from commit 585fbbe)

Signed-off-by: Martin Gaievski <gaievski@amazon.com>
* Initial commit for adding BWC tests in neural search plugin (opensearch-project#515)

Signed-off-by: Varun Jain <varunudr@amazon.com>
…roject#531) (opensearch-project#532)

* Adding information on BWC tests in Developer guide

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
(cherry picked from commit 91a1202)

Co-authored-by: Varun Jain <varunudr@amazon.com>
@zhichao-aws
Copy link
Member Author

choose wrong branch. close it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants