Commit 436fa2ef authored by Maciej Szwed's avatar Maciej Szwed Committed by Tomasz Zawadzki
Browse files

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



Signed-off-by: default avatarMaciej 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
parent a44d0614

lib/rocksdb/env_spdk.cc

+5 −5
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ public: 
	virtual ~SpdkEnv();



	virtual Status NewSequentialFile(const std::string &fname,

					 unique_ptr<SequentialFile> *result,

					 std::unique_ptr<SequentialFile> *result,

					 const EnvOptions &options) override

	{

		if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@@ -444,7 +444,7 @@ public: 
	}



	virtual Status NewRandomAccessFile(const std::string &fname,

					   unique_ptr<RandomAccessFile> *result,

					   std::unique_ptr<RandomAccessFile> *result,

					   const EnvOptions &options) override

	{

		if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@@ -468,7 +468,7 @@ public: 
	}



	virtual Status NewWritableFile(const std::string &fname,

				       unique_ptr<WritableFile> *result,

				       std::unique_ptr<WritableFile> *result,

				       const EnvOptions &options) override

	{

		if (fname.compare(0, mDirectory.length(), mDirectory) == 0) {
@@ -493,14 +493,14 @@ public: 


	virtual Status ReuseWritableFile(const std::string &fname,

					 const std::string &old_fname,

					 unique_ptr<WritableFile> *result,

					 std::unique_ptr<WritableFile> *result,

					 const EnvOptions &options) override

	{

		return EnvWrapper::ReuseWritableFile(fname, old_fname, result, options);

	}



	virtual Status NewDirectory(__attribute__((unused)) const std::string &name,

				    unique_ptr<Directory> *result) override

				    std::unique_ptr<Directory> *result) override

	{

		result->reset(new SpdkDirectory());

		return Status::OK();

lib/rocksdb/spdk.rocksdb.mk

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ CXXFLAGS += -I$(SPDK_DIR)/include -Iinclude/ 


# The SPDK makefiles turn this on, but RocksDB won't compile with it.  So

#  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

#  them for the RocksDB source files.