Skip to content

Commit

Permalink
librocksdb-sys: bump to 6.17.3 (#503)
Browse files Browse the repository at this point in the history
  • Loading branch information
ordian committed Mar 19, 2021
1 parent 39b877b commit bc59596
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 10 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,7 @@
* Add `DB::cancel_all_background_work` method (stanislav-tkach)
* Bump `librocksdb-sys` up to 6.13.3 (aleksuss)
* Add `multi_get`, `multi_get_opt`, `multi_get_cf` and `multi_get_cf_opt` `DB` methods (stanislav-tkach)
* Bump `librocksdb-sys` up to 6.17.3 (ordian)

## 0.15.0 (2020-08-25)

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Expand Up @@ -27,7 +27,7 @@ bzip2 = ["librocksdb-sys/bzip2"]

[dependencies]
libc = "0.2"
librocksdb-sys = { path = "librocksdb-sys", version = "6.15.4" }
librocksdb-sys = { path = "librocksdb-sys", version = "6.17.3" }

[dev-dependencies]
trybuild = "1.0.21"
Expand Down
6 changes: 3 additions & 3 deletions librocksdb-sys/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "librocksdb-sys"
version = "6.15.4"
version = "6.17.3"
edition = "2018"
authors = ["Karl Hobley <karlhobley10@gmail.com>", "Arkadiy Paronyan <arkadiy@ethcore.io>"]
license = "MIT/Apache-2.0/BSD-3-Clause"
Expand Down Expand Up @@ -28,6 +28,6 @@ const-cstr = "0.3"
uuid = { version = "0.8", features = ["v4"] }

[build-dependencies]
cc = { version = "^1.0", features = ["parallel"] }
bindgen = { version = "0.55", default-features = false, features = ["runtime"] }
cc = { version = "1.0", features = ["parallel"] }
bindgen = { version = "0.57.0", default-features = false, features = ["runtime"] }
glob = "0.3"
4 changes: 4 additions & 0 deletions librocksdb-sys/build.rs
Expand Up @@ -114,6 +114,10 @@ fn build_rocksdb() {
}
}

if target.contains("aarch64") {
lib_sources.push("util/crc32c_arm64.cc")
}

if target.contains("darwin") {
config.define("OS_MACOSX", None);
config.define("ROCKSDB_PLATFORM_POSIX", None);
Expand Down
4 changes: 2 additions & 2 deletions librocksdb-sys/build_version.cc
@@ -1,4 +1,4 @@
#include "build_version.h"
const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@fbed72f03c3d9e4fdca3e5993587ef2559ba6ab9@";
const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2021/01/21 12:41:08@";
const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@09c7e96eac1ab983f97ce9e0406730b8014b3398@";
const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2021/02/18 09:36:23@";
const char* rocksdb_build_compile_date = __DATE__;
2 changes: 1 addition & 1 deletion librocksdb-sys/rocksdb
Submodule rocksdb updated 377 files
28 changes: 25 additions & 3 deletions librocksdb-sys/rocksdb_lib_sources.txt
Expand Up @@ -82,8 +82,8 @@ env/env_encryption.cc
env/env_hdfs.cc
env/env_posix.cc
env/file_system.cc
env/fs_posix.cc
env/file_system_tracer.cc
env/fs_posix.cc
env/io_posix.cc
env/mock_env.cc
file/delete_scheduler.cc
Expand Down Expand Up @@ -182,8 +182,15 @@ table/table_properties.cc
table/two_level_iterator.cc
test_util/sync_point.cc
test_util/sync_point_impl.cc
test_util/testutil.cc
test_util/transaction_test_util.cc
tools/block_cache_analyzer/block_cache_trace_analyzer.cc
tools/dump/db_dump_tool.cc
tools/io_tracer_parser_tool.cc
tools/ldb_cmd.cc
tools/ldb_tool.cc
tools/sst_dump_tool.cc
tools/trace_analyzer_tool.cc
trace_replay/trace_replay.cc
trace_replay/block_cache_tracer.cc
trace_replay/io_tracer.cc
Expand Down Expand Up @@ -211,6 +218,7 @@ utilities/blob_db/blob_compaction_filter.cc
utilities/blob_db/blob_db.cc
utilities/blob_db/blob_db_impl.cc
utilities/blob_db/blob_db_impl_filesnapshot.cc
utilities/blob_db/blob_dump_tool.cc
utilities/blob_db/blob_file.cc
utilities/cassandra/cassandra_compaction_filter.cc
utilities/cassandra/format.cc
Expand All @@ -225,13 +233,13 @@ utilities/fault_injection_env.cc
utilities/fault_injection_fs.cc
utilities/leveldb_options/leveldb_options.cc
utilities/memory/memory_util.cc
utilities/merge_operators/bytesxor.cc
utilities/merge_operators/max.cc
utilities/merge_operators/put.cc
utilities/merge_operators/sortlist.cc
utilities/merge_operators/string_append/stringappend.cc
utilities/merge_operators/string_append/stringappend2.cc
utilities/merge_operators/uint64add.cc
utilities/merge_operators/bytesxor.cc
utilities/object_registry.cc
utilities/option_change_migration/option_change_migration.cc
utilities/options/options_util.cc
Expand All @@ -247,8 +255,22 @@ utilities/trace/file_trace_reader_writer.cc
utilities/transactions/lock/lock_manager.cc
utilities/transactions/lock/point/point_lock_tracker.cc
utilities/transactions/lock/point/point_lock_manager.cc
utilities/transactions/optimistic_transaction.cc
utilities/transactions/lock/range/range_tree/lib/locktree/concurrent_tree.cc
utilities/transactions/lock/range/range_tree/lib/locktree/keyrange.cc
utilities/transactions/lock/range/range_tree/lib/locktree/lock_request.cc
utilities/transactions/lock/range/range_tree/lib/locktree/locktree.cc
utilities/transactions/lock/range/range_tree/lib/locktree/manager.cc
utilities/transactions/lock/range/range_tree/lib/locktree/range_buffer.cc
utilities/transactions/lock/range/range_tree/lib/locktree/treenode.cc
utilities/transactions/lock/range/range_tree/lib/locktree/txnid_set.cc
utilities/transactions/lock/range/range_tree/lib/locktree/wfg.cc
utilities/transactions/lock/range/range_tree/lib/standalone_port.cc
utilities/transactions/lock/range/range_tree/lib/util/dbt.cc
utilities/transactions/lock/range/range_tree/lib/util/memarena.cc
utilities/transactions/lock/range/range_tree/range_tree_lock_manager.cc
utilities/transactions/lock/range/range_tree/range_tree_lock_tracker.cc
utilities/transactions/optimistic_transaction_db_impl.cc
utilities/transactions/optimistic_transaction.cc
utilities/transactions/pessimistic_transaction.cc
utilities/transactions/pessimistic_transaction_db.cc
utilities/transactions/snapshot_checker.cc
Expand Down
2 changes: 2 additions & 0 deletions librocksdb-sys/tests/ffi.rs
Expand Up @@ -741,7 +741,9 @@ fn ffi() {
limit.as_ptr(),
limit_len.as_ptr(),
sizes.as_mut_ptr(),
&mut err,
);
CheckNoError!(err);
CheckCondition!(sizes[0] > 0);
CheckCondition!(sizes[1] > 0);
}
Expand Down

0 comments on commit bc59596

Please sign in to comment.