@@ -62,25 +62,25 @@ - (instancetype)initWithRemoteDocumentCache:(id<FSTRemoteDocumentCache>)remoteDo
6262}
6363
6464- (nullable FSTMaybeDocument *)documentForKey : (const DocumentKey &)key {
65- NSArray <FSTMutationBatch *> *affectingBatches =
65+ NSArray <FSTMutationBatch *> *batches =
6666 [self .mutationQueue allMutationBatchesAffectingDocumentKey: key];
67- return [self documentForKey: key withAffectingBatches: affectingBatches ];
67+ return [self documentForKey: key inBatches: batches ];
6868}
6969
70- // Internal version of documentForKey: which allows reusing `affectingBatches `.
70+ // Internal version of documentForKey: which allows reusing `batches `.
7171- (nullable FSTMaybeDocument *)documentForKey : (const DocumentKey &)key
72- withAffectingBatches : (NSArray <FSTMutationBatch *> *)affectingBatches {
72+ inBatches : (NSArray <FSTMutationBatch *> *)batches {
7373 FSTMaybeDocument *_Nullable remoteDoc = [self .remoteDocumentCache entryForKey: key];
74- return [self localDocument: remoteDoc key: key affectingBatches: affectingBatches ];
74+ return [self localDocument: remoteDoc key: key inBatches: batches ];
7575}
7676
7777- (FSTMaybeDocumentDictionary *)documentsForKeys : (const DocumentKeySet &)keys {
7878 FSTMaybeDocumentDictionary *results = [FSTMaybeDocumentDictionary maybeDocumentDictionary ];
79- NSArray <FSTMutationBatch *> *affectingBatches =
79+ NSArray <FSTMutationBatch *> *batches =
8080 [self .mutationQueue allMutationBatchesAffectingDocumentKeys: keys];
8181 for (const DocumentKey &key : keys) {
8282 // TODO(mikelehen): PERF: Consider fetching all remote documents at once rather than one-by-one.
83- FSTMaybeDocument *maybeDoc = [self documentForKey: key withAffectingBatches: affectingBatches ];
83+ FSTMaybeDocument *maybeDoc = [self documentForKey: key inBatches: batches ];
8484 // TODO(http://b/32275378): Don't conflate missing / deleted.
8585 if (!maybeDoc) {
8686 maybeDoc = [FSTDeletedDocument documentWithKey: key version:SnapshotVersion: :None ()];
@@ -164,8 +164,8 @@ - (FSTDocumentDictionary *)documentsMatchingCollectionQuery:(FSTQuery *)query {
164164 */
165165- (nullable FSTMaybeDocument *)localDocument : (nullable FSTMaybeDocument *)document
166166 key : (const DocumentKey &)documentKey
167- affectingBatches : (NSArray <FSTMutationBatch *> *)affectingBatches {
168- for (FSTMutationBatch *batch in affectingBatches ) {
167+ inBatches : (NSArray <FSTMutationBatch *> *)batches {
168+ for (FSTMutationBatch *batch in batches ) {
169169 document = [batch applyTo: document documentKey: documentKey];
170170 }
171171
@@ -185,14 +185,14 @@ - (FSTDocumentDictionary *)localDocuments:(FSTDocumentDictionary *)documents {
185185 enumerateKeysAndObjectsUsingBlock: ^(FSTDocumentKey *key, FSTDocument *doc, BOOL *stop) {
186186 keySet = keySet.insert (doc.key );
187187 }];
188- NSArray <FSTMutationBatch *> *affectingBatches =
188+ NSArray <FSTMutationBatch *> *batches =
189189 [self .mutationQueue allMutationBatchesAffectingDocumentKeys: keySet];
190190
191191 __block FSTDocumentDictionary *result = documents;
192192 [documents enumerateKeysAndObjectsUsingBlock: ^(FSTDocumentKey *key, FSTDocument *remoteDocument,
193193 BOOL *stop) {
194194 FSTMaybeDocument *mutatedDoc =
195- [self localDocument: remoteDocument key: key affectingBatches: affectingBatches ];
195+ [self localDocument: remoteDocument key: key inBatches: batches ];
196196 if ([mutatedDoc isKindOfClass: [FSTDeletedDocument class ]]) {
197197 result = [result dictionaryByRemovingObjectForKey: key];
198198 } else if ([mutatedDoc isKindOfClass: [FSTDocument class ]]) {
0 commit comments