Merge branch 'master' into mikelehen/collection-group-queries

Author: Michael Lehenbauer

firebase-common/src/main/java/com/google/firebase/platforminfo/DefaultUserAgentPublisher.java

@@ -27,10 +27,10 @@
  */
 public class DefaultUserAgentPublisher implements UserAgentPublisher {
   private final String javaSDKVersionUserAgent;
-  private final OutOfBandLibraryVersionRegistrar gamesSDKRegistrar;
+  private final GlobalLibraryVersionRegistrar gamesSDKRegistrar;
 
   DefaultUserAgentPublisher(
-      Set<LibraryVersion> libraryVersions, OutOfBandLibraryVersionRegistrar gamesSDKRegistrar) {
+      Set<LibraryVersion> libraryVersions, GlobalLibraryVersionRegistrar gamesSDKRegistrar) {
     this.javaSDKVersionUserAgent = toUserAgent(libraryVersions);
     this.gamesSDKRegistrar = gamesSDKRegistrar;
   }
@@ -70,7 +70,7 @@ public static Component<UserAgentPublisher> component() {
         .factory(
             c ->
                 new DefaultUserAgentPublisher(
-                    c.setOf(LibraryVersion.class), OutOfBandLibraryVersionRegistrar.getInstance()))
+                    c.setOf(LibraryVersion.class), GlobalLibraryVersionRegistrar.getInstance()))
         .build();
   }
 }

firebase-common/src/main/java/com/google/firebase/platforminfo/OutOfBandLibraryVersionRegistrar.java renamed to firebase-common/src/main/java/com/google/firebase/platforminfo/GlobalLibraryVersionRegistrar.java

@@ -21,15 +21,15 @@
 /**
  * In order to allow the C++ and Unity SDKs to publish their versions without the use of the
  * components framework, we have a mechanism where the versions can be wired as out of band as side
- * effects. See {@link OutOfBandLibraryVersionRegistrar#registerVersion(String, String)}
+ * effects. See {@link GlobalLibraryVersionRegistrar#registerVersion(String, String)}
  *
  * <p>Java libraries should use {@link LibraryVersionComponent#create(String, String)} instead.
  */
-public class OutOfBandLibraryVersionRegistrar {
+public class GlobalLibraryVersionRegistrar {
   private final Set<LibraryVersion> infos = new HashSet<>();
-  private static volatile OutOfBandLibraryVersionRegistrar INSTANCE;
+  private static volatile GlobalLibraryVersionRegistrar INSTANCE;
 
-  OutOfBandLibraryVersionRegistrar() {}
+  GlobalLibraryVersionRegistrar() {}
 
   /**
    * Thread safe method to publish versions outside of the components mechanics.
@@ -49,14 +49,14 @@ Set<LibraryVersion> getRegisteredVersions() {
     }
   }
 
-  /** Returns an instance of {@link OutOfBandLibraryVersionRegistrar} */
-  public static OutOfBandLibraryVersionRegistrar getInstance() {
-    OutOfBandLibraryVersionRegistrar localRef = INSTANCE;
+  /** Returns an instance of {@link GlobalLibraryVersionRegistrar} */
+  public static GlobalLibraryVersionRegistrar getInstance() {
+    GlobalLibraryVersionRegistrar localRef = INSTANCE;
     if (localRef == null) {
-      synchronized (OutOfBandLibraryVersionRegistrar.class) {
+      synchronized (GlobalLibraryVersionRegistrar.class) {
         localRef = INSTANCE;
         if (localRef == null) {
-          INSTANCE = localRef = new OutOfBandLibraryVersionRegistrar();
+          INSTANCE = localRef = new GlobalLibraryVersionRegistrar();
         }
       }
     }

firebase-common/src/test/java/com/google/firebase/platforminfo/DefaultUserAgentPublisherTest.java

@@ -30,20 +30,20 @@
 public class DefaultUserAgentPublisherTest {
   private Set<LibraryVersion> libraryVersions;
   private DefaultUserAgentPublisher userAgentPublisher;
-  private OutOfBandLibraryVersionRegistrar outOfBandLibraryVersionRegistrar;
+  private GlobalLibraryVersionRegistrar globalLibraryVersionRegistrar;
 
   @Before
   public void before() {
     libraryVersions = new HashSet<>();
     libraryVersions.add(LibraryVersion.create("foo", "1"));
     libraryVersions.add(LibraryVersion.create("bar", "2"));
 
-    outOfBandLibraryVersionRegistrar = mock(OutOfBandLibraryVersionRegistrar.class);
+    globalLibraryVersionRegistrar = mock(GlobalLibraryVersionRegistrar.class);
 
-    when(outOfBandLibraryVersionRegistrar.getRegisteredVersions()).thenReturn(new HashSet<>());
+    when(globalLibraryVersionRegistrar.getRegisteredVersions()).thenReturn(new HashSet<>());
 
     userAgentPublisher =
-        new DefaultUserAgentPublisher(libraryVersions, outOfBandLibraryVersionRegistrar);
+        new DefaultUserAgentPublisher(libraryVersions, globalLibraryVersionRegistrar);
   }
 
   @Test
@@ -59,7 +59,7 @@ public void getUserAgent_createsConcatenatedStringOfSdkVersions() {
   @Test
   public void getUserAgent_returnsEmptyString_whenVersionSetIsEmpty() {
     userAgentPublisher =
-        new DefaultUserAgentPublisher(new HashSet<>(), outOfBandLibraryVersionRegistrar);
+        new DefaultUserAgentPublisher(new HashSet<>(), globalLibraryVersionRegistrar);
 
     assertThat(userAgentPublisher.getUserAgent()).isEqualTo("");
   }
@@ -71,9 +71,9 @@ public void getUserAgent_returnsEmptyString_whenVersionSetIsEmpty() {
     HashSet<LibraryVersion> gamesLibraryVersions = new HashSet<>();
     gamesLibraryVersions.add(LibraryVersion.create("fizz", "1"));
     gamesLibraryVersions.add(LibraryVersion.create("buzz", "2"));
-    when(outOfBandLibraryVersionRegistrar.getRegisteredVersions()).thenReturn(gamesLibraryVersions);
+    when(globalLibraryVersionRegistrar.getRegisteredVersions()).thenReturn(gamesLibraryVersions);
     userAgentPublisher =
-        new DefaultUserAgentPublisher(libraryVersions, outOfBandLibraryVersionRegistrar);
+        new DefaultUserAgentPublisher(libraryVersions, globalLibraryVersionRegistrar);
 
     String[] actualUserAgent = userAgentPublisher.getUserAgent().split(" ");
     Arrays.sort(actualUserAgent);

firebase-common/src/test/java/com/google/firebase/platforminfo/OutOfBandLibraryVersionRegistrarTest.java renamed to firebase-common/src/test/java/com/google/firebase/platforminfo/GlobalLibraryVersionRegistrarTest.java

@@ -21,22 +21,22 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class OutOfBandLibraryVersionRegistrarTest {
+public class GlobalLibraryVersionRegistrarTest {
   @Test
   public void registerVersion_persistsVersion() {
-    OutOfBandLibraryVersionRegistrar outOfBandLibraryVersionRegistrar =
-        new OutOfBandLibraryVersionRegistrar();
-    outOfBandLibraryVersionRegistrar.registerVersion("foo", "1.1.1");
+    GlobalLibraryVersionRegistrar globalLibraryVersionRegistrar =
+        new GlobalLibraryVersionRegistrar();
+    globalLibraryVersionRegistrar.registerVersion("foo", "1.1.1");
 
-    assertThat(outOfBandLibraryVersionRegistrar.getRegisteredVersions())
+    assertThat(globalLibraryVersionRegistrar.getRegisteredVersions())
         .contains(LibraryVersion.create("foo", "1.1.1"));
   }
 
   @Test
   public void getRegisteredVersions_returnsEmptySet_whenNoVersionsAreRegistered() {
-    OutOfBandLibraryVersionRegistrar outOfBandLibraryVersionRegistrar =
-        new OutOfBandLibraryVersionRegistrar();
+    GlobalLibraryVersionRegistrar globalLibraryVersionRegistrar =
+        new GlobalLibraryVersionRegistrar();
 
-    assertThat(outOfBandLibraryVersionRegistrar.getRegisteredVersions()).isEmpty();
+    assertThat(globalLibraryVersionRegistrar.getRegisteredVersions()).isEmpty();
   }
 }

firebase-firestore/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Unreleased
 - [feature] You can now query across all collections in your database with a
   given collection ID using the `FirebaseFirestore.collectionGroup()` method.
+- [fixed] Fixed calculation of SQLite database size on Android 9 Pie devices.
+  Previous method could be off by a few MBs on these devices, potentially
+  delaying garbage collection.
 
 # 18.0.1
 - [fixed] Fixed an issue where Firestore would crash if handling write batches

firebase-firestore/firebase-firestore.gradle

@@ -83,6 +83,7 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    testOptions.unitTests.includeAndroidResources = true
 }
 
 dependencies {

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

@@ -34,7 +34,6 @@
 import com.google.firebase.firestore.util.Consumer;
 import com.google.firebase.firestore.util.Logger;
 import com.google.firebase.firestore.util.Supplier;
-import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -77,7 +76,6 @@ public static String databaseName(String persistenceKey, DatabaseId databaseId)
   private final OpenHelper opener;
   private final LocalSerializer serializer;
   private SQLiteDatabase db;
-  private File databasePath;
   private boolean started;
   private final SQLiteQueryCache queryCache;
   private final SQLiteIndexManager indexManager;
@@ -107,7 +105,6 @@ public SQLitePersistence(
       LruGarbageCollector.Params params) {
     String databaseName = databaseName(persistenceKey, databaseId);
     this.opener = new OpenHelper(context, databaseName);
-    this.databasePath = context.getDatabasePath(databaseName);
     this.serializer = serializer;
     this.queryCache = new SQLiteQueryCache(this, this.serializer);
     this.indexManager = new SQLiteIndexManager(this);
@@ -206,7 +203,26 @@ <T> T runTransaction(String action, Supplier<T> operation) {
   }
 
   long getByteSize() {
-    return databasePath.length();
+    return getPageCount() * getPageSize();
+  }
+
+  /**
+   * Gets the page size of the database. Typically 4096.
+   *
+   * @see https://www.sqlite.org/pragma.html#pragma_page_size
+   */
+  private long getPageSize() {
+    return query("PRAGMA page_size").firstValue(row -> row.getLong(/*column=*/ 0));
+  }
+
+  /**
+   * Gets the number of pages in the database file. Multiplying this with the page size yields the
+   * approximate size of the database on disk (including the WAL, if relevant).
+   *
+   * @see https://www.sqlite.org/pragma.html#pragma_page_count.
+   */
+  private long getPageCount() {
+    return query("PRAGMA page_count").firstValue(row -> row.getLong(/*column=*/ 0));
   }
 
   /**