Use DocumentSet

Author: schmidt-sebastian

firebase-database-collection/src/main/java/com/google/firebase/database/collection/ImmutableSortedMap.java

@@ -56,14 +56,6 @@ public abstract class ImmutableSortedMap<K, V> implements Iterable<Map.Entry<K,
 
   public abstract Comparator<K> getComparator();
 
-  public ImmutableSortedMap<K, V> insertAll(ImmutableSortedMap<K, V> source) {
-    ImmutableSortedMap<K, V> result = this;
-    for (Map.Entry<K, V> entry : source) {
-      result = result.insert(entry.getKey(), entry.getValue());
-    }
-    return result;
-  }
-
   @Override
   @SuppressWarnings("unchecked")
   public boolean equals(Object o) {

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

@@ -21,12 +21,10 @@
 import com.google.firebase.database.collection.ImmutableSortedSet;
 import com.google.firebase.firestore.core.Query;
 import com.google.firebase.firestore.model.Document;
-import com.google.firebase.firestore.model.DocumentCollections;
 import com.google.firebase.firestore.model.DocumentKey;
 import com.google.firebase.firestore.model.MaybeDocument;
 import com.google.firebase.firestore.model.SnapshotVersion;
-import java.util.Comparator;
-import java.util.Iterator;
+import java.util.Collections;
 import java.util.Map;
 
 /**
@@ -78,8 +76,7 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
       return executeFullCollectionScan(query);
     }
 
-    ImmutableSortedMap<DocumentKey, Document> previousResults =
-        getPreviousResults(query, remoteKeys);
+    ImmutableSortedSet<Document> previousResults = getPreviousResults(query, remoteKeys);
 
     if (query.hasLimit()
         && needsRefill(
@@ -92,24 +89,29 @@ && needsRefill(
     ImmutableSortedMap<DocumentKey, Document> updatedResults =
         localDocumentsView.getDocumentsMatchingQuery(
             query, queryData.getLastLimboFreeSnapshotVersion());
-    return previousResults.insertAll(updatedResults);
+    for (Document result : previousResults) {
+      updatedResults = updatedResults.insert(result.getKey(), result);
+    }
+
+    return updatedResults;
   }
 
   /** Returns the documents for the specified remote keys if they still match the query. */
-  private ImmutableSortedMap<DocumentKey, Document> getPreviousResults(
+  private ImmutableSortedSet<Document> getPreviousResults(
       Query query, ImmutableSortedSet<DocumentKey> remoteKeys) {
     // Fetch the documents that matched the query at the last snapshot.
     ImmutableSortedMap<DocumentKey, MaybeDocument> previousResults =
         localDocumentsView.getDocuments(remoteKeys);
 
     // Re-apply the query filter since previously matching documents do not necessarily still
     // match the query.
-    ImmutableSortedMap<DocumentKey, Document> results = DocumentCollections.emptyDocumentMap();
+    ImmutableSortedSet<Document> results =
+        new ImmutableSortedSet<>(Collections.emptyList(), query.comparator());
     for (Map.Entry<DocumentKey, MaybeDocument> entry : previousResults) {
       MaybeDocument maybeDoc = entry.getValue();
       if (maybeDoc instanceof Document && query.matches((Document) maybeDoc)) {
         Document doc = (Document) maybeDoc;
-        results = results.insert(entry.getKey(), doc);
+        results = results.insert(doc);
       }
     }
 
@@ -123,38 +125,28 @@ private ImmutableSortedMap<DocumentKey, Document> getPreviousResults(
   private boolean needsRefill(
       Query query,
       SnapshotVersion limboFreeSnapshotVersion,
-      ImmutableSortedMap<DocumentKey, Document> previousResults,
+      ImmutableSortedSet<Document> previousResults,
       ImmutableSortedSet<DocumentKey> remoteKeys) {
     hardAssert(query.hasLimit(), "Only limit queries should be refilled");
+    // The query needs to be refilled if a previously matching document no longer matches.
+    if (remoteKeys.size() != previousResults.size()) {
+      return true;
+    }
 
     // The query doesn't need to be refilled if there were never any documents that matched the
     // query constraint.
-    if (remoteKeys.isEmpty()) {
+    if (previousResults.isEmpty()) {
       return false;
     }
 
-    // The query needs to be refilled if a previously matching document no longer matches.
-    if (remoteKeys.size() != previousResults.size()) {
-      return true;
-    }
-
     // Limit queries are not eligible for index-free query execution if an older document from cache
     // may sort before a document that was previously part of the limit. This can happen if the last
     // document of the limit could sort lower than it did when the query was last synchronized. To
     // verify this, we use the query's comparator to determine the last document that fit the
     // limit. If the last document was edited after the query was last synchronized, there is a
     // chance that another document from cache sorts higher, in which case we have to perform a full
     // cache scan.
-    Comparator<Document> comparator = query.comparator();
-    Iterator<Map.Entry<DocumentKey, Document>> it = previousResults.iterator();
-    Document lastDocumentInLimit = it.next().getValue();
-    while (it.hasNext()) {
-      Document doc = it.next().getValue();
-      if (comparator.compare(lastDocumentInLimit, doc) < 0) {
-        lastDocumentInLimit = doc;
-      }
-    }
-
+    Document lastDocumentInLimit = previousResults.getMaxEntry();
     return lastDocumentInLimit.hasPendingWrites()
         || lastDocumentInLimit.getVersion().compareTo(limboFreeSnapshotVersion) > 0;
   }

firebase-storage/src/androidTest/java/com/google/firebase/storage/IntegrationTest.java

@@ -49,7 +49,7 @@ public class IntegrationTest {
 
   private FirebaseStorage storageClient;
 
-  private final String randomPrefix = UUID.randomUUID().toString();
+  private final String randomPrefix = "foo:bar";
 
   @Before
   public void before() throws ExecutionException, InterruptedException {

firebase-storage/src/main/java/com/google/firebase/storage/network/ListNetworkRequest.java

@@ -56,7 +56,7 @@ protected String getQueryParameters() throws UnsupportedEncodingException {
     List<String> keys = new ArrayList<>();
     List<String> values = new ArrayList<>();
 
-    String prefix = getPathWithoutBucket();
+    String prefix = getDecodedPathWithoutBucket();
     if (!TextUtils.isEmpty(prefix)) {
       keys.add("prefix");
       values.add(prefix + "/");

firebase-storage/src/main/java/com/google/firebase/storage/network/NetworkRequest.java

@@ -129,7 +129,7 @@ public static String getDefaultURL(@NonNull Uri gsUri) {
    */
   @Nullable
   public static String getPathWithoutBucket(@NonNull Uri gsUri) {
-    String path = gsUri.getEncodedPath();
+    String path = gsUri.getPath();
     if (path != null && path.startsWith("/")) {
       // this should always be true.
       path = path.substring(1);
@@ -138,13 +138,13 @@ public static String getPathWithoutBucket(@NonNull Uri gsUri) {
   }
 
   /**
-   * Returns the path of the object but excludes the bucket name
+   * Returns the decoded path of the object but excludes the bucket name
    *
    * @return the path in string form.
    */
   @Nullable
-  public String getPathWithoutBucket() {
-    return getPathWithoutBucket(mGsUri);
+  public String getDecodedPathWithoutBucket() {
+    return Uri.decode(getPathWithoutBucket(mGsUri));
   }
 
   @NonNull
@@ -318,6 +318,7 @@ private HttpURLConnection createConnection() throws IOException {
     }
 
     url = new URL(urlString);
+    System.err.println("--- query: " + url.toString());
     conn = connectionFactory.createInstance(url);
     return conn;
   }
@@ -527,6 +528,7 @@ String getPostDataString(@Nullable List<String> keys, List<String> values, boole
       result.append("=");
       result.append(encode ? URLEncoder.encode(values.get(i), "UTF-8") : values.get(i));
     }
+   System.err.println("--- " + result.toString());
 
     return result.toString();
   }

firebase-storage/src/main/java/com/google/firebase/storage/network/ResumableUploadStartRequest.java

@@ -64,7 +64,7 @@ protected String getQueryParameters() throws UnsupportedEncodingException {
     List<String> keys = new ArrayList<>();
     List<String> values = new ArrayList<>();
 
-    String pathWithoutBucket = getPathWithoutBucket();
+    String pathWithoutBucket = getDecodedPathWithoutBucket();
     keys.add("name");
     values.add(pathWithoutBucket != null ? Slashes.unSlashize(pathWithoutBucket) : "");
     keys.add("uploadType");

firebase-storage/src/testUtil/java/com/google/firebase/storage/TestCommandHelper.java

@@ -226,7 +226,7 @@ public static Task<StringBuilder> deleteBlob() {
   }
 
   public static Task<StringBuilder> listFiles(int pageSize, int pageCount) {
-    final StorageReference reference = FirebaseStorage.getInstance().getReference("smallDirectory");
+    final StorageReference reference = FirebaseStorage.getInstance().getReference("small:Directory");
 
     TaskCompletionSource<StringBuilder> result = new TaskCompletionSource<>();
     StringBuilder builder = new StringBuilder();