Remove user from globals cache.

Author: tom-andersen

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

@@ -156,6 +156,7 @@ public LocalStore(Persistence persistence, QueryEngine queryEngine, User initial
  this.persistence = persistence;
  this.queryEngine = queryEngine;
 
+ globalsCache = persistence.getGlobalsCache();
  targetCache = persistence.getTargetCache();
  bundleCache = persistence.getBundleCache();
  targetIdGenerator = TargetIdGenerator.forTargetCache(targetCache.getHighestTargetId());
@@ -171,7 +172,6 @@ public LocalStore(Persistence persistence, QueryEngine queryEngine, User initial
 
  private void initializeUserComponents(User user) {
  // TODO(indexing): Add spec tests that test these components change after a user change
- globalsCache = persistence.getGlobalsCache(user);
  indexManager = persistence.getIndexManager(user);
  mutationQueue = persistence.getMutationQueue(user, indexManager);
  documentOverlayCache = persistence.getDocumentOverlayCache(user);

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

@@ -31,7 +31,7 @@ public final class MemoryPersistence extends Persistence {
  // tests affecting both the in-memory and SQLite-backed persistence layers. Tests can create a new
  // LocalStore wrapping this Persistence instance and this will make the in-memory persistence
  // layer behave as if it were actually persisting values.
- private final Map<User, MemoryGlobalsCache> userGlobals;
+ private final MemoryGlobalsCache globalsCache;
  private final Map<User, MemoryMutationQueue> mutationQueues;
  private final Map<User, MemoryDocumentOverlayCache> overlays;
  private final MemoryIndexManager indexManager;
@@ -58,7 +58,7 @@ public static MemoryPersistence createLruGcMemoryPersistence(
 
  /** Use static helpers to instantiate */
  private MemoryPersistence() {
- userGlobals = new HashMap<>();
+ globalsCache = new MemoryGlobalsCache();
  mutationQueues = new HashMap<>();
  indexManager = new MemoryIndexManager();
  targetCache = new MemoryTargetCache(this);
@@ -120,13 +120,8 @@ MemoryRemoteDocumentCache getRemoteDocumentCache() {
  }
 
  @Override
- GlobalsCache getGlobalsCache(User user) {
- MemoryGlobalsCache globals = userGlobals.get(user);
- if (globals == null) {
- globals = new MemoryGlobalsCache();
- userGlobals.put(user, globals);
- }
- return globals;
+ GlobalsCache getGlobalsCache() {
+ return globalsCache;
  }
 
  @Override

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

@@ -86,8 +86,8 @@ public abstract class Persistence {
  /** Creates a RemoteDocumentCache representing the persisted cache of remote documents. */
  abstract RemoteDocumentCache getRemoteDocumentCache();
 
- /** Creates GlobalCache that provides access to global values for user. */
- abstract GlobalsCache getGlobalsCache(User user);
+ /** Creates GlobalCache that provides access to global values. */
+ abstract GlobalsCache getGlobalsCache();
 
  /** Creates an IndexManager that manages our persisted query indexes. */
  abstract IndexManager getIndexManager(User user);

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

@@ -22,12 +22,8 @@ public class SQLiteGlobalsCache implements GlobalsCache{
  private static final String DB_TOKEN = "dbToken";
  private final SQLitePersistence db;
 
- /** The normalized uid (for example, null => "") used in the uid column. */
- private final String uid;
-
- public SQLiteGlobalsCache(SQLitePersistence persistence, User user) {
+ public SQLiteGlobalsCache(SQLitePersistence persistence) {
  this.db = persistence;
- this.uid = user.isAuthenticated() ? user.getUid() : "";
  }
 
  @Override
@@ -42,17 +38,16 @@ public void setDbToken(ByteString value) {
  }
 
  private byte[] get(String global) {
- return db.query("SELECT value FROM globals WHERE uid = ? AND global = ?")
- .binding(uid, global)
+ return db.query("SELECT value FROM globals WHERE global = ?")
+ .binding(global)
  .firstValue(row -> row.getBlob(0));
  }
 
  private void set(String global, byte[] value) {
  db.execute(
  "INSERT OR REPLACE INTO globals "
- + "(uid, global, value) "
- + "VALUES (?, ?, ?)",
- uid,
+ + "(global, value) "
+ + "VALUES (?, ?)",
  global,
  value);
  }

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

@@ -206,8 +206,8 @@ RemoteDocumentCache getRemoteDocumentCache() {
  }
 
  @Override
- GlobalsCache getGlobalsCache(User user) {
- return new SQLiteGlobalsCache(this, user);
+ GlobalsCache getGlobalsCache() {
+ return new SQLiteGlobalsCache(this);
  }
 
  @Override

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

@@ -719,16 +719,14 @@ private void addPendingDataMigration(String migration) {
 
  private void createGlobalsTable() {
  ifTablesDontExist(
- new String[] {"globals"},
- () -> {
- // A table of key value pairs by user.
- db.execSQL(
- "CREATE TABLE globals ("
- + "uid TEXT, "
- + "global TEXT, "
- + "value BLOB, "
- + "PRIMARY KEY (uid, global))");
- });
+ new String[] {"globals"},
+ () -> {
+ // A table of key value pairs by user.
+ db.execSQL(
+ "CREATE TABLE globals ("
+ + "global TEXT PRIMARY KEY, "
+ + "value BLOB)");
+ });
  }
 
  private boolean tableExists(String table) {

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

@@ -33,7 +33,7 @@ public abstract class GlobalsCacheTest {
  @Before
  public void setUp() {
  persistence = getPersistence();
- globalsCache = persistence.getGlobalsCache(User.UNAUTHENTICATED);
+ globalsCache = persistence.getGlobalsCache();
  }
 
  @After