diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-04-26 13:34:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-26 13:34:54 +0200 |
| commit | 5f6a5a5d626808459bc65c95eb226e746ed3d18f (patch) | |
| tree | 58dfb87b6905a2709c70f19a6470627ff614ca93 /container-search/src/main/java/com/yahoo/search | |
| parent | 6e1be1f6c681c26594b3f539f41b6e23ee0c446b (diff) | |
| parent | 08be9a163a0861901bd832f2d0cbd1c0d4a05ddf (diff) | |
Merge pull request #9044 from vespa-engine/revert-9043-revert-9026-bratseth/better-negative-number-heuristics
Revert "Revert "Better heuristics for negative numbers""
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search')
3 files changed, 3 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java b/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java index 32c386f0e32..b3d79f65df4 100644 --- a/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java +++ b/container-search/src/main/java/com/yahoo/search/query/parser/Parser.java @@ -15,8 +15,7 @@ public interface Parser { * {@link QueryTree}. If parsing fails without an exception, the contained * root will be an instance of {@link com.yahoo.prelude.query.NullItem}. * - * @param query - * the Parsable to parse + * @param query the Parsable to parse * @return the parsed QueryTree, never null */ QueryTree parse(Parsable query); diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java index 6a56f94c724..5427da6c06c 100644 --- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java +++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java @@ -481,7 +481,7 @@ public class Execution extends com.yahoo.processing.execution.Execution { * if searchChain is null */ @SuppressWarnings("unchecked") - private Execution(Chain<? extends Processor> searchChain,Context context, int searcherIndex) { + private Execution(Chain<? extends Processor> searchChain, Context context, int searcherIndex) { // Create a new Execution which is placed in the context of the execution of the given Context if any // "if any" because a context may, or may not, belong to an execution. // This is decided at the creation time of the Context - Context instances which do not belong 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 af095fefc1c..3eac1d88784 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 @@ -712,7 +712,7 @@ public class YqlParser implements Parser { .setLanguage(language) .setDefaultIndexName(defaultIndex)).getRoot(); // the null check should be unnecessary, but is there to avoid having to suppress null warnings - if ( !allowNullItem && (item == null || item instanceof NullItem)) + if ( ! allowNullItem && (item == null || item instanceof NullItem)) throw new IllegalArgumentException("Parsing '" + wordData + "' only resulted in NullItem."); if (language != Language.ENGLISH) // mark the language used, unless it's the default |