summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2018-05-23 13:08:47 +0200
committerGitHub <noreply@github.com>2018-05-23 13:08:47 +0200
commit0fa6036254da751e0e38f77c20a419124b8af800 (patch)
tree657984ca049491cc274f8d57e010159785a901c3 /container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
parentbbfa8456064e99c65ea4e78902d4fb02591ee7f3 (diff)
Revert "Bratseth/iterate over indexes not fields"
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
index dd8f4eff666..3d803b322ca 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/IndexCombinatorSearcher.java
@@ -22,15 +22,14 @@ import java.util.*;
* Searcher to rewrite queries to achieve mixed recall between indices and
* memory attributes.
*
- * @author Steinar Knutsen
- * @deprecated do not use
+ * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
*/
@After({PhaseNames.RAW_QUERY, PHRASE_REPLACEMENT})
@Before(PhaseNames.TRANSFORMED_QUERY)
@Provides(IndexCombinatorSearcher.MIXED_RECALL_REWRITE)
-@Deprecated // TODO: Remove on Vespa 7 (not necessary any more)
+// TODO: This is not necessary on Vespa 6, we should probably remove it from the default chain but keep it
+// around until Vespa 6 to avoid breaking those who refer to it.
public class IndexCombinatorSearcher extends Searcher {
-
public static final String MIXED_RECALL_REWRITE = "MixedRecallRewrite";
private static class ArrayComparator implements Comparator<Attribute[]> {