Skip to content

Rename getDocumentOverlay to getDocumentOverlayCache. #3600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ private void initializeUserComponents(User user) {
// TODO(indexing): Add spec tests that test these components change after a user change
indexManager = persistence.getIndexManager(user);
mutationQueue = persistence.getMutationQueue(user, indexManager);
documentOverlayCache = persistence.getDocumentOverlay(user);
documentOverlayCache = persistence.getDocumentOverlayCache(user);
localDocuments =
new LocalDocumentsView(remoteDocuments, mutationQueue, documentOverlayCache, indexManager);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ BundleCache getBundleCache() {
}

@Override
DocumentOverlayCache getDocumentOverlay(User user) {
DocumentOverlayCache getDocumentOverlayCache(User user) {
MemoryDocumentOverlayCache overlay = overlays.get(user);
if (overlay == null) {
overlay = new MemoryDocumentOverlayCache();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public abstract class Persistence {
abstract BundleCache getBundleCache();

/** Returns a DocumentOverlayCache representing the documents that are mutated locally. */
abstract DocumentOverlayCache getDocumentOverlay(User user);
abstract DocumentOverlayCache getDocumentOverlayCache(User user);

/** Returns a OverlayMigrationManager that runs any pending data migration required by SDK. */
abstract OverlayMigrationManager getOverlayMigrationManager();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ private void buildOverlays() {
}

// Recalculate and save overlays
DocumentOverlayCache documentOverlayCache = db.getDocumentOverlay(user);
DocumentOverlayCache documentOverlayCache = db.getDocumentOverlayCache(user);
LocalDocumentsView localView =
new LocalDocumentsView(
remoteDocumentCache,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ BundleCache getBundleCache() {
}

@Override
DocumentOverlayCache getDocumentOverlay(User user) {
DocumentOverlayCache getDocumentOverlayCache(User user) {
return new SQLiteDocumentOverlayCache(this, this.serializer, user);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public abstract class DocumentOverlayCacheTestCase {
@Before
public void setUp() {
persistence = getPersistence();
cache = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
cache = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
}

@After
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class IndexBackfillerTest {
public void setUp() {
persistence = PersistenceTestHelpers.createSQLitePersistence();
remoteDocumentCache = persistence.getRemoteDocumentCache();
documentOverlayCache = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
documentOverlayCache = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
indexManager = persistence.getIndexManager(User.UNAUTHENTICATED);
indexManager.start();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void setUp() {

indexManager = persistence.getIndexManager(User.UNAUTHENTICATED);
mutationQueue = persistence.getMutationQueue(User.UNAUTHENTICATED, indexManager);
documentOverlayCache = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
documentOverlayCache = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
remoteDocumentCache = persistence.getRemoteDocumentCache();
targetCache = persistence.getTargetCache();
queryEngine = new QueryEngine();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void testCreateOverlayFromSet() {
assertEquals(
setMutation("foo/bar", map("foo", "bar")),
persistence
.getDocumentOverlay(User.UNAUTHENTICATED)
.getDocumentOverlayCache(User.UNAUTHENTICATED)
.getOverlay(key("foo/bar"))
.getMutation());
// Version is 0 because of remote document elision.
Expand All @@ -126,7 +126,7 @@ public void testCreateOverlayFromDelete() {
assertEquals(
deleteMutation("foo/bar"),
persistence
.getDocumentOverlay(User.UNAUTHENTICATED)
.getDocumentOverlayCache(User.UNAUTHENTICATED)
.getOverlay(key("foo/bar"))
.getMutation());
// Version is 0 because of remote document elision.
Expand Down Expand Up @@ -155,7 +155,7 @@ public void testCreateOverlayFromPatches() {
new LocalStore(persistence, indexBackfiller, new QueryEngine(), User.UNAUTHENTICATED);
localStore.start();

DocumentOverlayCache overlay = persistence.getDocumentOverlay(User.UNAUTHENTICATED);
DocumentOverlayCache overlay = persistence.getDocumentOverlayCache(User.UNAUTHENTICATED);
assertEquals(
mergeMutation("foo/bar", map("it", 2), Collections.emptyList()),
overlay.getOverlay(key("foo/bar")).getMutation());
Expand Down Expand Up @@ -194,13 +194,13 @@ public void testCreateOverlayForDifferentUsers() {
assertEquals(
setMutation("foo/bar", map("foo", "set-by-unauthenticated")),
persistence
.getDocumentOverlay(User.UNAUTHENTICATED)
.getDocumentOverlayCache(User.UNAUTHENTICATED)
.getOverlay(key("foo/bar"))
.getMutation());
assertEquals(
setMutation("foo/bar", map("foo", "set-by-another_user")),
persistence
.getDocumentOverlay(new User("another_user"))
.getDocumentOverlayCache(new User("another_user"))
.getOverlay(key("foo/bar"))
.getMutation());

Expand Down