port paths to FSTDocumentKey (#877)

* replace path with C++ implementation in FSTDocumentKey.{h,mm} only

* address changes

* address changes

1 files changed, 3 insertions, 2 deletions

diff --git a/Firestore/Source/Local/FSTLocalDocumentsView.mm b/Firestore/Source/Local/FSTLocalDocumentsView.mm
index 4bcdf47..0059e28 100644
--- a/Firestore/Source/Local/FSTLocalDocumentsView.mm
+++ b/Firestore/Source/Local/FSTLocalDocumentsView.mm
@@ -75,7 +75,7 @@ NS_ASSUME_NONNULL_BEGIN
 }
 
 - (FSTDocumentDictionary *)documentsMatchingQuery:(FSTQuery *)query {
-  if ([FSTDocumentKey isDocumentKey:[FSTResourcePath resourcePathWithCPPResourcePath:query.path]]) {
+  if ([FSTDocumentKey isDocumentKey:query.path]) {
     return [self documentsMatchingDocumentQuery:[FSTResourcePath
                                                     resourcePathWithCPPResourcePath:query.path]];
   } else {
@@ -86,7 +86,8 @@ NS_ASSUME_NONNULL_BEGIN
 - (FSTDocumentDictionary *)documentsMatchingDocumentQuery:(FSTResourcePath *)docPath {
   FSTDocumentDictionary *result = [FSTDocumentDictionary documentDictionary];
   // Just do a simple document lookup.
-  FSTMaybeDocument *doc = [self documentForKey:[FSTDocumentKey keyWithPath:docPath]];
+  FSTMaybeDocument *doc =
+      [self documentForKey:[FSTDocumentKey keyWithPath:[docPath toCPPResourcePath]]];
   if ([doc isKindOfClass:[FSTDocument class]]) {
     result = [result dictionaryBySettingObject:(FSTDocument *)doc forKey:doc.key];
   }