Changed DB to store node positions as Ordinals.

sync/engine/build_commit_command.cc

Index: sync/engine/build_commit_command.cc
diff --git a/sync/engine/build_commit_command.cc b/sync/engine/build_commit_command.cc
index 8e51ddb530a0e8a49072c5157285bf08413f2468..3128916ee0fbef02e1db7faada6fa8b084b1bdeb 100644
--- a/sync/engine/build_commit_command.cc
+++ b/sync/engine/build_commit_command.cc
@@ -22,6 +22,11 @@
 #include "sync/syncable/write_transaction.h"
 #include "sync/util/time.h"
 
+//TODO(vishwath): Remove this include after node positions have

[akalin, 2012/10/05 22:40:27]

space after //

[vishwath, 2012/10/08 20:17:49]

Done.

+// shifted to completely using Ordinals.
+// See http://crbug.com/145412 .
+#include "sync/internal_api/public/base/node_ordinal.h"
+
 using std::set;
 using std::string;
 using std::vector;
@@ -31,7 +36,7 @@ namespace syncer {
 using sessions::SyncSession;
 using syncable::Entry;
 using syncable::IS_DEL;
-using syncable::SERVER_POSITION_IN_PARENT;
+using syncable::SERVER_ORDINAL_IN_PARENT;
 using syncable::IS_UNAPPLIED_UPDATE;
 using syncable::IS_UNSYNCED;
 using syncable::Id;
@@ -231,7 +236,7 @@ int64 BuildCommitCommand::FindAnchorPosition(syncable::IdField direction,
                      syncable::GET_BY_ID,
                      next_id);
     if (!next_entry.Get(IS_UNSYNCED) && !next_entry.Get(IS_UNAPPLIED_UPDATE)) {
-      return next_entry.Get(SERVER_POSITION_IN_PARENT);
+      return NodeOrdinalToInt64(next_entry.Get(SERVER_ORDINAL_IN_PARENT));
     }
     next_id = next_entry.Get(direction);
   }