Merge pull request #7494 from vespa-engine/bratseth/remove-unintended-change

Revert unintended change

1 files changed, 4 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
index 7c4bec2078a..e0e9042e1a3 100644
--- a/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
+++ b/container-search/src/main/java/com/yahoo/search/yql/YqlParser.java
@@ -1340,7 +1340,7 @@ public class YqlParser implements Parser {
                     wordItem = new WordItem(wordData, fromQuery);
                     break;
                 case POSSIBLY:
-                    if (shouldResegmentWord(ast, fromQuery)) {
+                    if (shouldResegmentWord(field, fromQuery)) {
                         wordItem = resegment(field, ast, wordData, fromQuery, parent, language);
                     } else {
                         wordItem = new WordItem(wordData, fromQuery);
@@ -1362,8 +1362,8 @@ public class YqlParser implements Parser {
     }
 
     @SuppressWarnings({"deprecation"})
-    private boolean shouldResegmentWord(OperatorNode<ExpressionOperator> ast, boolean fromQuery) {
-        return resegment && fromQuery &&  ! indexFactsSession.getIndex(getIndex(ast)).isAttribute();
+    private boolean shouldResegmentWord(String field, boolean fromQuery) {
+        return resegment && fromQuery &&  ! indexFactsSession.getIndex(field).isAttribute();
     }
 
     @NonNull
@@ -1408,7 +1408,7 @@ public class YqlParser implements Parser {
                              WordItem wordItem) {
         wordItem.setIndexName(field);
         wordStyleSettings(ast, wordItem);
-        if (shouldResegmentWord(ast, fromQuery)) {
+        if (shouldResegmentWord(field, fromQuery)) {
             // force re-stemming, new case normalization, etc
             wordItem.setStemmed(false);
             wordItem.setLowercased(false);