Merge cca6406 into e7c83bc

Author: MarkDuckworth

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

@@ -32,8 +32,6 @@
 import com.google.firebase.firestore.model.MutableDocument;
 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.Executors;
 import com.google.firebase.firestore.util.Function;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.MessageLite;
@@ -47,7 +45,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
@@ -170,13 +167,9 @@ public Map<DocumentKey, MutableDocument> getAll(Iterable<DocumentKey> documentKe
             bindVars,
             ") ORDER BY path");
 
-    BackgroundQueue backgroundQueue = new BackgroundQueue();
     while (longQuery.hasMoreSubqueries()) {
-      longQuery
-          .performNextSubquery()
-          .forEach(row -> processRowInBackground(backgroundQueue, results, row, /*filter*/ null));
+      longQuery.performNextSubquery().forEach(row -> processRow(results, row, /*filter*/ null));
     }
-    backgroundQueue.drain();
 
     // Backfill any rows with null "document_type" discovered by processRowInBackground().
     documentTypeBackfiller.backfill(db);
@@ -266,18 +259,16 @@ private Map<DocumentKey, MutableDocument> getAll(
     }
     bindVars[i] = count;
 
-    BackgroundQueue backgroundQueue = new BackgroundQueue();
     Map<DocumentKey, MutableDocument> results = new HashMap<>();
     db.query(sql.toString())
         .binding(bindVars)
         .forEach(
             row -> {
-              processRowInBackground(backgroundQueue, results, row, filter);
+              processRow(results, row, filter);
               if (context != null) {
                 context.incrementDocumentReadCount();
               }
             });
-    backgroundQueue.drain();
 
     // Backfill any null "document_type" columns discovered by processRowInBackground().
     documentTypeBackfiller.backfill(db);
@@ -297,8 +288,7 @@ private Map<DocumentKey, MutableDocument> getAll(
         collections, offset, count, /*tryFilterDocumentType*/ null, filter, /*context*/ null);
   }
 
-  private void processRowInBackground(
-      BackgroundQueue backgroundQueue,
+  private void processRow(
       Map<DocumentKey, MutableDocument> results,
       Cursor row,
       @Nullable Function<MutableDocument, Boolean> filter) {
@@ -308,22 +298,15 @@ private void processRowInBackground(
     boolean documentTypeIsNull = row.isNull(3);
     String path = row.getString(4);
 
-    // Since scheduling background tasks incurs overhead, we only dispatch to a
-    // background thread if there are still some documents remaining.
-    Executor executor = row.isLast() ? Executors.DIRECT_EXECUTOR : backgroundQueue;
-    executor.execute(
-        () -> {
-          MutableDocument document =
-              decodeMaybeDocument(rawDocument, readTimeSeconds, readTimeNanos);
-          if (documentTypeIsNull) {
-            documentTypeBackfiller.enqueue(path, readTimeSeconds, readTimeNanos, document);
-          }
-          if (filter == null || filter.apply(document)) {
-            synchronized (results) {
-              results.put(document.getKey(), document);
-            }
-          }
-        });
+    MutableDocument document = decodeMaybeDocument(rawDocument, readTimeSeconds, readTimeNanos);
+    if (documentTypeIsNull) {
+      documentTypeBackfiller.enqueue(path, readTimeSeconds, readTimeNanos, document);
+    }
+    if (filter == null || filter.apply(document)) {
+      synchronized (results) {
+        results.put(document.getKey(), document);
+      }
+    }
   }
 
   @Override

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

@@ -18,6 +18,7 @@
 
 import androidx.annotation.NonNull;
 import com.google.firebase.firestore.util.Util;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,6 +28,7 @@
  */
 public abstract class BasePath<B extends BasePath<B>> implements Comparable<B> {
   final List<String> segments;
+  List<byte[]> utf8Segments = null;
 
   BasePath(List<String> segments) {
     this.segments = segments;
@@ -93,8 +95,12 @@ public int compareTo(@NonNull B o) {
     int i = 0;
     int myLength = length();
     int theirLength = o.length();
+    List<byte[]> myUtf8Segments = ensureUtf8Segments();
+    List<byte[]> theirUtf8Segments = o.ensureUtf8Segments();
     while (i < myLength && i < theirLength) {
-      int localCompare = compareSegments(getSegment(i), o.getSegment(i));
+      int localCompare =
+          compareSegments(
+              myUtf8Segments.get(i), theirUtf8Segments.get(i), getSegment(i), o.getSegment(i));
       if (localCompare != 0) {
         return localCompare;
       }
@@ -103,21 +109,39 @@ public int compareTo(@NonNull B o) {
     return Integer.compare(myLength, theirLength);
   }
 
-  private static int compareSegments(String lhs, String rhs) {
-    boolean isLhsNumeric = isNumericId(lhs);
-    boolean isRhsNumeric = isNumericId(rhs);
+  private static int compareSegments(byte[] lhs, byte[] rhs, String lhsString, String rhsString) {
+    boolean isLhsNumeric = lhs == null;
+    boolean isRhsNumeric = rhs == null;
 
     if (isLhsNumeric && !isRhsNumeric) { // Only lhs is numeric
       return -1;
     } else if (!isLhsNumeric && isRhsNumeric) { // Only rhs is numeric
       return 1;
     } else if (isLhsNumeric && isRhsNumeric) { // both numeric
-      return Long.compare(extractNumericId(lhs), extractNumericId(rhs));
+      return Long.compare(extractNumericId(lhsString), extractNumericId(rhsString));
     } else { // both string
-      return Util.compareUtf8Strings(lhs, rhs);
+      return Util.compareByteArrays(lhs, rhs);
     }
   }
 
+  public List<byte[]> ensureUtf8Segments() {
+    if (this.utf8Segments == null) {
+      this.utf8Segments = new ArrayList<>(this.segments.size());
+      for (int i = 0; i < this.segments.size(); i++) {
+        String segment = this.segments.get(i);
+        boolean isNumeric = isNumericId(segment);
+        if (!isNumeric) {
+          byte[] utf8Bytes = segment.getBytes(StandardCharsets.UTF_8);
+          this.utf8Segments.add(utf8Bytes);
+        } else {
+          this.utf8Segments.add(null);
+        }
+      }
+    }
+
+    return this.utf8Segments;
+  }
+
   /** Checks if a segment is a numeric ID (starts with "__id" and ends with "__"). */
   private static boolean isNumericId(String segment) {
     return segment.startsWith("__id") && segment.endsWith("__");