Add CMake support for FSTLocalSerializer (#3753)

* Add support for building Objective-C protos in CMake

* Add support for building FSTLocalSerializer to CMake

* Build ProtoSizer with CMake

* Build memory components with CMake

* Build LevelDB components with CMake

Author: wilhuff

Firestore/CMakeLists.txt

@@ -15,5 +15,6 @@
 add_subdirectory(Example/Benchmarks)
 
 add_subdirectory(Protos)
+add_subdirectory(Source)
 add_subdirectory(core)
 add_subdirectory(fuzzing)

Firestore/Protos/CMakeLists.txt

@@ -167,6 +167,26 @@ target_include_directories(
   ${FIREBASE_SOURCE_DIR}/Firestore/Protos/cpp
 )
 
+if(APPLE)
+  cc_library(
+    firebase_firestore_protos_objc
+    SOURCES
+      ${PROTOBUF_OBJC_GENERATED_SOURCES}
+    DEPENDS
+      libprotobuf_objc
+    EXCLUDE_FROM_ALL
+  )
+
+  target_include_directories(
+    firebase_firestore_protos_objc PRIVATE
+    ${FIREBASE_SOURCE_DIR}/Firestore/Protos/objc/firestore/local
+    ${FIREBASE_SOURCE_DIR}/Firestore/Protos/objc/google/firestore/v1
+    ${FIREBASE_SOURCE_DIR}/Firestore/Protos/objc/google/api
+    ${FIREBASE_SOURCE_DIR}/Firestore/Protos/objc/google/rpc
+    ${FIREBASE_SOURCE_DIR}/Firestore/Protos/objc/google/type
+  )
+endif()
+
 
 # Generate the python representation of descriptor.proto.
 set(PROTOBUF_DIR ${FIREBASE_BINARY_DIR}/external/src/grpc/third_party/protobuf)
@@ -306,3 +326,95 @@ add_custom_target(
     generate_cpp_protos
     generate_objc_protos
 )
+
+if(APPLE)
+  set(
+    protobuf_objc_source_dir
+    ${FIREBASE_EXTERNAL_SOURCE_DIR}/grpc/third_party/protobuf/objectivec
+  )
+  objc_framework(
+    Protobuf
+    HEADERS
+      ${protobuf_objc_source_dir}/GPBArray.h
+      ${protobuf_objc_source_dir}/GPBArray_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBBootstrap.h
+      ${protobuf_objc_source_dir}/GPBCodedInputStream.h
+      ${protobuf_objc_source_dir}/GPBCodedInputStream_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBCodedOutputStream.h
+      ${protobuf_objc_source_dir}/GPBCodedOutputStream_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBDescriptor.h
+      ${protobuf_objc_source_dir}/GPBDescriptor_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBDictionary.h
+      ${protobuf_objc_source_dir}/GPBDictionary_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBExtensionInternals.h
+      ${protobuf_objc_source_dir}/GPBExtensionRegistry.h
+      ${protobuf_objc_source_dir}/GPBMessage.h
+      ${protobuf_objc_source_dir}/GPBMessage_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBProtocolBuffers.h
+      ${protobuf_objc_source_dir}/GPBProtocolBuffers_RuntimeSupport.h
+      ${protobuf_objc_source_dir}/GPBRootObject.h
+      ${protobuf_objc_source_dir}/GPBRootObject_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBRuntimeTypes.h
+      ${protobuf_objc_source_dir}/GPBUnknownField.h
+      ${protobuf_objc_source_dir}/GPBUnknownFieldSet.h
+      ${protobuf_objc_source_dir}/GPBUnknownFieldSet_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBUnknownField_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBUtilities.h
+      ${protobuf_objc_source_dir}/GPBUtilities_PackagePrivate.h
+      ${protobuf_objc_source_dir}/GPBWellKnownTypes.h
+      ${protobuf_objc_source_dir}/GPBWireFormat.h
+      ${protobuf_objc_source_dir}/google/protobuf/Any.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/Api.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/Duration.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/Empty.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/FieldMask.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/SourceContext.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/Struct.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/Timestamp.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/Type.pbobjc.h
+      ${protobuf_objc_source_dir}/google/protobuf/Wrappers.pbobjc.h
+
+    SOURCES
+      ${protobuf_objc_source_dir}/GPBArray.m
+      ${protobuf_objc_source_dir}/GPBCodedInputStream.m
+      ${protobuf_objc_source_dir}/GPBCodedOutputStream.m
+      ${protobuf_objc_source_dir}/GPBDescriptor.m
+      ${protobuf_objc_source_dir}/GPBDictionary.m
+      ${protobuf_objc_source_dir}/GPBExtensionInternals.m
+      ${protobuf_objc_source_dir}/GPBExtensionRegistry.m
+      ${protobuf_objc_source_dir}/GPBMessage.m
+      ${protobuf_objc_source_dir}/GPBProtocolBuffers.m
+      ${protobuf_objc_source_dir}/GPBRootObject.m
+      ${protobuf_objc_source_dir}/GPBUnknownField.m
+      ${protobuf_objc_source_dir}/GPBUnknownFieldSet.m
+      ${protobuf_objc_source_dir}/GPBUtilities.m
+      ${protobuf_objc_source_dir}/GPBWellKnownTypes.m
+      ${protobuf_objc_source_dir}/GPBWireFormat.m
+      ${protobuf_objc_source_dir}/google/protobuf/Any.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/Api.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/Duration.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/Empty.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/FieldMask.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/SourceContext.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/Struct.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/Timestamp.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/Type.pbobjc.m
+      ${protobuf_objc_source_dir}/google/protobuf/Wrappers.pbobjc.m
+  )
+  target_include_directories(
+    Protobuf
+    PRIVATE
+      ${protobuf_objc_source_dir}/google/protobuf
+    INTERFACE
+      ${PROJECT_BINARY_DIR}/Headers/Protobuf
+    PUBLIC
+      ${protobuf_objc_source_dir}
+  )
+  target_compile_options(
+    Protobuf PRIVATE
+    -fno-objc-arc
+    -Wno-missing-noescape
+  )
+  add_alias(libprotobuf_objc Protobuf)
+
+endif()

Firestore/Source/CMakeLists.txt

@@ -0,0 +1,16 @@
+# Copyright 2019 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_subdirectory(Public)
+add_subdirectory(Remote)

Firestore/Source/Public/CMakeLists.txt

@@ -0,0 +1,30 @@
+# Copyright 2019 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if(APPLE)
+  cc_library(
+    firebase_firestore_public_objc
+    HEADER_ONLY
+    SOURCES
+      FIRFirestoreErrors.h
+  )
+
+  target_include_directories(
+    firebase_firestore_public_objc
+    INTERFACE
+    ${FIREBASE_SOURCE_DIR}/Firestore/Source/Public
+  )
+
+endif()
+

Firestore/Source/Remote/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Copyright 2019 Google
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+if(APPLE)
+  cc_library(
+    firebase_firestore_remote_objc
+    SOURCES
+      FSTSerializerBeta.h
+      FSTSerializerBeta.mm
+    DEPENDS
+      absl_algorithm
+      firebase_firestore_nanopb
+      firebase_firestore_public_objc
+      libprotobuf_objc
+  )
+
+endif()

Firestore/Source/Remote/FSTSerializerBeta.mm

@@ -450,7 +450,7 @@ - (ObjectValue)decodedMapValue:(GCFSMapValue *)map {
 - (ObjectValue)decodedFields:(NSDictionary<NSString *, GCFSValue *> *)fields {
   __block ObjectValue result = ObjectValue::Empty();
   [fields enumerateKeysAndObjectsUsingBlock:^(NSString *_Nonnull key, GCFSValue *_Nonnull obj,
-                                              BOOL *_Nonnull stop) {
+                                              BOOL *_Nonnull) {
     FieldPath path{util::MakeString(key)};
     FieldValue value = [self decodedFieldValue:obj];
     result = result.Set(path, std::move(value));
@@ -725,7 +725,7 @@ - (GCFSArrayValue *)encodedArrayTransformElements:(const std::vector<FieldValue>
 
 - (std::vector<FieldValue>)decodedArrayTransformElements:(GCFSArrayValue *)proto {
   __block std::vector<FieldValue> elements;
-  [proto.valuesArray enumerateObjectsUsingBlock:^(GCFSValue *value, NSUInteger idx, BOOL *stop) {
+  [proto.valuesArray enumerateObjectsUsingBlock:^(GCFSValue *value, NSUInteger, BOOL *) {
     elements.push_back([self decodedFieldValue:value]);
   }];
   return elements;
@@ -1167,7 +1167,7 @@ - (SnapshotVersion)versionFromListenResponse:(GCFSListenResponse *)watchChange {
   WatchTargetChangeState state = [self decodedWatchTargetChangeState:change.targetChangeType];
   __block std::vector<TargetId> targetIDs;
 
-  [change.targetIdsArray enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
+  [change.targetIdsArray enumerateValuesWithBlock:^(int32_t value, NSUInteger, BOOL *) {
     targetIDs.push_back(value);
   }];
 
@@ -1203,7 +1203,7 @@ - (WatchTargetChangeState)decodedWatchTargetChangeState:(GCFSTargetChange_Target
 - (std::vector<TargetId>)decodedIntegerArray:(GPBInt32Array *)values {
   __block std::vector<TargetId> result;
   result.reserve(values.count);
-  [values enumerateValuesWithBlock:^(int32_t value, NSUInteger idx, BOOL *stop) {
+  [values enumerateValuesWithBlock:^(int32_t value, NSUInteger, BOOL *) {
     result.push_back(value);
   }];
   return result;

Firestore/core/src/firebase/firestore/local/CMakeLists.txt

@@ -16,17 +16,17 @@ cc_library(
   firebase_firestore_local_persistence_leveldb
   SOURCES
     leveldb_index_manager.h
-    #leveldb_index_manager.mm
+    leveldb_index_manager.mm
     leveldb_key.cc
     leveldb_key.h
     leveldb_migrations.cc
     leveldb_migrations.h
     leveldb_mutation_queue.h
-    #leveldb_mutation_queue.mm
+    leveldb_mutation_queue.mm
     leveldb_query_cache.h
-    #leveldb_query_cache.mm
+    leveldb_query_cache.mm
     leveldb_remote_document_cache.h
-    #leveldb_remote_document_cache.mm
+    leveldb_remote_document_cache.mm
     leveldb_transaction.cc
     leveldb_transaction.h
     leveldb_util.cc
@@ -44,6 +44,14 @@ cc_library(
   EXCLUDE_FROM_ALL
 )
 
+if(APPLE)
+  target_link_libraries(
+    firebase_firestore_local_persistence_leveldb
+    PRIVATE
+    firebase_firestore_protos_objc
+  )
+endif()
+
 cc_library(
   firebase_firestore_local
   SOURCES
@@ -62,12 +70,14 @@ cc_library(
     memory_index_manager.cc
     memory_index_manager.h
     memory_mutation_queue.h
-    #memory_mutation_queue.mm
+    memory_mutation_queue.mm
     memory_query_cache.h
-    #memory_query_cache.mm
+    memory_query_cache.mm
     memory_remote_document_cache.h
-    #memory_remote_document_cache.mm
+    memory_remote_document_cache.mm
     mutation_queue.h
+    proto_sizer.h
+    proto_sizer.mm
     query_cache.h
     query_data.cc
     query_data.h
@@ -88,3 +98,10 @@ cc_library(
     firebase_firestore_remote
     firebase_firestore_util
 )
+
+if(APPLE)
+  target_link_libraries(
+    firebase_firestore_local PRIVATE
+    firebase_firestore_protos_objc
+  )
+endif()

Firestore/core/src/firebase/firestore/local/leveldb_mutation_queue.mm

@@ -154,7 +154,7 @@ BatchId LoadNextBatchIdFromDb(DB* db) {
   return empty;
 }
 
-void LevelDbMutationQueue::AcknowledgeBatch(const MutationBatch& batch,
+void LevelDbMutationQueue::AcknowledgeBatch(const MutationBatch&,
                                             const ByteString& stream_token) {
   SetLastStreamToken(stream_token);
 }

Firestore/core/src/firebase/firestore/local/memory_mutation_queue.mm

@@ -211,7 +211,7 @@ MutationBatch batch(batch_id, local_write_time, std::move(base_mutations),
   // The requested batchID may still be out of range so normalize it to the
   // start of the queue.
   int raw_index = IndexOfBatchId(next_batch_id);
-  int index = raw_index < 0 ? 0 : raw_index;
+  size_t index = raw_index < 0 ? 0 : static_cast<size_t>(raw_index);
   if (queue_.size() <= index) {
     return absl::nullopt;
   }
@@ -230,7 +230,7 @@ MutationBatch batch(batch_id, local_write_time, std::move(base_mutations),
   }
 
   int index = IndexOfBatchId(batch_id);
-  if (index < 0 || index >= queue_.size()) {
+  if (index < 0 || static_cast<size_t>(index) >= queue_.size()) {
     return absl::nullopt;
   }