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

[ᚬtxn] upgrade rocksdb to v6.4.6 #2

Merged
merged 3 commits into from
Dec 16, 2019
Merged

[ᚬtxn] upgrade rocksdb to v6.4.6 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
715a256
feat: upgrade rocksdb to v6.4.6
zhangsoledad Dec 15, 2019
da87571
feat: update lz4 to v1.9.2
zhangsoledad Dec 15, 2019
15f4394
feat: sync upstream
zhangsoledad Dec 15, 2019
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
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ bzip2 = ["librocksdb-sys/bzip2"]

[dependencies]
libc = "0.2"
librocksdb-sys = { path = "librocksdb-sys", version = "6.2.4" }
librocksdb-sys = { path = "librocksdb-sys", version = "6.4.6" }
Empty file added bindings.rs
View file
Open in desktop
Empty file.
3 changes: 1 addition & 2 deletions librocksdb-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "librocksdb-sys"
version = "6.2.4"
version = "6.4.6"
authors = ["Karl Hobley <[email protected]>", "Arkadiy Paronyan <[email protected]>"]
license = "MIT/Apache-2.0/BSD-3-Clause"
description = "Native bindings to librocksdb"
Expand Down Expand Up @@ -30,5 +30,4 @@ uuid = { version = "0.7", features = ["v4"] }

[build-dependencies]
cc = { version = "^1.0", features = ["parallel"] }
bindgen = "0.50"
glob = "0.2.11"
40 changes: 40 additions & 0 deletions librocksdb-sys/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* bindgen 0.52.0 */
/* bindgen rocksdb/include/rocksdb/c.h --blacklist-type max_align_t --ctypes-prefix libc -o bindings.rs */
/* automatically generated by rust-bindgen */

pub const __GNUC_VA_LIST: u32 = 1;
Expand Down Expand Up @@ -475,6 +477,14 @@ extern "C" {
errptr: *mut *mut libc::c_char,
) -> *mut rocksdb_t;
}
extern "C" {
pub fn rocksdb_open_as_secondary(
options: *const rocksdb_options_t,
name: *const libc::c_char,
secondary_path: *const libc::c_char,
errptr: *mut *mut libc::c_char,
) -> *mut rocksdb_t;
}
extern "C" {
pub fn rocksdb_backup_engine_open(
options: *const rocksdb_options_t,
Expand Down Expand Up @@ -612,6 +622,18 @@ extern "C" {
errptr: *mut *mut libc::c_char,
) -> *mut rocksdb_t;
}
extern "C" {
pub fn rocksdb_open_as_secondary_column_families(
options: *const rocksdb_options_t,
name: *const libc::c_char,
secondary_path: *const libc::c_char,
num_column_families: libc::c_int,
column_family_names: *mut *const libc::c_char,
column_family_options: *mut *const rocksdb_options_t,
colummn_family_handles: *mut *mut rocksdb_column_family_handle_t,
errptr: *mut *mut libc::c_char,
) -> *mut rocksdb_t;
}
extern "C" {
pub fn rocksdb_list_column_families(
options: *const rocksdb_options_t,
Expand Down Expand Up @@ -1930,6 +1952,9 @@ extern "C" {
arg2: libc::c_uchar,
);
}
extern "C" {
pub fn rocksdb_options_set_unordered_write(arg1: *mut rocksdb_options_t, arg2: libc::c_uchar);
}
extern "C" {
pub fn rocksdb_options_set_max_subcompactions(arg1: *mut rocksdb_options_t, arg2: u32);
}
Expand Down Expand Up @@ -2715,6 +2740,18 @@ extern "C" {
extern "C" {
pub fn rocksdb_env_join_all_threads(env: *mut rocksdb_env_t);
}
extern "C" {
pub fn rocksdb_env_lower_thread_pool_io_priority(env: *mut rocksdb_env_t);
}
extern "C" {
pub fn rocksdb_env_lower_high_priority_thread_pool_io_priority(env: *mut rocksdb_env_t);
}
extern "C" {
pub fn rocksdb_env_lower_thread_pool_cpu_priority(env: *mut rocksdb_env_t);
}
extern "C" {
pub fn rocksdb_env_lower_high_priority_thread_pool_cpu_priority(env: *mut rocksdb_env_t);
}
extern "C" {
pub fn rocksdb_env_destroy(arg1: *mut rocksdb_env_t);
}
Expand Down Expand Up @@ -2852,6 +2889,9 @@ extern "C" {
errptr: *mut *mut libc::c_char,
);
}
extern "C" {
pub fn rocksdb_try_catch_up_with_primary(db: *mut rocksdb_t, errptr: *mut *mut libc::c_char);
}
extern "C" {
pub fn rocksdb_slicetransform_create(
state: *mut libc::c_void,
Expand Down
1 change: 0 additions & 1 deletion librocksdb-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extern crate bindgen;
extern crate cc;
extern crate glob;

Expand Down
4 changes: 2 additions & 2 deletions librocksdb-sys/build_version.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "build_version.h"
const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@76a56d89a7740f8dbb01edabf1ea5abc95a67657@";
const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2019/10/16 09:47:38@";
const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:@e3169e3ea8762d2f34880742106858a23c8dc8b7@";
const char* rocksdb_build_git_date = "rocksdb_build_git_date:@2019/10/21 12:07:58@";
const char* rocksdb_build_compile_date = __DATE__;
2 changes: 1 addition & 1 deletion librocksdb-sys/lz4
Open in desktop
Submodule lz4 updated 116 files
2 changes: 1 addition & 1 deletion librocksdb-sys/rocksdb
Open in desktop
Submodule rocksdb updated 544 files
112 changes: 60 additions & 52 deletions librocksdb-sys/rocksdb_lib_sources.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,24 @@ db/builder.cc
db/c.cc
db/column_family.cc
db/compacted_db_impl.cc
db/compaction.cc
db/compaction_iterator.cc
db/compaction_job.cc
db/compaction_picker.cc
db/compaction_picker_fifo.cc
db/compaction_picker_universal.cc
db/compaction/compaction.cc
db/compaction/compaction_iterator.cc
db/compaction/compaction_job.cc
db/compaction/compaction_picker.cc
db/compaction/compaction_picker_fifo.cc
db/compaction/compaction_picker_level.cc
db/compaction/compaction_picker_universal.cc
db/convenience.cc
db/db_filesnapshot.cc
db/db_impl.cc
db/db_impl_compaction_flush.cc
db/db_impl_debug.cc
db/db_impl_experimental.cc
db/db_impl_files.cc
db/db_impl_open.cc
db/db_impl_readonly.cc
db/db_impl_secondary.cc
db/db_impl_write.cc
db/db_impl/db_impl.cc
db/db_impl/db_impl_compaction_flush.cc
db/db_impl/db_impl_debug.cc
db/db_impl/db_impl_experimental.cc
db/db_impl/db_impl_files.cc
db/db_impl/db_impl_open.cc
db/db_impl/db_impl_readonly.cc
db/db_impl/db_impl_secondary.cc
db/db_impl/db_impl_write.cc
db/db_info_dumper.cc
db/db_iter.cc
db/dbformat.cc
Expand All @@ -33,7 +34,7 @@ db/file_indexer.cc
db/flush_job.cc
db/flush_scheduler.cc
db/forward_iterator.cc
db/in_memory_stats_history.cc
db/import_column_family_job.cc
db/internal_stats.cc
db/logs_with_prep_tracker.cc
db/log_reader.cc
Expand Down Expand Up @@ -65,6 +66,16 @@ env/env_hdfs.cc
env/env_posix.cc
env/io_posix.cc
env/mock_env.cc
file/delete_scheduler.cc
file/file_util.cc
file/filename.cc
file/sst_file_manager_impl.cc
logging/auto_roll_logger.cc
logging/event_logger.cc
logging/log_buffer.cc
memory/arena.cc
memory/concurrent_arena.cc
memory/jemalloc_nodump_allocator.cc
memtable/alloc_tracker.cc
memtable/hash_linklist_rep.cc
memtable/hash_skiplist_rep.cc
Expand All @@ -73,10 +84,12 @@ memtable/vectorrep.cc
memtable/write_buffer_manager.cc
monitoring/histogram.cc
monitoring/histogram_windowing.cc
monitoring/in_memory_stats_history.cc
monitoring/instrumented_mutex.cc
monitoring/iostats_context.cc
monitoring/perf_context.cc
monitoring/perf_level.cc
monitoring/persistent_stats_history.cc
monitoring/statistics.cc
monitoring/thread_status_impl.cc
monitoring/thread_status_updater.cc
Expand All @@ -91,75 +104,68 @@ options/options_parser.cc
options/options_sanity_check.cc
port/port_posix.cc
port/stack_trace.cc
table/adaptive_table_factory.cc
table/block.cc
table/block_based_filter_block.cc
table/block_based_table_builder.cc
table/block_based_table_factory.cc
table/block_based_table_reader.cc
table/block_builder.cc
table/adaptive/adaptive_table_factory.cc
table/block_based/block.cc
table/block_based/block_based_filter_block.cc
table/block_based/block_based_table_builder.cc
table/block_based/block_based_table_factory.cc
table/block_based/block_based_table_reader.cc
table/block_based/block_builder.cc
table/block_based/block_prefix_index.cc
table/block_based/data_block_hash_index.cc
table/block_based/data_block_footer.cc
table/block_based/filter_block_reader_common.cc
table/block_based/flush_block_policy.cc
table/block_based/full_filter_block.cc
table/block_based/index_builder.cc
table/block_based/partitioned_filter_block.cc
table/block_based/uncompression_dict_reader.cc
table/block_fetcher.cc
table/block_prefix_index.cc
table/bloom_block.cc
table/cuckoo_table_builder.cc
table/cuckoo_table_factory.cc
table/cuckoo_table_reader.cc
table/data_block_hash_index.cc
table/data_block_footer.cc
table/flush_block_policy.cc
table/cuckoo/cuckoo_table_builder.cc
table/cuckoo/cuckoo_table_factory.cc
table/cuckoo/cuckoo_table_reader.cc
table/format.cc
table/full_filter_block.cc
table/get_context.cc
table/index_builder.cc
table/iterator.cc
table/merging_iterator.cc
table/meta_blocks.cc
table/partitioned_filter_block.cc
table/persistent_cache_helper.cc
table/plain_table_builder.cc
table/plain_table_factory.cc
table/plain_table_index.cc
table/plain_table_key_coding.cc
table/plain_table_reader.cc
table/plain/plain_table_builder.cc
table/plain/plain_table_factory.cc
table/plain/plain_table_index.cc
table/plain/plain_table_key_coding.cc
table/plain/plain_table_reader.cc
table/sst_file_reader.cc
table/sst_file_writer.cc
table/table_properties.cc
table/two_level_iterator.cc
test_util/sync_point.cc
test_util/sync_point_impl.cc
test_util/transaction_test_util.cc
tools/dump/db_dump_tool.cc
util/arena.cc
util/auto_roll_logger.cc
trace_replay/trace_replay.cc
trace_replay/block_cache_tracer.cc
util/bloom.cc
util/build_version.cc
util/coding.cc
util/compaction_job_stats_impl.cc
util/comparator.cc
util/compression_context_cache.cc
util/concurrent_arena.cc
util/concurrent_task_limiter_impl.cc
util/crc32c.cc
util/delete_scheduler.cc
util/dynamic_bloom.cc
util/event_logger.cc
util/file_reader_writer.cc
util/file_util.cc
util/filename.cc
util/filter_policy.cc
util/hash.cc
util/jemalloc_nodump_allocator.cc
util/log_buffer.cc
util/murmurhash.cc
util/random.cc
util/rate_limiter.cc
util/slice.cc
util/sst_file_manager_impl.cc
util/status.cc
util/string_util.cc
util/sync_point.cc
util/sync_point_impl.cc
util/thread_local.cc
util/threadpool_imp.cc
util/trace_replay.cc
util/transaction_test_util.cc
util/xxhash.cc
utilities/backupable/backupable_db.cc
utilities/blob_db/blob_compaction_filter.cc
Expand Down Expand Up @@ -187,13 +193,15 @@ 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
utilities/persistent_cache/block_cache_tier.cc
utilities/persistent_cache/block_cache_tier_file.cc
utilities/persistent_cache/block_cache_tier_metadata.cc
utilities/persistent_cache/persistent_cache_tier.cc
utilities/persistent_cache/volatile_tier_impl.cc
utilities/simulator_cache/cache_simulator.cc
utilities/simulator_cache/sim_cache.cc
utilities/table_properties_collectors/compact_on_deletion_collector.cc
utilities/trace/file_trace_reader_writer.cc
Expand Down
Loading