sync: Loop committing items without downloading updates (v2)

sync/engine/get_commit_ids_command.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_ENGINE_GET_COMMIT_IDS_COMMAND_H_
 #define SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_
 #pragma once
 
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "sync/engine/syncer_command.h"
 #include "sync/engine/syncer_util.h"
 #include "sync/sessions/ordered_commit_set.h"
 #include "sync/sessions/sync_session.h"
 
 using std::pair;
 using std::vector;
 
 namespace browser_sync {
 
 class GetCommitIdsCommand : public SyncerCommand {
   friend class SyncerTest;
 
  public:
-  explicit GetCommitIdsCommand(int commit_batch_size);
+  GetCommitIdsCommand(size_t commit_batch_size,
+                      sessions::OrderedCommitSet* ordered_commit_set,
+                      size_t* unsynced_item_count);

[tim (not reviewing), 2012/05/11 18:42:16]

Comments would be nice here.

[rlarocque, 2012/05/14 23:10:43]

Done.

   virtual ~GetCommitIdsCommand();
 
   // SyncerCommand implementation.
   virtual SyncerError ExecuteImpl(sessions::SyncSession* session) OVERRIDE;
 
   // Builds a vector of IDs that should be committed.
   void BuildCommitIds(syncable::WriteTransaction* write_transaction,
                       const ModelSafeRoutingInfo& routes,
                       const std::set<int64>& ready_unsynced_set);
 
@@ skipping 48 matching lines @@
   // Return values:
   //   False: if there was an entry in conflict.
   //   True: if all entries were checked for commit readiness and added to
   //         |result| as necessary.
   bool AddItemThenPredecessors(syncable::BaseTransaction* trans,
                                const std::set<int64>& ready_unsynced_set,
                                const syncable::Entry& item,
                                sessions::OrderedCommitSet* result) const;
 
   // Appends all commit ready predecessors of |item|, followed by |item| itself,
-  // to |ordered_commit_set_|, iff item and all its predecessors not in
-  // conflict.
+  // to |commit_set|, iff item and all its predecessors not in conflict.
   // Return values:
   //   False: if there was an entry in conflict.
   //   True: if all entries were checked for commit readiness and added to
   //         |result| as necessary.
   bool AddPredecessorsThenItem(syncable::BaseTransaction* trans,
                                const ModelSafeRoutingInfo& routes,
                                const std::set<int64>& ready_unsynced_set,
                                const syncable::Entry& item,
-                               sessions::OrderedCommitSet* result) const;
+                               sessions::OrderedCommitSet* commit_set) const;
 
   bool IsCommitBatchFull() const;
 
   void AddCreatesAndMoves(syncable::WriteTransaction* write_transaction,
                           const ModelSafeRoutingInfo& routes,
                           const std::set<int64>& ready_unsynced_set);
 
   void AddDeletes(syncable::WriteTransaction* write_transaction,
                   const std::set<int64>& ready_unsynced_set);
 
-  scoped_ptr<sessions::OrderedCommitSet> ordered_commit_set_;
-
-  int requested_commit_batch_size_;
+  size_t requested_commit_batch_size_;

[tim (not reviewing), 2012/05/11 18:42:16]

const?

[rlarocque, 2012/05/14 23:10:43]

Done.

+  sessions::OrderedCommitSet* commit_set_;

[tim (not reviewing), 2012/05/11 18:42:16]

Comments about ownership / lifetime wouldn't hurt.

[rlarocque, 2012/05/14 23:10:43]

Done.

+  size_t* unsynced_item_count_;
 
   DISALLOW_COPY_AND_ASSIGN(GetCommitIdsCommand);
 };
 
 }  // namespace browser_sync
 
 #endif  // SYNC_ENGINE_GET_COMMIT_IDS_COMMAND_H_