Revert "Removing elements from an array is very costly."

2 files changed, 7 insertions, 13 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/result/Hit.java b/container-search/src/main/java/com/yahoo/search/result/Hit.java
index 13f0dc1c007..10fa7d24d1a 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Hit.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Hit.java
@@ -625,6 +625,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
     }
 
     /** Compares this hit to another hit */
+    @SuppressWarnings("deprecation")
     @Override
     public int compareTo(Hit other) {
         // higher relevance is before
diff --git a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
index 056976724bb..9ecd6513a94 100644
--- a/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
+++ b/container-search/src/main/java/com/yahoo/search/result/HitGroup.java
@@ -500,17 +500,10 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
             if (hit.isAuxiliary()) continue;
 
             currentIndex++;
-            if (currentIndex < offset || currentIndex >= highBound)
+            if (currentIndex < offset || currentIndex >= highBound) {
+                i.remove();
                 handleRemovedHit(hit);
-        }
-        if ((offset > 0) || (hits.size() > highBound)) {
-            ListenableArrayList<Hit> newHits = new ListenableArrayList<>(numHits);
-            for (int index = offset; index < Math.min(highBound, hits.size()); index++)
-                newHits.add(hits.get(index));
-            for (Runnable listener : hits.listeners())
-                newHits.addListener(listener);
-            hits = newHits;
-            unmodifiableHits = Collections.unmodifiableList(hits);
+            }
         }
     }
 
@@ -842,7 +835,7 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
             Hit hitClone = i.next().clone();
             hitGroupClone.hits.add(hitClone);
         }
-        if (this.errorHit != null) { // Find the cloned error and assign it
+        if (this.errorHit!=null) { // Find the cloned error and assign it
             for (Hit hit : hitGroupClone.asList()) {
                 if (hit instanceof DefaultErrorHit)
                     hitGroupClone.errorHit=(DefaultErrorHit)hit;
@@ -874,7 +867,7 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
         /*
          This is an optimisation to avoid creating many temporary hash sets in the happy path.
          The simple naive implementation is
-        Set<String> filled = null;
+         Set<String> filled = null;
         for (Hit hit : hits) {
             if (hit.getFilled() == null) continue;
             if (filled == null)
@@ -883,7 +876,7 @@ public class HitGroup extends Hit implements DataList<Hit>, Cloneable, Iterable<
                 filled.retainAll(hit.getFilled());
         }
         return filled;
-        */
+         */
         Iterator<Hit> iterator = hits.iterator();
         Set<String> firstSummaryNames = getSummaryNamesNextFilledHit(iterator);
         if (firstSummaryNames == null || firstSummaryNames.isEmpty())