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

Unified Diff: chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc

Issue 428063002: [SyncFS] Replace leveldb classes with LevelDBWrapper (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase on cl/437943002 Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc
index c804b36ef535b34a2a15a087660065f12d50e9e6..4107a4b964d05f96ad6c09cd858d514f8e89bf59 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_util.cc
@@ -11,65 +11,62 @@
#include "base/threading/thread_restrictions.h"
#include "chrome/browser/drive/drive_api_util.h"
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
+#include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h"
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
#include "chrome/browser/sync_file_system/logger.h"
#include "google_apis/drive/drive_api_parser.h"
#include "google_apis/drive/gdata_wapi_parser.h"
-#include "third_party/leveldatabase/src/include/leveldb/db.h"
-#include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
+#include "third_party/leveldatabase/src/include/leveldb/status.h"
namespace sync_file_system {
namespace drive_backend {
-void PutVersionToBatch(int64 version, leveldb::WriteBatch* batch) {
- if (batch)
- batch->Put(kDatabaseVersionKey, base::Int64ToString(version));
+void PutVersionToDB(int64 version, LevelDBWrapper* db) {
+ if (db)
nhiroki 2014/08/05 07:32:15 Can you replace this and others with DCHECKs in a
+ db->Put(kDatabaseVersionKey, base::Int64ToString(version));
}
-void PutServiceMetadataToBatch(const ServiceMetadata& service_metadata,
- leveldb::WriteBatch* batch) {
- if (!batch)
+void PutServiceMetadataToDB(const ServiceMetadata& service_metadata,
+ LevelDBWrapper* db) {
+ if (!db)
return;
std::string value;
bool success = service_metadata.SerializeToString(&value);
DCHECK(success);
- batch->Put(kServiceMetadataKey, value);
+ db->Put(kServiceMetadataKey, value);
}
-void PutFileMetadataToBatch(const FileMetadata& file,
- leveldb::WriteBatch* batch) {
- if (!batch)
+void PutFileMetadataToDB(const FileMetadata& file, LevelDBWrapper* db) {
+ if (!db)
return;
std::string value;
bool success = file.SerializeToString(&value);
DCHECK(success);
- batch->Put(kFileMetadataKeyPrefix + file.file_id(), value);
+ db->Put(kFileMetadataKeyPrefix + file.file_id(), value);
}
-void PutFileTrackerToBatch(const FileTracker& tracker,
- leveldb::WriteBatch* batch) {
- if (!batch)
+void PutFileTrackerToDB(const FileTracker& tracker, LevelDBWrapper* db) {
+ if (!db)
return;
std::string value;
bool success = tracker.SerializeToString(&value);
DCHECK(success);
- batch->Put(kFileTrackerKeyPrefix + base::Int64ToString(tracker.tracker_id()),
- value);
+ db->Put(kFileTrackerKeyPrefix + base::Int64ToString(tracker.tracker_id()),
+ value);
}
-void PutFileMetadataDeletionToBatch(const std::string& file_id,
- leveldb::WriteBatch* batch) {
- if (batch)
- batch->Delete(kFileMetadataKeyPrefix + file_id);
+void PutFileMetadataDeletionToDB(const std::string& file_id,
+ LevelDBWrapper* db) {
+ if (db)
+ db->Delete(kFileMetadataKeyPrefix + file_id);
}
-void PutFileTrackerDeletionToBatch(int64 tracker_id,
- leveldb::WriteBatch* batch) {
- if (batch)
- batch->Delete(kFileTrackerKeyPrefix + base::Int64ToString(tracker_id));
+void PutFileTrackerDeletionToDB(int64 tracker_id, LevelDBWrapper* db) {
+ if (db)
+ db->Delete(kFileTrackerKeyPrefix + base::Int64ToString(tracker_id));
}
bool HasFileAsParent(const FileDetails& details, const std::string& file_id) {
@@ -171,14 +168,12 @@ bool RemovePrefix(const std::string& str, const std::string& prefix,
return true;
}
-scoped_ptr<ServiceMetadata> InitializeServiceMetadata(leveldb::DB* db) {
+scoped_ptr<ServiceMetadata> InitializeServiceMetadata(LevelDBWrapper* db) {
base::ThreadRestrictions::AssertIOAllowed();
DCHECK(db);
std::string value;
- leveldb::Status status = db->Get(leveldb::ReadOptions(),
- kServiceMetadataKey,
- &value);
+ leveldb::Status status = db->Get(kServiceMetadataKey, &value);
scoped_ptr<ServiceMetadata> service_metadata(new ServiceMetadata);
if (!status.ok() || !service_metadata->ParseFromString(value))

Powered by Google App Engine
This is Rietveld 408576698