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] [Refactor] Metadata members from ImmutableOpenMap to j.u.Map (#7165) #8241

Merged
merged 3 commits into from
Jun 26, 2023

Conversation

nknize
Copy link
Collaborator

@nknize nknize commented Jun 23, 2023

Backport 1ab22e1 from #7165.

@nknize nknize added enhancement Enhancement or improvement to existing feature or request backport PRs or issues specific to backporting features or enhancments v2.9.0 'Issues and PRs related to version v2.9.0' labels Jun 23, 2023
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

nknize added 3 commits June 23, 2023 17:52
…pensearch-project#7126)

With java.util.Map immutability and collection improvements the
hppc ImmutableOpenMap is not needed in ClusterInfo. This commit
refactors ClusterInfo to use java Maps and Immutable Collections and
further trim the dependency on the aging hppc library.

Signed-off-by: Nicholas Walter Knize <[email protected]>
…rch-project#7165)

Refactors Metadata.{indices, templates, customs} member variables from
ImmutableOpenMap to use jdk Maps. Usage of these variables across the
codebase is also refactored to use jdk maps.

Signed-off-by: Nicholas Walter Knize <[email protected]>
Signed-off-by: Nicholas Walter Knize <[email protected]>
@nknize nknize force-pushed the backport/backport-7165-to-2.x branch from 89bc467 to ba756e7 Compare June 23, 2023 23:02
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString
      1 org.opensearch.remotestore.SegmentReplicationUsingRemoteStoreIT.testPressureServiceStats
      1 org.opensearch.indices.replication.SegmentReplicationTargetServiceTests.testStartReplicationListenerSuccess

@codecov
Copy link

codecov bot commented Jun 24, 2023

Codecov Report

Merging #8241 (ba756e7) into 2.x (e3d8f7d) will decrease coverage by 0.12%.
The diff coverage is 63.78%.

@@             Coverage Diff              @@
##                2.x    #8241      +/-   ##
============================================
- Coverage     70.72%   70.61%   -0.12%     
+ Complexity    56865    56842      -23     
============================================
  Files          4703     4705       +2     
  Lines        269109   269154      +45     
  Branches      39778    39785       +7     
============================================
- Hits         190333   190068     -265     
- Misses        62468    62774     +306     
- Partials      16308    16312       +4     
Impacted Files Coverage Δ
...rg/opensearch/gradle/CheckCompatibilityTask.groovy 0.00% <0.00%> (ø)
...main/java/org/opensearch/common/util/set/Sets.java 72.09% <ø> (ø)
...ing/delete/TransportDeleteDanglingIndexAction.java 9.58% <0.00%> (ø)
...g/opensearch/cluster/coordination/Coordinator.java 79.13% <ø> (+0.23%) ⬆️
...rch/cluster/coordination/RemoveCustomsCommand.java 0.00% <0.00%> (ø)
...dination/UnsafeBootstrapClusterManagerCommand.java 0.00% <0.00%> (ø)
.../src/main/java/org/opensearch/gateway/Gateway.java 8.33% <0.00%> (ø)
...h/index/shard/RemoveCorruptedShardDataCommand.java 83.89% <ø> (+3.06%) ⬆️
...pensearch/rest/action/cat/RestTemplatesAction.java 22.44% <0.00%> (+0.44%) ⬆️
.../java/org/opensearch/snapshots/RestoreService.java 55.78% <0.00%> (+1.57%) ⬆️
... and 27 more

... and 445 files with indirect coverage changes

@nknize nknize merged commit 21623ca into opensearch-project:2.x Jun 26, 2023
gaiksaya pushed a commit to gaiksaya/OpenSearch that referenced this pull request Jun 26, 2023
…ableOpenMap to j.u.Map (opensearch-project#7126) (opensearch-project#7165) (opensearch-project#8241)

* [Refactor] ClusterInfo to use j.util.Map instead of ImmutableOpenMap (opensearch-project#7126)

With java.util.Map immutability and collection improvements the
hppc ImmutableOpenMap is not needed in ClusterInfo. This commit
refactors ClusterInfo to use java Maps and Immutable Collections and
further trim the dependency on the aging hppc library.

* [Refactor] Metadata members from ImmutableOpenMap to j.u.Map (opensearch-project#7165)

Refactors Metadata.{indices, templates, customs} member variables from
ImmutableOpenMap to use jdk Maps. Usage of these variables across the
codebase is also refactored to use jdk maps.

---------

Signed-off-by: Nicholas Walter Knize <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport PRs or issues specific to backporting features or enhancments enhancement Enhancement or improvement to existing feature or request v2.9.0 'Issues and PRs related to version v2.9.0'
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants