Commit 084c0150 authored by yiwu-arbug's avatar yiwu-arbug Committed by Yi Wu

Update rocksdb and titan (#445)

* update rocksdb
Signed-off-by: 's avatarYi Wu <yiwu@pingcap.com>

* update titan
Signed-off-by: 's avatarYi Wu <yiwu@pingcap.com>
parent cba31d72
...@@ -3,14 +3,13 @@ ...@@ -3,14 +3,13 @@
pub const __GNUC_VA_LIST: u32 = 1; pub const __GNUC_VA_LIST: u32 = 1;
pub const _STDINT_H: u32 = 1; pub const _STDINT_H: u32 = 1;
pub const _FEATURES_H: u32 = 1; pub const _FEATURES_H: u32 = 1;
pub const __USE_ANSI: u32 = 1; pub const _DEFAULT_SOURCE: u32 = 1;
pub const _BSD_SOURCE: u32 = 1; pub const __USE_ISOC11: u32 = 1;
pub const _SVID_SOURCE: u32 = 1;
pub const __USE_ISOC99: u32 = 1; pub const __USE_ISOC99: u32 = 1;
pub const __USE_ISOC95: u32 = 1; pub const __USE_ISOC95: u32 = 1;
pub const __USE_POSIX_IMPLICITLY: u32 = 1;
pub const _POSIX_SOURCE: u32 = 1; pub const _POSIX_SOURCE: u32 = 1;
pub const _POSIX_C_SOURCE: u32 = 200809; pub const _POSIX_C_SOURCE: u32 = 200809;
pub const __USE_POSIX_IMPLICITLY: u32 = 1;
pub const __USE_POSIX: u32 = 1; pub const __USE_POSIX: u32 = 1;
pub const __USE_POSIX2: u32 = 1; pub const __USE_POSIX2: u32 = 1;
pub const __USE_POSIX199309: u32 = 1; pub const __USE_POSIX199309: u32 = 1;
...@@ -19,26 +18,38 @@ pub const __USE_XOPEN2K: u32 = 1; ...@@ -19,26 +18,38 @@ pub const __USE_XOPEN2K: u32 = 1;
pub const __USE_XOPEN2K8: u32 = 1; pub const __USE_XOPEN2K8: u32 = 1;
pub const _ATFILE_SOURCE: u32 = 1; pub const _ATFILE_SOURCE: u32 = 1;
pub const __USE_MISC: u32 = 1; pub const __USE_MISC: u32 = 1;
pub const __USE_BSD: u32 = 1;
pub const __USE_SVID: u32 = 1;
pub const __USE_ATFILE: u32 = 1; pub const __USE_ATFILE: u32 = 1;
pub const __USE_FORTIFY_LEVEL: u32 = 0; pub const __USE_FORTIFY_LEVEL: u32 = 0;
pub const __GLIBC_USE_DEPRECATED_GETS: u32 = 0;
pub const __GLIBC_USE_DEPRECATED_SCANF: u32 = 0;
pub const _STDC_PREDEF_H: u32 = 1; pub const _STDC_PREDEF_H: u32 = 1;
pub const __STDC_IEC_559__: u32 = 1; pub const __STDC_IEC_559__: u32 = 1;
pub const __STDC_IEC_559_COMPLEX__: u32 = 1; pub const __STDC_IEC_559_COMPLEX__: u32 = 1;
pub const __STDC_ISO_10646__: u32 = 201103; pub const __STDC_ISO_10646__: u32 = 201706;
pub const __STDC_NO_THREADS__: u32 = 1;
pub const __GNU_LIBRARY__: u32 = 6; pub const __GNU_LIBRARY__: u32 = 6;
pub const __GLIBC__: u32 = 2; pub const __GLIBC__: u32 = 2;
pub const __GLIBC_MINOR__: u32 = 17; pub const __GLIBC_MINOR__: u32 = 30;
pub const __GLIBC_HAVE_LONG_LONG: u32 = 1;
pub const _SYS_CDEFS_H: u32 = 1; pub const _SYS_CDEFS_H: u32 = 1;
pub const __glibc_c99_flexarr_available: u32 = 1;
pub const __WORDSIZE: u32 = 64; pub const __WORDSIZE: u32 = 64;
pub const __WORDSIZE_TIME64_COMPAT32: u32 = 1; pub const __WORDSIZE_TIME64_COMPAT32: u32 = 1;
pub const __SYSCALL_WORDSIZE: u32 = 64; pub const __SYSCALL_WORDSIZE: u32 = 64;
pub const __HAVE_GENERIC_SELECTION: u32 = 1;
pub const __GLIBC_USE_LIB_EXT2: u32 = 0;
pub const __GLIBC_USE_IEC_60559_BFP_EXT: u32 = 0;
pub const __GLIBC_USE_IEC_60559_FUNCS_EXT: u32 = 0;
pub const __GLIBC_USE_IEC_60559_TYPES_EXT: u32 = 0;
pub const _BITS_TYPES_H: u32 = 1;
pub const __TIMESIZE: u32 = 64;
pub const _BITS_TYPESIZES_H: u32 = 1;
pub const __OFF_T_MATCHES_OFF64_T: u32 = 1;
pub const __INO_T_MATCHES_INO64_T: u32 = 1;
pub const __RLIM_T_MATCHES_RLIM64_T: u32 = 1;
pub const __FD_SETSIZE: u32 = 1024;
pub const _BITS_TIME64_H: u32 = 1;
pub const _BITS_WCHAR_H: u32 = 1; pub const _BITS_WCHAR_H: u32 = 1;
pub const __WCHAR_MIN: i32 = -2147483648; pub const _BITS_STDINT_INTN_H: u32 = 1;
pub const __WCHAR_MAX: u32 = 2147483647; pub const _BITS_STDINT_UINTN_H: u32 = 1;
pub const INT8_MIN: i32 = -128; pub const INT8_MIN: i32 = -128;
pub const INT16_MIN: i32 = -32768; pub const INT16_MIN: i32 = -32768;
pub const INT32_MIN: i32 = -2147483648; pub const INT32_MIN: i32 = -2147483648;
...@@ -74,21 +85,153 @@ pub const PTRDIFF_MAX: u64 = 9223372036854775807; ...@@ -74,21 +85,153 @@ pub const PTRDIFF_MAX: u64 = 9223372036854775807;
pub const SIG_ATOMIC_MIN: i32 = -2147483648; pub const SIG_ATOMIC_MIN: i32 = -2147483648;
pub const SIG_ATOMIC_MAX: u32 = 2147483647; pub const SIG_ATOMIC_MAX: u32 = 2147483647;
pub const SIZE_MAX: i32 = -1; pub const SIZE_MAX: i32 = -1;
pub const WCHAR_MIN: i32 = -2147483648;
pub const WCHAR_MAX: u32 = 2147483647;
pub const WINT_MIN: u32 = 0; pub const WINT_MIN: u32 = 0;
pub const WINT_MAX: u32 = 4294967295; pub const WINT_MAX: u32 = 4294967295;
pub type va_list = __builtin_va_list; pub type va_list = __builtin_va_list;
pub type __gnuc_va_list = __builtin_va_list; pub type __gnuc_va_list = __builtin_va_list;
pub type wchar_t = libc::c_int; pub type wchar_t = libc::c_int;
pub type int_least8_t = libc::c_schar; #[repr(C)]
pub type int_least16_t = libc::c_short; #[repr(align(16))]
pub type int_least32_t = libc::c_int; #[derive(Debug, Copy, Clone)]
pub type int_least64_t = libc::c_long; pub struct max_align_t {
pub type uint_least8_t = libc::c_uchar; pub __clang_max_align_nonce1: libc::c_longlong,
pub type uint_least16_t = libc::c_ushort; pub __bindgen_padding_0: u64,
pub type uint_least32_t = libc::c_uint; pub __clang_max_align_nonce2: u128,
pub type uint_least64_t = libc::c_ulong; }
#[test]
fn bindgen_test_layout_max_align_t() {
assert_eq!(
::std::mem::size_of::<max_align_t>(),
32usize,
concat!("Size of: ", stringify!(max_align_t))
);
assert_eq!(
::std::mem::align_of::<max_align_t>(),
16usize,
concat!("Alignment of ", stringify!(max_align_t))
);
assert_eq!(
unsafe {
&(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce1 as *const _ as usize
},
0usize,
concat!(
"Offset of field: ",
stringify!(max_align_t),
"::",
stringify!(__clang_max_align_nonce1)
)
);
assert_eq!(
unsafe {
&(*(::std::ptr::null::<max_align_t>())).__clang_max_align_nonce2 as *const _ as usize
},
16usize,
concat!(
"Offset of field: ",
stringify!(max_align_t),
"::",
stringify!(__clang_max_align_nonce2)
)
);
}
pub type __u_char = libc::c_uchar;
pub type __u_short = libc::c_ushort;
pub type __u_int = libc::c_uint;
pub type __u_long = libc::c_ulong;
pub type __int8_t = libc::c_schar;
pub type __uint8_t = libc::c_uchar;
pub type __int16_t = libc::c_short;
pub type __uint16_t = libc::c_ushort;
pub type __int32_t = libc::c_int;
pub type __uint32_t = libc::c_uint;
pub type __int64_t = libc::c_long;
pub type __uint64_t = libc::c_ulong;
pub type __int_least8_t = __int8_t;
pub type __uint_least8_t = __uint8_t;
pub type __int_least16_t = __int16_t;
pub type __uint_least16_t = __uint16_t;
pub type __int_least32_t = __int32_t;
pub type __uint_least32_t = __uint32_t;
pub type __int_least64_t = __int64_t;
pub type __uint_least64_t = __uint64_t;
pub type __quad_t = libc::c_long;
pub type __u_quad_t = libc::c_ulong;
pub type __intmax_t = libc::c_long;
pub type __uintmax_t = libc::c_ulong;
pub type __dev_t = libc::c_ulong;
pub type __uid_t = libc::c_uint;
pub type __gid_t = libc::c_uint;
pub type __ino_t = libc::c_ulong;
pub type __ino64_t = libc::c_ulong;
pub type __mode_t = libc::c_uint;
pub type __nlink_t = libc::c_ulong;
pub type __off_t = libc::c_long;
pub type __off64_t = libc::c_long;
pub type __pid_t = libc::c_int;
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct __fsid_t {
pub __val: [libc::c_int; 2usize],
}
#[test]
fn bindgen_test_layout___fsid_t() {
assert_eq!(
::std::mem::size_of::<__fsid_t>(),
8usize,
concat!("Size of: ", stringify!(__fsid_t))
);
assert_eq!(
::std::mem::align_of::<__fsid_t>(),
4usize,
concat!("Alignment of ", stringify!(__fsid_t))
);
assert_eq!(
unsafe { &(*(::std::ptr::null::<__fsid_t>())).__val as *const _ as usize },
0usize,
concat!(
"Offset of field: ",
stringify!(__fsid_t),
"::",
stringify!(__val)
)
);
}
pub type __clock_t = libc::c_long;
pub type __rlim_t = libc::c_ulong;
pub type __rlim64_t = libc::c_ulong;
pub type __id_t = libc::c_uint;
pub type __time_t = libc::c_long;
pub type __useconds_t = libc::c_uint;
pub type __suseconds_t = libc::c_long;
pub type __daddr_t = libc::c_int;
pub type __key_t = libc::c_int;
pub type __clockid_t = libc::c_int;
pub type __timer_t = *mut libc::c_void;
pub type __blksize_t = libc::c_long;
pub type __blkcnt_t = libc::c_long;
pub type __blkcnt64_t = libc::c_long;
pub type __fsblkcnt_t = libc::c_ulong;
pub type __fsblkcnt64_t = libc::c_ulong;
pub type __fsfilcnt_t = libc::c_ulong;
pub type __fsfilcnt64_t = libc::c_ulong;
pub type __fsword_t = libc::c_long;
pub type __ssize_t = libc::c_long;
pub type __syscall_slong_t = libc::c_long;
pub type __syscall_ulong_t = libc::c_ulong;
pub type __loff_t = __off64_t;
pub type __caddr_t = *mut libc::c_char;
pub type __intptr_t = libc::c_long;
pub type __socklen_t = libc::c_uint;
pub type __sig_atomic_t = libc::c_int;
pub type int_least8_t = __int_least8_t;
pub type int_least16_t = __int_least16_t;
pub type int_least32_t = __int_least32_t;
pub type int_least64_t = __int_least64_t;
pub type uint_least8_t = __uint_least8_t;
pub type uint_least16_t = __uint_least16_t;
pub type uint_least32_t = __uint_least32_t;
pub type uint_least64_t = __uint_least64_t;
pub type int_fast8_t = libc::c_schar; pub type int_fast8_t = libc::c_schar;
pub type int_fast16_t = libc::c_long; pub type int_fast16_t = libc::c_long;
pub type int_fast32_t = libc::c_long; pub type int_fast32_t = libc::c_long;
...@@ -97,8 +240,8 @@ pub type uint_fast8_t = libc::c_uchar; ...@@ -97,8 +240,8 @@ pub type uint_fast8_t = libc::c_uchar;
pub type uint_fast16_t = libc::c_ulong; pub type uint_fast16_t = libc::c_ulong;
pub type uint_fast32_t = libc::c_ulong; pub type uint_fast32_t = libc::c_ulong;
pub type uint_fast64_t = libc::c_ulong; pub type uint_fast64_t = libc::c_ulong;
pub type intmax_t = libc::c_long; pub type intmax_t = __intmax_t;
pub type uintmax_t = libc::c_ulong; pub type uintmax_t = __uintmax_t;
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
pub struct crocksdb_t { pub struct crocksdb_t {
...@@ -743,6 +886,15 @@ extern "C" { ...@@ -743,6 +886,15 @@ extern "C" {
errptr: *mut *mut libc::c_char, errptr: *mut *mut libc::c_char,
); );
} }
extern "C" {
pub fn crocksdb_write_multi_batch(
db: *mut crocksdb_t,
options: *const crocksdb_writeoptions_t,
batches: *mut *mut crocksdb_writebatch_t,
batch_size: usize,
errptr: *mut *mut libc::c_char,
);
}
extern "C" { extern "C" {
pub fn crocksdb_get( pub fn crocksdb_get(
db: *mut crocksdb_t, db: *mut crocksdb_t,
...@@ -2183,6 +2335,12 @@ extern "C" { ...@@ -2183,6 +2335,12 @@ extern "C" {
arg2: libc::c_uchar, arg2: libc::c_uchar,
); );
} }
extern "C" {
pub fn crocksdb_options_set_enable_multi_batch_write(
opt: *mut crocksdb_options_t,
v: libc::c_uchar,
);
}
extern "C" { extern "C" {
pub fn crocksdb_options_set_unordered_write(arg1: *mut crocksdb_options_t, arg2: libc::c_uchar); pub fn crocksdb_options_set_unordered_write(arg1: *mut crocksdb_options_t, arg2: libc::c_uchar);
} }
...@@ -3833,6 +3991,15 @@ extern "C" { ...@@ -3833,6 +3991,15 @@ extern "C" {
extern "C" { extern "C" {
pub fn crocksdb_perf_context_db_mutex_lock_nanos(arg1: *mut crocksdb_perf_context_t) -> u64; pub fn crocksdb_perf_context_db_mutex_lock_nanos(arg1: *mut crocksdb_perf_context_t) -> u64;
} }
extern "C" {
pub fn crocksdb_perf_context_write_thread_wait_nanos(arg1: *mut crocksdb_perf_context_t)
-> u64;
}
extern "C" {
pub fn crocksdb_perf_context_write_scheduling_flushes_compactions_time(
arg1: *mut crocksdb_perf_context_t,
) -> u64;
}
extern "C" { extern "C" {
pub fn crocksdb_perf_context_db_condition_wait_nanos(arg1: *mut crocksdb_perf_context_t) pub fn crocksdb_perf_context_db_condition_wait_nanos(arg1: *mut crocksdb_perf_context_t)
-> u64; -> u64;
...@@ -4023,6 +4190,40 @@ fn bindgen_test_layout_ctitandb_blob_index_t() { ...@@ -4023,6 +4190,40 @@ fn bindgen_test_layout_ctitandb_blob_index_t() {
8usize, 8usize,
concat!("Alignment of ", stringify!(ctitandb_blob_index_t)) concat!("Alignment of ", stringify!(ctitandb_blob_index_t))
); );
assert_eq!(
unsafe {
&(*(::std::ptr::null::<ctitandb_blob_index_t>())).file_number as *const _ as usize
},
0usize,
concat!(
"Offset of field: ",
stringify!(ctitandb_blob_index_t),
"::",
stringify!(file_number)
)
);
assert_eq!(
unsafe {
&(*(::std::ptr::null::<ctitandb_blob_index_t>())).blob_offset as *const _ as usize
},
8usize,
concat!(
"Offset of field: ",
stringify!(ctitandb_blob_index_t),
"::",
stringify!(blob_offset)
)
);
assert_eq!(
unsafe { &(*(::std::ptr::null::<ctitandb_blob_index_t>())).blob_size as *const _ as usize },
16usize,
concat!(
"Offset of field: ",
stringify!(ctitandb_blob_index_t),
"::",
stringify!(blob_size)
)
);
} }
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
...@@ -4287,4 +4488,44 @@ fn bindgen_test_layout___va_list_tag() { ...@@ -4287,4 +4488,44 @@ fn bindgen_test_layout___va_list_tag() {
8usize, 8usize,
concat!("Alignment of ", stringify!(__va_list_tag)) concat!("Alignment of ", stringify!(__va_list_tag))
); );
assert_eq!(
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).gp_offset as *const _ as usize },
0usize,
concat!(
"Offset of field: ",
stringify!(__va_list_tag),
"::",
stringify!(gp_offset)
)
);
assert_eq!(
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).fp_offset as *const _ as usize },
4usize,
concat!(
"Offset of field: ",
stringify!(__va_list_tag),
"::",
stringify!(fp_offset)
)
);
assert_eq!(
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).overflow_arg_area as *const _ as usize },
8usize,
concat!(
"Offset of field: ",
stringify!(__va_list_tag),
"::",
stringify!(overflow_arg_area)
)
);
assert_eq!(
unsafe { &(*(::std::ptr::null::<__va_list_tag>())).reg_save_area as *const _ as usize },
16usize,
concat!(
"Offset of field: ",
stringify!(__va_list_tag),
"::",
stringify!(reg_save_area)
)
);
} }
Subproject commit ffaa9d1affa5c2172f57d6d03323c9e91eb87c05 Subproject commit 3fcbc2b3c4f413b915a62b8983f7bd9dae281553
Subproject commit cb7efe6d7da529b97166f4cd64be8a995cf71d70 Subproject commit 906258cb21d221162dd9047e2753237d7070fb34
...@@ -201,5 +201,6 @@ pub enum DBStatisticsHistogramType { ...@@ -201,5 +201,6 @@ pub enum DBStatisticsHistogramType {
BlobDbDecompressionMicros = 45, BlobDbDecompressionMicros = 45,
FlushTime = 46, FlushTime = 46,
SstBatchSize = 47, SstBatchSize = 47,
HistogramEnumMax = 48, DbWriteWalTime = 48,
HistogramEnumMax = 49,
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment