diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-08-19 11:52:10 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-08-19 11:52:10 +0200 |
commit | 7a6b75c6d8769e21de50cc620abcd5263fb8d2f7 (patch) | |
tree | 4adbffbecb7c17990faa33cf61fea99852c6556d /container-search/src/main/java/com/yahoo/prelude/query | |
parent | a520fda96ce01c92f28ea4c6b700a39396544d2e (diff) |
No defaultIndex in filter
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/query')
3 files changed, 6 insertions, 8 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java index 2d76db889b8..f838e96c930 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AbstractParser.java @@ -161,9 +161,9 @@ public abstract class AbstractParser implements CustomParser { if (filterToParse != null) { AnyParser filterParser = new AnyParser(environment); if (root == null) { - root = filterParser.parseFilter(filterToParse, parsingLanguage, indexFacts, defaultIndex); + root = filterParser.parseFilter(filterToParse, parsingLanguage, indexFacts); } else { - root = filterParser.applyFilter(root, filterToParse, parsingLanguage, indexFacts, defaultIndex); + root = filterParser.applyFilter(root, filterToParse, parsingLanguage, indexFacts); } } return simplifyPhrases(root); diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java index bf778409364..7fc4c823018 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/AnyParser.java @@ -34,8 +34,8 @@ public class AnyParser extends SimpleParser { return anyItems(true); } - Item parseFilter(String filter, Language queryLanguage, IndexFacts.Session indexFacts, String defaultIndex) { - setState(queryLanguage, indexFacts, defaultIndex); + Item parseFilter(String filter, Language queryLanguage, IndexFacts.Session indexFacts) { + setState(queryLanguage, indexFacts, null); tokenize(filter, null, indexFacts, queryLanguage); Item filterRoot = anyItems(true); @@ -122,8 +122,8 @@ public class AnyParser extends SimpleParser { } } - Item applyFilter(Item root, String filter, Language queryLanguage, IndexFacts.Session indexFacts, String defaultIndex) { - setState(queryLanguage, indexFacts, defaultIndex); + Item applyFilter(Item root, String filter, Language queryLanguage, IndexFacts.Session indexFacts) { + setState(queryLanguage, indexFacts, null); tokenize(filter, null, indexFacts, queryLanguage); return filterItems(root); } diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java index 88490237fc7..9d9aee54df0 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/StructuredParser.java @@ -25,7 +25,6 @@ import com.yahoo.search.query.parser.ParserEnvironment; import java.util.ArrayList; import java.util.List; -import java.util.Objects; import static com.yahoo.prelude.query.parser.Token.Kind.*; @@ -220,7 +219,6 @@ abstract class StructuredParser extends AbstractParser { item = indexPrefix(); } } - return item; } finally { if (item == null) { |