Merge pull request #31194 from vespa-engine/bratseth/stemming-trace

Trace no stemming due to language=UNKNOWN

3 files changed, 10 insertions, 6 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java b/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java
index f27e9bbc281..0ea9cefc63e 100644
--- a/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/querytransform/StemmingSearcher.java
@@ -109,14 +109,17 @@ public class StemmingSearcher extends Searcher {
 
     private Item replaceTerms(Query q, IndexFacts.Session indexFacts) {
         Language language = q.getModel().getParsingLanguage();
-        if (language == Language.UNKNOWN) return q.getModel().getQueryTree().getRoot();
+        if (language == Language.UNKNOWN) {
+            q.trace("Language is unknown, not stemming", 3);
+            return q.getModel().getQueryTree().getRoot();
+        }
 
         StemContext context = new StemContext();
         context.isCJK = language.isCjk();
         context.language = language;
         context.indexFacts = indexFacts;
         context.reverseConnectivity = createReverseConnectivities(q.getModel().getQueryTree().getRoot());
-        q.trace("Stemming with language="+language, 3);
+        q.trace("Stemming with language " + language, 3);
         return scan(q.getModel().getQueryTree().getRoot(), context);
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java b/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java
index f6025dc6ba7..e3a559da8f9 100644
--- a/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/significance/SignificanceSearcher.java
@@ -30,9 +30,8 @@ import static com.yahoo.prelude.querytransform.StemmingSearcher.STEMMING;
 /**
  * Sets significance values on word items in the query tree.
  *
- * @author MariusArhaug
+ * @author Marius Arhaug
  */
-
 @Provides(SignificanceSearcher.SIGNIFICANCE)
 @Before(STEMMING)
 public class SignificanceSearcher extends Searcher {
@@ -112,6 +111,7 @@ public class SignificanceSearcher extends Searcher {
     public static double calculateIDF(long N, long nq_i) {
         return Math.log(1 + (N - nq_i + 0.5) / (nq_i + 0.5));
     }
+
 }
 
 
diff --git a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
index 91f5984481a..1ba10a31638 100644
--- a/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/yql/YqlParserTestCase.java
@@ -17,6 +17,7 @@ import com.yahoo.prelude.query.Item;
 import com.yahoo.prelude.query.MarkerWordItem;
 import com.yahoo.prelude.query.NearestNeighborItem;
 import com.yahoo.prelude.query.NumericInItem;
+import com.yahoo.prelude.query.OrItem;
 import com.yahoo.prelude.query.PhraseItem;
 import com.yahoo.prelude.query.PhraseSegmentItem;
 import com.yahoo.prelude.query.PrefixItem;
@@ -30,6 +31,7 @@ import com.yahoo.prelude.query.SuffixItem;
 import com.yahoo.prelude.query.WeakAndItem;
 import com.yahoo.prelude.query.WordAlternativesItem;
 import com.yahoo.prelude.query.WordItem;
+import com.yahoo.prelude.query.textualrepresentation.TextualQueryRepresentation;
 import com.yahoo.prelude.querytransform.QueryRewrite;
 import com.yahoo.processing.IllegalInputException;
 import com.yahoo.search.Query;
@@ -557,8 +559,7 @@ public class YqlParserTestCase {
                 "title contains ({id: 1, connectivity: {\"id\": 3, weight: 7.0}}\"madonna\") " +
                 "and title contains ({id: 2}\"saint\") " +
                 "and title contains ({id: 3}\"angel\")");
-        assertEquals("AND title:madonna title:saint title:angel",
-                parsed.toString());
+        assertEquals("AND title:madonna title:saint title:angel", parsed.toString());
         AndItem root = (AndItem) parsed.getRoot();
         WordItem first = (WordItem) root.getItem(0);
         WordItem second = (WordItem) root.getItem(1);