diff options
author | rsgowman <rgowman@google.com> | 2018-03-27 17:04:10 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-27 17:04:10 -0400 |
commit | 0e86c06f60262c013c0b653470ac59a3c4d12b46 (patch) | |
tree | f47c6b2fbbf16f419ae4dc13d3869007e573b976 /Firestore/core/src/firebase/firestore/model | |
parent | cb8c4b6b1f1ad213a5b3272e2c2e94f755bbabf9 (diff) |
Add ObjectValue::Map alias (#967)
Diffstat (limited to 'Firestore/core/src/firebase/firestore/model')
-rw-r--r-- | Firestore/core/src/firebase/firestore/model/field_value.cc | 19 | ||||
-rw-r--r-- | Firestore/core/src/firebase/firestore/model/field_value.h | 48 |
2 files changed, 52 insertions, 15 deletions
diff --git a/Firestore/core/src/firebase/firestore/model/field_value.cc b/Firestore/core/src/firebase/firestore/model/field_value.cc index a38a676..2c1af53 100644 --- a/Firestore/core/src/firebase/firestore/model/field_value.cc +++ b/Firestore/core/src/firebase/firestore/model/field_value.cc @@ -113,8 +113,8 @@ FieldValue& FieldValue::operator=(const FieldValue& value) { } case Type::Object: { // copy-and-swap - std::map<std::string, FieldValue> tmp = value.object_value_; - std::swap(object_value_, tmp); + ObjectValue::Map tmp = value.object_value_.internal_value; + std::swap(object_value_.internal_value, tmp); break; } default: @@ -280,16 +280,15 @@ FieldValue FieldValue::ArrayValue(std::vector<FieldValue>&& value) { return result; } -FieldValue FieldValue::ObjectValue( - const std::map<std::string, FieldValue>& value) { - std::map<std::string, FieldValue> copy(value); - return ObjectValue(std::move(copy)); +FieldValue FieldValue::ObjectValueFromMap(const ObjectValue::Map& value) { + ObjectValue::Map copy(value); + return ObjectValueFromMap(std::move(copy)); } -FieldValue FieldValue::ObjectValue(std::map<std::string, FieldValue>&& value) { +FieldValue FieldValue::ObjectValueFromMap(ObjectValue::Map&& value) { FieldValue result; result.SwitchTo(Type::Object); - std::swap(result.object_value_, value); + std::swap(result.object_value_.internal_value, value); return result; } @@ -386,7 +385,7 @@ void FieldValue::SwitchTo(const Type type) { array_value_.~vector(); break; case Type::Object: - object_value_.~map(); + object_value_.internal_value.~map(); break; default: {} // The other types where there is nothing to worry about. } @@ -417,7 +416,7 @@ void FieldValue::SwitchTo(const Type type) { new (&array_value_) std::vector<FieldValue>(); break; case Type::Object: - new (&object_value_) std::map<std::string, FieldValue>(); + new (&object_value_) ObjectValue{}; break; default: {} // The other types where there is nothing to worry about. } diff --git a/Firestore/core/src/firebase/firestore/model/field_value.h b/Firestore/core/src/firebase/firestore/model/field_value.h index 9111ffb..c42d533 100644 --- a/Firestore/core/src/firebase/firestore/model/field_value.h +++ b/Firestore/core/src/firebase/firestore/model/field_value.h @@ -47,6 +47,19 @@ struct ReferenceValue { const DatabaseId* database_id; }; +// TODO(rsgowman): Expand this to roughly match the java class +// c.g.f.f.model.value.ObjectValue. Probably move it to a similar namespace as +// well. (FieldValue itself is also in the value package in java.) Also do the +// same with the other FooValue values that FieldValue can return. +class FieldValue; +struct ObjectValue { + // TODO(rsgowman): These will eventually be private. We do want the serializer + // to be able to directly access these (possibly implying 'friend' usage, or a + // getInternalValue() like java has.) + using Map = std::map<std::string, FieldValue>; + Map internal_value; +}; + /** * tagged-union class representing an immutable data value as stored in * Firestore. FieldValue represents all the different kinds of values @@ -111,9 +124,9 @@ class FieldValue { return string_value_; } - const std::map<std::string, FieldValue>& object_value() const { + const ObjectValue object_value() const { FIREBASE_ASSERT(tag_ == Type::Object); - return object_value_; + return ObjectValue{object_value_}; } /** factory methods. */ @@ -139,8 +152,8 @@ class FieldValue { static FieldValue GeoPointValue(const GeoPoint& value); static FieldValue ArrayValue(const std::vector<FieldValue>& value); static FieldValue ArrayValue(std::vector<FieldValue>&& value); - static FieldValue ObjectValue(const std::map<std::string, FieldValue>& value); - static FieldValue ObjectValue(std::map<std::string, FieldValue>&& value); + static FieldValue ObjectValueFromMap(const ObjectValue::Map& value); + static FieldValue ObjectValueFromMap(ObjectValue::Map&& value); friend bool operator<(const FieldValue& lhs, const FieldValue& rhs); @@ -167,7 +180,7 @@ class FieldValue { firebase::firestore::model::ReferenceValue reference_value_; GeoPoint geo_point_value_; std::vector<FieldValue> array_value_; - std::map<std::string, FieldValue> object_value_; + ObjectValue object_value_; }; }; @@ -194,6 +207,31 @@ inline bool operator==(const FieldValue& lhs, const FieldValue& rhs) { return !(lhs != rhs); } +/** Compares against another ObjectValue. */ +inline bool operator<(const ObjectValue& lhs, const ObjectValue& rhs) { + return lhs.internal_value < rhs.internal_value; +} + +inline bool operator>(const ObjectValue& lhs, const ObjectValue& rhs) { + return rhs < lhs; +} + +inline bool operator>=(const ObjectValue& lhs, const ObjectValue& rhs) { + return !(lhs < rhs); +} + +inline bool operator<=(const ObjectValue& lhs, const ObjectValue& rhs) { + return !(lhs > rhs); +} + +inline bool operator!=(const ObjectValue& lhs, const ObjectValue& rhs) { + return lhs < rhs || lhs > rhs; +} + +inline bool operator==(const ObjectValue& lhs, const ObjectValue& rhs) { + return !(lhs != rhs); +} + } // namespace model } // namespace firestore } // namespace firebase |