Specialized ternaryEquals and fixed NO_VALUE comparison for MapValue

community/kernel/src/main/java/org/neo4j/kernel/impl/util/ValueUtils.java

@@ -50,6 +50,7 @@
 import org.neo4j.values.virtual.VirtualValues;
 
 import static java.util.stream.StreamSupport.stream;
+import static org.neo4j.values.storable.Values.NO_VALUE;
 import static org.neo4j.values.virtual.VirtualValues.list;
 import static org.neo4j.values.virtual.VirtualValues.map;
 
@@ -315,9 +316,9 @@ protected boolean eq( Object other )
         }
 
         @Override
-        public Boolean ternaryEquals( Object other )
+        public Boolean ternaryEquals( AnyValue other )
         {
-            if ( other == null )
+            if ( other == null || other == NO_VALUE )
             {
                 return null;
             }

community/values/src/main/java/org/neo4j/values/AnyValue.java

@@ -53,5 +53,5 @@ public boolean isSequenceValue()
         return false; // per default Values are no SequenceValues
     }
 
-    public abstract Boolean ternaryEquals( Object other );
+    public abstract Boolean ternaryEquals( AnyValue other );
 }

community/values/src/main/java/org/neo4j/values/SequenceValue.java

@@ -200,7 +200,7 @@ static int compareUsingIterators( SequenceValue a, SequenceValue b, Comparator<A
         return x;
     }
 
-    default Boolean ternaryEquals( SequenceValue other )
+    default Boolean ternaryEquality( SequenceValue other )
     {
         IterationPreference pref = iterationPreference();
         IterationPreference otherPref = other.iterationPreference();

community/values/src/main/java/org/neo4j/values/VirtualValue.java

@@ -48,15 +48,15 @@ public final boolean eq( Object other )
 
     public abstract boolean equals( VirtualValue other );
 
-    public Boolean ternaryEquals( Object other )
+    public Boolean ternaryEquals( AnyValue other )
     {
         if ( other == null || other == NO_VALUE )
         {
             return null;
         }
         if ( other instanceof SequenceValue && this.isSequenceValue() )
         {
-            return ((SequenceValue) this).ternaryEquals( (SequenceValue) other );
+            return ((SequenceValue) this).ternaryEquality( (SequenceValue) other );
         }
         if ( other instanceof VirtualValue && ((VirtualValue) other).valueGroup() == valueGroup() )
         {

community/values/src/main/java/org/neo4j/values/storable/NoValue.java

@@ -19,6 +19,8 @@
  */
 package org.neo4j.values.storable;
 
+import org.neo4j.values.AnyValue;
+
 /**
  * Not a value.
  *
@@ -41,7 +43,7 @@ public boolean eq( Object other )
     }
 
     @Override
-    public Boolean ternaryEquals( Object other )
+    public Boolean ternaryEquals( AnyValue other )
     {
         return null;
     }

community/values/src/main/java/org/neo4j/values/storable/Value.java

@@ -59,15 +59,15 @@ public boolean eq( Object other )
 
     public abstract boolean equals( String[] x );
 
-    public Boolean ternaryEquals( Object other )
+    public Boolean ternaryEquals( AnyValue other )
     {
         if ( other == null || other == NO_VALUE )
         {
             return null;
         }
         if ( other instanceof SequenceValue && this.isSequenceValue() )
         {
-            return ((SequenceValue) this).ternaryEquals( (SequenceValue) other );
+            return ((SequenceValue) this).ternaryEquality( (SequenceValue) other );
         }
         if ( other instanceof Value && ((Value) other).valueGroup() == valueGroup() )
         {

community/values/src/main/java/org/neo4j/values/virtual/MapValue.java

@@ -30,6 +30,8 @@
 import org.neo4j.values.VirtualValue;
 import org.neo4j.values.storable.Values;
 
+import static org.neo4j.values.storable.Values.NO_VALUE;
+
 public final class MapValue extends VirtualValue
 {
     private final Map<String,AnyValue> map;
@@ -119,12 +121,16 @@ public int compareTo( VirtualValue other, Comparator<AnyValue> comparator )
     }
 
     @Override
-    public Boolean ternaryEquals( Object other )
+    public Boolean ternaryEquals( AnyValue other )
     {
-        if ( other == null || !(other instanceof MapValue) )
+        if ( other == null || other == NO_VALUE )
         {
             return null;
         }
+        else if ( !(other instanceof MapValue) )
+        {
+            return false;
+        }
         Map<String,AnyValue> otherMap = ((MapValue) other).map;
         int size = map.size();
         if ( size != otherMap.size() )
@@ -177,7 +183,7 @@ public boolean containsKey( String key )
 
     public AnyValue get( String key )
     {
-      return map.getOrDefault( key, Values.NO_VALUE );
+      return map.getOrDefault( key, NO_VALUE );
     }
 
     @Override