Have get check the pending writes cache

Author: jmwski

firebase-database/src/androidTest/java/com/google/firebase/database/QueryTest.java

@@ -584,14 +584,16 @@ public void setVariousLimitsWithStartAtName() throws DatabaseException, Interrup
 
   @Test
   public void testStartAfterWithOrderByKey()
-      throws DatabaseException, InterruptedException, ExecutionException {
+      throws DatabaseException, InterruptedException, ExecutionException, TimeoutException,
+          TestFailure {
     DatabaseReference ref = IntegrationTestHelpers.getRandomNode();
     DatabaseReference childOne = ref.push();
     DatabaseReference childTwo = ref.push();
     Tasks.await(childOne.setValue(1L));
     Tasks.await(childTwo.setValue(2L));
 
     DataSnapshot snapshot = Tasks.await(ref.orderByKey().startAfter(childOne.getKey()).get());
+
     Map<String, Long> values = (Map<String, Long>) snapshot.getValue();
 
     assertNotNull(values);
@@ -4630,6 +4632,33 @@ public void onCancelled(@NonNull DatabaseError error) {}
     }
   }
 
+  @Test
+  public void testGetWithPendingWrites() throws ExecutionException, InterruptedException {
+    DatabaseReference node = IntegrationTestHelpers.getRandomNode();
+    node.getDatabase().goOffline();
+    try {
+      Map<String, Object> expected = new MapBuilder().put("foo", "bar").build();
+      node.setValue(expected);
+      DataSnapshot snapshot = Tasks.await(node.get());
+      assertEquals(snapshot.getValue(), expected);
+    } finally {
+      node.getDatabase().goOnline();
+    }
+  }
+
+  @Test
+  public void testGetChildOfPendingWrites() throws ExecutionException, InterruptedException {
+    DatabaseReference node = IntegrationTestHelpers.getRandomNode();
+    node.getDatabase().goOffline();
+    try {
+      node.setValue(new MapBuilder().put("foo", "bar").build());
+      DataSnapshot snapshot = Tasks.await(node.child("foo").get());
+      assertEquals(snapshot.getValue(), "bar");
+    } finally {
+      node.getDatabase().goOnline();
+    }
+  }
+
   @Test
   public void testGetSendsServerProbesPersistenceCacheWhenOfflineWithNoListener()
       throws DatabaseException, InterruptedException, ExecutionException, TestFailure,

firebase-database/src/main/java/com/google/firebase/database/core/SyncPoint.java

@@ -31,6 +31,7 @@
 import com.google.firebase.database.core.view.View;
 import com.google.firebase.database.core.view.ViewCache;
 import com.google.firebase.database.snapshot.ChildKey;
+import com.google.firebase.database.snapshot.EmptyNode;
 import com.google.firebase.database.snapshot.IndexedNode;
 import com.google.firebase.database.snapshot.NamedNode;
 import com.google.firebase.database.snapshot.Node;
@@ -124,7 +125,9 @@ public View getView(QuerySpec query, WriteTreeRef writesCache, CacheNode serverC
       if (eventCache != null) {
         eventCacheComplete = true;
       } else {
-        eventCache = writesCache.calcCompleteEventChildren(serverCache.getNode());
+        eventCache =
+            writesCache.calcCompleteEventChildren(
+                serverCache.getNode() != null ? serverCache.getNode() : EmptyNode.Empty());
         eventCacheComplete = false;
       }
       IndexedNode indexed = IndexedNode.from(eventCache, query.getIndex());

firebase-database/src/main/java/com/google/firebase/database/core/SyncTree.java

@@ -524,16 +524,17 @@ public Node getServerValue(QuerySpec query) {
                     : syncPoint.getCompleteServerCache(Path.getEmptyPath());
           }
 
-          CacheNode serverCache;
-          if (serverCacheNode != null) {
-            serverCache =
-                new CacheNode(IndexedNode.from(serverCacheNode, query.getIndex()), true, false);
-
-            WriteTreeRef writesCache = pendingWriteTree.childWrites(path);
-            View view = syncPoint.getView(query, writesCache, serverCache);
-            return view.getCompleteNode();
-          }
-          return null;
+          CacheNode serverCache =
+              new CacheNode(
+                  IndexedNode.from(
+                      serverCacheNode != null ? serverCacheNode : EmptyNode.Empty(),
+                      query.getIndex()),
+                  serverCacheNode != null,
+                  false);
+
+          WriteTreeRef writesCache = pendingWriteTree.childWrites(path);
+          View view = syncPoint.getView(query, writesCache, serverCache);
+          return view.getCompleteNode();
         });
   }