memenv: normalize file path

Summary: Now using memenv, DB will not able to be reopened, since a "//" in the file name. Fix it by normalizing file path.

Test Plan: Add a unit test that used to fail and now pass.

Reviewers: rven, yhchiang, igor

Reviewed By: igor

Subscribers: leveldb, dhruba

Differential Revision: https://reviews.facebook.net/D31767
main
sdong 10 years ago
parent 4d9d5955ac
commit 0ddf5f73ec
  1. 57
      helpers/memenv/memenv.cc
  2. 9
      helpers/memenv/memenv_test.cc

@ -15,6 +15,26 @@ namespace rocksdb {
namespace { namespace {
std::string NormalizeFileName(const std::string fname) {
if (fname.find("//") == std::string::npos) {
return fname;
}
std::string out_name = "";
bool is_slash = false;
for (char c : fname) {
if (c == '/' && is_slash) {
continue;
}
out_name.append(1, c);
if (c == '/') {
is_slash = true;
} else {
is_slash = false;
}
}
return out_name;
}
class FileState { class FileState {
public: public:
// FileStates are reference counted. The initial reference count is zero // FileStates are reference counted. The initial reference count is zero
@ -238,40 +258,43 @@ class InMemoryEnv : public EnvWrapper {
virtual Status NewSequentialFile(const std::string& fname, virtual Status NewSequentialFile(const std::string& fname,
unique_ptr<SequentialFile>* result, unique_ptr<SequentialFile>* result,
const EnvOptions& soptions) { const EnvOptions& soptions) {
std::string nfname = NormalizeFileName(fname);
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (file_map_.find(fname) == file_map_.end()) { if (file_map_.find(fname) == file_map_.end()) {
*result = NULL; *result = NULL;
return Status::IOError(fname, "File not found"); return Status::IOError(fname, "File not found");
} }
result->reset(new SequentialFileImpl(file_map_[fname])); result->reset(new SequentialFileImpl(file_map_[nfname]));
return Status::OK(); return Status::OK();
} }
virtual Status NewRandomAccessFile(const std::string& fname, virtual Status NewRandomAccessFile(const std::string& fname,
unique_ptr<RandomAccessFile>* result, unique_ptr<RandomAccessFile>* result,
const EnvOptions& soptions) { const EnvOptions& soptions) {
std::string nfname = NormalizeFileName(fname);
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (file_map_.find(fname) == file_map_.end()) { if (file_map_.find(nfname) == file_map_.end()) {
*result = NULL; *result = NULL;
return Status::IOError(fname, "File not found"); return Status::IOError(fname, "File not found");
} }
result->reset(new RandomAccessFileImpl(file_map_[fname])); result->reset(new RandomAccessFileImpl(file_map_[nfname]));
return Status::OK(); return Status::OK();
} }
virtual Status NewWritableFile(const std::string& fname, virtual Status NewWritableFile(const std::string& fname,
unique_ptr<WritableFile>* result, unique_ptr<WritableFile>* result,
const EnvOptions& soptions) { const EnvOptions& soptions) {
std::string nfname = NormalizeFileName(fname);
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (file_map_.find(fname) != file_map_.end()) { if (file_map_.find(nfname) != file_map_.end()) {
DeleteFileInternal(fname); DeleteFileInternal(nfname);
} }
FileState* file = new FileState(); FileState* file = new FileState();
file->Ref(); file->Ref();
file_map_[fname] = file; file_map_[nfname] = file;
result->reset(new WritableFileImpl(file)); result->reset(new WritableFileImpl(file));
return Status::OK(); return Status::OK();
@ -284,8 +307,9 @@ class InMemoryEnv : public EnvWrapper {
} }
virtual bool FileExists(const std::string& fname) { virtual bool FileExists(const std::string& fname) {
std::string nfname = NormalizeFileName(fname);
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
return file_map_.find(fname) != file_map_.end(); return file_map_.find(nfname) != file_map_.end();
} }
virtual Status GetChildren(const std::string& dir, virtual Status GetChildren(const std::string& dir,
@ -315,12 +339,13 @@ class InMemoryEnv : public EnvWrapper {
} }
virtual Status DeleteFile(const std::string& fname) { virtual Status DeleteFile(const std::string& fname) {
std::string nfname = NormalizeFileName(fname);
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (file_map_.find(fname) == file_map_.end()) { if (file_map_.find(nfname) == file_map_.end()) {
return Status::IOError(fname, "File not found"); return Status::IOError(fname, "File not found");
} }
DeleteFileInternal(fname); DeleteFileInternal(nfname);
return Status::OK(); return Status::OK();
} }
@ -337,12 +362,14 @@ class InMemoryEnv : public EnvWrapper {
} }
virtual Status GetFileSize(const std::string& fname, uint64_t* file_size) { virtual Status GetFileSize(const std::string& fname, uint64_t* file_size) {
std::string nfname = NormalizeFileName(fname);
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (file_map_.find(fname) == file_map_.end()) {
if (file_map_.find(nfname) == file_map_.end()) {
return Status::IOError(fname, "File not found"); return Status::IOError(fname, "File not found");
} }
*file_size = file_map_[fname]->Size(); *file_size = file_map_[nfname]->Size();
return Status::OK(); return Status::OK();
} }
@ -352,14 +379,16 @@ class InMemoryEnv : public EnvWrapper {
} }
virtual Status RenameFile(const std::string& src, const std::string& dest) { virtual Status RenameFile(const std::string& src, const std::string& dest) {
std::string nsrc = NormalizeFileName(src);
std::string ndest = NormalizeFileName(dest);
MutexLock lock(&mutex_); MutexLock lock(&mutex_);
if (file_map_.find(src) == file_map_.end()) { if (file_map_.find(nsrc) == file_map_.end()) {
return Status::IOError(src, "File not found"); return Status::IOError(src, "File not found");
} }
DeleteFileInternal(dest); DeleteFileInternal(dest);
file_map_[dest] = file_map_[src]; file_map_[ndest] = file_map_[nsrc];
file_map_.erase(src); file_map_.erase(nsrc);
return Status::OK(); return Status::OK();
} }

@ -222,6 +222,15 @@ TEST(MemEnvTest, DBTest) {
} }
delete db; delete db;
options.create_if_missing = false;
ASSERT_OK(DB::Open(options, "/dir/db", &db));
for (size_t i = 0; i < 3; ++i) {
std::string res;
ASSERT_OK(db->Get(ReadOptions(), keys[i], &res));
ASSERT_TRUE(res == vals[i]);
}
delete db;
} }
} // namespace rocksdb } // namespace rocksdb

Loading…
Cancel
Save