ValueGroup interfaces

There is a need to separate the capabilities of logical values from their implementation. The ValueGroup class contains these logical capabilities, so that they can be given to both lazy and direct implementations without crashing the class hierachies. Also moves static hash and compare methods to TextValues and NumberValues classes. lazy vs. direct equality is still broken for arrays.
neo4j · May 31, 2017 · 3132934 · 3132934
1 parent eab13c4
commit 3132934
Show file tree

Hide file tree

Showing 17 changed files with 288 additions and 134 deletions.
diff --git a/community/values/src/main/java/org/neo4j/values/BooleanArrayValue.java b/community/values/src/main/java/org/neo4j/values/BooleanArrayValue.java
@@ -23,7 +23,7 @@
 
 import static java.lang.String.format;
 
-class BooleanArrayValue extends ArrayValue
+class BooleanArrayValue extends ArrayValue implements ValueGroup.VBooleanArray
 {
     private final boolean[] value;
 
@@ -34,11 +34,17 @@ class BooleanArrayValue extends ArrayValue
     }
 
     @Override
-    int length()
+    public int length()
     {
         return value.length;
     }
 
+    @Override
+    public boolean booleanValue( int offset )
+    {
+        return value[offset];
+    }
+
     @Override
     public boolean equals( Object other )
     {
@@ -138,14 +144,14 @@ public String toString()
         return format( "BooleanArray(%s)", Arrays.toString( value ) );
     }
 
-    public int compareTo( BooleanArrayValue other )
+    public int compareTo( ValueGroup.VBooleanArray other )
     {
         int i = 0;
-        int x = value.length - other.value.length;
+        int x = value.length - other.length();
 
         while ( x == 0 && i < value.length )
         {
-            x = Boolean.compare( value[i], other.value[i] );
+            x = Boolean.compare( value[i], other.booleanValue( i ) );
             i++;
         }
         return x;

diff --git a/community/values/src/main/java/org/neo4j/values/BooleanValue.java b/community/values/src/main/java/org/neo4j/values/BooleanValue.java
@@ -25,7 +25,7 @@
  * This does not extend AbstractProperty since the JVM can take advantage of the 4 byte initial field alignment if
  * we don't extend a class that has fields.
  */
-final class BooleanValue extends ScalarValue
+final class BooleanValue extends ScalarValue implements ValueGroup.VBoolean
 {
     private final boolean bool;
 
@@ -70,14 +70,16 @@ public int hashCode()
         return bool ? -1 : 0;
     }
 
+    @Override
     public boolean booleanValue()
     {
         return bool;
     }
 
-    public int compareTo( BooleanValue other )
+    @Override
+    public int compareTo( ValueGroup.VBoolean other )
     {
-        return Boolean.compare( bool, other.bool );
+        return Boolean.compare( bool, other.booleanValue() );
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/CharArrayValue.java b/community/values/src/main/java/org/neo4j/values/CharArrayValue.java
@@ -115,12 +115,7 @@ boolean equals( String[] x )
     @Override
     public int hashCode()
     {
-        return hash( value );
-    }
-
-    static int hash( char[] value )
-    {
-        return Arrays.hashCode( value );
+        return TextValues.hash( value );
     }
 
     @Override

diff --git a/community/values/src/main/java/org/neo4j/values/CharValue.java b/community/values/src/main/java/org/neo4j/values/CharValue.java
@@ -21,7 +21,7 @@
 
 import static java.lang.String.format;
 
-final class CharValue extends ScalarValue implements Value.WithStringValue
+final class CharValue extends ScalarValue implements ValueGroup.VText
 {
     final char value;
 
@@ -78,6 +78,12 @@ public String stringValue()
         return Character.toString( value );
     }
 
+    @Override
+    public int compareTo( ValueGroup.VText other )
+    {
+        return TextValues.compareCharToString( value, other.stringValue() );
+    }
+
     @Override
     public String toString()
     {

diff --git a/community/values/src/main/java/org/neo4j/values/FloatingPointArrayValue.java b/community/values/src/main/java/org/neo4j/values/FloatingPointArrayValue.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.values;
 
-abstract class FloatingPointArrayValue extends ArrayValue
+abstract class FloatingPointArrayValue extends ArrayValue implements ValueGroup.VFloatingPointArray
 {
     public abstract double doubleValue( int index );
 
@@ -50,14 +50,14 @@ public boolean equals( Object other )
     @Override
     final boolean equals( Value other )
     {
-        if ( other instanceof FloatingPointArrayValue )
+        if ( other instanceof ValueGroup.VFloatingPointArray )
         {
-            FloatingPointArrayValue that = (FloatingPointArrayValue) other;
+            ValueGroup.VFloatingPointArray that = (ValueGroup.VFloatingPointArray) other;
             return NumberValues.numbersEqual( this, that );
         }
-        else if ( other instanceof IntegralArrayValue )
+        else if ( other instanceof ValueGroup.VIntegerArray )
         {
-            IntegralArrayValue that = (IntegralArrayValue) other;
+            ValueGroup.VIntegerArray that = (ValueGroup.VIntegerArray) other;
             return NumberValues.numbersEqual( this, that );
         }
         return false;
@@ -75,29 +75,7 @@ public final int hashCode()
         return result;
     }
 
-    static int hash( float[] values )
-    {
-        int result = 1;
-        for ( float value : values )
-        {
-            int elementHash = NumberValues.hash( value );
-            result = 31 * result + elementHash;
-        }
-        return result;
-    }
-
-    static int hash( double[] values )
-    {
-        int result = 1;
-        for ( double value : values )
-        {
-            int elementHash = NumberValues.hash( value );
-            result = 31 * result + elementHash;
-        }
-        return result;
-    }
-
-    public int compareTo( IntegralArrayValue other )
+    public int compareTo( ValueGroup.VIntegerArray other )
     {
         int i = 0;
         int length = length();
@@ -111,7 +89,7 @@ public int compareTo( IntegralArrayValue other )
         return x;
     }
 
-    public int compareTo( FloatingPointArrayValue other )
+    public int compareTo( ValueGroup.VFloatingPointArray other )
     {
         int i = 0;
         int length = length();

diff --git a/community/values/src/main/java/org/neo4j/values/FloatingPointNumberValue.java b/community/values/src/main/java/org/neo4j/values/FloatingPointNumberValue.java
@@ -19,7 +19,7 @@
  */
 package org.neo4j.values;
 
-abstract class FloatingPointNumberValue extends NumberValue
+abstract class FloatingPointNumberValue extends ScalarValue implements ValueGroup.VFloatingPoint
 {
     @Override
     public final int hashCode()
@@ -52,12 +52,12 @@ else if ( other instanceof IntegralNumberValue )
         }
     }
 
-    public int compareTo( IntegralNumberValue other )
+    public int compareTo( ValueGroup.VInteger other )
     {
         return NumberValues.compareDoubleAgainstLong( doubleValue(), other.longValue() );
     }
 
-    public int compareTo( NumberValue other )
+    public int compareTo( ValueGroup.VFloatingPoint other )
     {
         return Double.compare( doubleValue(), other.doubleValue() );
     }

diff --git a/community/values/src/main/java/org/neo4j/values/IntegralArrayValue.java b/community/values/src/main/java/org/neo4j/values/IntegralArrayValue.java
@@ -19,10 +19,8 @@
  */
 package org.neo4j.values;
 
-abstract class IntegralArrayValue extends ArrayValue
+abstract class IntegralArrayValue extends ArrayValue implements ValueGroup.VIntegerArray
 {
-    public abstract long longValue( int index );
-
     @Override
     boolean equals( boolean[] x )
     {
@@ -50,14 +48,14 @@ public boolean equals( Object other )
     @Override
     final boolean equals( Value other )
     {
-        if ( other instanceof IntegralArrayValue )
+        if ( other instanceof ValueGroup.VIntegerArray )
         {
-            IntegralArrayValue that = (IntegralArrayValue) other;
+            ValueGroup.VIntegerArray that = (ValueGroup.VIntegerArray) other;
             return NumberValues.numbersEqual( this, that );
         }
-        else if ( other instanceof FloatingPointArrayValue )
+        else if ( other instanceof ValueGroup.VFloatingPointArray )
         {
-            FloatingPointArrayValue that = (FloatingPointArrayValue) other;
+            ValueGroup.VFloatingPointArray that = (ValueGroup.VFloatingPointArray) other;
             return NumberValues.numbersEqual( that, this );
         }
         return false;
@@ -75,51 +73,8 @@ public final int hashCode()
         return result;
     }
 
-    static int hash( byte[] values )
-    {
-        int result = 1;
-        for ( byte value : values )
-        {
-            int elementHash = NumberValues.hash( value );
-            result = 31 * result + elementHash;
-        }
-        return result;
-    }
-
-    static int hash( short[] values )
-    {
-        int result = 1;
-        for ( short value : values )
-        {
-            int elementHash = NumberValues.hash( value );
-            result = 31 * result + elementHash;
-        }
-        return result;
-    }
-
-    static int hash( int[] values )
-    {
-        int result = 1;
-        for ( int value : values )
-        {
-            int elementHash = NumberValues.hash( value );
-            result = 31 * result + elementHash;
-        }
-        return result;
-    }
-
-    static int hash( long[] values )
-    {
-        int result = 1;
-        for ( long value : values )
-        {
-            int elementHash = NumberValues.hash( value );
-            result = 31 * result + elementHash;
-        }
-        return result;
-    }
-
-    public int compareTo( IntegralArrayValue other )
+    @Override
+    public int compareTo( ValueGroup.VIntegerArray other )
     {
         int i = 0;
         int length = length();
@@ -133,7 +88,8 @@ public int compareTo( IntegralArrayValue other )
         return x;
     }
 
-    public int compareTo( FloatingPointArrayValue other )
+    @Override
+    public int compareTo( ValueGroup.VFloatingPointArray other )
     {
         int i = 0;
         int length = length();

diff --git a/community/values/src/main/java/org/neo4j/values/IntegralNumberValue.java b/community/values/src/main/java/org/neo4j/values/IntegralNumberValue.java
@@ -19,15 +19,8 @@
  */
 package org.neo4j.values;
 
-abstract class IntegralNumberValue extends NumberValue
+abstract class IntegralNumberValue extends ScalarValue implements ValueGroup.VInteger
 {
-    abstract long longValue();
-
-    public double doubleValue()
-    {
-        return (double) longValue();
-    }
-
     @Override
     public final int hashCode()
     {
@@ -59,12 +52,12 @@ else if ( other instanceof FloatingPointNumberValue )
         }
     }
 
-    public int compareTo( IntegralNumberValue other )
+    public int compareTo( ValueGroup.VInteger other )
     {
         return Long.compare( longValue(), other.longValue() );
     }
 
-    public int compareTo( NumberValue other )
+    public int compareTo( ValueGroup.VFloatingPoint other )
     {
         return NumberValues.compareLongAgainstDouble( longValue(), other.doubleValue() );
     }