Fixes RocksDB build

pull/216/head
Tpt 3 years ago
parent 489d271148
commit ed5004a70d
  1. 22
      oxrocksdb-sys/api/build_version.cc

@ -3,24 +3,27 @@
#include <memory> #include <memory>
#include "rocksdb/version.h" #include "rocksdb/version.h"
#include "util/string_util.h" #include "rocksdb/utilities/object_registry.h"
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {
const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() { std::unordered_map<std::string, RegistrarFunc> ObjectRegistry::builtins_ = {};
const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() {
static std::unique_ptr<std::unordered_map<std::string, std::string>> props(new std::unordered_map<std::string, std::string>()); static std::unique_ptr<std::unordered_map<std::string, std::string>> props(new std::unordered_map<std::string, std::string>());
return *props; return *props;
} }
std::string GetRocksVersionAsString(bool with_patch) { std::string GetRocksVersionAsString(bool with_patch) {
std::string version = ToString(ROCKSDB_MAJOR) + "." + ToString(ROCKSDB_MINOR); std::string version = std::to_string(ROCKSDB_MAJOR) + "." + std::to_string(ROCKSDB_MINOR);
if (with_patch) { if (with_patch) {
return version + "." + ToString(ROCKSDB_PATCH); return version + "." + std::to_string(ROCKSDB_PATCH);
} else { } else {
return version; return version;
} }
} }
std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) { std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) {
std::string info = program + " (RocksDB) " + GetRocksVersionAsString(true); std::string info = program + " (RocksDB) " + GetRocksVersionAsString(true);
if (verbose) { if (verbose) {
for (const auto& it : GetRocksBuildProperties()) { for (const auto& it : GetRocksBuildProperties()) {
@ -31,6 +34,5 @@ std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose)
} }
} }
return info; return info;
} }
} // namespace ROCKSDB_NAMESPACE } // namespace ROCKSDB_NAMESPACE

Loading…
Cancel
Save