Skip to content

Commit 841ccbe

Browse files
committed
remove new index offset
1 parent 8c5bccc commit 841ccbe

File tree

3 files changed

+2
-57
lines changed

3 files changed

+2
-57
lines changed

packages/firestore/src/local/local_store_impl.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import {
4242
FieldIndex,
4343
fieldIndexSemanticComparator,
4444
INITIAL_LARGEST_BATCH_ID,
45-
newIndexOffsetFromReadTime
45+
newIndexOffsetSuccessorFromReadTime
4646
} from '../model/field_index';
4747
import {
4848
mutationExtractBaseValue,
@@ -1260,7 +1260,7 @@ export function localStoreGetNewDocumentChanges(
12601260
localStoreImpl.remoteDocuments.getAllFromCollectionGroup(
12611261
txn,
12621262
collectionGroup,
1263-
newIndexOffsetFromReadTime(readTime, INITIAL_LARGEST_BATCH_ID),
1263+
newIndexOffsetSuccessorFromReadTime(readTime, INITIAL_LARGEST_BATCH_ID),
12641264
/* limit= */ Number.MAX_SAFE_INTEGER
12651265
)
12661266
)

packages/firestore/src/model/field_index.ts

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -177,21 +177,6 @@ export class IndexState {
177177
}
178178
}
179179

180-
/**
181-
* Creates an offset that matches all documents with a read time starting from
182-
* the `readTime`.
183-
*/
184-
export function newIndexOffsetFromReadTime(
185-
readTime: SnapshotVersion,
186-
largestBatchId: number
187-
): IndexOffset {
188-
return new IndexOffset(
189-
SnapshotVersion.fromTimestamp(readTime.toTimestamp()),
190-
DocumentKey.empty(),
191-
largestBatchId
192-
);
193-
}
194-
195180
/**
196181
* Creates an offset that matches all documents with a read time higher than
197182
* `readTime`.

packages/firestore/test/unit/specs/query_spec.test.ts

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -174,44 +174,4 @@ describeSpec('Queries:', [], () => {
174174
);
175175
}
176176
);
177-
178-
specTest(
179-
'Multiple queries on same collection group',
180-
['multi-client'],
181-
() => {
182-
const cgQuery = newQueryForCollectionGroup('cg');
183-
const cgQuery1 = queryWithAddedFilter(cgQuery, filter('val', '==', 1));
184-
const cgQuery2 = queryWithAddedFilter(cgQuery, filter('val', '!=', 1));
185-
const docs = [
186-
doc('cg/1', 1000, { val: 1 }),
187-
doc('cg/2', 1000, { val: 2 }),
188-
doc('not-cg/nope', 1000, { val: 1 }),
189-
doc('cg/1/not-cg/nope', 1000, { val: 1 })
190-
];
191-
return (
192-
client(0)
193-
.expectPrimaryState(true)
194-
// Listen to different queries on the same collection group
195-
.client(1)
196-
.userListens(cgQuery1)
197-
.userListens(cgQuery2)
198-
199-
.client(0)
200-
.expectListen(cgQuery1)
201-
.expectListen(cgQuery2)
202-
.watchAcks(cgQuery1)
203-
.watchSends({ affects: [cgQuery1] }, docs[0])
204-
.watchCurrents(cgQuery1, 'resume-token-2000')
205-
.watchAcks(cgQuery2)
206-
.watchSends({ affects: [cgQuery2] }, docs[1])
207-
.watchCurrents(cgQuery2, 'resume-token-2000')
208-
.watchSnapshots(2000)
209-
210-
.client(1)
211-
.expectEvents(cgQuery1, { added: [docs[0]] })
212-
.expectEvents(cgQuery2, { added: [docs[1]], fromCache: true })
213-
.expectEvents(cgQuery2, { added: [] })
214-
);
215-
}
216-
);
217177
});

0 commit comments

Comments
 (0)