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

Search dv only IP masks #16628

Merged
merged 13 commits into from
Nov 15, 2024
Merged

Conversation

mkhludnev
Copy link
Contributor

Description

it fixes an edge case when docvalues-only (index:false) IP field is queried via IP mask (1.2.3.4/22 syntax). Now such query is ignored, this change makes it work.

Related Issues

relate #11508

Check List

  • [v] Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

Copy link
Contributor

❌ Gradle check result for bf572a8: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@reta
Copy link
Collaborator

reta commented Nov 13, 2024

@mkhludnev Could you please add entry to CHANGELOG.md for this change? thank you

@reta reta added backport 2.x Backport to 2.x branch v3.0.0 Issues and PRs related to version 3.0.0 v2.19.0 Issues and PRs related to version 2.19.0 labels Nov 13, 2024
Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Copy link
Contributor

❌ Gradle check result for f7eecfc: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Copy link
Contributor

❌ Gradle check result for a859408: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Copy link
Contributor

❕ Gradle check result for fa14302: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link

codecov bot commented Nov 14, 2024

Codecov Report

Attention: Patch coverage is 85.71429% with 5 lines in your changes missing coverage. Please review.

Project coverage is 72.11%. Comparing base (548a650) to head (ca7569d).
Report is 9 commits behind head on main.

Files with missing lines Patch % Lines
...ava/org/opensearch/index/mapper/IpFieldMapper.java 85.71% 3 Missing and 2 partials ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #16628      +/-   ##
============================================
+ Coverage     72.03%   72.11%   +0.08%     
- Complexity    65169    65232      +63     
============================================
  Files          5318     5318              
  Lines        303890   303895       +5     
  Branches      43968    43972       +4     
============================================
+ Hits         218906   219155     +249     
+ Misses        67051    66773     -278     
- Partials      17933    17967      +34     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Copy link
Contributor

✅ Gradle check result for f522622: SUCCESS

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
@reta
Copy link
Collaborator

reta commented Nov 15, 2024

@msfroh LGTY? thanks!

Copy link
Contributor

✅ Gradle check result for ca7569d: SUCCESS

@reta reta merged commit d4d70d8 into opensearch-project:main Nov 15, 2024
39 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 15, 2024
* search dv only ip masks

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* search dv only ip masks: changes

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* drop fancy closures

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* drop fancy closures. one more

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* fix unit tests; add some more dvOnly

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* drop skipping dvOnly in 2.x

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* drop redundant brackets

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* extract conditions

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* asserts

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* spotless apply

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* bring back skip before

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* combine asserts

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

* inline, copy-paste

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>

---------

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
Co-authored-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
(cherry picked from commit d4d70d8)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
reta pushed a commit that referenced this pull request Nov 16, 2024
* search dv only ip masks



* search dv only ip masks: changes



* drop fancy closures



* drop fancy closures. one more



* fix unit tests; add some more dvOnly



* drop skipping dvOnly in 2.x



* drop redundant brackets



* extract conditions



* asserts



* spotless apply



* bring back skip before



* combine asserts



* inline, copy-paste



---------




(cherry picked from commit d4d70d8)

Signed-off-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: mikhail-khludnev <mikhail_khludnev@rntgroup.com>
@mkhludnev
Copy link
Contributor Author

Thank you so much @reta @msfroh

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch bug Something isn't working v2.19.0 Issues and PRs related to version 2.19.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants