Use constants from ValueDouble and ValueFloat in more places

h2/src/main/org/h2/mvstore/db/ValueDataType.java

@@ -589,13 +589,13 @@ public class ValueDataType implements DataType {
                     ordinal < 5 ? 0 : readVarLong(buff));
         }
         case FLOAT_0_1:
-            return ValueFloat.get(0);
+            return ValueFloat.ZERO;
         case FLOAT_0_1 + 1:
-            return ValueFloat.get(1);
+            return ValueFloat.ONE;
         case DOUBLE_0_1:
-            return ValueDouble.get(0);
+            return ValueDouble.ZERO;
         case DOUBLE_0_1 + 1:
-            return ValueDouble.get(1);
+            return ValueDouble.ONE;
         case Value.DOUBLE:
             return ValueDouble.get(Double.longBitsToDouble(
                     Long.reverse(readVarLong(buff))));

h2/src/main/org/h2/store/Data.java

@@ -809,13 +809,13 @@ public class Data {
         case Value.STRING_FIXED:
             return ValueStringFixed.get(readString());
         case FLOAT_0_1:
-            return ValueFloat.get(0);
+            return ValueFloat.ZERO;
         case FLOAT_0_1 + 1:
-            return ValueFloat.get(1);
+            return ValueFloat.ONE;
         case DOUBLE_0_1:
-            return ValueDouble.get(0);
+            return ValueDouble.ZERO;
         case DOUBLE_0_1 + 1:
-            return ValueDouble.get(1);
+            return ValueDouble.ONE;
         case Value.DOUBLE:
             return ValueDouble.get(Double.longBitsToDouble(
                     Long.reverse(readVarLong())));

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

@@ -963,7 +963,7 @@ public abstract class Value {
     private ValueDouble convertToDouble() {
         switch (getType()) {
         case BOOLEAN:
-            return ValueDouble.get(getBoolean() ? 1 : 0);
+            return getBoolean() ? ValueDouble.ONE : ValueDouble.ZERO;
         case BYTE:
         case SHORT:
         case INT:
@@ -984,7 +984,7 @@ public abstract class Value {
     private ValueFloat convertToFloat() {
         switch (getType()) {
         case BOOLEAN:
-            return ValueFloat.get(getBoolean() ? 1 : 0);
+            return getBoolean() ? ValueFloat.ONE : ValueFloat.ZERO;
         case BYTE:
         case SHORT:
         case INT:

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

@@ -28,12 +28,20 @@ public class ValueDouble extends Value {
     public static final int DISPLAY_SIZE = 24;
 
     /**
-     * Double.doubleToLongBits(0.0)
+     * Double.doubleToLongBits(0d)
      */
-    public static final long ZERO_BITS = Double.doubleToLongBits(0.0);
+    public static final long ZERO_BITS = 0L;
+
+    /**
+     * The value 0.
+     */
+    public static final ValueDouble ZERO = new ValueDouble(0d);
+
+    /**
+     * The value 1.
+     */
+    public static final ValueDouble ONE = new ValueDouble(1d);
 
-    private static final ValueDouble ZERO = new ValueDouble(0.0);
-    private static final ValueDouble ONE = new ValueDouble(1.0);
     private static final ValueDouble NAN = new ValueDouble(Double.NaN);
 
     private final double value;
@@ -45,24 +53,24 @@ public class ValueDouble extends Value {
     @Override
     public Value add(Value v) {
         ValueDouble v2 = (ValueDouble) v;
-        return ValueDouble.get(value + v2.value);
+        return get(value + v2.value);
     }
 
     @Override
     public Value subtract(Value v) {
         ValueDouble v2 = (ValueDouble) v;
-        return ValueDouble.get(value - v2.value);
+        return get(value - v2.value);
     }
 
     @Override
     public Value negate() {
-        return ValueDouble.get(-value);
+        return get(-value);
     }
 
     @Override
     public Value multiply(Value v) {
         ValueDouble v2 = (ValueDouble) v;
-        return ValueDouble.get(value * v2.value);
+        return get(value * v2.value);
     }
 
     @Override
@@ -71,7 +79,7 @@ public class ValueDouble extends Value {
         if (v2.value == 0.0) {
             throw DbException.get(ErrorCode.DIVISION_BY_ZERO_1, getSQL());
         }
-        return ValueDouble.get(value / v2.value);
+        return get(value / v2.value);
     }
 
     @Override
@@ -80,7 +88,7 @@ public class ValueDouble extends Value {
         if (other.value == 0) {
             throw DbException.get(ErrorCode.DIVISION_BY_ZERO_1, getSQL());
         }
-        return ValueDouble.get(value % other.value);
+        return get(value % other.value);
     }
 
     @Override

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

@@ -16,11 +16,6 @@ import org.h2.message.DbException;
  */
 public class ValueFloat extends Value {
 
-    /**
-     * Float.floatToIntBits(0.0F).
-     */
-    public static final int ZERO_BITS = Float.floatToIntBits(0.0F);
-
     /**
      * The precision in digits.
      */
@@ -32,8 +27,21 @@ public class ValueFloat extends Value {
      */
     static final int DISPLAY_SIZE = 15;
 
-    private static final ValueFloat ZERO = new ValueFloat(0.0F);
-    private static final ValueFloat ONE = new ValueFloat(1.0F);
+    /**
+     * Float.floatToIntBits(0f).
+     */
+    public static final int ZERO_BITS = 0;
+
+    /**
+     * The value 0.
+     */
+    public static final ValueFloat ZERO = new ValueFloat(0f);
+
+    /**
+     * The value 1.
+     */
+    public static final ValueFloat ONE = new ValueFloat(1f);
+
     private static final ValueFloat NAN = new ValueFloat(Float.NaN);
 
     private final float value;
@@ -45,24 +53,24 @@ public class ValueFloat extends Value {
     @Override
     public Value add(Value v) {
         ValueFloat v2 = (ValueFloat) v;
-        return ValueFloat.get(value + v2.value);
+        return get(value + v2.value);
     }
 
     @Override
     public Value subtract(Value v) {
         ValueFloat v2 = (ValueFloat) v;
-        return ValueFloat.get(value - v2.value);
+        return get(value - v2.value);
     }
 
     @Override
     public Value negate() {
-        return ValueFloat.get(-value);
+        return get(-value);
     }
 
     @Override
     public Value multiply(Value v) {
         ValueFloat v2 = (ValueFloat) v;
-        return ValueFloat.get(value * v2.value);
+        return get(value * v2.value);
     }
 
     @Override
@@ -71,7 +79,7 @@ public class ValueFloat extends Value {
         if (v2.value == 0.0) {
             throw DbException.get(ErrorCode.DIVISION_BY_ZERO_1, getSQL());
         }
-        return ValueFloat.get(value / v2.value);
+        return get(value / v2.value);
     }
 
     @Override
@@ -80,7 +88,7 @@ public class ValueFloat extends Value {
         if (other.value == 0) {
             throw DbException.get(ErrorCode.DIVISION_BY_ZERO_1, getSQL());
         }
-        return ValueFloat.get(value % other.value);
+        return get(value % other.value);
     }
 
     @Override