Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump rocksdb version (v7.2.2+commits, c4cd8e1accfd010bba9a919e234ba04… #1

Merged
merged 1 commit into from
Jun 1, 2022
Merged

Bump rocksdb version (v7.2.2+commits, c4cd8e1accfd010bba9a919e234ba04… #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}, { # OS != 'win'
'cflags!': [ '-fno-rtti' ]
, 'cflags_cc!': [ '-fno-rtti' ]
, 'cflags_cc+': [ '-frtti' ]
, 'cflags_cc+': [ '-frtti', '-std=c++17' ]
}]
, ["OS == 'mac'", {
"cflags+": ["-fvisibility=hidden"],
Expand All @@ -39,7 +39,7 @@
]
, 'OTHER_CPLUSPLUSFLAGS': [
'-mmacosx-version-min=10.8'
, '-std=c++11'
, '-std=c++17'
, '-stdlib=libc++'
, '-arch x86_64'
, '-arch arm64'
Expand Down
63 changes: 60 additions & 3 deletions deps/rocksdb/build_version.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,61 @@
#include "rocksdb/util/build_version.h"
#include "rocksdb/version.h"
#include "rocksdb/utilities/object_registry.h"

// In original RocksDB build the following variables and functions are generated either by CMake or Makefile

const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:None";
const char* rocksdb_build_git_date = "rocksdb_build_git_date:None";
const char* rocksdb_build_compile_date = "None";
const char* rocksdb_build_git_tag = "rocksdb_build_git_tag:None";
const char* rocksdb_build_date = "rocksdb_build_date:None";

std::unordered_map<std::string, ROCKSDB_NAMESPACE::RegistrarFunc> ROCKSDB_NAMESPACE::ObjectRegistry::builtins_ = {};

namespace ROCKSDB_NAMESPACE {

static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string& name) {
size_t colon = name.find(":");
if (colon != std::string::npos && colon > 0 && colon < name.length() - 1) {
// If we found a "@:", then this property was a build-time substitution that failed. Skip it
size_t at = name.find("@", colon);
if (at != colon + 1) {
// Everything before the colon is the name, after is the value
(*props)[name.substr(0, colon)] = name.substr(colon + 1);
}
}
}

static std::unordered_map<std::string, std::string>* LoadPropertiesSet() {
auto * properties = new std::unordered_map<std::string, std::string>();
AddProperty(properties, rocksdb_build_git_sha);
AddProperty(properties, rocksdb_build_git_tag);
AddProperty(properties, rocksdb_build_date);
return properties;
}

const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() {
static std::unique_ptr<std::unordered_map<std::string, std::string>> props(LoadPropertiesSet());
return *props;
}

std::string GetRocksVersionAsString(bool with_patch) {
std::string version = std::to_string(ROCKSDB_MAJOR) + "." + std::to_string(ROCKSDB_MINOR);
if (with_patch) {
return version + "." + std::to_string(ROCKSDB_PATCH);
} else {
return version;
}
}

std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) {
std::string info = program + " (RocksDB) " + GetRocksVersionAsString(true);
if (verbose) {
for (const auto& it : GetRocksBuildProperties()) {
info.append("\n ");
info.append(it.first);
info.append(": ");
info.append(it.second);
}
}
return info;
}

} // namespace ROCKSDB_NAMESPACE
2 changes: 1 addition & 1 deletion deps/rocksdb/rocksdb
Open in desktop
Submodule rocksdb updated from 09c7e9 to 19a876
28 changes: 21 additions & 7 deletions deps/rocksdb/rocksdb.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
]
}
, 'defines': [
'SNAPPY=1'
'SNAPPY=1'
, 'ROCKSDB_SUPPORT_THREAD_LOCAL=1'
]
, 'include_dirs': [
'rocksdb/'
Expand Down Expand Up @@ -80,7 +81,7 @@
, 'cflags': [ '-std=c++0x' ]
, 'cflags!': [ '-fno-tree-vrp', '-fno-rtti' ]
, 'cflags_cc!': [ '-fno-rtti' ]
# , 'cflags_cc+': [ '-frtti' ]
, 'cflags_cc+': [ '-std=c++17' ]
}]
, ['OS != "win"' and 'OS != "freebsd"', {
'cflags': [
Expand Down Expand Up @@ -162,7 +163,7 @@
]
, 'OTHER_CPLUSPLUSFLAGS': [
'-mmacosx-version-min=10.8'
, '-std=c++11'
, '-std=c++17'
, '-stdlib=libc++'
, '-fno-omit-frame-pointer'
, '-momit-leaf-frame-pointer'
Expand All @@ -178,7 +179,12 @@
]
, 'sources': [
'rocksdb/cache/cache.cc'
, 'rocksdb/cache/cache_entry_roles.cc'
, 'rocksdb/cache/cache_key.cc'
, 'rocksdb/cache/cache_reservation_manager.cc'
, 'rocksdb/cache/clock_cache.cc'
, 'rocksdb/cache/compressed_secondary_cache.cc'
, 'rocksdb/cache/fast_lru_cache.cc'
, 'rocksdb/cache/lru_cache.cc'
, 'rocksdb/cache/sharded_cache.cc'
, 'rocksdb/db/arena_wrapped_db_iter.cc'
Expand All @@ -194,7 +200,6 @@
, 'rocksdb/db/builder.cc'
, 'rocksdb/db/c.cc'
, 'rocksdb/db/column_family.cc'
, 'rocksdb/db/compacted_db_impl.cc'
, 'rocksdb/db/compaction/compaction.cc'
, 'rocksdb/db/compaction/compaction_iterator.cc'
, 'rocksdb/db/compaction/compaction_picker.cc'
Expand All @@ -205,6 +210,7 @@
, 'rocksdb/db/compaction/sst_partitioner.cc'
, 'rocksdb/db/convenience.cc'
, 'rocksdb/db/db_filesnapshot.cc'
, 'rocksdb/db/db_impl/compacted_db_impl.cc'
, 'rocksdb/db/db_impl/db_impl.cc'
, 'rocksdb/db/db_impl/db_impl_write.cc'
, 'rocksdb/db/db_impl/db_impl_compaction_flush.cc'
Expand Down Expand Up @@ -257,15 +263,18 @@
, 'rocksdb/db/write_thread.cc'
, 'rocksdb/env/env.cc'
, 'rocksdb/env/env_chroot.cc'
, 'rocksdb/env/composite_env.cc'
, 'rocksdb/env/env_encryption.cc'
, 'rocksdb/env/env_hdfs.cc'
, 'rocksdb/env/file_system.cc'
, 'rocksdb/env/file_system_tracer.cc'
, 'rocksdb/env/fs_remap.cc'
, 'rocksdb/env/mock_env.cc'
, 'rocksdb/env/unique_id_gen.cc'
, 'rocksdb/file/delete_scheduler.cc'
, 'rocksdb/file/file_prefetch_buffer.cc'
, 'rocksdb/file/file_util.cc'
, 'rocksdb/file/filename.cc'
, 'rocksdb/file/line_file_reader.cc'
, 'rocksdb/file/random_access_file_reader.cc'
, 'rocksdb/file/read_write_util.cc'
, 'rocksdb/file/readahead_raf.cc'
Expand Down Expand Up @@ -353,6 +362,7 @@
, 'rocksdb/table/table_factory.cc'
, 'rocksdb/table/table_properties.cc'
, 'rocksdb/table/two_level_iterator.cc'
, 'rocksdb/table/unique_id.cc'
, 'rocksdb/test_util/sync_point.cc'
, 'rocksdb/test_util/sync_point_impl.cc'
, 'rocksdb/test_util/testutil.cc'
Expand All @@ -372,6 +382,7 @@
, 'rocksdb/trace_replay/trace_replay.cc'
, 'rocksdb/trace_replay/block_cache_tracer.cc'
, 'rocksdb/trace_replay/io_tracer.cc'
, 'rocksdb/util/cleanable.cc'
, 'rocksdb/util/coding.cc'
, 'rocksdb/util/compaction_job_stats_impl.cc'
, 'rocksdb/util/comparator.cc'
Expand Down Expand Up @@ -409,6 +420,7 @@
# , 'rocksdb/utilities/cassandra/merge_operator.cc'

, 'rocksdb/utilities/checkpoint/checkpoint_impl.cc'
, 'rocksdb/utilities/compaction_filters.cc'
, 'rocksdb/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc'
, 'rocksdb/utilities/debug.cc'

Expand All @@ -422,12 +434,13 @@

, 'rocksdb/utilities/leveldb_options/leveldb_options.cc'
, 'rocksdb/utilities/memory/memory_util.cc'
, 'rocksdb/utilities/merge_operators.cc'
, 'rocksdb/utilities/merge_operators/bytesxor.cc'
, 'rocksdb/utilities/merge_operators/sortlist.cc'

# Unused
# , 'rocksdb/utilities/merge_operators/bytesxor.cc'
# , 'rocksdb/utilities/merge_operators/max.cc'
# , 'rocksdb/utilities/merge_operators/put.cc'
# , 'rocksdb/utilities/merge_operators/sortlist.cc'
# , 'rocksdb/utilities/merge_operators/string_append/stringappend.cc'
# , 'rocksdb/utilities/merge_operators/string_append/stringappend2.cc'
# , 'rocksdb/utilities/merge_operators/uint64add.cc'
Expand Down Expand Up @@ -467,6 +480,7 @@
, 'rocksdb/utilities/transactions/write_unprepared_txn.cc'
, 'rocksdb/utilities/transactions/write_unprepared_txn_db.cc'
, 'rocksdb/utilities/ttl/db_ttl_impl.cc'
, 'rocksdb/utilities/wal_filter.cc'
, 'rocksdb/utilities/write_batch_with_index/write_batch_with_index.cc'
, 'rocksdb/utilities/write_batch_with_index/write_batch_with_index_internal.cc'

Expand Down