Merge pull request #10621 from vespa-engine/balder/avoid-double-bookeeping-of-id

Balder/avoid double bookeeping of.

3 files changed, 6 insertions, 8 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 1ade10f4f1f..0126fc01410 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
@@ -40,14 +40,14 @@ public class FastHit extends Hit {
     private int partId;
 
     /** The global id of this document in the backend node which produced it */
+    //Todo should be bytearray directly and generate GlobvalId on access
     private GlobalId globalId = emptyGlobalId;
 
-    /** Full information pointing to the location of further data for this hit. Lazily set */
-    private URI indexUri = null;
-
+    //TODO Remove with fs4
     private transient QueryPacketData queryPacketData = null;
 
     private transient byte[] sortData = null;
+    // TODO I supect this one can be dropped.
     private transient Sorting sortDataSorting = null;
 
     /**
@@ -108,11 +108,11 @@ public class FastHit extends Hit {
         if (uri != null) return uri;
 
         // Fallback to index:[source]/[partid]/[id]
-        if (indexUri != null) return indexUri;
         StringBuilder sb = new StringBuilder(64);
         sb.append("index:").append(getSource()).append('/').append(getPartId()).append('/');
         appendAsHex(getGlobalId(), sb);
-        indexUri = new URI(sb.toString());
+        URI indexUri = new URI(sb.toString());
+        assignId(indexUri);
         return indexUri;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
index 1e19c6e7345..b4a469c569a 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchResponse.java
@@ -2,7 +2,6 @@
 package com.yahoo.search.handler;
 
 import com.yahoo.container.handler.Timing;
-import com.yahoo.container.logging.Coverage;
 import com.yahoo.container.logging.HitCounts;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
@@ -49,7 +48,6 @@ public class SearchResponse {
         return false;
     }
 
-    @SuppressWarnings("deprecation")
     public static Timing createTiming(Query query, Result result) {
         return new Timing(result.getElapsedTime().firstFill(),
                           0,
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 fbe1c2fec2e..1299654e2b7 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
@@ -352,7 +352,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
      * @param summaryClass summary class used for filling
      **/
     public void setFilled(String summaryClass) {
-        if (filled == null || filled.size() == 0) {
+        if (filled == null || filled.isEmpty()) {
             filled = Collections.singleton(summaryClass);
             unmodifiableFilled = filled;
         } else if (filled.size() == 1) {