Stop using source number: Same uniqueness as source name

5 files changed, 18 insertions, 32 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index 40364824774..91fbd1b2aca 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -155,8 +155,8 @@ public class ClusterSearcher extends Searcher {
                     if (! isRemote(searchClusterConfig.dispatcher(dispatcherIndex).host())) {
                         Backend b = createBackend(searchClusterConfig.dispatcher(dispatcherIndex));
                         FastSearcher searcher = searchDispatch(searchClusterIndex, fs4ResourcePool,
-                                searchClusterConfig, cacheParams, emulationConfig, docSumParams,
-                                documentDbConfig, b, dispatcher, dispatcherIndex);
+                                                               cacheParams, emulationConfig, docSumParams,
+                                                               documentDbConfig, b, dispatcher, dispatcherIndex);
                         addBackendSearcher(searcher);
                     }
                 } catch (UnknownHostException e) {
@@ -190,7 +190,6 @@ public class ClusterSearcher extends Searcher {
     }
 
     private static ClusterParams makeClusterParams(int searchclusterIndex,
-                                                   QrSearchersConfig.Searchcluster searchClusterConfig,
                                                    LegacyEmulationConfig emulConfig,
                                                    int dispatchIndex) {
         return new ClusterParams(searchclusterIndex,
@@ -200,7 +199,6 @@ public class ClusterSearcher extends Searcher {
 
     private static FastSearcher searchDispatch(int searchclusterIndex,
                                                FS4ResourcePool fs4ResourcePool,
-                                               QrSearchersConfig.Searchcluster searchClusterConfig,
                                                CacheParams cacheParams,
                                                LegacyEmulationConfig emulConfig,
                                                SummaryParameters docSumParams,
@@ -208,7 +206,7 @@ public class ClusterSearcher extends Searcher {
                                                Backend backend,
                                                Dispatcher dispatcher,
                                                int dispatcherIndex) {
-        ClusterParams clusterParams = makeClusterParams(searchclusterIndex, searchClusterConfig,
+        ClusterParams clusterParams = makeClusterParams(searchclusterIndex,
                                                         emulConfig, dispatcherIndex);
         return new FastSearcher(backend, fs4ResourcePool, dispatcher, docSumParams, clusterParams, cacheParams, 
                                 documentdbInfoConfig);
@@ -220,7 +218,7 @@ public class ClusterSearcher extends Searcher {
                                                    LegacyEmulationConfig emulConfig,
                                                    SummaryParameters docSumParams,
                                                    DocumentdbInfoConfig documentdbInfoConfig) {
-        ClusterParams clusterParams = makeClusterParams(searchclusterIndex, searchClusterConfig, emulConfig, 0);
+        ClusterParams clusterParams = makeClusterParams(searchclusterIndex, emulConfig, 0);
         VdsStreamingSearcher searcher = (VdsStreamingSearcher) VespaBackEndSearcher
                 .getSearcher("com.yahoo.vespa.streamingvisitors.VdsStreamingSearcher");
         searcher.setSearchClusterConfigId(searchClusterConfig.rankprofiles().configid());
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 8056e0a02bc..9276ceed5b3 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
@@ -59,17 +59,13 @@ public class FastHit extends Hit {
     /** Returns false - this is a concrete hit containing requested content */
     public boolean isMeta() { return false; }
 
-    @Override
-    public URI getId() {
-        return getUri(); // Make sure we decode it if the id is encoded
-    }
-
     /**
      * Returns the explicitly set uri if available, returns "index:[source]/[partid]/[id]" otherwise
      *
      * @return uri of hit
      */
-    public URI getUri() {
+    @Override
+    public URI getId() {
         URI uri = super.getId();
         if (uri != null) return uri;
 
@@ -83,7 +79,7 @@ public class FastHit extends Hit {
 
         // Fallback to index:[source]/[partid]/[id]
         if (indexUri != null) return indexUri;
-        indexUri = new URI("index:" + getSourceNumber() + "/" + getPartId() + "/" + asHexString(getGlobalId()));
+        indexUri = new URI("index:" + getSource() + "/" + getPartId() + "/" + asHexString(getGlobalId()));
         return indexUri;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
index 7d5b91ab1e3..3abd97d814e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/fastsearch/VespaBackEndSearcher.java
@@ -421,7 +421,6 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
             GroupingListHit hit = new GroupingListHit(list, getDocsumDefinitionSet(query));
             hit.setQuery(result.getQuery());
             hit.setSource(getName());
-            hit.setSourceNumber(sourceNumber);
             hit.setQueryPacketData(queryPacketData);
             result.hits().add(hit);
         }
@@ -556,7 +555,6 @@ public abstract class VespaBackEndSearcher extends PingableSearcher {
     }
 
     private void extractDocumentInfo(FastHit hit, DocumentInfo document) {
-        hit.setSourceNumber(sourceNumber);
         hit.setSource(getName());
 
         Number rank = document.getMetric();
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java b/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
index a095f6dc686..7e848243c99 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/vespa/HitConverter.java
@@ -57,7 +57,6 @@ class HitConverter implements ResultBuilder.HitConverter {
             throw new NullPointerException("Hit has no context.");
         }
         hit.setSource(ctxHit.getSource());
-        hit.setSourceNumber(ctxHit.getSourceNumber());
         hit.setQuery(ctxHit.getQuery());
 
         if (ctxHit instanceof GroupingListHit) {
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 aca3ed6a91d..cb24418b50c 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
@@ -571,24 +571,27 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
      * Changes the key under which a value is found. This is useful because it allows keys to be changed
      * without accessing the value (which may be lazily created).
      */
-    public void changeFieldKey(String oldKey,String newKey) {
+    public void changeFieldKey(String oldKey, String newKey) {
         Map<String,Object> fieldMap = getFieldMap();
-        Object value=fieldMap.remove(oldKey);
-        fieldMap.put(newKey,value);
+        Object value = fieldMap.remove(oldKey);
+        fieldMap.put(newKey, value);
     }
 
+    /** @deprecated do not use */
+    @Deprecated
     public int getSourceNumber() { return sourceNumber; }
 
+    /** @deprecated do not use */
+    @Deprecated
     public void setSourceNumber(int number) { this.sourceNumber = number; }
 
     /** Returns the query which produced this hit, or null if not known */
     public Query getQuery() { return query; }
 
+    /** Returns the query which produced this hit as a request, or null if not known */
     public Request request() { return query; }
 
-    // TODO: rethink hit tagging
-    // hit group -> need option to retag
-    // hit -> should only set query once
+    /** Sets the query which produced this. This is ignored (except if this is a HitGroup) if a query is already set */
     public final void setQuery(Query query) {
         if (this.query == null || this instanceof HitGroup) {
             this.query = query;
@@ -639,11 +642,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
         }
     }
 
-    /**
-     * Set meta data describing how a given searcher should treat this hit.
-     * It is currently recommended that the invoker == searcher.
-     * <b>Internal. Do not use!</b>
-     */
+    /** Attach some data to this hit for this searcher */
     public void setSearcherSpecificMetaData(Searcher searcher, Object data) {
         if (searcherSpecificMetaData == null) {
             searcherSpecificMetaData = Collections.singletonMap(searcher, data);
@@ -662,11 +661,7 @@ public class Hit extends ListenableFreezableClass implements Data, Comparable<Hi
         }
     }
 
-    /**
-     * get meta data describing how a given searcher should treat this hit.
-     * It is currently recommended that the invoker == searcher
-     * <b>Internal. Do not use!</b>
-     */
+    /** Returns data attached to this hit for this searcher, or null if none */
     public Object getSearcherSpecificMetaData(Searcher searcher) {
         return searcherSpecificMetaData != null ? searcherSpecificMetaData.get(searcher) : null;
     }