rename compareTypeSave to compareTypeSafe

lealone · Aug 21, 2015 · 02387ad · 02387ad
1 parent 9a8e850
commit 02387ad
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/lealone-common/src/main/java/org/lealone/value/Value.java b/lealone-common/src/main/java/org/lealone/value/Value.java
@@ -845,7 +845,7 @@ public Value convertTo(int targetType) {
      * @return 0 if both values are equal, -1 if the other value is smaller, and
      *         1 otherwise
      */
-    public final int compareTypeSave(Value v, CompareMode mode) {
+    public final int compareTypeSafe(Value v, CompareMode mode) {
         if (this == v) {
             return 0;
         } else if (this == ValueNull.INSTANCE) {

diff --git a/lealone-mvdb/src/main/java/org/lealone/dbobject/index/ValueDataType.java b/lealone-mvdb/src/main/java/org/lealone/dbobject/index/ValueDataType.java
@@ -120,18 +120,18 @@ private int compareValues(Value a, Value b, int sortType) {
         if (aNull || bNull) {
             return SortOrder.compareNull(aNull, sortType);
         }
-        int comp = compareTypeSave(a, b);
+        int comp = compareTypeSafe(a, b);
         if ((sortType & SortOrder.DESCENDING) != 0) {
             comp = -comp;
         }
         return comp;
     }
 
-    private int compareTypeSave(Value a, Value b) {
+    private int compareTypeSafe(Value a, Value b) {
         if (a == b) {
             return 0;
         }
-        return a.compareTypeSave(b, compareMode);
+        return a.compareTypeSafe(b, compareMode);
     }
 
     @Override

diff --git a/lealone-sql/src/main/java/org/lealone/dbobject/constraint/ConstraintReferential.java b/lealone-sql/src/main/java/org/lealone/dbobject/constraint/ConstraintReferential.java
@@ -388,7 +388,7 @@ private boolean existsRow(Session session, Index searchIndex, SearchRow check, R
                 int idx = cols[i].getColumnId();
                 Value c = check.getValue(idx);
                 Value f = found.getValue(idx);
-                if (searchTable.compareTypeSave(c, f) != 0) {
+                if (searchTable.compareTypeSafe(c, f) != 0) {
                     allEqual = false;
                     break;
                 }

diff --git a/lealone-sql/src/main/java/org/lealone/dbobject/index/IndexBase.java b/lealone-sql/src/main/java/org/lealone/dbobject/index/IndexBase.java
@@ -316,7 +316,7 @@ private int compareValues(Value a, Value b, int sortType) {
         if (aNull || bNull) {
             return SortOrder.compareNull(aNull, sortType);
         }
-        int comp = table.compareTypeSave(a, b);
+        int comp = table.compareTypeSafe(a, b);
         if ((sortType & SortOrder.DESCENDING) != 0) {
             comp = -comp;
         }

diff --git a/lealone-sql/src/main/java/org/lealone/dbobject/table/Table.java b/lealone-sql/src/main/java/org/lealone/dbobject/table/Table.java
@@ -1072,14 +1072,14 @@ public boolean isPersistData() {
      * @return 0 if both values are equal, -1 if the first value is smaller, and
      *         1 otherwise
      */
-    public int compareTypeSave(Value a, Value b) {
+    public int compareTypeSafe(Value a, Value b) {
         if (a == b) {
             return 0;
         }
         int dataType = Value.getHigherOrder(a.getType(), b.getType());
         a = a.convertTo(dataType);
         b = b.convertTo(dataType);
-        return a.compareTypeSave(b, compareMode);
+        return a.compareTypeSafe(b, compareMode);
     }
 
     public CompareMode getCompareMode() {

diff --git a/lealone-sql/src/main/java/org/lealone/engine/Database.java b/lealone-sql/src/main/java/org/lealone/engine/Database.java
@@ -421,8 +421,8 @@ public int compare(Value a, Value b) {
      * @return 0 if both values are equal, -1 if the first value is smaller, and
      *         1 otherwise
      */
-    public int compareTypeSave(Value a, Value b) {
-        return a.compareTypeSave(b, compareMode);
+    public int compareTypeSafe(Value a, Value b) {
+        return a.compareTypeSafe(b, compareMode);
     }
 
     public long getModificationDataId() {

diff --git a/lealone-sql/src/main/java/org/lealone/expression/Function.java b/lealone-sql/src/main/java/org/lealone/expression/Function.java
@@ -864,7 +864,7 @@ private Value getSimpleValue(Session session, Value v0, Expression[] args, Value
                     if (result == ValueNull.INSTANCE) {
                         result = v;
                     } else {
-                        int comp = database.compareTypeSave(result, v);
+                        int comp = database.compareTypeSafe(result, v);
                         if (info.type == GREATEST && comp < 0) {
                             result = v;
                         } else if (info.type == LEAST && comp > 0) {