Skip to content

Update to serde #3

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

Open
erg wants to merge 1 commit into
base: noise
Choose a base branch
from
Open

Update to serde #3

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
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 @@ libc = "0.2"
noise_search_deps_librocksdb-sys = { path = "librocksdb-sys", version = "0.1.0" }

[dev-dependencies]
integer-encoding = "1.0.3"
integer-encoding = "1.1.7"
2 changes: 1 addition & 1 deletion librocksdb-sys/rocksdb
Open in desktop
Submodule rocksdb updated from c3435e to 3cdddf
101 changes: 73 additions & 28 deletions src/merge_operator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,16 @@ pub struct MergeOperatorCallback {
}

pub unsafe extern "C" fn destructor_callback(raw_cb: *mut c_void) {
let _: Box<MergeOperatorCallback> = mem::transmute(raw_cb);
unsafe {
drop(Box::from_raw(raw_cb as *mut MergeOperatorCallback));
}
}

pub unsafe extern "C" fn name_callback(raw_cb: *mut c_void) -> *const c_char {
let cb = &mut *(raw_cb as *mut MergeOperatorCallback);
cb.name.as_ptr()
unsafe {
let cb = &mut *(raw_cb as *mut MergeOperatorCallback);
cb.name.as_ptr()
}
}

pub unsafe extern "C" fn full_merge_callback(raw_cb: *mut c_void,
Expand All @@ -87,19 +91,43 @@ pub unsafe extern "C" fn full_merge_callback(raw_cb: *mut c_void,
success: *mut u8,
new_value_length: *mut size_t)
-> *mut c_char {
let cb = &mut *(raw_cb as *mut MergeOperatorCallback);
let operands = &mut MergeOperands::new(operands_list, operands_list_len, num_operands);
let key = slice::from_raw_parts(raw_key as *const u8, key_len as usize);
let oldval = slice::from_raw_parts(existing_value as *const u8, existing_value_len as usize);
let mut result = (cb.merge_fn)(key, Some(oldval), operands);
result.shrink_to_fit();
// TODO(tan) investigate zero-copy techniques to improve performance
let buf = libc::malloc(result.len() as size_t);
assert!(!buf.is_null());
*new_value_length = result.len() as size_t;
*success = 1 as u8;
ptr::copy(result.as_ptr() as *mut c_void, &mut *buf, result.len());
buf as *mut c_char
unsafe {
let cb = &mut *(raw_cb as *mut MergeOperatorCallback);
let operands = &mut MergeOperands::new(operands_list, operands_list_len, num_operands);
let key = if raw_key.is_null() || key_len == 0 {
&[]
} else {
slice::from_raw_parts(raw_key as *const u8, key_len as usize)
};
let oldval = if existing_value.is_null() || existing_value_len == 0 {
None
} else {
Some(slice::from_raw_parts(
existing_value as *const u8,
existing_value_len as usize,
))
};
let mut result = (cb.merge_fn)(key, oldval, operands);
result.shrink_to_fit();
// TODO(tan) investigate zero-copy techniques to improve performance
let len = result.len();
let buf = if len == 0 {
ptr::null_mut()
} else {
libc::malloc(len as size_t)
};
if len > 0 && buf.is_null() {
*new_value_length = 0;
*success = 0;
return ptr::null_mut();
}
*new_value_length = len as size_t;
*success = 1 as u8;
if len > 0 {
ptr::copy_nonoverlapping(result.as_ptr(), buf as *mut u8, len);
}
buf as *mut c_char
}
}

pub unsafe extern "C" fn partial_merge_callback(raw_cb: *mut c_void,
Expand All @@ -111,18 +139,35 @@ pub unsafe extern "C" fn partial_merge_callback(raw_cb: *mut c_void,
success: *mut u8,
new_value_length: *mut size_t)
-> *mut c_char {
let cb = &mut *(raw_cb as *mut MergeOperatorCallback);
let operands = &mut MergeOperands::new(operands_list, operands_list_len, num_operands);
let key = slice::from_raw_parts(raw_key as *const u8, key_len as usize);
let mut result = (cb.merge_fn)(key, None, operands);
result.shrink_to_fit();
// TODO(tan) investigate zero-copy techniques to improve performance
let buf = libc::malloc(result.len() as size_t);
assert!(!buf.is_null());
*new_value_length = result.len() as size_t;
*success = 1 as u8;
ptr::copy(result.as_ptr() as *mut c_void, &mut *buf, result.len());
buf as *mut c_char
unsafe {
let cb = &mut *(raw_cb as *mut MergeOperatorCallback);
let operands = &mut MergeOperands::new(operands_list, operands_list_len, num_operands);
let key = if raw_key.is_null() || key_len == 0 {
&[]
} else {
slice::from_raw_parts(raw_key as *const u8, key_len as usize)
};
let mut result = (cb.merge_fn)(key, None, operands);
result.shrink_to_fit();
// TODO(tan) investigate zero-copy techniques to improve performance
let len = result.len();
let buf = if len == 0 {
ptr::null_mut()
} else {
libc::malloc(len as size_t)
};
if len > 0 && buf.is_null() {
*new_value_length = 0;
*success = 0;
return ptr::null_mut();
}
*new_value_length = len as size_t;
*success = 1 as u8;
if len > 0 {
ptr::copy_nonoverlapping(result.as_ptr(), buf as *mut u8, len);
}
buf as *mut c_char
}
}


Expand Down