Skip to content

Integrate Document Overlay with the SDK. #6012

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.

Sign up for GitHub

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

Closed
wants to merge 15 commits into from
Closed

Integrate Document Overlay with the SDK. #6012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a8482ff
Integrate Document Overlay with the SDK.
ehsannas Feb 9, 2022
268bbb8
Fix mutation.test.ts
ehsannas Feb 15, 2022
b8de752
Fix usage of insert and disambiguate a type.
ehsannas Feb 16, 2022
66a1cb9
Fix circular dependency compile error.
ehsannas Feb 16, 2022
143d1c0
Fix: use strict comparison
ehsannas Feb 16, 2022
bd5b4d8
fix `setHasLocalMutations`, and port more tests.
ehsannas Feb 17, 2022
d46c5b2
Use ObjectMap instead of Map with proper comparator.
ehsannas Feb 17, 2022
c3fbc23
Fix usages of Map/Set (switch to ObjectMap/SortedSet). Don't use docu…
ehsannas Feb 18, 2022
db4f6c1
use documentKeySet.
ehsannas Feb 18, 2022
08eafdf
Add FieldMask.empty().
ehsannas Feb 18, 2022
c61aec2
Bug fix: forgot to take result of immutable set insertion.
ehsannas Feb 18, 2022
c05b58c
Fix bug: more insertion into immutable data structures.
ehsannas Feb 18, 2022
fc6836b
Update LocalStore tests.
ehsannas Feb 19, 2022
b9d2906
Fix SortedMap's reverse iterator (without start key).
ehsannas Feb 19, 2022
5ed48fa
Fix sorted map.
ehsannas Feb 19, 2022
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
13 changes: 8 additions & 5 deletions packages/firestore/src/local/document_overlay_cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,12 @@
* limitations under the License.
*/

import { DocumentKeySet } from '../model/collections';
import {
DocumentKeySet,
DocumentKeyToMutationMap,
DocumentKeyToOverlayMap
} from '../model/collections';
import { DocumentKey } from '../model/document_key';
import { Mutation } from '../model/mutation';
import { Overlay } from '../model/overlay';
import { ResourcePath } from '../model/path';

Expand Down Expand Up @@ -51,7 +54,7 @@ export interface DocumentOverlayCache {
saveOverlays(
transaction: PersistenceTransaction,
largestBatchId: number,
overlays: Map<DocumentKey, Mutation>
overlays: DocumentKeyToMutationMap
): PersistencePromise<void>;

/** Removes overlays for the given document keys and batch ID. */
Expand All @@ -74,7 +77,7 @@ export interface DocumentOverlayCache {
transaction: PersistenceTransaction,
collection: ResourcePath,
sinceBatchId: number
): PersistencePromise<Map<DocumentKey, Overlay>>;
): PersistencePromise<DocumentKeyToOverlayMap>;

/**
* Returns `count` overlays with a batch ID higher than `sinceBatchId` for the
Expand All @@ -95,5 +98,5 @@ export interface DocumentOverlayCache {
collectionGroup: string,
sinceBatchId: number,
count: number
): PersistencePromise<Map<DocumentKey, Overlay>>;
): PersistencePromise<DocumentKeyToOverlayMap>;
}
22 changes: 13 additions & 9 deletions packages/firestore/src/local/indexeddb_document_overlay_cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@
*/

import { User } from '../auth/user';
import { DocumentKeySet } from '../model/collections';
import {
DocumentKeySet,
DocumentKeyToMutationMap,
DocumentKeyToOverlayMap,
newDocumentKeyToOverlayMap
} from '../model/collections';
import { DocumentKey } from '../model/document_key';
import { Mutation } from '../model/mutation';
import { Overlay } from '../model/overlay';
import { ResourcePath } from '../model/path';

Expand Down Expand Up @@ -74,10 +78,10 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
saveOverlays(
transaction: PersistenceTransaction,
largestBatchId: number,
overlays: Map<DocumentKey, Mutation>
overlays: DocumentKeyToMutationMap
): PersistencePromise<void> {
const promises: Array<PersistencePromise<void>> = [];
overlays.forEach(mutation => {
overlays.forEach((_, mutation) => {
const overlay = new Overlay(largestBatchId, mutation);
promises.push(this.saveOverlay(transaction, overlay));
});
Expand Down Expand Up @@ -118,8 +122,8 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
transaction: PersistenceTransaction,
collection: ResourcePath,
sinceBatchId: number
): PersistencePromise<Map<DocumentKey, Overlay>> {
const result = new Map<DocumentKey, Overlay>();
): PersistencePromise<DocumentKeyToOverlayMap> {
const result = newDocumentKeyToOverlayMap();
const collectionPath = encodeResourcePath(collection);
// We want batch IDs larger than `sinceBatchId`, and so the lower bound
// is not inclusive.
Expand All @@ -144,8 +148,8 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
collectionGroup: string,
sinceBatchId: number,
count: number
): PersistencePromise<Map<DocumentKey, Overlay>> {
const result = new Map<DocumentKey, Overlay>();
): PersistencePromise<DocumentKeyToOverlayMap> {
const result = newDocumentKeyToOverlayMap();
let currentBatchId: number | undefined = undefined;
// We want batch IDs larger than `sinceBatchId`, and so the lower bound
// is not inclusive.
Expand All @@ -167,7 +171,7 @@ export class IndexedDbDocumentOverlayCache implements DocumentOverlayCache {
// `count` if there are more overlays from the `currentBatchId`.
const overlay = fromDbDocumentOverlay(this.serializer, dbOverlay);
if (
result.size < count ||
result.size() < count ||
overlay.largestBatchId === currentBatchId
) {
result.set(overlay.getKey(), overlay);
Expand Down
Loading