Cleanup

Author: schmidt-sebastian

firestore/src/main/document_snapshot_main.cc

@@ -185,12 +185,13 @@ FieldValue DocumentSnapshotInternal::ConvertServerTimestamp(
     case ServerTimestampBehavior::kNone:
       return FieldValue::Null();
     case ServerTimestampBehavior::kEstimate: {
-      auto timestamp = GetLocalWriteTime(server_timestamp);
+      google_firestore_v1_Value timestamp = GetLocalWriteTime(server_timestamp);
       return FieldValue::Timestamp(
           Timestamp(timestamp.seconds, timestamp.nanos));
     }
     case ServerTimestampBehavior::kPrevious:
-      auto previous_value = GetPreviousValue(server_timestamp);
+      google_firestore_v1_Value previous_value =
+          GetPreviousValue(server_timestamp);
       if (previous_value) {
         return ConvertScalar(*previous_value, stb);
       }

firestore/src/main/field_value_main.cc

@@ -206,16 +206,52 @@ FieldValue FieldValueInternal::IntegerIncrement(std::int64_t by_value) {
 FieldValue FieldValueInternal::DoubleIncrement(double by_value) {
   Message<google_firestore_v1_Value> value;
   value->which_value_type = google_firestore_v1_Value_double_value_tag;
-  value->integer_value = by_value;
+  value->double_value = by_value;
   return MakePublic(
       FieldValueInternal{Type::kIncrementDouble, std::move(value)});
 }
 
 // Equality operator
 
 bool operator==(const FieldValueInternal& lhs, const FieldValueInternal& rhs) {
-  return *absl::get<SharedMessage<google_firestore_v1_Value>>(lhs.value_) ==
-         *absl::get<SharedMessage<google_firestore_v1_Value>>(rhs.value_);
+  using ArrayT = FieldValueInternal::ArrayT;
+  using MapT = FieldValueInternal::MapT;
+
+  auto type = lhs.type();
+  if (type != rhs.type()) {
+    return false;
+  }
+
+  switch (type) {
+    case Type::kNull:
+    case Type::kBoolean:
+    case Type::kInteger:
+    case Type::kDouble:
+    case Type::kTimestamp:
+    case Type::kString:
+    case Type::kBlob:
+    case Type::kGeoPoint:
+      // Sentinels
+    case Type::kIncrementDouble:
+    case Type::kIncrementInteger:
+    case Type::kDelete:
+    case Type::kServerTimestamp:
+      return *absl::get <
+                 SharedMessage<google_firestore_v1_Value>(lhs.value_) ==
+             *absl::get < SharedMessage<google_firestore_v1_Value>(rhs.value_);
+
+    case Type::kReference:
+      return absl::get<DocumentReference>(lhs.value_) ==
+             absl::get<DocumentReference>(rhs.value_);
+
+    case Type::kArray:
+    case Type::kArrayRemove:
+    case Type::kArrayUnion:
+      return absl::get<ArrayT>(lhs.value_) == absl::get<ArrayT>(rhs.value_);
+
+    case Type::kMap:
+      return absl::get<MapT>(lhs.value_) == absl::get<MapT>(rhs.value_);
+  }
 }
 
 std::string Describe(Type type) {