summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-06-17 10:27:06 +0200
committerJon Bratseth <bratseth@gmail.com>2020-06-17 10:27:06 +0200
commit57cbdcc67d9b0f35f05325d6d72d4a0cc8187a4b (patch)
tree72556b057aaa9886283722d026762e7c3f5ecbb6 /container-search
parent7f7b6777514bf05916e2edcbc3e27b1bfd28906c (diff)
Test SpareCapacityMaintainer
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/Item.java2
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java21
2 files changed, 8 insertions, 15 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Item.java b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
index ea65bc7d7d2..475a80f7ae0 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/Item.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
@@ -32,7 +32,7 @@ public abstract class Item implements Cloneable {
/**
* The definitions in Item.ItemType must match the ones in
- * searchlib/src/searchlib/parsequery/parse.h
+ * searchlib/src/vespa/searchlib/parsequery/parse.h
*/
public static enum ItemType {
OR(0),
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java
index 97c68ee3da8..2c017410109 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java
@@ -12,8 +12,7 @@ import com.google.common.collect.ImmutableList;
import com.yahoo.compress.IntegerCompressor;
/**
- * A set words with differing exactness scores to be used for literal boost
- * ranking.
+ * A set of words with differing exactness scores to be used for literal boost ranking.
*
* @author Steinar Knutsen
*/
@@ -145,17 +144,14 @@ public class WordAlternativesItem extends TermItem {
}
/**
- * Return an immutable snapshot of the contained terms. This list will not
- * reflect later changes to the item.
+ * Return an immutable snapshot of the contained terms. This list will not reflect later changes to the item.
*
- * @return an immutable list of word alternatives and their respective
- * scores
+ * @return an immutable list of word alternatives and their respective scores
*/
public List<Alternative> getAlternatives() {
return alternatives;
}
-
@Override
public void encodeThis(ByteBuffer target) {
super.encodeThis(target);
@@ -172,17 +168,14 @@ public class WordAlternativesItem extends TermItem {
* equal or higher exactness score. If the term string is present with a
* lower exactness score, the new, higher score will take precedence.
*
- * @param term
- * one of several string interpretations of the input word
- * @param exactness
- * how close the term string matches what the user input
+ * @param term one of several string interpretations of the input word
+ * @param exactness how close the term string matches what the user input
*/
public void addTerm(String term, double exactness) {
// do note, Item is Cloneable, and overwriting the reference is what
// saves us from overriding the method
- if (alternatives.stream().anyMatch((a) -> a.word.equals(term) && a.exactness >= exactness )) {
- return;
- }
+ if (alternatives.stream().anyMatch((a) -> a.word.equals(term) && a.exactness >= exactness )) return;
+
List<Alternative> newTerms = new ArrayList<>(alternatives.size() + 1);
newTerms.addAll(alternatives);
newTerms.add(new Alternative(term, exactness));