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

Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility. #11095

Merged
merged 1 commit into from
Nov 6, 2023

Conversation

navneet1v
Copy link
Contributor

Description

Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility.

Related Issues

Resolves #10958

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Failing checks are inspected and point to the corresponding known issue(s) (See: Troubleshooting Failing Builds)
  • Commits are signed per the DCO using --signoff
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)
  • Public documentation issue/PR created

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 github-actions bot added bug Something isn't working Geospatial Indexing Indexing, Bulk Indexing and anything related to indexing labels Nov 5, 2023
@navneet1v navneet1v changed the title Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility. [Draft] Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility. Nov 5, 2023
Copy link
Contributor

github-actions bot commented Nov 5, 2023

Compatibility status:

Checks if related components are compatible with change 1549ed0

Incompatible components

Incompatible components: [https://github.com/opensearch-project/performance-analyzer.git]

Skipped components

Compatible components

Compatible components: [https://github.com/opensearch-project/security-analytics.git, https://github.com/opensearch-project/security.git, https://github.com/opensearch-project/custom-codecs.git, https://github.com/opensearch-project/opensearch-oci-object-storage.git, https://github.com/opensearch-project/index-management.git, https://github.com/opensearch-project/geospatial.git, https://github.com/opensearch-project/sql.git, https://github.com/opensearch-project/job-scheduler.git, https://github.com/opensearch-project/notifications.git, https://github.com/opensearch-project/observability.git, https://github.com/opensearch-project/k-nn.git, https://github.com/opensearch-project/neural-search.git, https://github.com/opensearch-project/cross-cluster-replication.git, https://github.com/opensearch-project/alerting.git, https://github.com/opensearch-project/performance-analyzer-rca.git, https://github.com/opensearch-project/anomaly-detection.git, https://github.com/opensearch-project/asynchronous-search.git, https://github.com/opensearch-project/ml-commons.git, https://github.com/opensearch-project/common-utils.git, https://github.com/opensearch-project/reporting.git]

Copy link
Contributor

github-actions bot commented Nov 5, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 5, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link
Contributor

github-actions bot commented Nov 5, 2023

Gradle Check (Jenkins) Run Completed with:

…x, to ensure backward compatibility.

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

github-actions bot commented Nov 5, 2023

Gradle Check (Jenkins) Run Completed with:

Copy link

codecov bot commented Nov 5, 2023

Codecov Report

Merging #11095 (1549ed0) into main (747f7d1) will decrease coverage by 0.02%.
The diff coverage is 62.50%.

@@             Coverage Diff              @@
##               main   #11095      +/-   ##
============================================
- Coverage     71.20%   71.19%   -0.02%     
+ Complexity    58716    58697      -19     
============================================
  Files          4872     4872              
  Lines        276773   276778       +5     
  Branches      40240    40240              
============================================
- Hits         197078   197052      -26     
- Misses        63238    63289      +51     
+ Partials      16457    16437      -20     
Files Coverage Δ
...g/opensearch/index/mapper/GeoShapeFieldMapper.java 80.00% <62.50%> (-3.64%) ⬇️

... and 449 files with indirect coverage changes

@navneet1v navneet1v changed the title [Draft] Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility. Adding version condition while adding geoshape doc values to the index, to ensure backward compatibility. Nov 5, 2023
@msfroh msfroh merged commit c40014f into opensearch-project:main Nov 6, 2023
31 of 32 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch/backport-2.x
# Create a new branch
git switch --create backport/backport-11095-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 c40014f8d37f27811362a3d6b3296cdc032b4399
# Push it to GitHub
git push --set-upstream origin backport/backport-11095-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-11095-to-2.x.

@navneet1v
Copy link
Contributor Author

Created a backport PR: #11114

rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…x, to ensure backward compatibility. (opensearch-project#11095)

Signed-off-by: Navneet Verma <navneev@amazon.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…x, to ensure backward compatibility. (opensearch-project#11095)

Signed-off-by: Navneet Verma <navneev@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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 backport-failed bug Something isn't working Geospatial Indexing Indexing, Bulk Indexing and anything related to indexing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Broken Upgrade from 2.7 to 2.9 for Indices with GeoShape mappings
2 participants