[Refactor] HPPC IntArrayList and ObjectArrayList to j.u.List (#8602) (#…

…8661) Refactors usage of obsolete HPPC IntArrayList and ObjectArrayList to java.util.List. (cherry picked from commit 8d2ec76) Signed-off-by: Nicholas Walter Knize <nknize@apache.org> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jul 12, 2023 · e8a29e9 · e8a29e9
1 parent c12cb3c
commit e8a29e9
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 49 deletions.
diff --git a/server/src/main/java/org/opensearch/action/get/MultiGetShardRequest.java b/server/src/main/java/org/opensearch/action/get/MultiGetShardRequest.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.get;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.single.shard.SingleShardRequest;
 import org.opensearch.common.io.stream.StreamInput;
@@ -54,13 +53,13 @@ public class MultiGetShardRequest extends SingleShardRequest<MultiGetShardReques
     private boolean realtime;
     private boolean refresh;
 
-    IntArrayList locations;
+    List<Integer> locations;
     List<MultiGetRequest.Item> items;
 
     MultiGetShardRequest(StreamInput in) throws IOException {
         super(in);
         int size = in.readVInt();
-        locations = new IntArrayList(size);
+        locations = new ArrayList<>(size);
         items = new ArrayList<>(size);
 
         for (int i = 0; i < size; i++) {
@@ -76,7 +75,7 @@ public class MultiGetShardRequest extends SingleShardRequest<MultiGetShardReques
     MultiGetShardRequest(MultiGetRequest multiGetRequest, String index, int shardId) {
         super(index);
         this.shardId = shardId;
-        locations = new IntArrayList();
+        locations = new ArrayList<>();
         items = new ArrayList<>();
         preference = multiGetRequest.preference;
         realtime = multiGetRequest.realtime;

diff --git a/server/src/main/java/org/opensearch/action/get/MultiGetShardResponse.java b/server/src/main/java/org/opensearch/action/get/MultiGetShardResponse.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.get;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -48,20 +47,20 @@
  */
 public class MultiGetShardResponse extends ActionResponse {
 
-    final IntArrayList locations;
+    final List<Integer> locations;
     final List<GetResponse> responses;
     final List<MultiGetResponse.Failure> failures;
 
     MultiGetShardResponse() {
-        locations = new IntArrayList();
+        locations = new ArrayList<>();
         responses = new ArrayList<>();
         failures = new ArrayList<>();
     }
 
     MultiGetShardResponse(StreamInput in) throws IOException {
         super(in);
         int size = in.readVInt();
-        locations = new IntArrayList(size);
+        locations = new ArrayList<>(size);
         responses = new ArrayList<>(size);
         failures = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {

diff --git a/server/src/main/java/org/opensearch/action/search/FetchSearchPhase.java b/server/src/main/java/org/opensearch/action/search/FetchSearchPhase.java
@@ -31,7 +31,6 @@
 
 package org.opensearch.action.search;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.lucene.search.ScoreDoc;
@@ -151,7 +150,7 @@ private void innerRun() throws Exception {
             finishPhase.run();
         } else {
             ScoreDoc[] scoreDocs = reducedQueryPhase.sortedTopDocs.scoreDocs;
-            final IntArrayList[] docIdsToLoad = searchPhaseController.fillDocIdsToLoad(numShards, scoreDocs);
+            final List<Integer>[] docIdsToLoad = searchPhaseController.fillDocIdsToLoad(numShards, scoreDocs);
             // no docs to fetch -- sidestep everything and return
             if (scoreDocs.length == 0) {
                 // we have to release contexts here to free up resources
@@ -168,7 +167,7 @@ private void innerRun() throws Exception {
                     context
                 );
                 for (int i = 0; i < docIdsToLoad.length; i++) {
-                    IntArrayList entry = docIdsToLoad[i];
+                    List<Integer> entry = docIdsToLoad[i];
                     SearchPhaseResult queryResult = queryResults.get(i);
                     if (entry == null) { // no results for this shard ID
                         if (queryResult != null) {
@@ -205,7 +204,7 @@ private void innerRun() throws Exception {
     protected ShardFetchSearchRequest createFetchRequest(
         ShardSearchContextId contextId,
         int index,
-        IntArrayList entry,
+        List<Integer> entry,
         ScoreDoc[] lastEmittedDocPerShard,
         OriginalIndices originalIndices,
         ShardSearchRequest shardSearchRequest,

diff --git a/server/src/main/java/org/opensearch/action/search/SearchPhaseController.java b/server/src/main/java/org/opensearch/action/search/SearchPhaseController.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.search;
 
-import com.carrotsearch.hppc.IntArrayList;
 import com.carrotsearch.hppc.ObjectObjectHashMap;
 
 import org.apache.lucene.index.Term;
@@ -277,12 +276,12 @@ public ScoreDoc[] getLastEmittedDocPerShard(ReducedQueryPhase reducedQueryPhase,
     /**
      * Builds an array, with potential null elements, with docs to load.
      */
-    public IntArrayList[] fillDocIdsToLoad(int numShards, ScoreDoc[] shardDocs) {
-        IntArrayList[] docIdsToLoad = new IntArrayList[numShards];
+    public List<Integer>[] fillDocIdsToLoad(int numShards, ScoreDoc[] shardDocs) {
+        final List<Integer>[] docIdsToLoad = (List<Integer>[]) new ArrayList<?>[numShards];
         for (ScoreDoc shardDoc : shardDocs) {
-            IntArrayList shardDocIdsToLoad = docIdsToLoad[shardDoc.shardIndex];
+            List<Integer> shardDocIdsToLoad = docIdsToLoad[shardDoc.shardIndex];
             if (shardDocIdsToLoad == null) {
-                shardDocIdsToLoad = docIdsToLoad[shardDoc.shardIndex] = new IntArrayList();
+                shardDocIdsToLoad = docIdsToLoad[shardDoc.shardIndex] = new ArrayList<>();
             }
             shardDocIdsToLoad.add(shardDoc.doc);
         }

diff --git a/server/src/main/java/org/opensearch/action/search/SearchScrollQueryThenFetchAsyncAction.java b/server/src/main/java/org/opensearch/action/search/SearchScrollQueryThenFetchAsyncAction.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.search;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.apache.logging.log4j.Logger;
 import org.apache.lucene.search.ScoreDoc;
 import org.opensearch.action.ActionListener;
@@ -48,6 +47,7 @@
 import org.opensearch.search.query.ScrollQuerySearchResult;
 import org.opensearch.transport.Transport;
 
+import java.util.List;
 import java.util.function.BiFunction;
 
 /**
@@ -104,15 +104,15 @@ public void run() {
                     return;
                 }
 
-                final IntArrayList[] docIdsToLoad = searchPhaseController.fillDocIdsToLoad(queryResults.length(), scoreDocs);
+                final List<Integer>[] docIdsToLoad = searchPhaseController.fillDocIdsToLoad(queryResults.length(), scoreDocs);
                 final ScoreDoc[] lastEmittedDocPerShard = searchPhaseController.getLastEmittedDocPerShard(
                     reducedQueryPhase,
                     queryResults.length()
                 );
                 final CountDown counter = new CountDown(docIdsToLoad.length);
                 for (int i = 0; i < docIdsToLoad.length; i++) {
                     final int index = i;
-                    final IntArrayList docIds = docIdsToLoad[index];
+                    final List<Integer> docIds = docIdsToLoad[index];
                     if (docIds != null) {
                         final QuerySearchResult querySearchResult = queryResults.get(index);
                         ScoreDoc lastEmittedDoc = lastEmittedDocPerShard[index];

diff --git a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsShardRequest.java b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsShardRequest.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.termvectors;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.opensearch.action.ActionRequestValidationException;
 import org.opensearch.action.support.single.shard.SingleShardRequest;
 import org.opensearch.common.io.stream.StreamInput;
@@ -52,13 +51,13 @@ public class MultiTermVectorsShardRequest extends SingleShardRequest<MultiTermVe
     private int shardId;
     private String preference;
 
-    IntArrayList locations;
+    List<Integer> locations;
     List<TermVectorsRequest> requests;
 
     MultiTermVectorsShardRequest(StreamInput in) throws IOException {
         super(in);
         int size = in.readVInt();
-        locations = new IntArrayList(size);
+        locations = new ArrayList<>(size);
         requests = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
             locations.add(in.readVInt());
@@ -71,7 +70,7 @@ public class MultiTermVectorsShardRequest extends SingleShardRequest<MultiTermVe
     MultiTermVectorsShardRequest(String index, int shardId) {
         super(index);
         this.shardId = shardId;
-        locations = new IntArrayList();
+        locations = new ArrayList<>();
         requests = new ArrayList<>();
     }
 

diff --git a/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsShardResponse.java b/server/src/main/java/org/opensearch/action/termvectors/MultiTermVectorsShardResponse.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.action.termvectors;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.opensearch.action.ActionResponse;
 import org.opensearch.common.io.stream.StreamInput;
 import org.opensearch.common.io.stream.StreamOutput;
@@ -48,20 +47,20 @@
  */
 public class MultiTermVectorsShardResponse extends ActionResponse {
 
-    final IntArrayList locations;
+    final List<Integer> locations;
     final List<TermVectorsResponse> responses;
     final List<MultiTermVectorsResponse.Failure> failures;
 
     MultiTermVectorsShardResponse() {
-        locations = new IntArrayList();
+        locations = new ArrayList<>();
         responses = new ArrayList<>();
         failures = new ArrayList<>();
     }
 
     MultiTermVectorsShardResponse(StreamInput in) throws IOException {
         super(in);
         int size = in.readVInt();
-        locations = new IntArrayList(size);
+        locations = new ArrayList<>(size);
         responses = new ArrayList<>(size);
         failures = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {

diff --git a/server/src/main/java/org/opensearch/common/transport/PortsRange.java b/server/src/main/java/org/opensearch/common/transport/PortsRange.java
@@ -32,8 +32,8 @@
 
 package org.opensearch.common.transport;
 
-import com.carrotsearch.hppc.IntArrayList;
-
+import java.util.ArrayList;
+import java.util.List;
 import java.util.StringTokenizer;
 
 /**
@@ -54,15 +54,12 @@ public String getPortRangeString() {
     }
 
     public int[] ports() throws NumberFormatException {
-        final IntArrayList ports = new IntArrayList();
-        iterate(new PortCallback() {
-            @Override
-            public boolean onPortNumber(int portNumber) {
-                ports.add(portNumber);
-                return false;
-            }
+        final List<Integer> ports = new ArrayList<>();
+        iterate(portNumber -> {
+            ports.add(portNumber);
+            return false;
         });
-        return ports.toArray();
+        return ports.stream().mapToInt(Integer::intValue).toArray();
     }
 
     public boolean iterate(PortCallback callback) throws NumberFormatException {

diff --git a/server/src/main/java/org/opensearch/search/fetch/ShardFetchRequest.java b/server/src/main/java/org/opensearch/search/fetch/ShardFetchRequest.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.search.fetch;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.apache.lucene.search.FieldDoc;
 import org.apache.lucene.search.ScoreDoc;
 import org.opensearch.action.search.SearchShardTask;
@@ -49,6 +48,7 @@
 import org.opensearch.transport.TransportRequest;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Map;
 
 /**
@@ -67,9 +67,9 @@ public class ShardFetchRequest extends TransportRequest {
 
     private ScoreDoc lastEmittedDoc;
 
-    public ShardFetchRequest(ShardSearchContextId contextId, IntArrayList list, ScoreDoc lastEmittedDoc) {
+    public ShardFetchRequest(ShardSearchContextId contextId, Collection<Integer> list, ScoreDoc lastEmittedDoc) {
         this.contextId = contextId;
-        this.docIds = list.buffer;
+        this.docIds = list.stream().mapToInt(Integer::intValue).toArray();
         this.size = list.size();
         this.lastEmittedDoc = lastEmittedDoc;
     }

diff --git a/server/src/main/java/org/opensearch/search/fetch/ShardFetchSearchRequest.java b/server/src/main/java/org/opensearch/search/fetch/ShardFetchSearchRequest.java
@@ -32,7 +32,6 @@
 
 package org.opensearch.search.fetch;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.apache.lucene.search.ScoreDoc;
 import org.opensearch.LegacyESVersion;
 import org.opensearch.action.IndicesRequest;
@@ -46,6 +45,7 @@
 import org.opensearch.search.internal.ShardSearchRequest;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Shard level fetch request used with search. Holds indices taken from the original search request
@@ -64,7 +64,7 @@ public ShardFetchSearchRequest(
         OriginalIndices originalIndices,
         ShardSearchContextId id,
         ShardSearchRequest shardSearchRequest,
-        IntArrayList list,
+        List<Integer> list,
         ScoreDoc lastEmittedDoc,
         RescoreDocIds rescoreDocIds,
         AggregatedDfs aggregatedDfs

diff --git a/server/src/test/java/org/opensearch/search/SearchServiceTests.java b/server/src/test/java/org/opensearch/search/SearchServiceTests.java
@@ -31,7 +31,6 @@
 
 package org.opensearch.search;
 
-import com.carrotsearch.hppc.IntArrayList;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.FilterDirectoryReader;
 import org.apache.lucene.index.LeafReader;
@@ -359,7 +358,7 @@ public void onFailure(Exception e) {
                             result
                         );
                         SearchPhaseResult searchPhaseResult = result.get();
-                        IntArrayList intCursors = new IntArrayList(1);
+                        List<Integer> intCursors = new ArrayList(1);
                         intCursors.add(0);
                         ShardFetchRequest req = new ShardFetchRequest(searchPhaseResult.getContextId(), intCursors, null/* not a scroll */);
                         PlainActionFuture<FetchSearchResult> listener = new PlainActionFuture<>();

diff --git a/test/framework/src/main/java/org/opensearch/test/TestCluster.java b/test/framework/src/main/java/org/opensearch/test/TestCluster.java
@@ -32,8 +32,6 @@
 
 package org.opensearch.test;
 
-import com.carrotsearch.hppc.ObjectArrayList;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.opensearch.action.admin.cluster.state.ClusterStateResponse;
@@ -53,6 +51,8 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
@@ -189,12 +189,14 @@ public void wipeIndices(String... indices) {
                 // which is the case in the CloseIndexDisableCloseAllTests
                 if ("_all".equals(indices[0])) {
                     ClusterStateResponse clusterStateResponse = client().admin().cluster().prepareState().execute().actionGet();
-                    ObjectArrayList<String> concreteIndices = new ObjectArrayList<>();
+                    List<String> concreteIndices = new ArrayList<>();
                     for (IndexMetadata indexMetadata : clusterStateResponse.getState().metadata()) {
                         concreteIndices.add(indexMetadata.getIndex().getName());
                     }
                     if (!concreteIndices.isEmpty()) {
-                        OpenSearchAssertions.assertAcked(client().admin().indices().prepareDelete(concreteIndices.toArray(String.class)));
+                        OpenSearchAssertions.assertAcked(
+                            client().admin().indices().prepareDelete(concreteIndices.toArray(new String[concreteIndices.size()]))
+                        );
                     }
                 }
             }