Replace MathUtils.compareLong() by Long.compare()

h2/src/main/org/h2/index/MultiVersionCursor.java

@@ -143,7 +143,7 @@ public class MultiVersionCursor implements Cursor {
                     // version would be compared as well
                     long k1 = deltaRow.getKey();
                     long k2 = baseRow.getKey();
-                    compare = MathUtils.compareLong(k1, k2);
+                    compare = Long.compare(k1, k2);
                 }
                 if (compare == 0) {
                     if (isDeleted) {

h2/src/main/org/h2/tools/ConvertTraceFile.java

@@ -46,7 +46,7 @@ public class ConvertTraceFile extends Tool {
             if (other == this) {
                 return 0;
             }
-            int c = MathUtils.compareLong(other.time, time);
+            int c = Long.compare(other.time, time);
             if (c == 0) {
                 c = MathUtils.compareInt(other.executeCount, executeCount);
                 if (c == 0) {

h2/src/main/org/h2/util/MathUtils.java

@@ -291,18 +291,6 @@ public class MathUtils {
         return a == b ? 0 : a < b ? -1 : 1;
     }
 
-    /**
-     * Compare two values. Returns -1 if the first value is smaller, 1 if
-     * bigger, and 0 if equal.
-     *
-     * @param a the first value
-     * @param b the second value
-     * @return the result
-     */
-    public static int compareLong(long a, long b) {
-        return a == b ? 0 : a < b ? -1 : 1;
-    }
-
     /**
      * Get a cryptographically secure pseudo random long value.
      *

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

@@ -12,7 +12,6 @@ import java.sql.SQLException;
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
 import org.h2.util.DateTimeUtils;
-import org.h2.util.MathUtils;
 import org.h2.util.StringUtils;
 
 /**
@@ -121,7 +120,7 @@ public class ValueDate extends Value {
 
     @Override
     protected int compareSecure(Value o, CompareMode mode) {
-        return MathUtils.compareLong(dateValue, ((ValueDate) o).dateValue);
+        return Long.compare(dateValue, ((ValueDate) o).dateValue);
     }
 
     @Override

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

@@ -12,7 +12,6 @@ import java.sql.SQLException;
 
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
-import org.h2.util.MathUtils;
 
 /**
  * Implementation of the BIGINT data type.
@@ -171,7 +170,7 @@ public class ValueLong extends Value {
     @Override
     protected int compareSecure(Value o, CompareMode mode) {
         ValueLong v = (ValueLong) o;
-        return MathUtils.compareLong(value, v.value);
+        return Long.compare(value, v.value);
     }
 
     @Override

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

@@ -11,7 +11,6 @@ import java.sql.Time;
 import org.h2.api.ErrorCode;
 import org.h2.message.DbException;
 import org.h2.util.DateTimeUtils;
-import org.h2.util.MathUtils;
 import org.h2.util.StringUtils;
 
 /**
@@ -129,7 +128,7 @@ public class ValueTime extends Value {
 
     @Override
     protected int compareSecure(Value o, CompareMode mode) {
-        return MathUtils.compareLong(nanos, ((ValueTime) o).nanos);
+        return Long.compare(nanos, ((ValueTime) o).nanos);
     }
 
     @Override

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

@@ -16,7 +16,6 @@ import org.h2.api.ErrorCode;
 import org.h2.engine.Mode;
 import org.h2.message.DbException;
 import org.h2.util.DateTimeUtils;
-import org.h2.util.MathUtils;
 
 /**
  * Implementation of the TIMESTAMP data type.
@@ -310,11 +309,11 @@ public class ValueTimestamp extends Value {
     @Override
     protected int compareSecure(Value o, CompareMode mode) {
         ValueTimestamp t = (ValueTimestamp) o;
-        int c = MathUtils.compareLong(dateValue, t.dateValue);
+        int c = Long.compare(dateValue, t.dateValue);
         if (c != 0) {
             return c;
         }
-        return MathUtils.compareLong(timeNanos, t.timeNanos);
+        return Long.compare(timeNanos, t.timeNanos);
     }
 
     @Override

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

@@ -14,7 +14,6 @@ import org.h2.api.ErrorCode;
 import org.h2.api.TimestampWithTimeZone;
 import org.h2.message.DbException;
 import org.h2.util.DateTimeUtils;
-import org.h2.util.MathUtils;
 import org.h2.util.StringUtils;
 
 /**
@@ -310,14 +309,14 @@ public class ValueTimestampTimeZone extends Value {
         b -= t.timeZoneOffsetMins;
 
         // compare date
-        int c = MathUtils.compareLong(a, b);
+        int c = Long.compare(a, b);
         if (c != 0) {
             return c;
         }
         // compare time
         long na = timeNanos - (ma * 1000L * 1000L * 1000L * 60L);
         long nb = t.timeNanos - (mb * 1000L * 1000L * 1000L * 60L);
-        return MathUtils.compareLong(na, nb);
+        return Long.compare(na, nb);
     }
 
     @Override

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

@@ -159,7 +159,7 @@ public class ValueUuid extends Value {
         }
         ValueUuid v = (ValueUuid) o;
         if (high == v.high) {
-            return MathUtils.compareLong(low, v.low);
+            return Long.compare(low, v.low);
         }
         return high > v.high ? 1 : -1;
     }