[SyncFS] Delete local file on rename and reorganize completion

chrome/browser/sync_file_system/drive_backend/metadata_database.cc

 // Copyright 2013 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 "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 
 #include <algorithm>
 #include <stack>
 
 #include "base/bind.h"
@@ skipping 868 matching lines @@
       tracker->clear_synced_details();
       tracker->set_dirty(true);
       tracker->set_active(false);
       PutTrackerToBatch(*tracker, batch.get());
     }
 
     WriteToDatabase(batch.Pass(), callback);
     return;
   }
 
-  // Check if the tracker was retitled.  If it was, update the title and its
-  // index in advance.
-  if (!tracker->has_synced_details() ||
-      tracker->synced_details().title() != updated_details.title()) {
-    UpdateTrackerTitle(tracker, updated_details.title(), batch.get());
+  if (tracker->has_synced_details()) {
+    // Check if the tracker was retitled.  If it was, there should exist another
+    // tracker for the new title, so delete old tracker.
+    if (tracker->synced_details().title() != updated_details.title()) {
+      RemoveTracker(tracker->tracker_id(), batch.get());
+      WriteToDatabase(batch.Pass(), callback);
+      return;
+    }
+
+    // Check if the tracker's parent is still in |parent_tracker_ids|.
+    // If not, there should exist another tracker for the new parent, so delete
+    // old tracker.
+    DCHECK(ContainsKey(tracker_by_id_, tracker->parent_tracker_id()));
+    FileTracker* parent_tracker = tracker_by_id_[tracker->parent_tracker_id()];
+    if (!HasFileAsParent(tracker->synced_details(),
+                         parent_tracker->file_id())) {
+      RemoveTracker(tracker->tracker_id(), batch.get());
+      WriteToDatabase(batch.Pass(), callback);
+      return;
+    }
   }
 
   *tracker->mutable_synced_details() = updated_details;
 
   // Activate the tracker if:
   //   - There is no active tracker that tracks |tracker->file_id()|.
   //   - There is no active tracker that has the same |parent| and |title|.
   if (!tracker->active() && CanActivateTracker(*tracker))
     MakeTrackerActive(tracker->tracker_id(), batch.get());
   if (tracker->dirty() && !ShouldKeepDirty(*tracker)) {
@@ skipping 539 matching lines @@
   TrackersByParentAndTitle::const_iterator found_by_parent =
       trackers_by_parent_and_title_.find(parent_tracker_id);
   if (found_by_parent == trackers_by_parent_and_title_.end())
     return false;
 
   const TrackersByTitle& trackers_by_title = found_by_parent->second;
   TrackersByTitle::const_iterator found = trackers_by_title.find(title);
   return found != trackers_by_title.end() && found->second.has_active();
 }
 
 void MetadataDatabase::UpdateTrackerTitle(FileTracker* tracker,

[kinuko, 2013/11/14 08:01:12]

This one's no longer used?

[tzik, 2013/11/14 08:15:27]

Done.

                                           const std::string& new_title,
                                           leveldb::WriteBatch* batch) {
   int64 parent_id = tracker->parent_tracker_id();
   std::string old_title = GetTrackerTitle(*tracker);
   DCHECK_NE(old_title, new_title);
   DCHECK(!new_title.empty());
 
   TrackersByTitle* trackers_by_title =
       &trackers_by_parent_and_title_[parent_id];
   TrackerSet* old_siblings = &(*trackers_by_title)[old_title];
@@ skipping 34 matching lines @@
       FROM_HERE,
       base::Bind(&leveldb::DB::Write,
                  base::Unretained(db_.get()),
                  leveldb::WriteOptions(),
                  base::Owned(batch.release())),
       base::Bind(&AdaptLevelDBStatusToSyncStatusCode, callback));
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system