Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
R
rust-rocksdb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangzongwu
rust-rocksdb
Commits
b3ae5fb6
Commit
b3ae5fb6
authored
Jul 01, 2015
by
Tyler Neely
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix breakage due to transmutation changes.
parent
00df70b2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
merge_operator.rs
src/merge_operator.rs
+4
-4
No files found.
src/merge_operator.rs
View file @
b3ae5fb6
...
@@ -56,9 +56,9 @@ pub extern "C" fn full_merge_callback(
...
@@ -56,9 +56,9 @@ pub extern "C" fn full_merge_callback(
&
mut
MergeOperands
::
new
(
operands_list
,
&
mut
MergeOperands
::
new
(
operands_list
,
operands_list_len
,
operands_list_len
,
num_operands
);
num_operands
);
let
key
:
&
[
u8
]
=
mem
::
transmute
(
slice
::
from_raw_parts
(
&
raw_key
,
key_len
as
usize
)
);
let
key
:
&
[
u8
]
=
slice
::
from_raw_parts
(
raw_key
as
*
const
u8
,
key_len
as
usize
);
let
oldval
:
&
[
u8
]
=
mem
::
transmute
(
slice
::
from_raw_parts
(
&
existing_value
,
let
oldval
:
&
[
u8
]
=
slice
::
from_raw_parts
(
existing_value
as
*
const
u8
,
existing_value_len
as
usize
)
)
;
existing_value_len
as
usize
);
let
mut
result
=
let
mut
result
=
(
cb
.merge_fn
)(
key
,
Some
(
oldval
),
operands
);
(
cb
.merge_fn
)(
key
,
Some
(
oldval
),
operands
);
result
.shrink_to_fit
();
result
.shrink_to_fit
();
...
@@ -83,7 +83,7 @@ pub extern "C" fn partial_merge_callback(
...
@@ -83,7 +83,7 @@ pub extern "C" fn partial_merge_callback(
let
operands
=
&
mut
MergeOperands
::
new
(
operands_list
,
let
operands
=
&
mut
MergeOperands
::
new
(
operands_list
,
operands_list_len
,
operands_list_len
,
num_operands
);
num_operands
);
let
key
:
&
[
u8
]
=
mem
::
transmute
(
slice
::
from_raw_parts
(
&
raw_key
,
key_len
as
usize
)
);
let
key
:
&
[
u8
]
=
slice
::
from_raw_parts
(
raw_key
as
*
const
u8
,
key_len
as
usize
);
let
mut
result
=
(
cb
.merge_fn
)(
key
,
None
,
operands
);
let
mut
result
=
(
cb
.merge_fn
)(
key
,
None
,
operands
);
result
.shrink_to_fit
();
result
.shrink_to_fit
();
//TODO(tan) investigate zero-copy techniques to improve performance
//TODO(tan) investigate zero-copy techniques to improve performance
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment