aboutsummaryrefslogtreecommitdiff
path: root/src/leveldb/db/version_set.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/leveldb/db/version_set.h')
-rw-r--r--src/leveldb/db/version_set.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/leveldb/db/version_set.h b/src/leveldb/db/version_set.h
index 61c4c99a08..9d084fdb7d 100644
--- a/src/leveldb/db/version_set.h
+++ b/src/leveldb/db/version_set.h
@@ -21,6 +21,7 @@
#include "db/dbformat.h"
#include "db/version_edit.h"
#include "port/port.h"
+#include "port/thread_annotations.h"
namespace leveldb {
@@ -159,7 +160,8 @@ class VersionSet {
// current version. Will release *mu while actually writing to the file.
// REQUIRES: *mu is held on entry.
// REQUIRES: no other thread concurrently calls LogAndApply()
- Status LogAndApply(VersionEdit* edit, port::Mutex* mu);
+ Status LogAndApply(VersionEdit* edit, port::Mutex* mu)
+ EXCLUSIVE_LOCKS_REQUIRED(mu);
// Recover the last saved descriptor from persistent storage.
Status Recover();
@@ -275,6 +277,8 @@ class VersionSet {
void AppendVersion(Version* v);
+ bool ManifestContains(const std::string& record) const;
+
Env* const env_;
const std::string dbname_;
const Options* const options_;