Additional Realtime Expression Support

Author: tom-andersen

firebase-firestore/api.txt

@@ -1063,7 +1063,7 @@ package com.google.firebase.firestore.pipeline {
     method public static final com.google.firebase.firestore.pipeline.BooleanExpr lt(com.google.firebase.firestore.pipeline.Expr left, Object right);
     method public final com.google.firebase.firestore.pipeline.BooleanExpr lt(Object value);
     method public static final com.google.firebase.firestore.pipeline.BooleanExpr lt(String fieldName, com.google.firebase.firestore.pipeline.Expr expression);
-    method public static final com.google.firebase.firestore.pipeline.BooleanExpr lt(String fieldName, Object right);
+    method public static final com.google.firebase.firestore.pipeline.BooleanExpr lt(String fieldName, Object value);
     method public final com.google.firebase.firestore.pipeline.BooleanExpr lte(com.google.firebase.firestore.pipeline.Expr other);
     method public static final com.google.firebase.firestore.pipeline.BooleanExpr lte(com.google.firebase.firestore.pipeline.Expr left, com.google.firebase.firestore.pipeline.Expr right);
     method public static final com.google.firebase.firestore.pipeline.BooleanExpr lte(com.google.firebase.firestore.pipeline.Expr left, Object right);
@@ -1377,7 +1377,7 @@ package com.google.firebase.firestore.pipeline {
     method public com.google.firebase.firestore.pipeline.BooleanExpr lt(com.google.firebase.firestore.pipeline.Expr left, com.google.firebase.firestore.pipeline.Expr right);
     method public com.google.firebase.firestore.pipeline.BooleanExpr lt(com.google.firebase.firestore.pipeline.Expr left, Object right);
     method public com.google.firebase.firestore.pipeline.BooleanExpr lt(String fieldName, com.google.firebase.firestore.pipeline.Expr expression);
-    method public com.google.firebase.firestore.pipeline.BooleanExpr lt(String fieldName, Object right);
+    method public com.google.firebase.firestore.pipeline.BooleanExpr lt(String fieldName, Object value);
     method public com.google.firebase.firestore.pipeline.BooleanExpr lte(com.google.firebase.firestore.pipeline.Expr left, com.google.firebase.firestore.pipeline.Expr right);
     method public com.google.firebase.firestore.pipeline.BooleanExpr lte(com.google.firebase.firestore.pipeline.Expr left, Object right);
     method public com.google.firebase.firestore.pipeline.BooleanExpr lte(String fieldName, com.google.firebase.firestore.pipeline.Expr expression);

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

@@ -107,6 +107,26 @@ internal object Values {
     }
   }
 
+  fun strictEquals(left: Value, right: Value): Boolean {
+    val leftType = typeOrder(left)
+    val rightType = typeOrder(right)
+    if (leftType != rightType) {
+      return false
+    }
+
+    return when (leftType) {
+      TYPE_ORDER_NULL -> false
+      TYPE_ORDER_NUMBER -> strictNumberEquals(left, right)
+      TYPE_ORDER_ARRAY -> strictArrayEquals(left, right)
+      TYPE_ORDER_VECTOR,
+      TYPE_ORDER_MAP -> strictObjectEquals(left, right)
+      TYPE_ORDER_SERVER_TIMESTAMP ->
+        ServerTimestamps.getLocalWriteTime(left) == ServerTimestamps.getLocalWriteTime(right)
+      TYPE_ORDER_MAX_VALUE -> true
+      else -> left == right
+    }
+  }
+
   @JvmStatic
   fun equals(left: Value?, right: Value?): Boolean {
     if (left === right) {
@@ -135,6 +155,17 @@ internal object Values {
     }
   }
 
+  private fun strictNumberEquals(left: Value, right: Value): Boolean {
+    if (left.valueTypeCase != right.valueTypeCase) {
+      return false
+    }
+    return when (left.valueTypeCase) {
+      ValueTypeCase.INTEGER_VALUE -> left.integerValue == right.integerValue
+      ValueTypeCase.DOUBLE_VALUE -> left.doubleValue == right.doubleValue
+      else -> false
+    }
+  }
+
   private fun numberEquals(left: Value, right: Value): Boolean {
     if (left.valueTypeCase != right.valueTypeCase) {
       return false
@@ -147,6 +178,23 @@ internal object Values {
     }
   }
 
+  private fun strictArrayEquals(left: Value, right: Value): Boolean {
+    val leftArray = left.arrayValue
+    val rightArray = right.arrayValue
+
+    if (leftArray.valuesCount != rightArray.valuesCount) {
+      return false
+    }
+
+    for (i in 0 until leftArray.valuesCount) {
+      if (!strictEquals(leftArray.getValues(i), rightArray.getValues(i))) {
+        return false
+      }
+    }
+
+    return true
+  }
+
   private fun arrayEquals(left: Value, right: Value): Boolean {
     val leftArray = left.arrayValue
     val rightArray = right.arrayValue
@@ -164,6 +212,24 @@ internal object Values {
     return true
   }
 
+  private fun strictObjectEquals(left: Value, right: Value): Boolean {
+    val leftMap = left.mapValue
+    val rightMap = right.mapValue
+
+    if (leftMap.fieldsCount != rightMap.fieldsCount) {
+      return false
+    }
+
+    for ((key, value) in leftMap.fieldsMap) {
+      val otherEntry = rightMap.fieldsMap[key] ?: return false
+      if (!strictEquals(value, otherEntry)) {
+        return false
+      }
+    }
+
+    return true
+  }
+
   private fun objectEquals(left: Value, right: Value): Boolean {
     val leftMap = left.mapValue
     val rightMap = right.mapValue
@@ -173,7 +239,7 @@ internal object Values {
     }
 
     for ((key, value) in leftMap.fieldsMap) {
-      val otherEntry = rightMap.fieldsMap[key]
+      val otherEntry = rightMap.fieldsMap[key] ?: return false
       if (!equals(value, otherEntry)) {
         return false
       }
@@ -592,13 +658,14 @@ internal object Values {
     // the backend to do that.
     val truncatedNanoseconds: Int = timestamp.nanoseconds / 1000 * 1000
 
-    return Value.newBuilder()
-      .setTimestampValue(
-        Timestamp.newBuilder().setSeconds(timestamp.seconds).setNanos(truncatedNanoseconds)
-      )
-      .build()
+    return encodeValue(
+      Timestamp.newBuilder().setSeconds(timestamp.seconds).setNanos(truncatedNanoseconds).build()
+    )
   }
 
+  @JvmStatic
+  fun encodeValue(value: Timestamp): Value = Value.newBuilder().setTimestampValue(value).build()
+
   @JvmField val TRUE_VALUE: Value = Value.newBuilder().setBooleanValue(true).build()
 
   @JvmField val FALSE_VALUE: Value = Value.newBuilder().setBooleanValue(false).build()

firebase-firestore/src/main/java/com/google/firebase/firestore/pipeline/EvaluateResult.kt

@@ -1,15 +1,31 @@
 package com.google.firebase.firestore.pipeline
 
 import com.google.firebase.firestore.model.Values
+import com.google.firebase.firestore.model.Values.encodeValue
 import com.google.firestore.v1.Value
+import com.google.protobuf.Timestamp
 
 internal sealed class EvaluateResult(val value: Value?) {
   companion object {
     val TRUE: EvaluateResultValue = EvaluateResultValue(Values.TRUE_VALUE)
     val FALSE: EvaluateResultValue = EvaluateResultValue(Values.FALSE_VALUE)
     val NULL: EvaluateResultValue = EvaluateResultValue(Values.NULL_VALUE)
-    fun booleanValue(boolean: Boolean) = if (boolean) TRUE else FALSE
+    val DOUBLE_ZERO: EvaluateResultValue = double(0.0)
+    val LONG_ZERO: EvaluateResultValue = long(0)
+    fun boolean(boolean: Boolean) = if (boolean) TRUE else FALSE
+    fun double(double: Double) = EvaluateResultValue(encodeValue(double))
+    fun long(long: Long) = EvaluateResultValue(encodeValue(long))
+    fun long(int: Int) = EvaluateResultValue(encodeValue(int.toLong()))
+    fun string(string: String) = EvaluateResultValue(encodeValue(string))
+    fun timestamp(seconds: Long, nanos: Int): EvaluateResult =
+      if (seconds !in -62_135_596_800 until 253_402_300_800) EvaluateResultError
+      else
+        EvaluateResultValue(
+          encodeValue(Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build())
+        )
   }
+  internal inline fun evaluateNonNull(f: (Value) -> EvaluateResult): EvaluateResult =
+    if (value?.hasNullValue() == true) f(value) else this
 }
 
 internal object EvaluateResultError : EvaluateResult(null)