diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java index f04853c06a80d..139106b8c1102 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneOperator.java @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.UncheckedIOException; -import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -284,20 +283,14 @@ List tags() { public String toString() { StringBuilder sb = new StringBuilder(); sb.append(this.getClass().getSimpleName()).append("["); - sb.append("shards = ").append(sortedUnion(processedShards, sliceQueue.remainingShardsIdentifiers())); + sb.append("shards = ") + .append(sliceQueue.partitioningStrategies().keySet().stream().sorted().collect(Collectors.joining(",", "[", "]"))); sb.append(", maxPageSize = ").append(maxPageSize); describe(sb); sb.append("]"); return sb.toString(); } - private static Set sortedUnion(Collection a, Collection b) { - var result = new TreeSet(); - result.addAll(a); - result.addAll(b); - return result; - } - protected abstract void describe(StringBuilder sb); @Override diff --git a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSliceQueue.java b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSliceQueue.java index 8ebab7be2e2f0..89c4ad2ed993d 100644 --- a/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSliceQueue.java +++ b/x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneSliceQueue.java @@ -23,7 +23,6 @@ import java.io.UncheckedIOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -178,17 +177,6 @@ public Map partitioningStrategies() { return partitioningStrategies; } - public Collection remainingShardsIdentifiers() { - List remaining = new ArrayList<>(slices.length()); - for (int i = 0; i < slices.length(); i++) { - LuceneSlice slice = slices.get(i); - if (slice != null) { - remaining.add(slice.shardContext().shardIdentifier()); - } - } - return remaining; - } - public static LuceneSliceQueue create( List contexts, Function> queryFunction,