Skip to content

Don't look up TargetId in notifyLocalViewChanges #1607

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

Merged
merged 4 commits into from
Jul 31, 2018
Merged

Don't look up TargetId in notifyLocalViewChanges #1607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5242dec
Don't look up TargetId in notifyLocalViewChanges
schmidt-sebastian Jul 31, 2018
4df0ddc
Merge
schmidt-sebastian Jul 31, 2018
a37fdcf
Lint fix
schmidt-sebastian Jul 31, 2018
ac47de8
Review feedback
schmidt-sebastian Jul 31, 2018
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
4 changes: 2 additions & 2 deletions Firestore/Example/Tests/Local/FSTLocalStoreTests.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ - (void)testPinsDocumentsInTheLocalView {
FSTAssertContains(FSTTestDoc("foo/bar", 1, @{@"foo" : @"bar"}, NO));
FSTAssertContains(FSTTestDoc("foo/baz", 0, @{@"foo" : @"baz"}, YES));

[self notifyLocalViewChanges:FSTTestViewChanges(query, @[ @"foo/bar", @"foo/baz" ], @[])];
[self notifyLocalViewChanges:FSTTestViewChanges(targetID, @[ @"foo/bar", @"foo/baz" ], @[])];
FSTAssertContains(FSTTestDoc("foo/bar", 1, @{@"foo" : @"bar"}, NO));
[self applyRemoteEvent:FSTTestUpdateRemoteEvent(FSTTestDoc("foo/bar", 1, @{@"foo" : @"bar"}, NO),
@[], @[ @(targetID) ])];
Expand All @@ -738,7 +738,7 @@ - (void)testPinsDocumentsInTheLocalView {
FSTAssertContains(FSTTestDoc("foo/bar", 1, @{@"foo" : @"bar"}, NO));
FSTAssertContains(FSTTestDoc("foo/baz", 2, @{@"foo" : @"baz"}, NO));

[self notifyLocalViewChanges:FSTTestViewChanges(query, @[], @[ @"foo/bar", @"foo/baz" ])];
[self notifyLocalViewChanges:FSTTestViewChanges(targetID, @[], @[ @"foo/bar", @"foo/baz" ])];
[self.localStore releaseQuery:query];

FSTAssertNotContains(@"foo/bar");
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Example/Tests/Util/FSTHelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ FSTRemoteEvent *FSTTestUpdateRemoteEventWithLimboTargets(FSTMaybeDocument *doc,
NSArray<NSNumber *> *limboTargets);

/** Creates a test view changes. */
FSTLocalViewChanges *FSTTestViewChanges(FSTQuery *query,
FSTLocalViewChanges *FSTTestViewChanges(FSTTargetID targetID,
NSArray<NSString *> *addedKeys,
NSArray<NSString *> *removedKeys);

Expand Down
8 changes: 4 additions & 4 deletions Firestore/Example/Tests/Util/FSTHelpers.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ - (nullable FSTQueryData *)queryDataForTarget:(FSTBoxedTargetID *)targetID {
return [snapshotString dataUsingEncoding:NSUTF8StringEncoding];
}

FSTLocalViewChanges *FSTTestViewChanges(FSTQuery *query,
FSTLocalViewChanges *FSTTestViewChanges(FSTTargetID targetID,
NSArray<NSString *> *addedKeys,
NSArray<NSString *> *removedKeys) {
DocumentKeySet added;
Expand All @@ -456,9 +456,9 @@ - (nullable FSTQueryData *)queryDataForTarget:(FSTBoxedTargetID *)targetID {
for (NSString *keyPath in removedKeys) {
removed = removed.insert(testutil::Key(util::MakeStringView(keyPath)));
}
return [FSTLocalViewChanges changesForQuery:query
addedKeys:std::move(added)
removedKeys:std::move(removed)];
return [FSTLocalViewChanges changesForTarget:targetID
addedKeys:std::move(added)
removedKeys:std::move(removed)];
}

NS_ASSUME_NONNULL_END
3 changes: 2 additions & 1 deletion Firestore/Source/Core/FSTSyncEngine.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,8 @@ - (void)emitNewSnapshotsWithChanges:(FSTMaybeDocumentDictionary *)changes
if (viewChange.snapshot) {
[newSnapshots addObject:viewChange.snapshot];
FSTLocalViewChanges *docChanges =
[FSTLocalViewChanges changesForViewSnapshot:viewChange.snapshot];
[FSTLocalViewChanges changesForViewSnapshot:viewChange.snapshot
withTargetID:queryView.targetID];
[documentChangesInAllViews addObject:docChanges];
}
}];
Expand Down
11 changes: 4 additions & 7 deletions Firestore/Source/Local/FSTLocalStore.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,15 +340,12 @@ - (FSTMaybeDocumentDictionary *)applyRemoteEvent:(FSTRemoteEvent *)remoteEvent {
- (void)notifyLocalViewChanges:(NSArray<FSTLocalViewChanges *> *)viewChanges {
self.persistence.run("NotifyLocalViewChanges", [&]() {
FSTReferenceSet *localViewReferences = self.localViewReferences;
for (FSTLocalViewChanges *view in viewChanges) {
FSTQueryData *queryData = [self.queryCache queryDataForQuery:view.query];
HARD_ASSERT(queryData, "Local view changes contain unallocated query.");
FSTTargetID targetID = queryData.targetID;
for (const DocumentKey &key : view.removedKeys) {
for (FSTLocalViewChanges *viewChange in viewChanges) {
for (const DocumentKey &key : viewChange.removedKeys) {
[self->_persistence.referenceDelegate removeReference:key];
}
[localViewReferences addReferencesToKeys:view.addedKeys forID:targetID];
[localViewReferences removeReferencesToKeys:view.removedKeys forID:targetID];
[localViewReferences addReferencesToKeys:viewChange.addedKeys forID:viewChange.targetID];
[localViewReferences removeReferencesToKeys:viewChange.removedKeys forID:viewChange.targetID];
}
});
}
Expand Down
13 changes: 8 additions & 5 deletions Firestore/Source/Local/FSTLocalViewChanges.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

#import <Foundation/Foundation.h>

#import "Firestore/Source/Core/FSTTypes.h"

#include "Firestore/core/src/firebase/firestore/model/document_key_set.h"

@class FSTDocumentSet;
Expand All @@ -33,15 +35,16 @@ NS_ASSUME_NONNULL_BEGIN
*/
@interface FSTLocalViewChanges : NSObject

+ (instancetype)changesForQuery:(FSTQuery *)query
addedKeys:(firebase::firestore::model::DocumentKeySet)addedKeys
removedKeys:(firebase::firestore::model::DocumentKeySet)removedKeys;
+ (instancetype)changesForTarget:(FSTTargetID)targetID
addedKeys:(firebase::firestore::model::DocumentKeySet)addedKeys
removedKeys:(firebase::firestore::model::DocumentKeySet)removedKeys;

+ (instancetype)changesForViewSnapshot:(FSTViewSnapshot *)viewSnapshot;
+ (instancetype)changesForViewSnapshot:(FSTViewSnapshot *)viewSnapshot
withTargetID:(FSTTargetID)targetID;

- (id)init NS_UNAVAILABLE;

@property(nonatomic, strong, readonly) FSTQuery *query;
@property(readonly) FSTTargetID targetID;

- (const firebase::firestore::model::DocumentKeySet &)addedKeys;
- (const firebase::firestore::model::DocumentKeySet &)removedKeys;
Expand Down
35 changes: 18 additions & 17 deletions Firestore/Source/Local/FSTLocalViewChanges.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,18 @@
NS_ASSUME_NONNULL_BEGIN

@interface FSTLocalViewChanges ()
- (instancetype)initWithQuery:(FSTQuery *)query
addedKeys:(DocumentKeySet)addedKeys
removedKeys:(DocumentKeySet)removedKeys NS_DESIGNATED_INITIALIZER;
- (instancetype)initWithTarget:(FSTTargetID)targetID
addedKeys:(DocumentKeySet)addedKeys
removedKeys:(DocumentKeySet)removedKeys NS_DESIGNATED_INITIALIZER;
@end

@implementation FSTLocalViewChanges {
DocumentKeySet _addedKeys;
DocumentKeySet _removedKeys;
}

+ (instancetype)changesForViewSnapshot:(FSTViewSnapshot *)viewSnapshot {
+ (instancetype)changesForViewSnapshot:(FSTViewSnapshot *)viewSnapshot
withTargetID:(FSTTargetID)targetID {
DocumentKeySet addedKeys;
DocumentKeySet removedKeys;

Expand All @@ -56,25 +57,25 @@ + (instancetype)changesForViewSnapshot:(FSTViewSnapshot *)viewSnapshot {
}
}

return [self changesForQuery:viewSnapshot.query
addedKeys:std::move(addedKeys)
removedKeys:std::move(removedKeys)];
return [self changesForTarget:targetID
addedKeys:std::move(addedKeys)
removedKeys:std::move(removedKeys)];
}

+ (instancetype)changesForQuery:(FSTQuery *)query
addedKeys:(DocumentKeySet)addedKeys
removedKeys:(DocumentKeySet)removedKeys {
return [[FSTLocalViewChanges alloc] initWithQuery:query
addedKeys:std::move(addedKeys)
removedKeys:std::move(removedKeys)];
+ (instancetype)changesForTarget:(FSTTargetID)targetID
addedKeys:(DocumentKeySet)addedKeys
removedKeys:(DocumentKeySet)removedKeys {
return [[FSTLocalViewChanges alloc] initWithTarget:targetID
addedKeys:std::move(addedKeys)
removedKeys:std::move(removedKeys)];
}

- (instancetype)initWithQuery:(FSTQuery *)query
addedKeys:(DocumentKeySet)addedKeys
removedKeys:(DocumentKeySet)removedKeys {
- (instancetype)initWithTarget:(FSTTargetID)targetID
addedKeys:(DocumentKeySet)addedKeys
removedKeys:(DocumentKeySet)removedKeys {
self = [super init];
if (self) {
_query = query;
_targetID = targetID;
_addedKeys = std::move(addedKeys);
_removedKeys = std::move(removedKeys);
}
Expand Down