[SyncFS] Support Delete operation on LevelDBWrapper::Iterator

chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.cc

 // Copyright 2014 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/leveldb_wrapper.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 49 matching lines @@
       db_iterator_->Next();
     if (comp >= 0)
       ++map_iterator_;
   } else {
     ++map_iterator_;
   }
 
   AdvanceIterators();
 }
 
+void LevelDBWrapper::Iterator::Delete() {
+  DCHECK(Valid());
+
+  const std::string key_str = key().ToString();
+  if (map_iterator_ != db_->pending_.end() && map_iterator_->first == key_str)
+    db_->pending_.erase(map_iterator_);
+  map_iterator_ = db_->pending_.insert(
+      std::make_pair(key_str,
+                     Transaction(DELETE_OPERATION, std::string()))).first;

[tzik, 2014/08/12 05:56:46]

Since we already have the right place to insert, how about doing like this?

Transaction deletion(DELETE_OPERATION, std::string());
std::pair<iterator, bool> inserted = db_->pending_.insert(map_iterator_,
std::make_pair(key_str, deletion));
map_iterator_ = inserted.first;
if (!inserted.second)
  map_iterator_->second = deletion;

[peria, 2014/08/12 06:04:34]

Done.

+  AdvanceIterators();
+}
+
 leveldb::Slice LevelDBWrapper::Iterator::key() {
   DCHECK(Valid());
 
   if (!db_iterator_->Valid())
     return map_iterator_->first;
   if (map_iterator_ == db_->pending_.end())
     return db_iterator_->key();
 
   const leveldb::Slice db_key = db_iterator_->key();
   const leveldb::Slice map_key = map_iterator_->first;
@@ skipping 112 matching lines @@
 void LevelDBWrapper::Clear() {
   pending_.clear();
 }
 
 leveldb::DB* LevelDBWrapper::GetLevelDB() {
   return db_.get();
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system