Merge pull request #2854 from yahoo/balder/avoid-sorting-when-not-necessary

Avoid the implicit sorting that deepIterator does as a sideeffect.

2 files changed, 4 insertions, 3 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
index 2e44015b0ce..e0d18f2b571 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/FastHit.java
@@ -143,7 +143,8 @@ public class FastHit extends Hit {
         if (useRowInIndexUri)
             rowString = String.valueOf(getRow());
 
-        return new URI("index:" + getSourceNumber() + "/" + getColumn() + "/" + rowString + "/" + asHexString(getGlobalId()));
+        indexUri = new URI("index:" + getSourceNumber() + "/" + getColumn() + "/" + rowString + "/" + asHexString(getGlobalId()));
+        return indexUri;
     }
 
     /** Returns the global id of this document in the backend node which produced it */
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index 9af684cf418..fb003463dba 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -92,9 +92,9 @@ public class Dispatcher extends AbstractComponent {
     }
 
     /** Return a map of hits by their search node (partition) id */
-    private ListMap<Integer, FastHit> hitsByNode(Result result) {
+    private static ListMap<Integer, FastHit> hitsByNode(Result result) {
         ListMap<Integer, FastHit> hitsByPartition = new ListMap<>();
-        for (Iterator<Hit> i = result.hits().deepIterator() ; i.hasNext(); ) {
+        for (Iterator<Hit> i = result.hits().unorderedDeepIterator() ; i.hasNext(); ) {
             Hit h = i.next();
             if ( ! (h instanceof FastHit)) continue;
             FastHit hit = (FastHit)h;