[Sync] Add support for loading, updating and querying delete journals in

sync/syncable/directory_backing_store_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 29 matching lines @@
   std::string GetUsername() {
     return "nick@chromium.org";
   }
 
   FilePath GetDatabasePath() {
     return temp_dir_.path().Append(Directory::kSyncDatabaseFilename);
   }
 
   static bool LoadAndIgnoreReturnedData(DirectoryBackingStore *dbs) {
     MetahandlesIndex metas;
+    JournalIndex  delete_journals;;
     STLElementDeleter<MetahandlesIndex> index_deleter(&metas);
     Directory::KernelLoadInfo kernel_load_info;
-    return dbs->Load(&metas, &kernel_load_info) == OPENED;
+    return dbs->Load(&metas, &delete_journals, &kernel_load_info) == OPENED;
   }
 
   void SetUpVersion67Database(sql::Connection* connection);
   void SetUpVersion68Database(sql::Connection* connection);
   void SetUpVersion69Database(sql::Connection* connection);
   void SetUpVersion70Database(sql::Connection* connection);
   void SetUpVersion71Database(sql::Connection* connection);
   void SetUpVersion72Database(sql::Connection* connection);
   void SetUpVersion73Database(sql::Connection* connection);
   void SetUpVersion74Database(sql::Connection* connection);
@@ skipping 2147 matching lines @@
           "local_external_id bigint default 0"
           ",mtime bigint default 0,server_mtime bigint default 0,ctime bigint d"
           "efault 0,server_ctime bigint default 0,id varchar(255) default 'r',p"
           "arent_id varchar(255) default 'r',server_parent_id varchar(255) defa"
           "ult 'r',prev_id varchar(255) default 'r',next_id varchar(255) defaul"
           "t 'r',is_unsynced bit default 0,is_unapplied_update bit default 0,is"
           "_del bit default 0,is_dir bit default 0,server_is_dir bit default 0,"
           "server_is_del bit default 0,non_unique_name varchar,server_non_uniqu"
           "e_name varchar(255),unique_server_tag varchar,unique_client_tag varc"
           "har,specifics blob,server_specifics blob, base_server_specifics BLOB"
-          ", server_ordinal_in_parent blob, transaction_verion bigint default 0"
-          ");"
+          ", server_ordinal_in_parent blob, transaction_version bigint default "
+          "0);"
       "CREATE TABLE 'share_info' (id TEXT primary key, name TEXT, store_birthda"
           "y TEXT, db_create_version TEXT, db_create_time INT, next_id INT defa"
           "ult -2, cache_guid TEXT , notification_state BLOB, bag_of_chips "
           "blob);"
       "INSERT INTO 'share_info' VALUES('nick@chromium.org','nick@chromium.org',"
           "'c27e9f59-08ca-46f8-b0cc-f16a2ed778bb','Unknown',1263522064,"
           "-131078,'9010788312004066376x-6609234393368420856x',NULL, NULL);"));
 
       const char* insert_stmts[V80_ROW_COUNT] = {
       "INSERT INTO 'metas' VALUES(1,-1,0,0," META_PROTO_TIMES_VALS(1) ",'r','"
@@ skipping 100 matching lines @@
           "local_external_id bigint default 0"
           ",mtime bigint default 0,server_mtime bigint default 0,ctime bigint d"
           "efault 0,server_ctime bigint default 0,id varchar(255) default 'r',p"
           "arent_id varchar(255) default 'r',server_parent_id varchar(255) defa"
           "ult 'r',prev_id varchar(255) default 'r',next_id varchar(255) defaul"
           "t 'r',is_unsynced bit default 0,is_unapplied_update bit default 0,is"
           "_del bit default 0,is_dir bit default 0,server_is_dir bit default 0,"
           "server_is_del bit default 0,non_unique_name varchar,server_non_uniqu"
           "e_name varchar(255),unique_server_tag varchar,unique_client_tag varc"
           "har,specifics blob,server_specifics blob, base_server_specifics BLOB"
-          ", server_ordinal_in_parent blob, transaction_verion bigint default 0"
-          ");"
+          ", server_ordinal_in_parent blob, transaction_version bigint default "
+          "0);"
       "CREATE TABLE 'share_info' (id TEXT primary key, name TEXT, store_birthda"
           "y TEXT, db_create_version TEXT, db_create_time INT, next_id INT defa"
           "ult -2, cache_guid TEXT , notification_state BLOB, bag_of_chips "
           "blob);"
       "INSERT INTO 'share_info' VALUES('nick@chromium.org','nick@chromium.org',"
           "'c27e9f59-08ca-46f8-b0cc-f16a2ed778bb','Unknown',1263522064,"
           "-131078,'9010788312004066376x-6609234393368420856x',NULL, NULL);"));
 
       const char* insert_stmts[V80_ROW_COUNT] = {
       "INSERT INTO 'metas' VALUES(1,-1,0,0," META_PROTO_TIMES_VALS(1) ",'r','"
@@ skipping 386 matching lines @@
 
   scoped_ptr<TestDirectoryBackingStore> dbs(
       new TestDirectoryBackingStore(GetUsername(), &connection));
   ASSERT_FALSE(dbs->needs_column_refresh_);
   ASSERT_TRUE(dbs->MigrateVersion78To79());
   ASSERT_EQ(79, dbs->GetVersion());
   ASSERT_FALSE(dbs->needs_column_refresh_);
 
   // Ensure the next_id has been incremented.
   MetahandlesIndex entry_bucket;
+  JournalIndex  delete_journals;;
   STLElementDeleter<MetahandlesIndex> deleter(&entry_bucket);
   Directory::KernelLoadInfo load_info;
 
   s.Clear();
-  ASSERT_TRUE(dbs->Load(&entry_bucket, &load_info));
+  ASSERT_TRUE(dbs->Load(&entry_bucket, &delete_journals, &load_info));
   EXPECT_LE(load_info.kernel_info.next_id, kInitialNextId - 65536);
 }
 
 TEST_F(DirectoryBackingStoreTest, MigrateVersion79To80) {
   sql::Connection connection;
   ASSERT_TRUE(connection.OpenInMemory());
   SetUpVersion79Database(&connection);
 
   scoped_ptr<TestDirectoryBackingStore> dbs(
       new TestDirectoryBackingStore(GetUsername(), &connection));
   ASSERT_FALSE(dbs->needs_column_refresh_);
   ASSERT_TRUE(dbs->MigrateVersion79To80());
   ASSERT_EQ(80, dbs->GetVersion());
   ASSERT_FALSE(dbs->needs_column_refresh_);
 
   // Ensure the bag_of_chips has been set.
   MetahandlesIndex entry_bucket;
+  JournalIndex  delete_journals;;
   STLElementDeleter<MetahandlesIndex> deleter(&entry_bucket);
   Directory::KernelLoadInfo load_info;
 
-  ASSERT_TRUE(dbs->Load(&entry_bucket, &load_info));
+  ASSERT_TRUE(dbs->Load(&entry_bucket, &delete_journals, &load_info));
   // Check that the initial value is the serialization of an empty ChipBag.
   sync_pb::ChipBag chip_bag;
   std::string serialized_chip_bag;
   ASSERT_TRUE(chip_bag.SerializeToString(&serialized_chip_bag));
   EXPECT_EQ(serialized_chip_bag, load_info.kernel_info.bag_of_chips);
 }
 
 TEST_F(DirectoryBackingStoreTest, MigrateVersion80To81) {
   sql::Connection connection;
   ASSERT_TRUE(connection.OpenInMemory());
@@ skipping 37 matching lines @@
   sql::Statement s(connection.GetUniqueStatement(
       "INSERT INTO metas "
       "( id, metahandle, is_dir, ctime, mtime, server_ordinal_in_parent) "
       "VALUES( \"c-invalid\", 9999, 1, ?, ?, \" \")"));
   s.BindInt64(0, now);
   s.BindInt64(1, now);
   ASSERT_TRUE(s.Run());
 
   // Trying to unpack this entry should signal that the DB is corrupted.
   MetahandlesIndex entry_bucket;
+  JournalIndex  delete_journals;;
   STLElementDeleter<MetahandlesIndex> deleter(&entry_bucket);
   Directory::KernelLoadInfo kernel_load_info;
   ASSERT_EQ(FAILED_DATABASE_CORRUPT,
-            dbs->Load(&entry_bucket, &kernel_load_info));
+            dbs->Load(&entry_bucket, &delete_journals, &kernel_load_info));
 }
 
 TEST_F(DirectoryBackingStoreTest, MigrateVersion81To82) {
   sql::Connection connection;
   ASSERT_TRUE(connection.OpenInMemory());
   SetUpVersion81Database(&connection);
   ASSERT_FALSE(connection.DoesColumnExist("models", "transaction_version"));
 
   scoped_ptr<TestDirectoryBackingStore> dbs(
       new TestDirectoryBackingStore(GetUsername(), &connection));
@@ skipping 119 matching lines @@
       //   5. Dump this using the sqlite3 command line tool:
       //        > .output foo_dump.sql
       //        > .dump
       //   6. Replace the timestamp columns with META_PROTO_TIMES(x) (or
       //      LEGACY_META_PROTO_TIMES(x) if before Version 77).
       FAIL() << "Need to supply database dump for version " << GetParam();
   }
 
   syncable::Directory::KernelLoadInfo dir_info;
   MetahandlesIndex index;
+  JournalIndex  delete_journals;;
   STLElementDeleter<MetahandlesIndex> index_deleter(&index);
 
   {
     scoped_ptr<TestDirectoryBackingStore> dbs(
         new TestDirectoryBackingStore(GetUsername(), &connection));
-    ASSERT_EQ(OPENED, dbs->Load(&index, &dir_info));
+    ASSERT_EQ(OPENED, dbs->Load(&index, &delete_journals, &dir_info));
     ASSERT_FALSE(dbs->needs_column_refresh_);
     ASSERT_EQ(kCurrentDBVersion, dbs->GetVersion());
   }
 
   // Columns deleted in Version 67.
   ASSERT_FALSE(connection.DoesColumnExist("metas", "name"));
   ASSERT_FALSE(connection.DoesColumnExist("metas", "unsanitized_name"));
   ASSERT_FALSE(connection.DoesColumnExist("metas", "server_name"));
 
   // Columns added in Version 68.
@@ skipping 251 matching lines @@
 }
 
 TEST_F(DirectoryBackingStoreTest, DeleteEntries) {
   sql::Connection connection;
   ASSERT_TRUE(connection.OpenInMemory());
 
   SetUpCurrentDatabaseAndCheckVersion(&connection);
   scoped_ptr<TestDirectoryBackingStore> dbs(
       new TestDirectoryBackingStore(GetUsername(), &connection));
   MetahandlesIndex index;
+  JournalIndex  delete_journals;;

[tim (not reviewing), 2013/01/04 18:54:14]

nit - is there an extra space here?

[haitaol1, 2013/01/04 19:06:14]

Done.

   Directory::KernelLoadInfo kernel_load_info;
   STLElementDeleter<MetahandlesIndex> index_deleter(&index);
 
-  dbs->Load(&index, &kernel_load_info);
+  dbs->Load(&index, &delete_journals, &kernel_load_info);
   size_t initial_size = index.size();
   ASSERT_LT(0U, initial_size) << "Test requires entries to delete.";
   int64 first_to_die = (*index.begin())->ref(META_HANDLE);
   MetahandleSet to_delete;
   to_delete.insert(first_to_die);
-  EXPECT_TRUE(dbs->DeleteEntries(to_delete));
+  EXPECT_TRUE(dbs->DeleteEntries(TestDirectoryBackingStore::METAS_TABLE,
+                                 to_delete));
 
   STLDeleteElements(&index);
   dbs->LoadEntries(&index);
 
   EXPECT_EQ(initial_size - 1, index.size());
   bool delete_failed = false;
   for (MetahandlesIndex::iterator it = index.begin(); it != index.end();
        ++it) {
     if ((*it)->ref(META_HANDLE) == first_to_die) {
       delete_failed = true;
       break;
     }
   }
   EXPECT_FALSE(delete_failed);
 
   to_delete.clear();
   for (MetahandlesIndex::iterator it = index.begin(); it != index.end();
        ++it) {
     to_delete.insert((*it)->ref(META_HANDLE));
   }
 
-  EXPECT_TRUE(dbs->DeleteEntries(to_delete));
+  EXPECT_TRUE(dbs->DeleteEntries(TestDirectoryBackingStore::METAS_TABLE,
+                                 to_delete));
 
   STLDeleteElements(&index);
   dbs->LoadEntries(&index);
   EXPECT_EQ(0U, index.size());
 }
 
 TEST_F(DirectoryBackingStoreTest, GenerateCacheGUID) {
   const std::string& guid1 = TestDirectoryBackingStore::GenerateCacheGUID();
   const std::string& guid2 = TestDirectoryBackingStore::GenerateCacheGUID();
   EXPECT_EQ(24U, guid1.size());
   EXPECT_EQ(24U, guid2.size());
   // In theory this test can fail, but it won't before the universe
   // dies of heat death.
   EXPECT_NE(guid1, guid2);
 }
 
 }  // namespace syncable
 }  // namespace syncer