Skip to content

Commit 3ad31c8

Browse files
Rewrap comment (#2148)
1 parent 4ccd09e commit 3ad31c8

File tree

8 files changed

+35
-33
lines changed

8 files changed

+35
-33
lines changed

packages/firestore/src/local/indexeddb_persistence.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,9 +1271,7 @@ export class IndexedDbLruDelegate implements ReferenceDelegate, LruDelegate {
12711271
txn: PersistenceTransaction,
12721272
queryData: QueryData
12731273
): PersistencePromise<void> {
1274-
const updated = queryData.copy({
1275-
sequenceNumber: txn.currentSequenceNumber
1276-
});
1274+
const updated = queryData.withSequenceNumber(txn.currentSequenceNumber);
12771275
return this.db.getQueryCache().updateQueryData(txn, updated);
12781276
}
12791277

packages/firestore/src/local/local_store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,10 +481,10 @@ export class LocalStore {
481481
const resumeToken = change.resumeToken;
482482
// Update the resume token if the change includes one.
483483
if (resumeToken.length > 0) {
484-
const newQueryData = oldQueryData.copy({
484+
const newQueryData = oldQueryData.withResumeToken(
485485
resumeToken,
486486
snapshotVersion
487-
});
487+
);
488488
this.queryDataByTarget[targetId] = newQueryData;
489489

490490
// Update the query data if there are target changes (or if

packages/firestore/src/local/memory_persistence.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,9 +434,7 @@ export class MemoryLruDelegate implements ReferenceDelegate, LruDelegate {
434434
txn: PersistenceTransaction,
435435
queryData: QueryData
436436
): PersistencePromise<void> {
437-
const updated = queryData.copy({
438-
sequenceNumber: txn.currentSequenceNumber
439-
});
437+
const updated = queryData.withSequenceNumber(txn.currentSequenceNumber);
440438
return this.persistence.getQueryCache().updateQueryData(txn, updated);
441439
}
442440

packages/firestore/src/local/query_data.ts

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,28 +61,33 @@ export class QueryData {
6161
readonly resumeToken: ProtoByteString = emptyByteString()
6262
) {}
6363

64+
/** Creates a new query data instance with an updated sequence number. */
65+
withSequenceNumber(sequenceNumber: number): QueryData {
66+
return new QueryData(
67+
this.query,
68+
this.targetId,
69+
this.purpose,
70+
sequenceNumber,
71+
this.snapshotVersion,
72+
this.resumeToken
73+
);
74+
}
75+
6476
/**
65-
* Creates a new query data instance with an updated snapshot version and
66-
* resume token.
77+
* Creates a new query data instance with an updated resume token and
78+
* snapshot version.
6779
*/
68-
copy(overwrite: {
69-
resumeToken?: ProtoByteString;
70-
snapshotVersion?: SnapshotVersion;
71-
sequenceNumber?: ListenSequenceNumber;
72-
}): QueryData {
80+
withResumeToken(
81+
resumeToken: ProtoByteString,
82+
snapshotVersion: SnapshotVersion
83+
): QueryData {
7384
return new QueryData(
7485
this.query,
7586
this.targetId,
7687
this.purpose,
77-
overwrite.sequenceNumber === undefined
78-
? this.sequenceNumber
79-
: overwrite.sequenceNumber,
80-
overwrite.snapshotVersion === undefined
81-
? this.snapshotVersion
82-
: overwrite.snapshotVersion,
83-
overwrite.resumeToken === undefined
84-
? this.resumeToken
85-
: overwrite.resumeToken
88+
this.sequenceNumber,
89+
snapshotVersion,
90+
resumeToken
8691
);
8792
}
8893

packages/firestore/src/remote/remote_store.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ export class RemoteStore implements TargetMetadataProvider {
429429
const queryData = this.listenTargets[targetId];
430430
// A watched target might have been removed already.
431431
if (queryData) {
432-
this.listenTargets[targetId] = queryData.copy({
433-
resumeToken: change.resumeToken,
432+
this.listenTargets[targetId] = queryData.withResumeToken(
433+
change.resumeToken,
434434
snapshotVersion
435-
});
435+
);
436436
}
437437
}
438438
});
@@ -448,9 +448,10 @@ export class RemoteStore implements TargetMetadataProvider {
448448

449449
// Clear the resume token for the query, since we're in a known mismatch
450450
// state.
451-
this.listenTargets[targetId] = queryData.copy({
452-
resumeToken: emptyByteString()
453-
});
451+
this.listenTargets[targetId] = queryData.withResumeToken(
452+
emptyByteString(),
453+
queryData.snapshotVersion
454+
);
454455

455456
// Cause a hard reset by unwatching and rewatching immediately, but
456457
// deliberately don't send a resume token so that we get a full update.

packages/firestore/test/integration/api/batch_writes.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ apiDescribe('Database batch writes', (persistence: boolean) => {
125125
});
126126

127127
it('can delete documents', () => {
128+
// TODO(#1865): This test fails with node:persistence against Prod
128129
return integrationHelpers.withTestDoc(persistence, doc => {
129130
return doc
130131
.set({ foo: 'bar' })

packages/firestore/test/integration/api/database.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ apiDescribe('Database', (persistence: boolean) => {
7070
});
7171

7272
it('can delete a document', () => {
73+
// TODO(#1865): This test fails with node:persistence against Prod
7374
return withTestDoc(persistence, docRef => {
7475
return docRef
7576
.set({ foo: 'bar' })

packages/firestore/test/unit/local/lru_garbage_collector.test.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,7 @@ function genericLruGarbageCollectorTests(
158158
txn: PersistenceTransaction,
159159
queryData: QueryData
160160
): PersistencePromise<void> {
161-
const updated = queryData.copy({
162-
sequenceNumber: txn.currentSequenceNumber
163-
});
161+
const updated = queryData.withSequenceNumber(txn.currentSequenceNumber);
164162
return queryCache
165163
.updateQueryData(txn, updated)
166164
.next(() =>

0 commit comments

Comments
 (0)