Skip to content

[Backport 2.x] Fix parsing of flat object fields with dots in keys#11825

Merged
kotwanikunal merged 1 commit intoopensearch-project:2.xfrom
msfroh:backport/backport-11425-to-2.x
Jan 10, 2024
Merged

[Backport 2.x] Fix parsing of flat object fields with dots in keys#11825
kotwanikunal merged 1 commit intoopensearch-project:2.xfrom
msfroh:backport/backport-11425-to-2.x

Conversation

@msfroh
Copy link
Copy Markdown
Contributor

@msfroh msfroh commented Jan 9, 2024

We have a bug where a flat object field with inner fields that contain dots will "push" the dotted name onto the dot-path from the root, but then would just "pop" off the last part of the dotted name.

This change adds more robust support for flat object keys and subkeys that contain dots (i.e. it pops off the entirety of the latest key, regardless of how many dots it contains).

Fixes #11402
Backport of #11425

Signed-off-by: Michael Froh froh@amazon.com
(cherry picked from commit 22b628b)

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
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 9, 2024

Compatibility status:

Checks if related components are compatible with change 9316f6d

Incompatible components

Skipped components

Compatible components

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

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Jan 9, 2024

❌ Gradle check result for b43ce24: 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 reta added the v2.12.0 Issues and PRs related to version 2.12.0 label Jan 9, 2024
…ct#11425)

We have a bug where a flat object field with inner fields that contain
dots will "push" the dotted name onto the dot-path from the root, but
then would just "pop" off the last part of the dotted name.

This change adds more robust support for flat object keys and subkeys
that contain dots (i.e. it pops off the entirety of the latest key,
regardless of how many dots it contains).

Fixes opensearch-project#11402

Signed-off-by: Michael Froh <froh@amazon.com>
(cherry picked from commit 22b628b)
@msfroh msfroh force-pushed the backport/backport-11425-to-2.x branch from b43ce24 to 9316f6d Compare January 10, 2024 00:05
@github-actions
Copy link
Copy Markdown
Contributor

❌ Gradle check result for 9316f6d:

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?

@github-actions
Copy link
Copy Markdown
Contributor

❕ Gradle check result for 9316f6d: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteIndexPrimaryRelocationIT.testPrimaryRelocationWhileIndexing
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testRefreshAfterCommit
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterRefresh
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterMultipleCommits
      1 org.opensearch.index.shard.RemoteStoreRefreshListenerTests.testAfterCommit

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

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 10, 2024

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (334636f) 71.12% compared to head (9316f6d) 71.04%.
Report is 4 commits behind head on 2.x.

Files Patch % Lines
...ch/common/xcontent/JsonToStringXContentParser.java 81.25% 1 Missing and 2 partials ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                2.x   #11825      +/-   ##
============================================
- Coverage     71.12%   71.04%   -0.08%     
+ Complexity    59351    59300      -51     
============================================
  Files          4889     4889              
  Lines        279804   279814      +10     
  Branches      41028    41031       +3     
============================================
- Hits         199004   198793     -211     
- Misses        63941    64170     +229     
+ Partials      16859    16851       -8     

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

@kotwanikunal kotwanikunal merged commit bd5b5ee into opensearch-project:2.x Jan 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v2.12.0 Issues and PRs related to version 2.12.0

Projects

Status: No status

Development

Successfully merging this pull request may close these issues.

4 participants