From d8d7d3418b8fa56f77a8515ef6da05b568d5588f Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 13 Apr 2022 20:28:33 -0700 Subject: [PATCH] Remove hppc from multi*shard request and responses The Multi API requests and responses use an hppc int array for term location data. The use of hppc here dates back to the beginning of the multi apis, yet all the other members have been converted to Java collections. This commit converts these uses to ArrayLists. relates #84735 --- .../elasticsearch/action/get/MultiGetShardRequest.java | 8 +++----- .../elasticsearch/action/get/MultiGetShardResponse.java | 8 +++----- .../action/termvectors/MultiTermVectorsShardRequest.java | 8 +++----- .../action/termvectors/MultiTermVectorsShardResponse.java | 8 +++----- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java index 7b72251dc5fb6..a1451ace11fba 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardRequest.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.get; -import com.carrotsearch.hppc.IntArrayList; - import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -26,13 +24,13 @@ public class MultiGetShardRequest extends SingleShardRequest locations; List 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++) { @@ -48,7 +46,7 @@ public class MultiGetShardRequest extends SingleShardRequest(); items = new ArrayList<>(); preference = multiGetRequest.preference; realtime = multiGetRequest.realtime; diff --git a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java index 89712af76bb3c..67969af00c08c 100644 --- a/server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java +++ b/server/src/main/java/org/elasticsearch/action/get/MultiGetShardResponse.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.get; -import com.carrotsearch.hppc.IntArrayList; - import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,12 +18,12 @@ public class MultiGetShardResponse extends ActionResponse { - final IntArrayList locations; + final List locations; final List responses; final List failures; MultiGetShardResponse() { - locations = new IntArrayList(); + locations = new ArrayList<>(); responses = new ArrayList<>(); failures = new ArrayList<>(); } @@ -33,7 +31,7 @@ public class MultiGetShardResponse extends ActionResponse { 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/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java index 00891e959e172..3fce5deb73f62 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardRequest.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.termvectors; -import com.carrotsearch.hppc.IntArrayList; - import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.single.shard.SingleShardRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -24,13 +22,13 @@ public class MultiTermVectorsShardRequest extends SingleShardRequest locations; List 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()); @@ -43,7 +41,7 @@ public class MultiTermVectorsShardRequest extends SingleShardRequest(); requests = new ArrayList<>(); } diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java index 05fec5cbe675f..1f79223695de5 100644 --- a/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java +++ b/server/src/main/java/org/elasticsearch/action/termvectors/MultiTermVectorsShardResponse.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.termvectors; -import com.carrotsearch.hppc.IntArrayList; - import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; @@ -20,12 +18,12 @@ public class MultiTermVectorsShardResponse extends ActionResponse { - final IntArrayList locations; + final List locations; final List responses; final List failures; MultiTermVectorsShardResponse() { - locations = new IntArrayList(); + locations = new ArrayList<>(); responses = new ArrayList<>(); failures = new ArrayList<>(); } @@ -33,7 +31,7 @@ public class MultiTermVectorsShardResponse extends ActionResponse { 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++) {