summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-10-17 11:32:38 +0200
committerJon Bratseth <bratseth@yahoo-inc.com>2017-10-17 11:32:38 +0200
commit340d02384d23d87530ede1f317dabc7e394eeaf6 (patch)
tree5eb22a2fb5b295cc49e8173bc3597c8557c50e14 /container-search
parent572e913e1ef1f1be36326b1cc58f7a9126f8d06b (diff)
Nonfunctional changes only
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/PhraseSegmentItem.java5
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java4
3 files changed, 7 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java b/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java
index de66d4c4408..91378eeca21 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/AndSegmentItem.java
@@ -9,7 +9,7 @@ import edu.umd.cs.findbugs.annotations.NonNull;
* An immutable and'ing of a collection of sub-expressions. It does not extend
* AndItem to avoid code using instanceof handling it as an AndItem.
*
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public class AndSegmentItem extends SegmentItem implements BlockItem {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/PhraseSegmentItem.java b/container-search/src/main/java/com/yahoo/prelude/query/PhraseSegmentItem.java
index ff310cafc2e..a19a6e53963 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/PhraseSegmentItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/PhraseSegmentItem.java
@@ -91,8 +91,7 @@ public class PhraseSegmentItem extends IndexedSegmentItem {
if (item instanceof WordItem) {
addWordItem((WordItem) item);
} else {
- throw new IllegalArgumentException(
- "Can not add " + item + " to a segment phrase");
+ throw new IllegalArgumentException("Can not add " + item + " to a segment phrase");
}
}
@@ -117,6 +116,7 @@ public class PhraseSegmentItem extends IndexedSegmentItem {
super.encodeThis(buffer); // takes care of index bytes
}
+ @Override
public int encode(ByteBuffer buffer) {
encodeThis(buffer);
return encodeContent(buffer, 1);
@@ -199,4 +199,5 @@ public class PhraseSegmentItem extends IndexedSegmentItem {
super.disclose(discloser);
discloser.addProperty("explicit", explicit);
}
+
}
diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
index 2c724e2b27b..0941ab3bccd 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/QueryRewrite.java
@@ -80,6 +80,7 @@ public class QueryRewrite {
}
return (theOnlyNot != null) ? theOnlyNot : parent;
}
+
/**
* Optimizes the given query tree based on its {@link Model#getRestrict()} parameter, if any.
*
@@ -209,7 +210,7 @@ public class QueryRewrite {
* Replaces and {@link SimpleIndexedItem} searching in the {@link Hit#SDDOCNAME_FIELD} with an item
* appropriate for the search node.
*
- * @param query The query to rewrite.
+ * @param query the query to rewrite.
*/
public static void rewriteSddocname(Query query) {
Item oldRoot = query.getModel().getQueryTree().getRoot();
@@ -239,4 +240,5 @@ public class QueryRewrite {
}
return item;
}
+
}