Port FIRQuery to C++ (#2986)

Author: wilhuff

Firestore/Example/Tests/API/FIRQueryTests.mm

@@ -18,11 +18,14 @@
 
 #import <XCTest/XCTest.h>
 
+#import "Firestore/Source/API/FIRFirestore+Internal.h"
 #import "Firestore/Source/API/FIRQuery+Internal.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 
 #import "Firestore/Example/Tests/API/FSTAPIHelpers.h"
 
+namespace api = firebase::firestore::api;
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface FIRQueryTests : XCTestCase
@@ -31,10 +34,10 @@ @interface FIRQueryTests : XCTestCase
 @implementation FIRQueryTests
 
 - (void)testEquals {
-  FIRFirestore *firestore = FSTTestFirestore();
-  FIRQuery *queryFoo = [FIRQuery referenceWithQuery:FSTTestQuery("foo") firestore:firestore];
-  FIRQuery *queryFooDup = [FIRQuery referenceWithQuery:FSTTestQuery("foo") firestore:firestore];
-  FIRQuery *queryBar = [FIRQuery referenceWithQuery:FSTTestQuery("bar") firestore:firestore];
+  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().wrapped;
+  FIRQuery *queryFoo = [[FIRQuery alloc] initWithQuery:FSTTestQuery("foo") firestore:firestore];
+  FIRQuery *queryFooDup = [[FIRQuery alloc] initWithQuery:FSTTestQuery("foo") firestore:firestore];
+  FIRQuery *queryBar = [[FIRQuery alloc] initWithQuery:FSTTestQuery("bar") firestore:firestore];
   XCTAssertEqualObjects(queryFoo, queryFooDup);
   XCTAssertNotEqualObjects(queryFoo, queryBar);
   XCTAssertEqualObjects([queryFoo queryWhereField:@"f" isEqualTo:@1],
@@ -51,8 +54,8 @@ - (void)testEquals {
 }
 
 - (void)testFilteringWithPredicate {
-  FIRFirestore *firestore = FSTTestFirestore();
-  FIRQuery *query = [FIRQuery referenceWithQuery:FSTTestQuery("foo") firestore:firestore];
+  std::shared_ptr<api::Firestore> firestore = FSTTestFirestore().wrapped;
+  FIRQuery *query = [[FIRQuery alloc] initWithQuery:FSTTestQuery("foo") firestore:firestore];
   FIRQuery *query1 = [query queryWhereField:@"f" isLessThanOrEqualTo:@1];
   FIRQuery *query2 = [query queryFilteredUsingPredicate:[NSPredicate predicateWithFormat:@"f<=1"]];
   FIRQuery *query3 = [[query queryWhereField:@"f1" isLessThan:@2] queryWhereField:@"f2"

Firestore/Source/API/FIRCollectionReference.mm

@@ -23,12 +23,12 @@
 #import "Firestore/Source/API/FIRDocumentReference+Internal.h"
 #import "Firestore/Source/API/FIRFirestore+Internal.h"
 #import "Firestore/Source/API/FIRQuery+Internal.h"
-#import "Firestore/Source/API/FIRQuery_Init.h"
 #import "Firestore/Source/Core/FSTQuery.h"
 
 #include "Firestore/core/src/firebase/firestore/api/input_validation.h"
 #include "Firestore/core/src/firebase/firestore/model/document_key.h"
 #include "Firestore/core/src/firebase/firestore/model/resource_path.h"
+#include "Firestore/core/src/firebase/firestore/util/hashing.h"
 #include "Firestore/core/src/firebase/firestore/util/string_apple.h"
 
 namespace util = firebase::firestore::util;
@@ -44,9 +44,7 @@ - (instancetype)initWithPath:(const ResourcePath &)path
                    firestore:(FIRFirestore *)firestore NS_DESIGNATED_INITIALIZER;
 
 // Mark the super class designated initializer unavailable.
-- (instancetype)initWithQuery:(FSTQuery *)query
-                    firestore:(FIRFirestore *)firestore
-    __attribute__((unavailable("Use the initWithPath constructor of FIRCollectionReference.")));
+- (instancetype)initWithQuery:(api::Query &&)query NS_UNAVAILABLE;
 @end
 
 @implementation FIRCollectionReference (Internal)
@@ -63,12 +61,14 @@ - (instancetype)initWithPath:(const ResourcePath &)path firestore:(FIRFirestore
                          "number of segments, but %s has %s",
                          path.CanonicalString(), path.size());
   }
-  self = [super initWithQuery:[FSTQuery queryWithPath:path] firestore:firestore];
+
+  api::Query query([FSTQuery queryWithPath:path], firestore.wrapped);
+  self = [super initWithQuery:std::move(query)];
   return self;
 }
 
 // Override the designated initializer from the super class.
-- (instancetype)initWithQuery:(FSTQuery *)query firestore:(FIRFirestore *)firestore {
+- (instancetype)initWithQuery:(api::Query &&)query {
   HARD_FAIL("Use FIRCollectionReference initWithPath: initializer.");
 }
 
@@ -87,9 +87,7 @@ - (BOOL)isEqualToReference:(nullable FIRCollectionReference *)reference {
 }
 
 - (NSUInteger)hash {
-  NSUInteger hash = [self.firestore hash];
-  hash = hash * 31u + [self.query hash];
-  return hash;
+  return util::Hash(self.firestore, self.query);
 }
 
 - (NSString *)collectionID {

Firestore/Source/API/FIRQuery+Internal.h

@@ -16,15 +16,29 @@
 
 #import "FIRQuery.h"
 
+#include <memory>
+
+#include "Firestore/core/src/firebase/firestore/api/query_core.h"
+
+namespace api = firebase::firestore::api;
+
 @class FSTQuery;
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface FIRQuery (/* Init */)
+
+- (instancetype)initWithQuery:(api::Query &&)query NS_DESIGNATED_INITIALIZER;
+
+- (instancetype)initWithQuery:(FSTQuery *)query
+                    firestore:(std::shared_ptr<api::Firestore>)firestore;
+
+@end
+
 /** Internal FIRQuery API we don't want exposed in our public header files. */
 @interface FIRQuery (Internal)
-+ (FIRQuery *)referenceWithQuery:(FSTQuery *)query firestore:(FIRFirestore *)firestore;
 
-@property(nonatomic, strong, readonly) FSTQuery *query;
+- (FSTQuery *)query;
 
 @end