Merge pull request #359 from firebase/feature/syncPointSpecTest

Added a new test suite for SyncPoints

Author: alexames

database/src/desktop/core/child_event_registration.cc

@@ -35,11 +35,6 @@ bool ChildEventRegistration::RespondsTo(EventType event_type) {
 
 Event ChildEventRegistration::GenerateEvent(const Change& change,
                                             const QuerySpec& query_spec) {
-  // return Event(change.event_type, this,
-  //              DataSnapshotInternal(database_,
-  //                                   query_spec.path.GetChild(change.child_key),
-  //                                   change.indexed_variant.variant()),
-  //              change.prev_name);
   return Event(
       change.event_type, this,
       DataSnapshotInternal(database_, change.indexed_variant.variant(),

database/src/desktop/core/repo.cc

@@ -534,25 +534,6 @@ void Repo::PostEvents(const std::vector<Event>& events) {
   }
 }
 
-static std::map<Path, Variant> VariantToPathMap(const Variant& data) {
-  std::map<Path, Variant> path_map;
-  if (data.is_map()) {
-    for (const auto& key_value : data.map()) {
-      Variant key_string_variant;
-      const char* key;
-      if (key_value.first.is_string()) {
-        key = key_value.first.string_value();
-      } else {
-        key_string_variant = key_value.first.AsString();
-        key = key_string_variant.string_value();
-      }
-      const Variant& value = key_value.second;
-      path_map.insert(std::make_pair(Path(key), value));
-    }
-  }
-  return path_map;
-}
-
 void Repo::OnConnect() {
   SAFE_REFERENCE_RETURN_VOID_IF_INVALID(ThisRefLock, lock, safe_this_);
 

database/src/desktop/core/value_event_registration.cc

@@ -30,10 +30,6 @@ bool ValueEventRegistration::RespondsTo(EventType event_type) {
 
 Event ValueEventRegistration::GenerateEvent(const Change& change,
                                             const QuerySpec& query_spec) {
-  // return Event(kEventTypeValue, this,
-  //              DataSnapshotInternal(database_,
-  //                                   query_spec.path.GetChild(change.child_key),
-  //                                   change.indexed_variant.variant()));
   return Event(
       kEventTypeValue, this,
       DataSnapshotInternal(database_, change.indexed_variant.variant(),

database/src/desktop/data_snapshot_desktop.cc

@@ -123,7 +123,7 @@ Variant DataSnapshotInternal::GetValue() const {
   return result;
 }
 
-Variant DataSnapshotInternal::GetPriority() {
+Variant DataSnapshotInternal::GetPriority() const {
   return GetVariantPriority(data_);
 }
 

database/src/desktop/data_snapshot_desktop.h

@@ -81,7 +81,7 @@ class DataSnapshotInternal {
   Variant GetValue() const;
 
   // Get the priority of the data contained in this snapshot.
-  Variant GetPriority();
+  Variant GetPriority() const;
 
   // Obtain a DatabaseReference to the source location for this snapshot.
   //

database/src/desktop/database_reference_desktop.cc

@@ -13,15 +13,17 @@
 // limitations under the License.
 
 #include "database/src/desktop/database_reference_desktop.h"
+
 #include <stdio.h>
+
 #include <sstream>
+
 #include "app/rest/util.h"
 #include "app/src/variant_util.h"
 #include "database/src/common/database_reference.h"
 #include "database/src/desktop/database_desktop.h"
 #include "database/src/desktop/disconnection_desktop.h"
 #include "database/src/desktop/util_desktop.h"
-
 #include "flatbuffers/util.h"
 
 namespace firebase {
@@ -37,15 +39,19 @@ const char kVirtualChildKeyPriority[] = ".priority";
 DatabaseReferenceInternal::DatabaseReferenceInternal(DatabaseInternal* database,
                                                      const Path& path)
     : QueryInternal(database, QuerySpec(path)) {
-  database_->future_manager().AllocFutureApi(&future_api_id_,
-                                             kDatabaseReferenceFnCount);
+  if (database_) {
+    database_->future_manager().AllocFutureApi(&future_api_id_,
+                                               kDatabaseReferenceFnCount);
+  }
 }
 
 DatabaseReferenceInternal::DatabaseReferenceInternal(
     const DatabaseReferenceInternal& internal)
     : QueryInternal(internal) {
-  database_->future_manager().AllocFutureApi(&future_api_id_,
-                                             kDatabaseReferenceFnCount);
+  if (database_) {
+    database_->future_manager().AllocFutureApi(&future_api_id_,
+                                               kDatabaseReferenceFnCount);
+  }
 }
 
 DatabaseReferenceInternal& DatabaseReferenceInternal::operator=(
@@ -57,22 +63,26 @@ DatabaseReferenceInternal& DatabaseReferenceInternal::operator=(
 #if defined(FIREBASE_USE_MOVE_OPERATORS) || defined(DOXYGEN)
 DatabaseReferenceInternal::DatabaseReferenceInternal(
     DatabaseReferenceInternal&& internal) {
-  database_->future_manager().MoveFutureApi(&internal.future_api_id_,
-                                            &future_api_id_);
+  if (database_) {
+    database_->future_manager().MoveFutureApi(&internal.future_api_id_,
+                                              &future_api_id_);
+  }
   QueryInternal::operator=(std::move(internal));
 }
 
 DatabaseReferenceInternal& DatabaseReferenceInternal::operator=(
     DatabaseReferenceInternal&& internal) {
-  database_->future_manager().MoveFutureApi(&internal.future_api_id_,
-                                            &future_api_id_);
+  if (database_) {
+    database_->future_manager().MoveFutureApi(&internal.future_api_id_,
+                                              &future_api_id_);
+  }
   QueryInternal::operator=(std::move(internal));
   return *this;
 }
 #endif  // defined(FIREBASE_USE_MOVE_OPERATORS) || defined(DOXYGEN)
 
 Database* DatabaseReferenceInternal::GetDatabase() const {
-  return Database::GetInstance(database_->GetApp());
+  return database_ ? Database::GetInstance(database_->GetApp()) : nullptr;
 }
 
 std::string DatabaseReferenceInternal::GetUrl() const {

database/src/desktop/persistence/persistence_manager.cc

@@ -206,10 +206,8 @@ void PersistenceManager::DoPruneCheckAfterServerUpdate() {
           tracked_query_manager_->PruneOldQueries(*cache_policy_);
       PruneForestRef prune_forest_ref(&prune_forest);
       if (prune_forest_ref.PrunesAnything()) {
-        std::cout << __LINE__ << std::endl;
         storage_engine_->PruneCache(Path(), prune_forest_ref);
       } else {
-        std::cout << __LINE__ << std::endl;
         can_prune = false;
       }
       cache_size = storage_engine_->ServerCacheEstimatedSizeInBytes();