diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-08 14:14:09 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-08 14:14:09 +0100 |
commit | 8e303425a1d16efe02bac2e8e2400b13fdfe2f9f (patch) | |
tree | b466b2f275f7982b06b4ab7739f1357c1e403c55 /container-search | |
parent | c606ef30c01817786802964ddc6b4ef0beeb86e5 (diff) |
More robust upgrading
- Support upgrades to a lower version than the highest deployed in an application
- Check what's actually deployed when deciding whether a change is done
Diffstat (limited to 'container-search')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java b/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java index bdeae21bfa1..62560d2e00a 100644 --- a/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java +++ b/container-search/src/main/java/com/yahoo/search/querytransform/QueryCombinator.java @@ -1,32 +1,31 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.querytransform; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.yahoo.component.ComponentId; import com.yahoo.language.Language; import com.yahoo.log.LogLevel; import com.yahoo.prelude.Index; import com.yahoo.prelude.IndexFacts; +import com.yahoo.prelude.query.AndItem; +import com.yahoo.prelude.query.CompositeItem; +import com.yahoo.prelude.query.IndexedItem; +import com.yahoo.prelude.query.Item; +import com.yahoo.prelude.query.NullItem; import com.yahoo.prelude.query.parser.CustomParser; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; import com.yahoo.search.query.Properties; import com.yahoo.search.query.QueryTree; -import com.yahoo.prelude.query.AndItem; -import com.yahoo.prelude.query.CompositeItem; -import com.yahoo.prelude.query.IndexedItem; -import com.yahoo.prelude.query.Item; -import com.yahoo.prelude.query.NullItem; -import com.yahoo.yolean.Exceptions; import com.yahoo.search.query.parser.ParserEnvironment; import com.yahoo.search.query.parser.ParserFactory; import com.yahoo.search.searchchain.Execution; +import com.yahoo.yolean.Exceptions; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * <p>A searcher which grabs query parameters of the form "defidx.(identifier)=(index name)" and @@ -36,8 +35,12 @@ import com.yahoo.search.searchchain.Execution; * settings of the default index set to the "".</p> * * @author Steinar Knutsen + * @deprecated use YQL */ +// TODO: Remove on Vespa 7 +@Deprecated public class QueryCombinator extends Searcher { + private static final String QUERYPREFIX = "query."; private static class QueryPart { |