Ensure well-defined semantics for non-commutative field comparisons

1 files changed, 21 insertions, 3 deletions

diff --git a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
index 47599e53ece..8f52c29e84d 100644
--- a/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
+++ b/document/src/main/java/com/yahoo/document/select/rule/ComparisonNode.java
@@ -144,9 +144,9 @@ public class ComparisonNode implements ExpressionNode {
                 return new ResultList(Result.INVALID);
             }
         } else if (oLeft instanceof AttributeNode.VariableValueList) {
-            return evaluateListAndSingle((AttributeNode.VariableValueList)oLeft, oRight);
+            return evaluateLhsListAndRhsSingle((AttributeNode.VariableValueList)oLeft, oRight);
         } else if (oRight instanceof AttributeNode.VariableValueList) {
-            return evaluateListAndSingle((AttributeNode.VariableValueList)oRight, oLeft);
+            return evaluateLhsSingleAndRhsList(oLeft, (AttributeNode.VariableValueList)oRight);
         }
         return new ResultList(evaluateBool(oLeft, oRight));
     }
@@ -197,7 +197,7 @@ public class ComparisonNode implements ExpressionNode {
         }
     }
 
-    private ResultList evaluateListAndSingle(AttributeNode.VariableValueList lhs, Object rhs) {
+    private ResultList evaluateLhsListAndRhsSingle(AttributeNode.VariableValueList lhs, Object rhs) {
         if (rhs == null && lhs == null) {
             return new ResultList(Result.TRUE);
         }
@@ -215,6 +215,24 @@ public class ComparisonNode implements ExpressionNode {
         return retVal;
     }
 
+    private ResultList evaluateLhsSingleAndRhsList(Object lhs, AttributeNode.VariableValueList rhs) {
+        if (rhs == null && lhs == null) {
+            return new ResultList(Result.TRUE);
+        }
+
+        if (rhs == null || lhs == null) {
+            return new ResultList(Result.FALSE);
+        }
+
+        ResultList retVal = new ResultList();
+        for (ResultList.VariableValue value : rhs) {
+            Result result = evaluateBool(lhs, value.getValue());
+            retVal.add((FieldPathIteratorHandler.VariableMap)value.getVariables().clone(), result);
+        }
+
+        return retVal;
+    }
+
     /**
      * Evaluate this expression on two operands, given that they are not invalid.
      *