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.10] Fix broken backward compatibility from 2.7 for IndexSorted field indi… #10076

Merged
merged 3 commits into from
Sep 16, 2023

Conversation

gashutos
Copy link
Contributor

Backport of #10075

…ces (opensearch-project#10045)

* Fix broken backward comparibility from 2.7 for IndexSorted field indices

Signed-off-by: gashutos <gashutos@amazon.com>

* Adding CHANGELOG

Signed-off-by: gashutos <gashutos@amazon.com>

* Update server/src/main/java/org/opensearch/index/IndexSettings.java

Co-authored-by: Andriy Redko <drreta@gmail.com>
Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com>

* Removing unwanted logs

Signed-off-by: gashutos <gashutos@amazon.com>

* Removing unwanted logs

Signed-off-by: gashutos <gashutos@amazon.com>

* Adding index sort as part of mixed cluster to test this scenario

Signed-off-by: gashutos <gashutos@amazon.com>

* Removing optimization disable logic

Signed-off-by: gashutos <gashutos@amazon.com>

* Correcting some comments & version check to before( V_2_7_0) instead onOrBefire(V_2_6_1) since

Signed-off-by: gashutos <gashutos@amazon.com>

* Resolving spotless check error

Signed-off-by: gashutos <gashutos@amazon.com>

* Fixing broken UT - last minute checkin without copile

Signed-off-by: gashutos <gashutos@amazon.com>

* Improving code coverage to make codcov happy

Signed-off-by: gashutos <gashutos@amazon.com>

* Correcting typos and adding more tests

Signed-off-by: gashutos <gashutos@amazon.com>

* Removing unwanted imports

Signed-off-by: gashutos <gashutos@amazon.com>

---------

Signed-off-by: gashutos <gashutos@amazon.com>
Signed-off-by: Chaitanya Gohel <104654647+gashutos@users.noreply.github.com>
Co-authored-by: Andriy Redko <drreta@gmail.com>
@gashutos
Copy link
Contributor Author

@reta ^^

Copy link
Collaborator

@reta reta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Holding the merge till we get green light from release team

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: gashutos <gashutos@amazon.com>
@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 1894a24

Incompatible components

Skipped components

Compatible components

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

@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change 2e46c30

Incompatible components

Skipped components

Compatible components

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

Copy link
Collaborator

@reta reta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2.10 is cleared out

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@reta
Copy link
Collaborator

reta commented Sep 15, 2023

There is an issue with the fix, #10075 (comment) for the reference, @gashutos is looking

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

Signed-off-by: Gohel <gashutos@88665a2fc937.ant.amazon.com>
@reta
Copy link
Collaborator

reta commented Sep 16, 2023

There is an issue with the fix, #10075 (comment) for the reference, @gashutos is looking

Cleared out

@github-actions
Copy link
Contributor

Compatibility status:

Checks if related components are compatible with change af099a8

Incompatible components

Skipped components

Compatible components

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

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented Sep 16, 2023

Codecov Report

Merging #10076 (af099a8) into 2.10 (2166b47) will decrease coverage by 0.02%.
The diff coverage is 70.58%.

@@             Coverage Diff              @@
##               2.10   #10076      +/-   ##
============================================
- Coverage     70.72%   70.71%   -0.02%     
+ Complexity    58153    58112      -41     
============================================
  Files          4807     4807              
  Lines        275047   275063      +16     
  Branches      40431    40433       +2     
============================================
- Hits         194534   194515      -19     
- Misses        63873    63902      +29     
- Partials      16640    16646       +6     
Files Changed Coverage Δ
...org/opensearch/index/fielddata/IndexFieldData.java 70.37% <0.00%> (-1.33%) ⬇️
...ain/java/org/opensearch/index/IndexSortConfig.java 73.17% <33.33%> (-1.83%) ⬇️
...nsearch/index/fielddata/IndexNumericFieldData.java 85.07% <80.00%> (-1.14%) ⬇️
...c/main/java/org/opensearch/index/IndexService.java 75.38% <100.00%> (+0.10%) ⬆️
.../main/java/org/opensearch/index/IndexSettings.java 87.19% <100.00%> (+0.06%) ⬆️

... and 482 files with indirect coverage changes

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

Successfully merging this pull request may close these issues.

3 participants