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

Fix unity build

Browse Source 
Summary: I broke it with 2fd8f750ab

Test Plan: make unity

Reviewers: yhchiang, rven, sdong

Reviewed By: sdong

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D32577
This commit is contained in:
Igor Canadi 2015-02-03 00:32:11 -06:00
parent 8d3819369f
commit b04408c47b
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -31,6 +31,7 @@ coverage/COVERAGE_REPORT
.gdbhistory .gdbhistory
package/ package/
.phutil_module_cache .phutil_module_cache
unity
tags tags
java/out java/out

26
util/mock_env.cc
View File

@ -168,13 +168,13 @@ class MemFile {
namespace { namespace {
class SequentialFileImpl : public SequentialFile { class MockSequentialFile : public SequentialFile {
public: public:
explicit SequentialFileImpl(MemFile* file) : file_(file), pos_(0) { explicit MockSequentialFile(MemFile* file) : file_(file), pos_(0) {
file_->Ref(); file_->Ref();
} }
~SequentialFileImpl() { ~MockSequentialFile() {
file_->Unref(); file_->Unref();
} }
@ -203,13 +203,13 @@ class SequentialFileImpl : public SequentialFile {
size_t pos_; size_t pos_;
}; };
class RandomAccessFileImpl : public RandomAccessFile { class MockRandomAccessFile : public RandomAccessFile {
public: public:
explicit RandomAccessFileImpl(MemFile* file) : file_(file) { explicit MockRandomAccessFile(MemFile* file) : file_(file) {
file_->Ref(); file_->Ref();
} }
~RandomAccessFileImpl() { ~MockRandomAccessFile() {
file_->Unref(); file_->Unref();
} }
@ -222,15 +222,15 @@ class RandomAccessFileImpl : public RandomAccessFile {
MemFile* file_; MemFile* file_;
}; };
class WritableFileImpl : public WritableFile { class MockWritableFile : public WritableFile {
public: public:
WritableFileImpl(MemFile* file, RateLimiter* rate_limiter) MockWritableFile(MemFile* file, RateLimiter* rate_limiter)
: file_(file), : file_(file),
rate_limiter_(rate_limiter) { rate_limiter_(rate_limiter) {
file_->Ref(); file_->Ref();
} }
~WritableFileImpl() { ~MockWritableFile() {
file_->Unref(); file_->Unref();
} }
@ -424,7 +424,7 @@ Status MockEnv::NewSequentialFile(const std::string& fname,
if (f->is_lock_file()) { if (f->is_lock_file()) {
return Status::InvalidArgument(fn, "Cannot open a lock file."); return Status::InvalidArgument(fn, "Cannot open a lock file.");
} }
result->reset(new SequentialFileImpl(f)); result->reset(new MockSequentialFile(f));
return Status::OK(); return Status::OK();
} }
@ -441,7 +441,7 @@ Status MockEnv::NewRandomAccessFile(const std::string& fname,
if (f->is_lock_file()) { if (f->is_lock_file()) {
return Status::InvalidArgument(fn, "Cannot open a lock file."); return Status::InvalidArgument(fn, "Cannot open a lock file.");
} }
result->reset(new RandomAccessFileImpl(f)); result->reset(new MockRandomAccessFile(f));
return Status::OK(); return Status::OK();
} }
@ -457,7 +457,7 @@ Status MockEnv::NewWritableFile(const std::string& fname,
file->Ref(); file->Ref();
file_map_[fn] = file; file_map_[fn] = file;
result->reset(new WritableFileImpl(file, env_options.rate_limiter)); result->reset(new MockWritableFile(file, env_options.rate_limiter));
return Status::OK(); return Status::OK();
} }
@ -613,7 +613,7 @@ Status MockEnv::NewLogger(const std::string& fname,
} else { } else {
file = iter->second; file = iter->second;
} }
std::unique_ptr<WritableFile> f(new WritableFileImpl(file, nullptr)); std::unique_ptr<WritableFile> f(new MockWritableFile(file, nullptr));
result->reset(new TestMemLogger(std::move(f), this)); result->reset(new TestMemLogger(std::move(f), this));
return Status::OK(); return Status::OK();
} }