Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 102073003: Revert of Add some DVLOG's in MetadataDatabase::Update* methods (Closed)

Created:
7 years ago by Michael van Ouwerkerk
Modified:
7 years ago
Reviewers:
kinuko, tzik
CC:
chromium-reviews, kinuko+watch, nhiroki, tzik
Visibility:
Public.

Description

Revert of https://codereview.chromium.org/101743002/ Reason for revert: Build broken on Chromium Webkit on GPU Win Builder TBR=tzik@chromium.org,kinuko@chromium.org NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+35 lines, -44 lines) Patch
M chrome/browser/sync_file_system/drive_backend/metadata_database.h View 2 chunks +3 lines, -4 lines 0 comments Download
M chrome/browser/sync_file_system/drive_backend/metadata_database.cc View 5 chunks +32 lines, -40 lines 0 comments Download

Messages

Total messages: 4 (0 generated)
Michael van Ouwerkerk
Created Revert of Add some DVLOG's in MetadataDatabase::Update* methods
7 years ago (2013-12-03 15:26:14 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/mvanouwerkerk@chromium.org/102073003/1
7 years ago (2013-12-03 15:26:35 UTC) #2
commit-bot: I haz the power
Failed to apply patch for chrome/browser/sync_file_system/drive_backend/metadata_database.cc: While running patch -p1 --forward --force --no-backup-if-mismatch; patching file ...
7 years ago (2013-12-03 15:26:37 UTC) #3
Michael van Ouwerkerk
7 years ago (2013-12-03 15:28:40 UTC) #4 
On 2013/12/03 15:26:37, I haz the power (commit-bot) wrote:
> Failed to apply patch for
> chrome/browser/sync_file_system/drive_backend/metadata_database.cc:
> While running patch -p1 --forward --force --no-backup-if-mismatch;
>   patching file
> chrome/browser/sync_file_system/drive_backend/metadata_database.cc
>   Hunk #1 succeeded at 826 with fuzz 1 (offset 29 lines).
>   Hunk #2 FAILED at 844.
>   Hunk #3 FAILED at 861.
>   Hunk #4 FAILED at 871.
>   Hunk #5 FAILED at 1686.
>   4 out of 5 hunks FAILED -- saving rejects to file
> chrome/browser/sync_file_system/drive_backend/metadata_database.cc.rej
> 
> Patch:      
chrome/browser/sync_file_system/drive_backend/metadata_database.cc
> Index: chrome/browser/sync_file_system/drive_backend/metadata_database.cc
> diff --git
a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
> b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
> index
>
013f6155f2e78de494674394a13c8c693e634a17..e090e7e26c3958ee844075b3da3835df5fcf611a
> 100644
> --- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
> +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
> @@ -797,6 +797,35 @@
>    return true;
>  }
>  
> +void MetadataDatabase::UpdateByFileMetadata(scoped_ptr<FileMetadata> file,
> +                                            leveldb::WriteBatch* batch) {
> +  DCHECK(file);
> +  DCHECK(file->has_details());
> +  std::string file_id = file->file_id();
> +  if (file->details().missing()) {
> +    TrackerSet trackers;
> +    FindTrackersByFileID(file_id, &trackers);
> +    for (TrackerSet::const_iterator itr = trackers.begin();
> +         itr != trackers.end(); ++itr) {
> +      const FileTracker& tracker = **itr;
> +      if (!tracker.has_synced_details() ||
> +          tracker.synced_details().missing()) {
> +        RemoveTracker(tracker.tracker_id(), batch);
> +      }
> +    }
> +  } else {
> +    MaybeAddTrackersForNewFile(*file, batch);
> +  }
> +
> +  if (FindTrackersByFileID(file_id, NULL)) {
> +    MarkTrackersDirtyByFileID(file_id, batch);
> +    PutFileToBatch(*file, batch);
> +    FileMetadata* file_ptr = file.release();
> +    std::swap(file_ptr, file_by_id_[file_id]);
> +    delete file_ptr;
> +  }
> +}
> +
>  void MetadataDatabase::UpdateByChangeList(
>      int64 largest_change_id,
>      ScopedVector<google_apis::ChangeResource> changes,
> @@ -815,7 +844,7 @@
>  
>      scoped_ptr<FileMetadata> file(
>          CreateFileMetadataFromChangeResource(change));
> -    UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
> +    UpdateByFileMetadata(file.Pass(), batch.get());
>    }
>  
>    UpdateLargestKnownChangeID(largest_change_id);
> @@ -832,7 +861,7 @@
>    scoped_ptr<FileMetadata> file(
>        CreateFileMetadataFromFileResource(
>            GetLargestKnownChangeID(), resource));
> -  UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
> +  UpdateByFileMetadata(file.Pass(), batch.get());
>    WriteToDatabase(batch.Pass(), callback);
>  }
>  
> @@ -842,7 +871,7 @@
>    scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
>    scoped_ptr<FileMetadata> file(
>        CreateDeletedFileMetadata(GetLargestKnownChangeID(), file_id));
> -  UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
> +  UpdateByFileMetadata(file.Pass(), batch.get());
>    WriteToDatabase(batch.Pass(), callback);
>  }
>  
> @@ -1657,43 +1686,6 @@
>    return found != trackers_by_title.end() && found->second.has_active();
>  }
>  
> -void MetadataDatabase::UpdateByFileMetadata(
> -    const tracked_objects::Location& from_where,
> -    scoped_ptr<FileMetadata> file,
> -    leveldb::WriteBatch* batch) {
> -  DCHECK(file);
> -  DCHECK(file->has_details());
> -
> -  DVLOG(1) << from_where.function_name() << ": "
> -           << file->file_id() << " ("
> -           << file->details().title() << ")"
> -           << (file->details().missing() ? " deleted" : "");
> -
> -  std::string file_id = file->file_id();
> -  if (file->details().missing()) {
> -    TrackerSet trackers;
> -    FindTrackersByFileID(file_id, &trackers);
> -    for (TrackerSet::const_iterator itr = trackers.begin();
> -         itr != trackers.end(); ++itr) {
> -      const FileTracker& tracker = **itr;
> -      if (!tracker.has_synced_details() ||
> -          tracker.synced_details().missing()) {
> -        RemoveTracker(tracker.tracker_id(), batch);
> -      }
> -    }
> -  } else {
> -    MaybeAddTrackersForNewFile(*file, batch);
> -  }
> -
> -  if (FindTrackersByFileID(file_id, NULL)) {
> -    MarkTrackersDirtyByFileID(file_id, batch);
> -    PutFileToBatch(*file, batch);
> -    FileMetadata* file_ptr = file.release();
> -    std::swap(file_ptr, file_by_id_[file_id]);
> -    delete file_ptr;
> -  }
> -}
> -
>  void MetadataDatabase::WriteToDatabase(scoped_ptr<leveldb::WriteBatch> batch,
>                                         const SyncStatusCallback& callback) {
>    base::PostTaskAndReplyWithResult(

http://build.chromium.org/p/chromium.webkit/builders/GPU%20Win%20Builder/buil...

Powered by Google App Engine
This is Rietveld 408576698