Changed DB to store node positions as Ordinals.

sync/engine/build_commit_command.cc

 // 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.
 
 #include "sync/engine/build_commit_command.h"
 
 #include <limits>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/string_util.h"
 #include "sync/engine/syncer_proto_util.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/ordered_commit_set.h"
 #include "sync/sessions/sync_session.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/mutable_entry.h"
 #include "sync/syncable/syncable_changes_version.h"
 #include "sync/syncable/syncable_proto_util.h"
 #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;
 
 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;
 using syncable::MutableEntry;
 using syncable::SPECIFICS;
 
 // static
 int64 BuildCommitCommand::GetFirstPosition() {
   return std::numeric_limits<int64>::min();
 }
@@ skipping 179 matching lines @@
 }
 
 int64 BuildCommitCommand::FindAnchorPosition(syncable::IdField direction,
                                              const syncable::Entry& entry) {
   Id next_id = entry.Get(direction);
   while (!next_id.IsRoot()) {
     Entry next_entry(entry.trans(),
                      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);
   }
   return
       direction == syncable::PREV_ID ?
       GetFirstPosition() : GetLastPosition();
 }
 
 int64 BuildCommitCommand::InterpolatePosition(const int64 lo,
                                               const int64 hi) {
@@ skipping 10 matching lines @@
   if (delta <= static_cast<uint64>(GetGap()*2))
     return lo + (static_cast<int64>(delta) + 7) / 8;  // Interpolate.
   else if (lo == GetFirstPosition())
     return hi - GetGap();  // Extend range just before successor.
   else
     return lo + GetGap();  // Use or extend range just after predecessor.
 }
 
 
 }  // namespace syncer