WIP: The Bookmark Position Megapatch

sync/syncable/syncable_columns.h

 // Copyright (c) 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.
 
 #ifndef SYNC_SYNCABLE_SYNCABLE_COLUMNS_H_
 #define SYNC_SYNCABLE_SYNCABLE_COLUMNS_H_
 
 #include "sync/syncable/entry_kernel.h"
 #include "sync/syncable/syncable_changes_version.h"
 
@@ skipping 19 matching lines @@
   // protocol (ms since Unix epoch).
   {"mtime", "bigint default 0"},
   {"server_mtime", "bigint default 0"},
   {"ctime", "bigint default 0"},
   {"server_ctime", "bigint default 0"},
   //////////////////////////////////////
   // Ids
   {"id", "varchar(255) default \"r\""},
   {"parent_id", "varchar(255) default \"r\""},
   {"server_parent_id", "varchar(255) default \"r\""},
-  {"prev_id", "varchar(255) default \"r\""},
-  {"next_id", "varchar(255) default \"r\""},
   //////////////////////////////////////
   // bits
   {"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"},
   //////////////////////////////////////
   // Strings
   {"non_unique_name", "varchar"},
   {"server_non_unique_name", "varchar(255)"},
   {"unique_server_tag", "varchar"},
   {"unique_client_tag", "varchar"},
   //////////////////////////////////////
   // Blobs (serialized protos).
   {"specifics", "blob"},
   {"server_specifics", "blob"},
   {"base_server_specifics", "blob"},
   //////////////////////////////////////
-  // Blobs (ordinals).
-  {"server_ordinal_in_parent", "blob"},
+  // Blobs (positions).
+  {"server_unique_position", "blob"},
+  {"unique_position", "blob"},
+  //////////////////////////////////////
+  // Blobs (bytes).
+  {"unique_bookmark_tag", "blob"},
 };
 
 // At least enforce that there are equal number of column names and fields.
 COMPILE_ASSERT(arraysize(g_metas_columns) >= FIELD_COUNT, missing_column_name);
 COMPILE_ASSERT(arraysize(g_metas_columns) <= FIELD_COUNT, extra_column_names);
 
 static inline const char* ColumnName(int field) {
   DCHECK(field < BEGIN_TEMPS);
   return g_metas_columns[field].name;
 }
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_SYNCABLE_COLUMNS_H_