Merge branch 'tomandersen/pipelines' into tomandersen/pipelines-evaluate

# Conflicts:
#	firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.kt

Author: tom-andersen

firebase-firestore/src/main/java/com/google/cloud/datastore/core/number/NumberComparisonHelper.java

@@ -50,7 +50,7 @@ public static int firestoreCompareDoubleWithLong(double doubleValue, long longVa
     }
 
     long doubleAsLong = (long) doubleValue;
-    int cmp = compareLongs(doubleAsLong, longValue);
+    int cmp = Long.compare(doubleAsLong, longValue);
     if (cmp != 0) {
       return cmp;
     }
@@ -60,11 +60,6 @@ public static int firestoreCompareDoubleWithLong(double doubleValue, long longVa
     return firestoreCompareDoubles(doubleValue, longAsDouble);
   }
 
-  /** Compares longs. */
-  public static int compareLongs(long leftLong, long rightLong) {
-    return Long.compare(leftLong, rightLong);
-  }
-
   /**
    * Compares doubles with Firestore query semantics: NaN precedes all other numbers and equals
    * itself, all zeroes are equal.

firebase-firestore/src/main/java/com/google/firebase/firestore/GeoPoint.java

@@ -14,9 +14,10 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.cloud.datastore.core.number.NumberComparisonHelper.firestoreCompareDoubles;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.firebase.firestore.util.Util;
 
 /** Immutable class representing a {@code GeoPoint} in Cloud Firestore */
 public class GeoPoint implements Comparable<GeoPoint> {
@@ -52,9 +53,9 @@ public double getLongitude() {
 
   @Override
   public int compareTo(@NonNull GeoPoint other) {
-    int comparison = Util.compareDoubles(latitude, other.latitude);
+    int comparison = firestoreCompareDoubles(latitude, other.latitude);
     if (comparison == 0) {
-      return Util.compareDoubles(longitude, other.longitude);
+      return firestoreCompareDoubles(longitude, other.longitude);
     } else {
       return comparison;
     }

firebase-firestore/src/main/java/com/google/firebase/firestore/core/View.java

@@ -17,7 +17,6 @@
 import static com.google.firebase.firestore.core.Query.LimitType.LIMIT_TO_FIRST;
 import static com.google.firebase.firestore.core.Query.LimitType.LIMIT_TO_LAST;
 import static com.google.firebase.firestore.util.Assert.hardAssert;
-import static com.google.firebase.firestore.util.Util.compareIntegers;
 
 import androidx.annotation.Nullable;
 import com.google.firebase.database.collection.ImmutableSortedMap;
@@ -301,7 +300,8 @@ public ViewChange applyChanges(
     Collections.sort(
         viewChanges,
         (DocumentViewChange o1, DocumentViewChange o2) -> {
-          int typeComp = compareIntegers(View.changeTypeOrder(o1), View.changeTypeOrder(o2));
+          int i1 = View.changeTypeOrder(o1);
+          int typeComp = Integer.compare(i1, View.changeTypeOrder(o2));
           if (typeComp != 0) {
             return typeComp;
           }

firebase-firestore/src/main/java/com/google/firebase/firestore/local/DocumentReference.java

@@ -14,8 +14,6 @@
 
 package com.google.firebase.firestore.local;
 
-import static com.google.firebase.firestore.util.Util.compareIntegers;
-
 import com.google.firebase.firestore.model.DocumentKey;
 import java.util.Comparator;
 
@@ -60,12 +58,12 @@ int getId() {
           return keyComp;
         }
 
-        return compareIntegers(o1.targetOrBatchId, o2.targetOrBatchId);
+        return Integer.compare(o1.targetOrBatchId, o2.targetOrBatchId);
       };
 
   static final Comparator<DocumentReference> BY_TARGET =
       (o1, o2) -> {
-        int targetComp = compareIntegers(o1.targetOrBatchId, o2.targetOrBatchId);
+        int targetComp = Integer.compare(o1.targetOrBatchId, o2.targetOrBatchId);
 
         if (targetComp != 0) {
           return targetComp;

firebase-firestore/src/main/java/com/google/firebase/firestore/local/MemoryMutationQueue.java

@@ -28,7 +28,6 @@
 import com.google.firebase.firestore.model.mutation.Mutation;
 import com.google.firebase.firestore.model.mutation.MutationBatch;
 import com.google.firebase.firestore.remote.WriteStream;
-import com.google.firebase.firestore.util.Util;
 import com.google.protobuf.ByteString;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -216,7 +215,7 @@ public List<MutationBatch> getAllMutationBatchesAffectingDocumentKey(DocumentKey
   public List<MutationBatch> getAllMutationBatchesAffectingDocumentKeys(
       Iterable<DocumentKey> documentKeys) {
     ImmutableSortedSet<Integer> uniqueBatchIDs =
-        new ImmutableSortedSet<Integer>(emptyList(), Util.comparator());
+        new ImmutableSortedSet<Integer>(emptyList(), Comparable::compareTo);
 
     for (DocumentKey key : documentKeys) {
       DocumentReference start = new DocumentReference(key, 0);
@@ -255,7 +254,7 @@ public List<MutationBatch> getAllMutationBatchesAffectingQuery(Query query) {
 
     // Find unique batchIDs referenced by all documents potentially matching the query.
     ImmutableSortedSet<Integer> uniqueBatchIDs =
-        new ImmutableSortedSet<Integer>(emptyList(), Util.comparator());
+        new ImmutableSortedSet<Integer>(emptyList(), Comparable::compareTo);
 
     Iterator<DocumentReference> iterator = batchesByDocumentKey.iteratorFrom(start);
     while (iterator.hasNext()) {

firebase-firestore/src/main/java/com/google/firebase/firestore/local/SQLiteMutationQueue.java

@@ -30,7 +30,6 @@
 import com.google.firebase.firestore.model.mutation.MutationBatch;
 import com.google.firebase.firestore.remote.WriteStream;
 import com.google.firebase.firestore.util.Consumer;
-import com.google.firebase.firestore.util.Util;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
@@ -324,7 +323,7 @@ public List<MutationBatch> getAllMutationBatchesAffectingDocumentKeys(
       Collections.sort(
           result,
           (MutationBatch lhs, MutationBatch rhs) ->
-              Util.compareIntegers(lhs.getBatchId(), rhs.getBatchId()));
+              Integer.compare(lhs.getBatchId(), rhs.getBatchId()));
     }
     return result;
   }

firebase-firestore/src/main/java/com/google/firebase/firestore/model/BasePath.java

@@ -107,7 +107,7 @@ public int compareTo(@NonNull B o) {
       }
       i++;
     }
-    return Util.compareIntegers(myLength, theirLength);
+    return Integer.compare(myLength, theirLength);
   }
 
   private static int compareSegments(String lhs, String rhs) {

firebase-firestore/src/main/java/com/google/firebase/firestore/model/Values.kt

@@ -13,6 +13,8 @@
 // limitations under the License.
 package com.google.firebase.firestore.model
 
+import com.google.cloud.datastore.core.number.NumberComparisonHelper.firestoreCompareDoubleWithLong
+import com.google.cloud.datastore.core.number.NumberComparisonHelper.firestoreCompareDoubles
 import com.google.firebase.firestore.Blob
 import com.google.firebase.firestore.DocumentReference
 import com.google.firebase.firestore.GeoPoint
@@ -28,7 +30,6 @@ import com.google.protobuf.ByteString
 import com.google.protobuf.NullValue
 import com.google.protobuf.Timestamp
 import com.google.type.LatLng
-import java.lang.Double.doubleToLongBits
 import java.util.Date
 import java.util.TreeMap
 import kotlin.math.min
@@ -175,42 +176,40 @@ internal object Values {
       ValueTypeCase.INTEGER_VALUE ->
         when (right.valueTypeCase) {
           ValueTypeCase.INTEGER_VALUE -> left.integerValue == right.integerValue
-          ValueTypeCase.DOUBLE_VALUE -> right.doubleValue.compareTo(left.integerValue) == 0
+          ValueTypeCase.DOUBLE_VALUE ->
+            firestoreCompareDoubleWithLong(right.doubleValue, left.integerValue) == 0
           else -> false
         }
       ValueTypeCase.DOUBLE_VALUE ->
         when (right.valueTypeCase) {
           ValueTypeCase.INTEGER_VALUE ->
-            compareDoubleWithLong(left.doubleValue, right.integerValue) == 0
+            firestoreCompareDoubleWithLong(left.doubleValue, right.integerValue) == 0
           ValueTypeCase.DOUBLE_VALUE ->
-            doubleToLongBits(left.doubleValue) == doubleToLongBits(right.doubleValue)
+            firestoreCompareDoubles(left.doubleValue, right.doubleValue) == 0
           else -> false
         }
       else -> false
     }
 
-  private fun compareDoubleWithLong(double: Double, long: Long): Int =
-    if (double.isNaN()) -1 else double.compareTo(long)
+    private fun strictArrayEquals(left: Value, right: Value): Boolean? {
+        val leftArray = left.arrayValue
+        val rightArray = right.arrayValue
 
-  private fun strictArrayEquals(left: Value, right: Value): Boolean? {
-    val leftArray = left.arrayValue
-    val rightArray = right.arrayValue
-
-    if (leftArray.valuesCount != rightArray.valuesCount) {
-      return false
-    }
+        if (leftArray.valuesCount != rightArray.valuesCount) {
+            return false
+        }
 
-    var foundNull = false
-    for (i in 0 until leftArray.valuesCount) {
-      val equals = strictEquals(leftArray.getValues(i), rightArray.getValues(i))
-      if (equals === null) {
-        foundNull = true
-      } else if (!equals) {
-        return false
-      }
+        var foundNull = false
+        for (i in 0 until leftArray.valuesCount) {
+            val equals = strictEquals(leftArray.getValues(i), rightArray.getValues(i))
+            if (equals === null) {
+                foundNull = true
+            } else if (!equals) {
+                return false
+            }
+        }
+        return if (foundNull) null else true
     }
-    return if (foundNull) null else true
-  }
 
   private fun arrayEquals(left: Value, right: Value): Boolean {
     val leftArray = left.arrayValue
@@ -286,7 +285,7 @@ internal object Values {
     val rightType = typeOrder(right)
 
     if (leftType != rightType) {
-      return Util.compareIntegers(leftType, rightType)
+      return leftType.compareTo(rightType)
     }
 
     return compareInternal(leftType, left, right)
@@ -296,7 +295,7 @@ internal object Values {
     when (leftType) {
       TYPE_ORDER_NULL,
       TYPE_ORDER_MAX_VALUE -> 0
-      TYPE_ORDER_BOOLEAN -> Util.compareBooleans(left.booleanValue, right.booleanValue)
+      TYPE_ORDER_BOOLEAN -> left.booleanValue.compareTo(right.booleanValue)
       TYPE_ORDER_NUMBER -> compareNumbers(left, right)
       TYPE_ORDER_TIMESTAMP -> compareTimestamps(left.timestampValue, right.timestampValue)
       TYPE_ORDER_SERVER_TIMESTAMP ->
@@ -359,27 +358,27 @@ internal object Values {
   private fun compareNumbers(left: Value, right: Value): Int {
     if (left.hasDoubleValue()) {
       if (right.hasDoubleValue()) {
-        return Util.compareDoubles(left.doubleValue, right.doubleValue)
+        return firestoreCompareDoubles(left.doubleValue, right.doubleValue)
       } else if (right.hasIntegerValue()) {
-        return Util.compareMixed(left.doubleValue, right.integerValue)
+        return firestoreCompareDoubleWithLong(left.doubleValue, right.integerValue)
       }
     } else if (left.hasIntegerValue()) {
       if (right.hasIntegerValue()) {
-        return Util.compareLongs(left.integerValue, right.integerValue)
+        return java.lang.Long.compare(left.integerValue, right.integerValue)
       } else if (right.hasDoubleValue()) {
-        return -1 * Util.compareMixed(right.doubleValue, left.integerValue)
+        return -1 * firestoreCompareDoubleWithLong(right.doubleValue, left.integerValue)
       }
     }
 
     throw Assert.fail("Unexpected values: %s vs %s", left, right)
   }
 
   private fun compareTimestamps(left: Timestamp, right: Timestamp): Int {
-    val cmp = Util.compareLongs(left.seconds, right.seconds)
+    val cmp = left.seconds.compareTo(right.seconds)
     if (cmp != 0) {
       return cmp
     }
-    return Util.compareIntegers(left.nanos, right.nanos)
+    return left.nanos.compareTo(right.nanos)
   }
 
   private fun compareReferences(leftPath: String, rightPath: String): Int {
@@ -393,13 +392,13 @@ internal object Values {
         return cmp
       }
     }
-    return Util.compareIntegers(leftSegments.size, rightSegments.size)
+    return leftSegments.size.compareTo(rightSegments.size)
   }
 
   private fun compareGeoPoints(left: LatLng, right: LatLng): Int {
-    val comparison = Util.compareDoubles(left.latitude, right.latitude)
+    val comparison = firestoreCompareDoubles(left.latitude, right.latitude)
     if (comparison == 0) {
-      return Util.compareDoubles(left.longitude, right.longitude)
+      return firestoreCompareDoubles(left.longitude, right.longitude)
     }
     return comparison
   }
@@ -412,7 +411,7 @@ internal object Values {
         return cmp
       }
     }
-    return Util.compareIntegers(left.valuesCount, right.valuesCount)
+    return left.valuesCount.compareTo(right.valuesCount)
   }
 
   private fun compareMaps(left: MapValue, right: MapValue): Int {
@@ -432,7 +431,7 @@ internal object Values {
     }
 
     // Only equal if both iterators are exhausted.
-    return Util.compareBooleans(iterator1.hasNext(), iterator2.hasNext())
+    return iterator1.hasNext().compareTo(iterator2.hasNext())
   }
 
   private fun compareVectors(left: MapValue, right: MapValue): Int {
@@ -443,8 +442,7 @@ internal object Values {
     val leftArrayValue = leftMap[VECTOR_MAP_VECTORS_KEY]!!.arrayValue
     val rightArrayValue = rightMap[VECTOR_MAP_VECTORS_KEY]!!.arrayValue
 
-    val lengthCompare =
-      Util.compareIntegers(leftArrayValue.valuesCount, rightArrayValue.valuesCount)
+    val lengthCompare = leftArrayValue.valuesCount.compareTo(rightArrayValue.valuesCount)
     if (lengthCompare != 0) {
       return lengthCompare
     }