Fix errors from merging with main

Author: wu-hui

firebase-firestore/gradle.properties

@@ -1,3 +1,2 @@
 version=26.0.3
 latestReleasedVersion=26.0.2
-kotlin.options.verbose=true

firebase-firestore/src/main/java/com/google/firebase/firestore/Pipeline.kt

@@ -61,6 +61,7 @@ import com.google.firebase.firestore.pipeline.WhereStage
 import com.google.firebase.firestore.remote.RemoteSerializer
 import com.google.firebase.firestore.util.Logger
 import com.google.firestore.v1.ExecutePipelineRequest
+import com.google.firestore.v1.Pipeline as ProtoPipeline
 import com.google.firestore.v1.StructuredPipeline
 import com.google.firestore.v1.Value
 
@@ -131,10 +132,8 @@ internal constructor(
     return builder.build()
   }
 
-  internal fun toPipelineProto(): com.google.firestore.v1.Pipeline =
-    com.google.firestore.v1.Pipeline.newBuilder()
-      .addAllStages(stages.map { it.toProtoStage(userDataReader) })
-      .build()
+  internal fun toPipelineProto(): ProtoPipeline =
+    ProtoPipeline.newBuilder().addAllStages(stages.map { it.toProtoStage(userDataReader) }).build()
 
   private fun toExecutePipelineRequest(options: InternalOptions?): ExecutePipelineRequest {
     val database = firestore!!.databaseId

firebase-firestore/src/main/java/com/google/firebase/firestore/RealtimePipeline.kt

@@ -42,6 +42,7 @@ import com.google.firebase.firestore.remote.RemoteSerializer
 import com.google.firebase.firestore.util.Assert
 import com.google.firebase.firestore.util.Assert.fail
 import com.google.firebase.firestore.util.Executors
+import com.google.firestore.v1.Pipeline as ProtoPipeline
 import com.google.firestore.v1.StructuredPipeline
 import java.util.concurrent.Executor
 import kotlinx.coroutines.channels.awaitClose
@@ -424,7 +425,7 @@ internal constructor(
   internal fun toStructurePipelineProto(): StructuredPipeline {
     val builder = StructuredPipeline.newBuilder()
     builder.pipeline =
-      com.google.firestore.v1.Pipeline.newBuilder()
+      ProtoPipeline.newBuilder()
         .addAllStages(rewrittenStages.map { it.toProtoStage(userDataReader) })
         .build()
     return builder.build()

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

@@ -193,6 +193,7 @@ public DocumentChanges computeDocChanges(
             changeSet.addChange(DocumentViewChange.create(Type.MODIFIED, newDoc));
             changeApplied = true;
 
+            Comparator<Document> queryComparator = query.comparator();
             if ((lastDocInLimit != null && queryComparator.compare(newDoc, lastDocInLimit) > 0)
                 || (firstDocInLimit != null
                     && queryComparator.compare(newDoc, firstDocInLimit) < 0)) {

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

@@ -34,7 +34,7 @@
 import com.google.firebase.firestore.model.ResourcePath;
 import com.google.firebase.firestore.model.SnapshotVersion;
 import com.google.firebase.firestore.util.BackgroundQueue;
-import com.google.firebase.firestore.util.Predicate;
+import com.google.firebase.firestore.util.Function;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
 import java.util.ArrayList;
@@ -198,7 +198,7 @@ public Map<DocumentKey, MutableDocument> getAll(
     if (collections.isEmpty()) {
       return Collections.emptyMap();
     } else if (BINDS_PER_STATEMENT * collections.size() < SQLitePersistence.MAX_ARGS) {
-      return getAll(collections, offset, limit, /*filter*/ null, /*context*/ null);
+      return getAll(collections, offset, limit, /*filter*/ null);
     } else {
       // We need to fan out our collection scan since SQLite only supports 999 binds per statement.
       Map<DocumentKey, MutableDocument> results = new HashMap<>();
@@ -209,8 +209,7 @@ public Map<DocumentKey, MutableDocument> getAll(
                 collections.subList(i, Math.min(collections.size(), i + pageSize)),
                 offset,
                 limit,
-                /*filter*/ null,
-                /*context*/ null));
+                /*filter*/ null));
       }
       return firstNEntries(results, limit, IndexOffset.DOCUMENT_COMPARATOR);
     }
@@ -299,7 +298,7 @@ private void processRowInBackground(
       BackgroundQueue backgroundQueue,
       Map<DocumentKey, MutableDocument> results,
       Cursor row,
-      @Nullable Predicate<MutableDocument> filter) {
+      @Nullable Function<MutableDocument, Boolean> filter) {
     byte[] rawDocument = row.getBlob(0);
     int readTimeSeconds = row.getInt(1);
     int readTimeNanos = row.getInt(2);

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

@@ -15,6 +15,7 @@
 package com.google.firebase.firestore.pipeline
 
 import com.google.firebase.firestore.UserDataReader
+import com.google.firestore.v1.Function as ProtoFunction
 import com.google.firestore.v1.Value
 
 class AliasedAggregate
@@ -178,7 +179,7 @@ private constructor(
   fun alias(alias: String) = AliasedAggregate(alias, this)
 
   internal fun toProto(userDataReader: UserDataReader): Value {
-    val builder = com.google.firestore.v1.Function.newBuilder()
+    val builder = ProtoFunction.newBuilder()
     builder.setName(name)
     for (param in params) {
       builder.addArgs(param.toProto(userDataReader))

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

@@ -37,6 +37,7 @@ import com.google.firebase.firestore.model.Values.canonicalId
 import com.google.firebase.firestore.model.Values.encodeValue
 import com.google.firebase.firestore.pipeline.Expression.Companion.field
 import com.google.firebase.firestore.util.CustomClassMapper
+import com.google.firestore.v1.Function as ProtoFunction
 import com.google.firestore.v1.MapValue
 import com.google.firestore.v1.Value
 import java.util.Date
@@ -7379,7 +7380,7 @@ internal constructor(
   ) : this(name, function, arrayOf(field(fieldName), *toArrayOfExprOrConstant(params)))
 
   override fun toProto(userDataReader: UserDataReader): Value {
-    val builder = com.google.firestore.v1.Function.newBuilder()
+    val builder = ProtoFunction.newBuilder()
     builder.setName(name)
     for (param in params) {
       builder.addArgs(param.toProto(userDataReader))

firebase-firestore/src/main/java/com/google/firebase/firestore/util/Util.java

@@ -21,6 +21,7 @@
 import android.os.Looper;
 import androidx.annotation.Nullable;
 import com.google.android.gms.tasks.Continuation;
+import com.google.cloud.datastore.core.number.NumberComparisonHelper;
 import com.google.firebase.firestore.FieldPath;
 import com.google.firebase.firestore.FirebaseFirestoreException;
 import com.google.firebase.firestore.FirebaseFirestoreException.Code;

firebase-firestore/src/test/java/com/google/firebase/firestore/local/SQLiteSchemaTest.java

@@ -728,7 +728,9 @@ public void existingDocumentsMatchAfterRemoteDocumentsDocumentTypeColumnAdded()
 
     Map<DocumentKey, MutableDocument> results =
         remoteDocumentCache.getDocumentsMatchingQuery(
-            query("coll"), IndexOffset.NONE, new HashSet<DocumentKey>());
+            new QueryOrPipeline.QueryWrapper(query("coll")),
+            IndexOffset.NONE,
+            new HashSet<DocumentKey>());
     assertResultsContain(results, "coll/doc0", "coll/doc1", "coll/doc2");
   }