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] replace with getField (#7855) #8600

Merged
merged 1 commit into from
Jul 11, 2023

Conversation

mingshl
Copy link
Contributor

@mingshl mingshl commented Jul 10, 2023

  • replace with getField

Signed-off-by: Shinsuke Sugaya shinsuke@apache.org

Signed-off-by: Shinsuke Sugaya shinsuke@apache.org
Signed-off-by: Shinsuke Sugaya shinsuke.sugaya@gmail.com
Signed-off-by: Mingshi Liu mingshl@amazon.com
Co-authored-by: Andriy Redko drreta@gmail.com
Co-authored-by: Mingshi Liu mingshl@amazon.com
(cherry picked from commit 828730f)

Description

[Backport] [2.x] replace with getField (#7855)

Related Issues

Resolves #7835

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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.

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@mingshl
Copy link
Contributor Author

mingshl commented Jul 10, 2023

Gradle Check failed not related to this code change.

same gradle check error failed at
testCodecServiceWithNullMapperService happed to the proceeding PRs to 2.x
#8587
#8595
#8545

@reta
Copy link
Collaborator

reta commented Jul 10, 2023

Builds are failing because of #8591

@mingshl
Copy link
Contributor Author

mingshl commented Jul 11, 2023

#8591 get merged, need some help rerunning the gradle check.

@macohen
Copy link
Contributor

macohen commented Jul 11, 2023

@dblock, @reta are you able to rerun the check now that #8591 is merged, please?

@reta
Copy link
Collaborator

reta commented Jul 11, 2023

@dblock, @reta are you able to rerun the check now that #8591 is merged, please?

@macohen the pull request needs rebase first :( @mingshl could you please do that?

* replace with getField

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>

* Update server/src/main/java/org/opensearch/index/mapper/FlatObjectFieldMapper.java

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Shinsuke Sugaya <shinsuke.sugaya@gmail.com>

* add import

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>

* add PR to CHANGELOG

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>

* move SortedSetDocValuesField addition for field type

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>

* remove a test case for flat-object field

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>

* remove getField

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

* remove unused import

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>

---------

Signed-off-by: Shinsuke Sugaya <shinsuke@apache.org>
Signed-off-by: Shinsuke Sugaya <shinsuke.sugaya@gmail.com>
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
Co-authored-by: Andriy Redko <drreta@gmail.com>
Co-authored-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit 828730f)
@mingshl mingshl force-pushed the backport/backport-7855-to-2.x branch from f87c27c to 2ca2596 Compare July 11, 2023 16:00
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString

@mingshl
Copy link
Contributor Author

mingshl commented Jul 11, 2023

Thanks @reta ! rebased and ready for merge.

@reta reta merged commit 166ed97 into opensearch-project:2.x Jul 11, 2023
6 checks passed
@mingshl mingshl self-assigned this Jul 11, 2023
@mingshl mingshl added the v2.9.0 'Issues and PRs related to version v2.9.0' label Jul 11, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v2.9.0 'Issues and PRs related to version v2.9.0'
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants