ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rocksdb: Update rocksdb code to work with spdk/rocksdb branch spdk-v6.10.2

Browse Source 
Signed-off-by: Maciej Szwed <maciej.szwed@intel.com>
Change-Id: Ib907762e9124737a9ea7d4786903446e4ed61abb
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3461
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Maciej Szwed 2020-07-21 13:05:14 +02:00 committed by Tomasz Zawadzki
parent a44d06142b
commit 436fa2efae
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/rocksdb/env_spdk.cc
View File

@ -416,7 +416,7 @@ public:
virtual ~SpdkEnv(); virtual ~SpdkEnv();
virtual Status NewSequentialFile(const std::string &fname, virtual Status NewSequentialFile(const std::string &fname,
unique_ptr<SequentialFile> *result, std::unique_ptr<SequentialFile> *result,
const EnvOptions &options) override const EnvOptions &options) override
{ {
if (fname.compare(0, mDirectory.length(), mDirectory) == 0) { if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@ -444,7 +444,7 @@ public:
} }
virtual Status NewRandomAccessFile(const std::string &fname, virtual Status NewRandomAccessFile(const std::string &fname,
unique_ptr<RandomAccessFile> *result, std::unique_ptr<RandomAccessFile> *result,
const EnvOptions &options) override const EnvOptions &options) override
{ {
if (fname.compare(0, mDirectory.length(), mDirectory) == 0) { if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@ -468,7 +468,7 @@ public:
} }
virtual Status NewWritableFile(const std::string &fname, virtual Status NewWritableFile(const std::string &fname,
unique_ptr<WritableFile> *result, std::unique_ptr<WritableFile> *result,
const EnvOptions &options) override const EnvOptions &options) override
{ {
if (fname.compare(0, mDirectory.length(), mDirectory) == 0) { if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@ -493,14 +493,14 @@ public:
virtual Status ReuseWritableFile(const std::string &fname, virtual Status ReuseWritableFile(const std::string &fname,
const std::string &old_fname, const std::string &old_fname,
unique_ptr<WritableFile> *result, std::unique_ptr<WritableFile> *result,
const EnvOptions &options) override const EnvOptions &options) override
{ {
return EnvWrapper::ReuseWritableFile(fname, old_fname, result, options); return EnvWrapper::ReuseWritableFile(fname, old_fname, result, options);
} }
virtual Status NewDirectory(__attribute__((unused)) const std::string &name, virtual Status NewDirectory(__attribute__((unused)) const std::string &name,
unique_ptr<Directory> *result) override std::unique_ptr<Directory> *result) override
{ {
result->reset(new SpdkDirectory()); result->reset(new SpdkDirectory());
return Status::OK(); return Status::OK();

2
lib/rocksdb/spdk.rocksdb.mk
View File

@ -41,7 +41,7 @@ CXXFLAGS += -I$(SPDK_DIR)/include -Iinclude/
# The SPDK makefiles turn this on, but RocksDB won't compile with it. So # The SPDK makefiles turn this on, but RocksDB won't compile with it. So
# turn it off after including the SPDK makefiles. # turn it off after including the SPDK makefiles.
CXXFLAGS += -Wno-missing-declarations CXXFLAGS += -Wno-missing-declarations -Wno-maybe-uninitialized
# The SPDK Makefiles may turn these options on but we do not want to enable # The SPDK Makefiles may turn these options on but we do not want to enable
# them for the RocksDB source files. # them for the RocksDB source files.