andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/facebook/rocksdb

Browse Source
This commit is contained in:
Ankit Gupta 2014-04-27 13:05:39 -07:00
commit 0e4e4dbd3c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/version_set.h
View File

@ -219,7 +219,7 @@ class Version {
friend class UniversalCompactionPicker;
class LevelFileNumIterator;
struct LevelFileIteratorState;
class LevelFileIteratorState;
bool PrefixMayMatch(const ReadOptions& options, Iterator* level_iter,
const Slice& internal_prefix) const;

2
table/block_based_table_reader.h
View File

@ -111,7 +111,7 @@ class BlockBasedTable : public TableReader {
Rep* rep_;
bool compaction_optimized_;
struct BlockEntryIteratorState;
class BlockEntryIteratorState;
static Iterator* NewDataBlockIterator(Rep* rep, const ReadOptions& ro,
bool* didIO, const Slice& index_value);

8
utilities/backupable/backupable_db.cc
View File

@ -1134,9 +1134,9 @@ Status BackupEngineImpl::BackupMeta::StoreToFile(bool sync) {
// -------- BackupEngineReadOnlyImpl ---------
class BackupEngineReadOnlyImpl : public BackupEngineReadOnly {
public:
BackupEngineReadOnlyImpl(Env* db_env, const BackupableDBOptions& options) {
backup_engine_ = new BackupEngineImpl(db_env, options, true);
}
BackupEngineReadOnlyImpl(Env* db_env, const BackupableDBOptions& options)
: backup_engine_(new BackupEngineImpl(db_env, options, true)) {}
virtual ~BackupEngineReadOnlyImpl() {}
virtual void GetBackupInfo(std::vector<BackupInfo>* backup_info) {
@ -1158,7 +1158,7 @@ class BackupEngineReadOnlyImpl : public BackupEngineReadOnly {
}
private:
BackupEngineImpl* backup_engine_;
std::unique_ptr<BackupEngineImpl> backup_engine_;
};
BackupEngineReadOnly* BackupEngineReadOnly::NewReadOnlyBackupEngine(