[realppl 5] map,string,timestamp and mirroring semantics

Author: wu-hui

Firestore/core/src/core/expressions_eval.cc

@@ -50,40 +50,6 @@ using nanopb::Message;
 using nanopb::ReleaseFieldOwnership;
 using nanopb::SetRepeatedField;
 
-struct MapEntryKeyCompare {
-  bool operator()(const google_firestore_v1_MapValue_FieldsEntry& entry,
-                  absl::string_view segment) const {
-    return nanopb::MakeStringView(entry.key) < segment;
-  }
-  bool operator()(absl::string_view segment,
-                  const google_firestore_v1_MapValue_FieldsEntry& entry) const {
-    return segment < nanopb::MakeStringView(entry.key);
-  }
-};
-
-/**
- * Finds an entry by key in the provided map value. Returns `nullptr` if the
- * entry does not exist.
- */
-google_firestore_v1_MapValue_FieldsEntry* FindEntry(
-    const google_firestore_v1_Value& value, absl::string_view segment) {
-  if (!IsMap(value)) {
-    return nullptr;
-  }
-  const google_firestore_v1_MapValue& map_value = value.map_value;
-
-  // MapValues in iOS are always stored in sorted order.
-  auto found = std::equal_range(map_value.fields,
-                                map_value.fields + map_value.fields_count,
-                                segment, MapEntryKeyCompare());
-
-  if (found.first == found.second) {
-    return nullptr;
-  }
-
-  return found.first;
-}
-
 size_t CalculateSizeOfUnion(
     const google_firestore_v1_MapValue& map_value,
     const std::map<std::string, Message<google_firestore_v1_Value>>& upserts,

Firestore/core/src/core/expressions_eval.h

@@ -955,6 +955,20 @@ Message<google_firestore_v1_Value> RefValue(
   return result;
 }
 
+Message<google_firestore_v1_Value> StringValue(const std::string& value) {
+  Message<google_firestore_v1_Value> result;
+  result->which_value_type = google_firestore_v1_Value_string_value_tag;
+  result->reference_value = nanopb::MakeBytesArray(value);
+  return result;
+}
+
+Message<google_firestore_v1_Value> StringValue(absl::string_view value) {
+  Message<google_firestore_v1_Value> result;
+  result->which_value_type = google_firestore_v1_Value_string_value_tag;
+  result->reference_value = nanopb::MakeBytesArray(value.data(), value.size());
+  return result;
+}
+
 Message<google_firestore_v1_Value> ArrayValue(
     std::vector<Message<google_firestore_v1_Value>> values) {
   google_firestore_v1_Value result;
@@ -1037,6 +1051,38 @@ absl::optional<int64_t> GetInteger(const google_firestore_v1_Value& value) {
   return absl::nullopt;
 }
 
+namespace {
+struct MapEntryKeyCompare {
+  bool operator()(const google_firestore_v1_MapValue_FieldsEntry& entry,
+                  absl::string_view segment) const {
+    return nanopb::MakeStringView(entry.key) < segment;
+  }
+  bool operator()(absl::string_view segment,
+                  const google_firestore_v1_MapValue_FieldsEntry& entry) const {
+    return segment < nanopb::MakeStringView(entry.key);
+  }
+};
+}  // namespace
+
+google_firestore_v1_MapValue_FieldsEntry* FindEntry(
+    const google_firestore_v1_Value& value, absl::string_view field) {
+  if (!IsMap(value)) {
+    return nullptr;
+  }
+  const google_firestore_v1_MapValue& map_value = value.map_value;
+
+  // MapValues in iOS are always stored in sorted order.
+  auto found = std::equal_range(map_value.fields,
+                                map_value.fields + map_value.fields_count,
+                                field, MapEntryKeyCompare());
+
+  if (found.first == found.second) {
+    return nullptr;
+  }
+
+  return found.first;
+}
+
 namespace {
 
 StrictEqualsResult StrictArrayEquals(

Firestore/core/src/model/object_value.cc

@@ -248,6 +248,17 @@ google_firestore_v1_Value MinMap();
 nanopb::Message<google_firestore_v1_Value> RefValue(
     const DatabaseId& database_id, const DocumentKey& document_key);
 
+/**
+ * Returns a Protobuf string value.
+ *
+ * The returned value might point to heap allocated memory that is owned by
+ * this function. To take ownership of this memory, call `DeepClone`.
+ */
+nanopb::Message<google_firestore_v1_Value> StringValue(
+    const std::string& value);
+
+nanopb::Message<google_firestore_v1_Value> StringValue(absl::string_view value);
+
 /**
  * Returns a Protobuf array value representing the given values.
  *
@@ -303,6 +314,13 @@ inline bool IsMap(const absl::optional<google_firestore_v1_Value>& value) {
  */
 absl::optional<int64_t> GetInteger(const google_firestore_v1_Value& value);
 
+/**
+ * Finds an entry by key in the provided map value. Returns `nullptr` if the
+ * entry does not exist.
+ */
+google_firestore_v1_MapValue_FieldsEntry* FindEntry(
+    const google_firestore_v1_Value& value, absl::string_view field);
+
 }  // namespace model
 
 inline bool operator==(const google_firestore_v1_Value& lhs,