Move firestore::model::mutation::Overlay into its parent namespace (#9422)

Author: dconeybe

Firestore/Example/Firestore.xcodeproj/project.pbxproj

@@ -22,7 +22,7 @@
 
 #include "Firestore/core/src/model/document_key.h"
 #include "Firestore/core/src/model/mutation.h"
-#include "Firestore/core/src/model/mutation/overlay.h"
+#include "Firestore/core/src/model/overlay.h"
 #include "Firestore/core/src/model/resource_path.h"
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
@@ -45,9 +45,8 @@ class DocumentOverlayCacheTestHelper;
  */
 class DocumentOverlayCache {
  public:
-  using OverlayByDocumentKeyMap = std::unordered_map<model::DocumentKey,
-                                                     model::mutation::Overlay,
-                                                     model::DocumentKeyHash>;
+  using OverlayByDocumentKeyMap = std::
+      unordered_map<model::DocumentKey, model::Overlay, model::DocumentKeyHash>;
   using MutationByDocumentKeyMap = std::unordered_map<model::DocumentKey,
                                                       model::Mutation,
                                                       model::DocumentKeyHash>;
@@ -59,7 +58,7 @@ class DocumentOverlayCache {
    *
    * Returns an empty optional if there is no overlay for that key.
    */
-  virtual absl::optional<model::mutation::Overlay> GetOverlay(
+  virtual absl::optional<model::Overlay> GetOverlay(
       const model::DocumentKey& key) const = 0;
 
   /**

Firestore/core/src/local/document_overlay_cache.h

@@ -37,9 +37,9 @@ namespace local {
 using credentials::User;
 using model::DocumentKey;
 using model::Mutation;
+using model::Overlay;
+using model::OverlayHash;
 using model::ResourcePath;
-using model::mutation::Overlay;
-using model::mutation::OverlayHash;
 using nanopb::Message;
 using nanopb::StringReader;
 

Firestore/core/src/local/leveldb_document_overlay_cache.cc

@@ -52,7 +52,7 @@ class LevelDbDocumentOverlayCache final : public DocumentOverlayCache {
   LevelDbDocumentOverlayCache& operator=(LevelDbDocumentOverlayCache&&) =
       delete;
 
-  absl::optional<model::mutation::Overlay> GetOverlay(
+  absl::optional<model::Overlay> GetOverlay(
       const model::DocumentKey&) const override;
 
   void SaveOverlays(int largest_batch_id,
@@ -84,9 +84,8 @@ class LevelDbDocumentOverlayCache final : public DocumentOverlayCache {
     kStop,
   };
 
-  model::mutation::Overlay ParseOverlay(
-      const LevelDbDocumentOverlayKey& key,
-      absl::string_view encoded_mutation) const;
+  model::Overlay ParseOverlay(const LevelDbDocumentOverlayKey& key,
+                              absl::string_view encoded_mutation) const;
 
   void SaveOverlay(int largest_batch_id,
                    const model::DocumentKey& document_key,
@@ -110,7 +109,7 @@ class LevelDbDocumentOverlayCache final : public DocumentOverlayCache {
       int since_batch_id,
       std::function<ForEachKeyAction(LevelDbDocumentOverlayKey&&)>) const;
 
-  absl::optional<model::mutation::Overlay> GetOverlay(
+  absl::optional<model::Overlay> GetOverlay(
       const LevelDbDocumentOverlayKey& decoded_key) const;
 
   // The LevelDbDocumentOverlayCache instance is owned by LevelDbPersistence.

Firestore/core/src/local/leveldb_document_overlay_cache.h

@@ -35,7 +35,6 @@
 #include "Firestore/core/src/local/target_data.h"
 #include "Firestore/core/src/model/field_path.h"
 #include "Firestore/core/src/model/mutable_document.h"
-#include "Firestore/core/src/model/mutation/overlay.h"
 #include "Firestore/core/src/model/mutation_batch.h"
 #include "Firestore/core/src/model/snapshot_version.h"
 #include "Firestore/core/src/nanopb/byte_string.h"
@@ -64,7 +63,6 @@ using model::MutationBatch;
 using model::ObjectValue;
 using model::Segment;
 using model::SnapshotVersion;
-using model::mutation::Overlay;
 using nanopb::ByteString;
 using nanopb::CheckedSize;
 using nanopb::CopyBytesArray;

Firestore/core/src/local/local_serializer.cc

@@ -28,8 +28,8 @@ namespace local {
 using model::DocumentKey;
 using model::DocumentKeyHash;
 using model::Mutation;
+using model::Overlay;
 using model::ResourcePath;
-using model::mutation::Overlay;
 
 absl::optional<Overlay> MemoryDocumentOverlayCache::GetOverlay(
     const DocumentKey& key) const {

Firestore/core/src/local/memory_document_overlay_cache.cc

@@ -38,7 +38,7 @@ class MemoryDocumentOverlayCache final : public DocumentOverlayCache {
   MemoryDocumentOverlayCache(MemoryDocumentOverlayCache&&) = delete;
   MemoryDocumentOverlayCache& operator=(MemoryDocumentOverlayCache&&) = delete;
 
-  absl::optional<model::mutation::Overlay> GetOverlay(
+  absl::optional<model::Overlay> GetOverlay(
       const model::DocumentKey& key) const override;
 
   void SaveOverlays(int largest_batch_id,
@@ -55,7 +55,7 @@ class MemoryDocumentOverlayCache final : public DocumentOverlayCache {
 
  private:
   using OverlayByDocumentKeySortedMap =
-      immutable::SortedMap<model::DocumentKey, model::mutation::Overlay>;
+      immutable::SortedMap<model::DocumentKey, model::Overlay>;
   using DocumentKeySet =
       std::unordered_set<model::DocumentKey, model::DocumentKeyHash>;
   using DocumentKeysByBatchIdMap = std::unordered_map<int, DocumentKeySet>;

Firestore/core/src/local/memory_document_overlay_cache.h

@@ -58,12 +58,6 @@ class Message;
 
 namespace model {
 
-namespace mutation {
-
-class Overlay;
-
-}  // namespace mutation
-
 class DatabaseId;
 class DeleteMutation;
 class Document;
@@ -80,6 +74,7 @@ class MutationBatch;
 class MutationBatchResult;
 class MutationResult;
 class ObjectValue;
+class Overlay;
 class PatchMutation;
 class Precondition;
 class SetMutation;

Firestore/core/src/model/model_fwd.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "Firestore/core/src/model/mutation/overlay.h"
+#include "Firestore/core/src/model/overlay.h"
 
 #include <iostream>
 
@@ -25,7 +25,6 @@
 namespace firebase {
 namespace firestore {
 namespace model {
-namespace mutation {
 
 bool operator==(const Overlay& lhs, const Overlay& rhs) {
   return lhs.largest_batch_id_ == rhs.largest_batch_id_ &&
@@ -53,7 +52,6 @@ std::size_t OverlayHash::operator()(const Overlay& overlay) const {
   return overlay.Hash();
 }
 
-}  // namespace mutation
 }  // namespace model
 }  // namespace firestore
 }  // namespace firebase

Firestore/core/src/model/mutation/overlay.cc renamed to Firestore/core/src/model/overlay.cc

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FIRESTORE_CORE_SRC_MODEL_MUTATION_OVERLAY_H_
-#define FIRESTORE_CORE_SRC_MODEL_MUTATION_OVERLAY_H_
+#ifndef FIRESTORE_CORE_SRC_MODEL_OVERLAY_H_
+#define FIRESTORE_CORE_SRC_MODEL_OVERLAY_H_
 
 #include <cstdlib>
 #include <iosfwd>
@@ -28,7 +28,6 @@
 namespace firebase {
 namespace firestore {
 namespace model {
-namespace mutation {
 
 /**
  * Representation of an overlay computed by Firestore.
@@ -80,9 +79,8 @@ struct OverlayHash {
   std::size_t operator()(const Overlay&) const;
 };
 
-}  // namespace mutation
 }  // namespace model
 }  // namespace firestore
 }  // namespace firebase
 
-#endif  // FIRESTORE_CORE_SRC_MODEL_MUTATION_OVERLAY_H_
+#endif  // FIRESTORE_CORE_SRC_MODEL_OVERLAY_H_