diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2022-06-09 17:04:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-09 17:04:03 +0200 |
commit | 27673d8cf6b107531b322428d90442869c88c3e9 (patch) | |
tree | 502182008df5b99855a571e1ef6882e3b0e8eb64 /container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | |
parent | 0fd0ba6d04f642095e35ff828e6d7ee334a4bdb8 (diff) |
Revert "Change user query default from ALL to WEAKAND on Vespa 8"
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/yql/YqlParser.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/yql/YqlParser.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java index a149ae9323a..15e3b7aab14 100644 --- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java +++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java @@ -740,7 +740,7 @@ public class YqlParser implements Parser { if (allowEmpty && (wordData == null || wordData.isEmpty())) return new NullItem(); String grammar = getAnnotation(ast, USER_INPUT_GRAMMAR, String.class, - Query.Type.WEAKAND.toString(), "grammar for handling user input"); + Query.Type.ALL.toString(), "grammar for handling user input"); String defaultIndex = getAnnotation(ast, USER_INPUT_DEFAULT_INDEX, String.class, "default", "default index for user input terms"); Language language = decideParsingLanguage(ast, wordData); @@ -1448,7 +1448,7 @@ public class YqlParser implements Parser { "setting for whether to use substring match of input data"); boolean exact = exactMatch != null ? exactMatch : indexFactsSession.getIndex(indexNameExpander.expand(field)).isExact(); String grammar = getAnnotation(ast, USER_INPUT_GRAMMAR, String.class, - Query.Type.WEAKAND.toString(), "grammar for handling word input"); + Query.Type.ALL.toString(), "grammar for handling word input"); Preconditions.checkArgument((prefixMatch ? 1 : 0) + (substrMatch ? 1 : 0) + (suffixMatch ? 1 : 0) < 2, "Only one of prefix, substring and suffix can be set."); |