Merge compareTypeSafe() and compareSecure() methods of Value

h2/src/main/org/h2/value/Value.java

@@ -265,16 +265,6 @@ public abstract class Value {
     public abstract void set(PreparedStatement prep, int parameterIndex)
             throws SQLException;
 
-    /**
-     * Compare the value with another value of the same type.
-     *
-     * @param v the other value
-     * @param mode the compare mode
-     * @return 0 if both values are equal, -1 if the other value is smaller, and
-     *         1 otherwise
-     */
-    protected abstract int compareSecure(Value v, CompareMode mode);
-
     @Override
     public abstract int hashCode();
 
@@ -1157,9 +1147,7 @@ public abstract class Value {
      * @return 0 if both values are equal, -1 if the other value is smaller, and
      *         1 otherwise
      */
-    public final int compareTypeSafe(Value v, CompareMode mode) {
-        return compareSecure(v, mode);
-    }
+    public abstract int compareTypeSafe(Value v, CompareMode mode);
 
     /**
      * Compare this value against another value using the specified compare
@@ -1194,7 +1182,7 @@ public abstract class Value {
                 v = v.convertTo(dataType, databaseMode);
             }
         }
-        return l.compareSecure(v, compareMode);
+        return l.compareTypeSafe(v, compareMode);
     }
 
     public int getScale() {

h2/src/main/org/h2/value/ValueArray.java

@@ -11,7 +11,6 @@ import java.sql.SQLException;
 import java.util.Arrays;
 
 import org.h2.engine.Constants;
-import org.h2.engine.Mode;
 import org.h2.engine.SysProperties;
 import org.h2.util.MathUtils;
 import org.h2.util.StatementBuilder;
@@ -99,7 +98,7 @@ public class ValueArray extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
+    public int compareTypeSafe(Value o, CompareMode mode) {
         ValueArray v = (ValueArray) o;
         if (values == v.values) {
             return 0;

h2/src/main/org/h2/value/ValueBoolean.java

@@ -66,9 +66,8 @@ public class ValueBoolean extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueBoolean v = (ValueBoolean) o;
-        return Boolean.compare(value, v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return Boolean.compare(value, ((ValueBoolean) o).value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueByte.java

@@ -108,9 +108,8 @@ public class ValueByte extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueByte v = (ValueByte) o;
-        return Integer.compare(value, v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return Integer.compare(value, ((ValueByte) o).value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueBytes.java

@@ -94,7 +94,7 @@ public class ValueBytes extends Value {
     }
 
     @Override
-    protected int compareSecure(Value v, CompareMode mode) {
+    public int compareTypeSafe(Value v, CompareMode mode) {
         byte[] v2 = ((ValueBytes) v).value;
         if (mode.isBinaryUnsigned()) {
             return Bits.compareNotNullUnsigned(value, v2);

h2/src/main/org/h2/value/ValueDate.java

@@ -113,7 +113,7 @@ public class ValueDate extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
+    public int compareTypeSafe(Value o, CompareMode mode) {
         return Long.compare(dateValue, ((ValueDate) o).dateValue);
     }
 

h2/src/main/org/h2/value/ValueDecimal.java

@@ -127,9 +127,8 @@ public class ValueDecimal extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueDecimal v = (ValueDecimal) o;
-        return value.compareTo(v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return value.compareTo(((ValueDecimal) o).value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueDouble.java

@@ -101,9 +101,8 @@ public class ValueDouble extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueDouble v = (ValueDouble) o;
-        return Double.compare(value, v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return Double.compare(value, ((ValueDouble) o).value);
     }
 
     @Override
@@ -180,7 +179,7 @@ public class ValueDouble extends Value {
         if (!(other instanceof ValueDouble)) {
             return false;
         }
-        return compareSecure((ValueDouble) other, null) == 0;
+        return compareTypeSafe((ValueDouble) other, null) == 0;
     }
 
 }

h2/src/main/org/h2/value/ValueEnumBase.java

@@ -33,7 +33,7 @@ public class ValueEnumBase extends Value {
     }
 
     @Override
-    protected int compareSecure(final Value v, final CompareMode mode) {
+    public int compareTypeSafe(Value v, CompareMode mode) {
         return Integer.compare(getInt(), v.getInt());
     }
 

h2/src/main/org/h2/value/ValueFloat.java

@@ -102,9 +102,8 @@ public class ValueFloat extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueFloat v = (ValueFloat) o;
-        return Float.compare(value, v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return Float.compare(value, ((ValueFloat) o).value);
     }
 
     @Override
@@ -180,7 +179,7 @@ public class ValueFloat extends Value {
         if (!(other instanceof ValueFloat)) {
             return false;
         }
-        return compareSecure((ValueFloat) other, null) == 0;
+        return compareTypeSafe((ValueFloat) other, null) == 0;
     }
 
 }

h2/src/main/org/h2/value/ValueGeometry.java

@@ -243,9 +243,8 @@ public class ValueGeometry extends Value {
     }
 
     @Override
-    protected int compareSecure(Value v, CompareMode mode) {
-        Geometry g = ((ValueGeometry) v).getGeometryNoCopy();
-        return getGeometryNoCopy().compareTo(g);
+    public int compareTypeSafe(Value v, CompareMode mode) {
+        return getGeometryNoCopy().compareTo(((ValueGeometry) v).getGeometryNoCopy());
     }
 
     @Override

h2/src/main/org/h2/value/ValueInt.java

@@ -141,9 +141,8 @@ public class ValueInt extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueInt v = (ValueInt) o;
-        return Integer.compare(value, v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return Integer.compare(value, ((ValueInt) o).value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueJavaObject.java

@@ -102,7 +102,7 @@ public class ValueJavaObject extends ValueBytes {
         }
 
         @Override
-        protected int compareSecure(Value v, CompareMode mode) {
+        public int compareTypeSafe(Value v, CompareMode mode) {
             Object o1 = getObject();
             Object o2 = v.getObject();
 

h2/src/main/org/h2/value/ValueLob.java

@@ -515,7 +515,7 @@ public class ValueLob extends Value {
     }
 
     @Override
-    protected int compareSecure(Value v, CompareMode mode) {
+    public int compareTypeSafe(Value v, CompareMode mode) {
         return compare(this, v);
     }
 
@@ -613,7 +613,7 @@ public class ValueLob extends Value {
     public boolean equals(Object other) {
         if (other instanceof ValueLob) {
             ValueLob o = (ValueLob) other;
-            return valueType == o.valueType && compareSecure(o, null) == 0;
+            return valueType == o.valueType && compareTypeSafe(o, null) == 0;
         }
         return false;
     }

h2/src/main/org/h2/value/ValueLobDb.java

@@ -375,7 +375,7 @@ public class ValueLobDb extends Value {
     }
 
     @Override
-    protected int compareSecure(Value v, CompareMode mode) {
+    public int compareTypeSafe(Value v, CompareMode mode) {
         if (v instanceof ValueLobDb) {
             ValueLobDb v2 = (ValueLobDb) v;
             if (v == this) {
@@ -511,7 +511,7 @@ public class ValueLobDb extends Value {
         ValueLobDb otherLob = (ValueLobDb) other;
         if (hashCode() != otherLob.hashCode())
             return false;
-        return compareSecure((Value) other, null) == 0;
+        return compareTypeSafe((Value) other, null) == 0;
     }
 
     @Override

h2/src/main/org/h2/value/ValueLong.java

@@ -161,9 +161,8 @@ public class ValueLong extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueLong v = (ValueLong) o;
-        return Long.compare(value, v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return Long.compare(value, ((ValueLong) o).value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueNull.java

@@ -139,7 +139,7 @@ public class ValueNull extends Value {
     }
 
     @Override
-    protected int compareSecure(Value v, CompareMode mode) {
+    public int compareTypeSafe(Value v, CompareMode mode) {
         throw DbException.throwInternalError("compare null");
     }
 

h2/src/main/org/h2/value/ValueResultSet.java

@@ -116,7 +116,7 @@ public class ValueResultSet extends Value {
     }
 
     @Override
-    protected int compareSecure(Value v, CompareMode mode) {
+    public int compareTypeSafe(Value v, CompareMode mode) {
         return this == v ? 0 : super.toString().compareTo(v.toString());
     }
 

h2/src/main/org/h2/value/ValueShort.java

@@ -108,9 +108,8 @@ public class ValueShort extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueShort v = (ValueShort) o;
-        return Integer.compare(value, v.value);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return Integer.compare(value, ((ValueShort) o).value);
     }
 
     @Override

h2/src/main/org/h2/value/ValueString.java

@@ -45,10 +45,8 @@ public class ValueString extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        // compatibility: the other object could be another type
-        ValueString v = (ValueString) o;
-        return mode.compareString(value, v.value, false);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return mode.compareString(value, ((ValueString) o).value, false);
     }
 
     @Override

h2/src/main/org/h2/value/ValueStringIgnoreCase.java

@@ -27,9 +27,8 @@ public class ValueStringIgnoreCase extends ValueString {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
-        ValueStringIgnoreCase v = (ValueStringIgnoreCase) o;
-        return mode.compareString(value, v.value, true);
+    public int compareTypeSafe(Value o, CompareMode mode) {
+        return mode.compareString(value, ((ValueStringIgnoreCase) o).value, true);
     }
 
     @Override

h2/src/main/org/h2/value/ValueTime.java

@@ -181,7 +181,7 @@ public class ValueTime extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
+    public int compareTypeSafe(Value o, CompareMode mode) {
         return Long.compare(nanos, ((ValueTime) o).nanos);
     }
 

h2/src/main/org/h2/value/ValueTimestamp.java

@@ -235,7 +235,7 @@ public class ValueTimestamp extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
+    public int compareTypeSafe(Value o, CompareMode mode) {
         ValueTimestamp t = (ValueTimestamp) o;
         int c = Long.compare(dateValue, t.dateValue);
         if (c != 0) {

h2/src/main/org/h2/value/ValueTimestampTimeZone.java

@@ -224,7 +224,7 @@ public class ValueTimestampTimeZone extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
+    public int compareTypeSafe(Value o, CompareMode mode) {
         ValueTimestampTimeZone t = (ValueTimestampTimeZone) o;
         // Maximum time zone offset is +/-18 hours so difference in days between local
         // and UTC cannot be more than one day

h2/src/main/org/h2/value/ValueUuid.java

@@ -163,7 +163,7 @@ public class ValueUuid extends Value {
     }
 
     @Override
-    protected int compareSecure(Value o, CompareMode mode) {
+    public int compareTypeSafe(Value o, CompareMode mode) {
         if (o == this) {
             return 0;
         }
@@ -176,7 +176,7 @@ public class ValueUuid extends Value {
 
     @Override
     public boolean equals(Object other) {
-        return other instanceof ValueUuid && compareSecure((Value) other, null) == 0;
+        return other instanceof ValueUuid && compareTypeSafe((Value) other, null) == 0;
     }
 
     @Override

h2/src/test/org/h2/test/jdbc/TestCustomDataTypesHandler.java

@@ -371,7 +371,7 @@ public class TestCustomDataTypesHandler extends TestDb {
         }
 
         @Override
-        protected int compareSecure(Value v, CompareMode mode) {
+        public int compareTypeSafe(Value v, CompareMode mode) {
             return val.compare((ComplexNumber) v.getObject());
         }