From d79c197194dc09100a4c2a19c75024fc1b5fbf52 Mon Sep 17 00:00:00 2001
From: Arne Juul <arnej@yahoo-inc.com>
Date: Thu, 17 Jan 2019 10:03:47 +0000
Subject: document and fix getNumWords()

* WordAlternativesItem used the wrong concept, leading to wrong arity
  for phrases containing alternatives.
---
 .../src/main/java/com/yahoo/prelude/query/HasIndexItem.java             | 1 +
 container-search/src/main/java/com/yahoo/prelude/query/SegmentItem.java | 1 +
 .../src/main/java/com/yahoo/prelude/query/WordAlternativesItem.java     | 2 +-
 container-search/src/main/java/com/yahoo/prelude/query/WordItem.java    | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'container-search/src')

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java b/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java
index d5d193f54b4..8a91587daa2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/HasIndexItem.java
@@ -15,6 +15,7 @@ public interface HasIndexItem {
     @NonNull
     public String getIndexName();
 
+    /** @return how many phrase words does this item contain */
     public int getNumWords();
 
 }
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/SegmentItem.java b/container-search/src/main/java/com/yahoo/prelude/query/SegmentItem.java
index 3d2e437d34c..1227a7f80cf 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/SegmentItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/SegmentItem.java
@@ -82,6 +82,7 @@ public abstract class SegmentItem extends CompositeItem implements BlockItem {
         return locked;
     }
 
+    @Override
     public int getNumWords() {
         return getItemCount();
     }
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 1157d2763e0..1d135b2a13c 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
@@ -101,7 +101,7 @@ public class WordAlternativesItem extends TermItem {
 
     @Override
     public int getNumWords() {
-        return alternatives.size();
+        return 1;
     }
 
     @Override
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
index 0b3d11158f1..39573e4d71f 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WordItem.java
@@ -157,6 +157,7 @@ public class WordItem extends TermItem {
         return this.word.equals(other.word);
     }
 
+    @Override
     public int getNumWords() {
         return 1;
     }
-- 
cgit v1.2.3