diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-09-13 14:52:09 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-09-13 14:52:09 +0200 |
commit | bfa97cd7db05e1f38a2fba7c5f834398eb9fd573 (patch) | |
tree | 95b71682cb017333447a488ef015ea12146abb2d /container-search/src/main/java/com/yahoo/prelude | |
parent | c7d8f1d90ff8904e5449f62c3482a93d1dc8049f (diff) |
Nonfunctional changes only
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude')
3 files changed, 16 insertions, 30 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java index 737f36e2553..419471348b7 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/RangeItem.java @@ -11,7 +11,6 @@ package com.yahoo.prelude.query; * * @author baldersheim * @author bratseth - * @since 5.1.23 */ // Note that this is just a convenience subclass of IntItem - it does not add any functionality not available in it. public class RangeItem extends IntItem { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java index a1ab3f1ef92..4b66d0d757b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/SimpleIndexedItem.java @@ -44,6 +44,7 @@ public abstract class SimpleIndexedItem extends SimpleTaggableItem implements In if (index == null) { index = ""; } + this.index = index; } 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 7da2e4c3240..ec1f79828c1 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 @@ -16,6 +16,7 @@ import static com.yahoo.prelude.query.parser.Token.Kind.*; * for structured queries (types ANY, ALL and ADVANCED). * * @author Steinar Knutsen + * @author bratseth */ abstract class StructuredParser extends AbstractParser { @@ -320,25 +321,19 @@ abstract class StructuredParser extends AbstractParser { private IntItem numberRange() { int position = tokens.getPosition(); IntItem item = null; - boolean negative = false; try { Token initial = tokens.next(); - if (initial.kind != LSQUAREBRACKET) { - return null; - } + if (initial.kind != LSQUAREBRACKET) return null; String rangeStart = ""; - - negative = tokens.skip(MINUS); + boolean negative = tokens.skip(MINUS); if (tokens.currentIs(NUMBER)) { rangeStart = (negative ? "-" : "") + tokens.next().toString() + decimalPart(); } - if (!tokens.skip(SEMICOLON)) { - return null; - } + if (!tokens.skip(SEMICOLON)) return null; String rangeEnd = ""; @@ -374,17 +369,13 @@ abstract class StructuredParser extends AbstractParser { private IntItem numberSmaller() { int position = tokens.getPosition(); IntItem item = null; - boolean negative = false; try { Token initial = tokens.next(); - if (initial.kind != SMALLER) { - return null; - } - negative = tokens.skipNoIgnore(MINUS); - if (!tokens.currentIs(NUMBER)) { - return null; - } + if (initial.kind != SMALLER) return null; + + boolean negative = tokens.skipNoIgnore(MINUS); + if ( ! tokens.currentIs(NUMBER)) return null; item = new IntItem("<" + (negative ? "-" : "") + tokens.next() + decimalPart(), true); item.setOrigin(new Substring(initial.substring.start, tokens.currentNoIgnore().substring.start, @@ -400,22 +391,17 @@ abstract class StructuredParser extends AbstractParser { private IntItem numberGreater() { int position = tokens.getPosition(); IntItem item = null; - boolean negative = false; try { - Token t = tokens.next(); - if (t.kind != GREATER) { - return null; - } + Token initial = tokens.next(); + if (initial.kind != GREATER) return null; - negative = tokens.skipNoIgnore(MINUS); - if (!tokens.currentIs(NUMBER)) { - return null; - } + boolean negative = tokens.skipNoIgnore(MINUS); + if ( ! tokens.currentIs(NUMBER)) return null; - Token number = tokens.next(); - item = new IntItem(">" + (negative ? "-" : "") + number + decimalPart(), true); - item.setOrigin(new Substring(t.substring.start, tokens.currentNoIgnore().substring.start, t.getSubstring().getSuperstring())); // XXX: Unsafe end? + item = new IntItem(">" + (negative ? "-" : "") + tokens.next() + decimalPart(), true); + item.setOrigin(new Substring(initial.substring.start, tokens.currentNoIgnore().substring.start, + initial.getSubstring().getSuperstring())); // XXX: Unsafe end? return item; } finally { if (item == null) { |