Skip to content

Commit

Permalink
[Refactor] more ImmutableOpenMap to jdk Map in cluster package (opens…
Browse files Browse the repository at this point in the history
…earch-project#7301)

This continues the refactor of ImmutableOpenMap to j.u.Map in the
o.o.cluster package in preparation for removal of HPPC dependencies.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
  • Loading branch information
nknize authored and austintlee committed Apr 28, 2023
1 parent 34137a9 commit 6f2eef6
Show file tree
Hide file tree
Showing 55 changed files with 490 additions and 550 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class GetIndexResponseTests extends AbstractResponseTestCase<
protected org.opensearch.action.admin.indices.get.GetIndexResponse createServerTestInstance(XContentType xContentType) {
String[] indices = generateRandomStringArray(5, 5, false, false);
final Map<String, MappingMetadata> mappings = new HashMap<>();
ImmutableOpenMap.Builder<String, List<AliasMetadata>> aliases = ImmutableOpenMap.builder();
final Map<String, List<AliasMetadata>> aliases = new HashMap<>();
ImmutableOpenMap.Builder<String, Settings> settings = ImmutableOpenMap.builder();
ImmutableOpenMap.Builder<String, Settings> defaultSettings = ImmutableOpenMap.builder();
ImmutableOpenMap.Builder<String, String> dataStreams = ImmutableOpenMap.builder();
Expand Down Expand Up @@ -95,7 +95,7 @@ protected org.opensearch.action.admin.indices.get.GetIndexResponse createServerT
return new org.opensearch.action.admin.indices.get.GetIndexResponse(
indices,
mappings,
aliases.build(),
aliases,
settings.build(),
defaultSettings.build(),
dataStreams.build()
Expand All @@ -116,7 +116,7 @@ protected void assertInstances(
assertEquals(serverTestInstance.getMappings(), clientInstance.getMappings());
assertMapEquals(serverTestInstance.getSettings(), clientInstance.getSettings());
assertMapEquals(serverTestInstance.defaultSettings(), clientInstance.getDefaultSettings());
assertMapEquals(serverTestInstance.getAliases(), clientInstance.getAliases());
assertEquals(serverTestInstance.getAliases(), clientInstance.getAliases());
}

private static MappingMetadata createMappingsForIndex() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ public void testAllowed() {
request.addAliasAction(IndicesAliasesRequest.AliasActions.add().index("index").alias("alias"));
assertAcked(client().admin().indices().aliases(request).actionGet());
final GetAliasesResponse response = client().admin().indices().getAliases(new GetAliasesRequest("alias")).actionGet();
assertThat(response.getAliases().keys().size(), equalTo(1));
assertThat(response.getAliases().keys().iterator().next().value, equalTo("index"));
assertThat(response.getAliases().keySet().size(), equalTo(1));
assertThat(response.getAliases().keySet().iterator().next(), equalTo("index"));
final List<AliasMetadata> aliasMetadata = response.getAliases().get("index");
assertThat(aliasMetadata, hasSize(1));
assertThat(aliasMetadata.get(0).alias(), equalTo("alias"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

package org.opensearch.action.admin.indices.get;

import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.opensearch.action.admin.indices.alias.Alias;
import org.opensearch.action.admin.indices.get.GetIndexRequest.Feature;
import org.opensearch.action.support.IndicesOptions;
Expand Down Expand Up @@ -288,7 +287,7 @@ private void assertEmptyOrOnlyDefaultMappings(GetIndexResponse response, String
}

private void assertAliases(GetIndexResponse response, String indexName) {
ImmutableOpenMap<String, List<AliasMetadata>> aliases = response.aliases();
final Map<String, List<AliasMetadata>> aliases = response.aliases();
assertThat(aliases, notNullValue());
assertThat(aliases.size(), equalTo(1));
List<AliasMetadata> indexAliases = aliases.get(indexName);
Expand All @@ -311,8 +310,8 @@ private void assertEmptyMappings(GetIndexResponse response) {

private void assertEmptyAliases(GetIndexResponse response) {
assertThat(response.aliases(), notNullValue());
for (final ObjectObjectCursor<String, List<AliasMetadata>> entry : response.getAliases()) {
assertTrue(entry.value.isEmpty());
for (final List<AliasMetadata> entry : response.getAliases().values()) {
assertTrue(entry.isEmpty());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

package org.opensearch.aliases;

import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.opensearch.action.admin.indices.alias.Alias;
import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest.AliasActions;
import org.opensearch.action.admin.indices.alias.get.GetAliasesResponse;
Expand Down Expand Up @@ -87,7 +86,6 @@
import static org.opensearch.cluster.metadata.IndexMetadata.SETTING_READ_ONLY;
import static org.opensearch.index.query.QueryBuilders.rangeQuery;
import static org.opensearch.index.query.QueryBuilders.termQuery;
import static org.opensearch.test.hamcrest.CollectionAssertions.hasKey;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertBlocked;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
Expand All @@ -96,6 +94,7 @@
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.emptyArray;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
Expand Down Expand Up @@ -1044,8 +1043,8 @@ public void testIndicesGetAliases() throws Exception {
assertAcked(admin().indices().prepareAliases().removeAlias("foobar", "foo"));

getResponse = admin().indices().prepareGetAliases("foo").addIndices("foobar").get();
for (final ObjectObjectCursor<String, List<AliasMetadata>> entry : getResponse.getAliases()) {
assertTrue(entry.value.isEmpty());
for (final List<AliasMetadata> entry : getResponse.getAliases().values()) {
assertTrue(entry.isEmpty());
}
assertTrue(admin().indices().prepareGetAliases("foo").addIndices("foobar").get().getAliases().isEmpty());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
import org.opensearch.cluster.routing.UnassignedInfo;
import org.opensearch.common.UUIDs;
import org.opensearch.common.bytes.BytesReference;
import org.opensearch.common.collect.ImmutableOpenMap;
import org.opensearch.common.io.stream.BytesStreamOutput;
import org.opensearch.common.io.stream.NamedWriteableAwareStreamInput;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
Expand Down Expand Up @@ -283,7 +282,7 @@ private ClusterState.Builder randomRoutingTable(ClusterState clusterState) {
if (numberOfIndices > 0) {
List<String> randomIndices = randomSubsetOf(
randomInt(numberOfIndices - 1),
clusterState.routingTable().indicesRouting().keys().toArray(String.class)
clusterState.routingTable().indicesRouting().keySet().toArray(new String[0])
);
for (String index : randomIndices) {
if (randomBoolean()) {
Expand Down Expand Up @@ -413,7 +412,7 @@ private interface RandomClusterPart<T> {
/**
* Returns list of parts from metadata
*/
ImmutableOpenMap<String, T> parts(ClusterState clusterState);
Map<String, T> parts(ClusterState clusterState);

/**
* Puts the part back into metadata
Expand Down Expand Up @@ -443,12 +442,12 @@ private interface RandomClusterPart<T> {
*/
private <T> ClusterState randomClusterStateParts(ClusterState clusterState, String prefix, RandomClusterPart<T> randomPart) {
ClusterState.Builder builder = ClusterState.builder(clusterState);
ImmutableOpenMap<String, T> parts = randomPart.parts(clusterState);
final Map<String, T> parts = randomPart.parts(clusterState);
int partCount = parts.size();
if (partCount > 0) {
List<String> randomParts = randomSubsetOf(
randomInt(partCount - 1),
randomPart.parts(clusterState).keys().toArray(String.class)
randomPart.parts(clusterState).keySet().toArray(new String[0])
);
for (String part : randomParts) {
if (randomBoolean()) {
Expand Down Expand Up @@ -745,7 +744,7 @@ private ClusterState.Builder randomClusterStateCustoms(final ClusterState cluste
return ClusterState.builder(randomClusterStateParts(clusterState, "custom", new RandomClusterPart<ClusterState.Custom>() {

@Override
public ImmutableOpenMap<String, ClusterState.Custom> parts(ClusterState clusterState) {
public Map<String, ClusterState.Custom> parts(ClusterState clusterState) {
return clusterState.customs();
}

Expand All @@ -769,12 +768,12 @@ public ClusterState.Custom randomCreate(String name) {
new Snapshot(randomName("repo"), new SnapshotId(randomName("snap"), UUIDs.randomBase64UUID())),
randomBoolean(),
randomBoolean(),
SnapshotsInProgressSerializationTests.randomState(ImmutableOpenMap.of()),
SnapshotsInProgressSerializationTests.randomState(Map.of()),
Collections.emptyList(),
Collections.emptyList(),
Math.abs(randomLong()),
randomIntBetween(0, 1000),
ImmutableOpenMap.of(),
Map.of(),
null,
SnapshotInfoTests.randomUserMetadata(),
randomVersion(random())
Expand All @@ -788,7 +787,7 @@ public ClusterState.Custom randomCreate(String name) {
new Snapshot(randomName("repo"), new SnapshotId(randomName("snap"), UUIDs.randomBase64UUID())),
RestoreInProgress.State.fromValue((byte) randomIntBetween(0, 3)),
emptyList(),
ImmutableOpenMap.of()
Map.of()
)
).build();
default:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void beforeIndexCreated(Index index, Settings indexSettings) {
} catch (Exception e) {
assertTrue(e.getMessage().contains("failing on purpose"));
ClusterStateResponse resp = client().admin().cluster().prepareState().get();
assertFalse(resp.getState().routingTable().indicesRouting().keys().contains("failed"));
assertFalse(resp.getState().routingTable().indicesRouting().keySet().contains("failed"));
}
}

Expand Down Expand Up @@ -179,7 +179,7 @@ public void testIndexStateShardChanged() throws Throwable {
} catch (OpenSearchException e) {
assertTrue(e.getMessage().contains("failing on purpose"));
ClusterStateResponse resp = client().admin().cluster().prepareState().get();
assertFalse(resp.getState().routingTable().indicesRouting().keys().contains("failed"));
assertFalse(resp.getState().routingTable().indicesRouting().keySet().contains("failed"));
}

// create an index
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

package org.opensearch.indices.replication;

import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.cluster.routing.IndexRoutingTable;
Expand All @@ -25,6 +24,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -231,19 +231,19 @@ private void verifyPerIndexPrimaryBalance() throws Exception {
assertBusy(() -> {
final ClusterState currentState = client().admin().cluster().prepareState().execute().actionGet().getState();
RoutingNodes nodes = currentState.getRoutingNodes();
for (ObjectObjectCursor<String, IndexRoutingTable> index : currentState.getRoutingTable().indicesRouting()) {
final int totalPrimaryShards = index.value.primaryShardsActive();
for (final Map.Entry<String, IndexRoutingTable> index : currentState.getRoutingTable().indicesRouting().entrySet()) {
final int totalPrimaryShards = index.getValue().primaryShardsActive();
final int avgPrimaryShardsPerNode = (int) Math.ceil(totalPrimaryShards * 1f / currentState.getRoutingNodes().size());
for (RoutingNode node : nodes) {
final int primaryCount = node.shardsWithState(index.key, STARTED)
final int primaryCount = node.shardsWithState(index.getKey(), STARTED)
.stream()
.filter(ShardRouting::primary)
.collect(Collectors.toList())
.size();
if (primaryCount > avgPrimaryShardsPerNode) {
logger.info(
"--> Primary shard balance assertion failure for index {} on node {} {} <= {}",
index.key,
index.getKey(),
node.node().getName(),
primaryCount,
avgPrimaryShardsPerNode
Expand All @@ -260,8 +260,8 @@ private void verifyPrimaryBalance() throws Exception {
final ClusterState currentState = client().admin().cluster().prepareState().execute().actionGet().getState();
RoutingNodes nodes = currentState.getRoutingNodes();
int totalPrimaryShards = 0;
for (ObjectObjectCursor<String, IndexRoutingTable> index : currentState.getRoutingTable().indicesRouting()) {
totalPrimaryShards += index.value.primaryShardsActive();
for (final IndexRoutingTable index : currentState.getRoutingTable().indicesRouting().values()) {
totalPrimaryShards += index.primaryShardsActive();
}
final int avgPrimaryShardsPerNode = (int) Math.ceil(totalPrimaryShards * 1f / currentState.getRoutingNodes().size());
for (RoutingNode node : nodes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@

package org.opensearch.snapshots;

import com.carrotsearch.hppc.cursors.ObjectCursor;

import org.opensearch.OpenSearchException;
import org.opensearch.action.ActionFuture;
import org.opensearch.action.ActionListener;
Expand Down Expand Up @@ -1428,8 +1426,8 @@ private void createIndexWithContent(String indexName, String nodeInclude, String
private static boolean snapshotHasCompletedShard(String snapshot, SnapshotsInProgress snapshotsInProgress) {
for (SnapshotsInProgress.Entry entry : snapshotsInProgress.entries()) {
if (entry.snapshot().getSnapshotId().getName().equals(snapshot)) {
for (ObjectCursor<SnapshotsInProgress.ShardSnapshotStatus> shard : entry.shards().values()) {
if (shard.value.state().completed()) {
for (final SnapshotsInProgress.ShardSnapshotStatus shard : entry.shards().values()) {
if (shard.state().completed()) {
return true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@
import org.opensearch.cluster.ClusterStateListener;
import org.opensearch.cluster.RestoreInProgress;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.collect.ImmutableOpenMap;
import org.opensearch.index.shard.ShardId;
import org.opensearch.snapshots.RestoreInfo;
import org.opensearch.snapshots.RestoreService;

import java.util.Map;
import java.util.function.Function;

import static org.opensearch.snapshots.RestoreService.restoreInProgress;
Expand Down Expand Up @@ -89,7 +89,7 @@ public void clusterChanged(ClusterChangedEvent changedEvent) {
listener.onResponse(actionResponseFactory.apply(null));
} else if (newEntry == null) {
clusterService.removeListener(this);
ImmutableOpenMap<ShardId, RestoreInProgress.ShardRestoreStatus> shards = prevEntry.shards();
final Map<ShardId, RestoreInProgress.ShardRestoreStatus> shards = prevEntry.shards();
assert prevEntry.state().completed() : "expected completed snapshot/remote store restore state but was " + prevEntry.state();
assert RestoreService.completed(shards) : "expected all restore entries to be completed";
RestoreInfo ri = new RestoreInfo(
Expand Down
Loading

0 comments on commit 6f2eef6

Please sign in to comment.