Skip to content

Commit 4b7858b

Browse files
committed
Address comments.
1 parent d65a6e0 commit 4b7858b

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private int writeIndexEntries() {
129129
private int writeEntriesForCollectionGroup(
130130
String collectionGroup, int documentsRemainingUnderCap) {
131131
// Use the earliest offset of all field indexes to query the local cache.
132-
IndexOffset existingOffset = indexManager.minOffset(collectionGroup);
132+
IndexOffset existingOffset = indexManager.getMinOffset(collectionGroup);
133133

134134
LocalDocumentsResult nextBatch =
135135
localDocumentsView.getNextDocuments(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ public interface IndexManager {
7979
boolean canServeFromIndex(Target target);
8080

8181
/**
82-
* Iterates over all field indexes that are used to serve the given target, and returns the least
83-
* recent offset of them all. Asserts that the target can be served from index.
82+
* Iterates over all field indexes that are used to serve the given target, and returns the
83+
* minimum offset of them all. Asserts that the target can be served from index.
8484
*/
85-
IndexOffset minOffset(Target target);
85+
IndexOffset getMinOffset(Target target);
8686

87-
/** Returns the lowest offset for the given collection group. */
88-
IndexOffset minOffset(String collectionGroup);
87+
/** Returns the minimum offset for the given collection group. */
88+
IndexOffset getMinOffset(String collectionGroup);
8989

9090
/**
9191
* Returns an index that can be used to serve the provided target. Returns {@code null} if no

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,12 @@ public boolean canServeFromIndex(Target target) {
105105
}
106106

107107
@Override
108-
public IndexOffset minOffset(Target target) {
108+
public IndexOffset getMinOffset(Target target) {
109109
return IndexOffset.NONE;
110110
}
111111

112112
@Override
113-
public IndexOffset minOffset(String collectionGroup) {
113+
public IndexOffset getMinOffset(String collectionGroup) {
114114
return IndexOffset.NONE;
115115
}
116116

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ public ImmutableSortedMap<DocumentKey, Document> getDocumentsMatchingQuery(
118118
ImmutableSortedMap<DocumentKey, Document> indexedDocuments =
119119
localDocumentsView.getDocuments(keys);
120120

121-
return appendRemainingResults(values(indexedDocuments), query, indexManager.minOffset(target));
121+
return appendRemainingResults(
122+
values(indexedDocuments), query, indexManager.getMinOffset(target));
122123
}
123124

124125
/**

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public boolean canServeFromIndex(Target target) {
297297
return true;
298298
}
299299

300-
private IndexOffset getLeastRecentIndexOffset(Collection<FieldIndex> fieldIndexes) {
300+
private IndexOffset getMinOffset(Collection<FieldIndex> fieldIndexes) {
301301
hardAssert(
302302
!fieldIndexes.isEmpty(),
303303
"Found empty index group when looking for least recent index offset.");
@@ -317,22 +317,22 @@ private IndexOffset getLeastRecentIndexOffset(Collection<FieldIndex> fieldIndexe
317317
}
318318

319319
@Override
320-
public IndexOffset minOffset(String collectionGroup) {
320+
public IndexOffset getMinOffset(String collectionGroup) {
321321
Collection<FieldIndex> fieldIndexes = getFieldIndexes(collectionGroup);
322322
hardAssert(!fieldIndexes.isEmpty(), "minOffset was called for collection without indexes");
323-
return getLeastRecentIndexOffset(fieldIndexes);
323+
return getMinOffset(fieldIndexes);
324324
}
325325

326326
@Override
327-
public IndexOffset minOffset(Target target) {
327+
public IndexOffset getMinOffset(Target target) {
328328
hardAssert(
329329
canServeFromIndex(target),
330330
"Cannot find least recent index offset if target cannot be served from index.");
331331
List<FieldIndex> fieldIndexes = new ArrayList<>();
332332
for (Target subTarget : getSubTargets(target)) {
333333
fieldIndexes.add(getFieldIndex(subTarget));
334334
}
335-
return getLeastRecentIndexOffset(fieldIndexes);
335+
return getMinOffset(fieldIndexes);
336336
}
337337

338338
private List<Target> getSubTargets(Target target) {

0 commit comments

Comments
 (0)