Upgrade gradle version and remove remaining use of ImmutableOpenMap #814
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
monusingh-1
changed the title
Codecov Report
❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more. @@ Coverage Diff @@
## main #814 +/- ##
============================================
+ Coverage 72.59% 73.39% +0.80%
- Complexity 1003 1008 +5
============================================
Files 141 141
Lines 4652 4653 +1
Branches 520 526 +6
============================================
+ Hits 3377 3415 +38
+ Misses 943 915 -28
+ Partials 332 323 -9
|
soosinha
reviewed
May 5, 2023
| @@ -110,7 +109,7 @@ open class NoOpClient(testName :String) : NoOpNodeClient(testName) { | |||
| val indexToSettings = HashMap<String, Settings>() | |||
| indexToSettings[IndexReplicationTaskTests.followerIndex] = desiredSettingsBuilder.build() | |||
|
|
|||
| val settingsMap = ImmutableOpenMap.builder<String, Settings>().putAll(indexToSettings).build() | |||
| val settingsMap = indexToSettings.toMutableMap() | |||
There was a problem hiding this comment.
We dont want to be using Immutable as map as that implementation is being remove.
There was a problem hiding this comment.
ImmutableOpenMap is being removed. So you can use any other immutable implementation like Collections.unmodifiableMap
soosinha
reviewed
May 8, 2023
| @@ -55,8 +54,7 @@ import org.opensearch.snapshots.RestoreInfo | |||
| import org.opensearch.test.OpenSearchTestCase | |||
| import org.opensearch.test.client.NoOpNodeClient | |||
| import java.lang.reflect.Field | |||
| import java.util.ArrayList | |||
| import java.util.HashMap | |||
| import java.util.* | |||
There was a problem hiding this comment.
Wildcard import should not be used
soosinha
previously approved these changes
May 8, 2023
| val retentionLeaseHelper = RemoteClusterRetentionLeaseHelper(clusterService.clusterName.value(), remoteClient) | ||
| shards.forEach { | ||
| shards?.forEach { |
There was a problem hiding this comment.
Do we know the changes in upstream that caused this?
At this point, we need these shards to exist as part of the cluster state. If it is not present(/null), let's log here.
There was a problem hiding this comment.
Please check similar cases in the PR.
ankitkala
reviewed
May 9, 2023
monusingh-1
force-pushed
the
test
branch
2 times, most recently
from
cf38053 to
9a0127e
Compare
Signed-off-by: Monu Singh <[email protected]>
ankitkala
approved these changes
May 10, 2023
saikaranam-amazon
approved these changes
May 10, 2023
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-814-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 49e8781df5bf9d48525302bfc5e523c8c28c55ef
# Push it to GitHub
git push --set-upstream origin backport/backport-814-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.xThen, create a pull request where the |
5 tasks
monusingh-1
added a commit
to monusingh-1/ccr-dev
that referenced
this pull request
Jul 11, 2023
…nMap (opensearch-project#814) Signed-off-by: Monu Singh <[email protected]>
5 tasks
monusingh-1
added a commit
that referenced
this pull request
Jul 11, 2023
* Open Upgrade gradle version and remove remaining use of ImmutableOpenMap (#814) Signed-off-by: Monu Singh <[email protected]> * Increment version to 2.9 and refactor Signed-off-by: monusingh-1 <[email protected]> * remove use of import java.util.* Signed-off-by: monusingh-1 <[email protected]> --------- Signed-off-by: Monu Singh <[email protected]> Signed-off-by: monusingh-1 <[email protected]>
monusingh-1
added a commit
to monusingh-1/ccr-dev
that referenced
this pull request
Jul 24, 2023
…nMap (opensearch-project#814) Signed-off-by: Monu Singh <[email protected]>
5 tasks
monusingh-1
added a commit
that referenced
this pull request
Jul 25, 2023
* Open Upgrade gradle version and remove remaining use of ImmutableOpenMap (#814) Signed-off-by: Monu Singh <[email protected]> * Move from common to core.common (#1087) Keep up with core changes opensearch-project/OpenSearch#8157 move from common to core.common Change kotlin.version "1.8.21" as Class 'org.opensearch.commons.utils.OpenForTesting' was compiled with "1.8.21" version of Kotlin. Ref Set following to use 1.6 as 1.8.21 is not available yet. Checked that other OpenSearch plugins are also doing the same. Set kotlinx-coroutines-core to 1.6.0 set kotlinx-coroutines-test to 1.6.0 Added else in when statements as from Kotlin 1.7 version onward exhaustive list is mandatory. 'when' expression must be exhaustive, add necessary 'else' branch --------- Signed-off-by: monusingh-1 <[email protected]> --------- Signed-off-by: Monu Singh <[email protected]> Signed-off-by: monusingh-1 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Changes made
Issues Resolved
Current builds started failing due to upstream changes in Opensearch
Opensearch removed the remaining uses of ImmutableOpenMap to Map.
the get() of ImmutableOpenMap return non-null empty set however the get() method of Map can return null. To avoid this we changed the uses of get() to getOrDefault() to handle null cases gracefully.
opensearch-project/OpenSearch@d984f50
Check List
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.