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
42a4d130
Unverified
Commit
42a4d130
authored
Feb 19, 2021
by
qupeng
Committed by
GitHub
Feb 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update rust toolchain (#607)
Signed-off-by:
qupeng
<
qupeng@pingcap.com
>
parent
26f1cf59
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
build.rs
librocksdb_sys/build.rs
+2
-2
rust-toolchain
rust-toolchain
+1
-1
merge_operator.rs
src/merge_operator.rs
+2
-2
rocksdb.rs
src/rocksdb.rs
+3
-4
No files found.
librocksdb_sys/build.rs
View file @
42a4d130
...
...
@@ -17,7 +17,7 @@ extern crate cmake;
use
cc
::
Build
;
use
cmake
::
Config
;
use
std
::
path
::
PathBuf
;
use
std
::
path
::
{
Path
,
PathBuf
}
;
use
std
::{
env
,
str
};
// On these platforms jemalloc-sys will use a prefixed jemalloc which cannot be linked together
...
...
@@ -27,7 +27,7 @@ const NO_JEMALLOC_TARGETS: &[&str] = &["android", "dragonfly", "musl", "darwin"]
// Generate the bindings to rocksdb C-API.
// Try to disable the generation of platform-related bindings.
fn
bindgen_rocksdb
(
file_path
:
&
Path
Buf
)
{
fn
bindgen_rocksdb
(
file_path
:
&
Path
)
{
let
bindings
=
bindgen
::
Builder
::
default
()
.header
(
"crocksdb/crocksdb/c.h"
)
.ctypes_prefix
(
"libc"
)
...
...
rust-toolchain
View file @
42a4d130
nightly-202
0-07-01
nightly-202
1-01-25
src/merge_operator.rs
View file @
42a4d130
...
...
@@ -61,7 +61,7 @@ pub unsafe extern "C" fn full_merge_callback(
let
buf
=
buf
as
*
mut
u8
;
assert
!
(
!
buf
.is_null
());
*
new_value_length
=
result
.len
()
as
size_t
;
*
success
=
1
as
u8
;
*
success
=
1
_
u8
;
ptr
::
copy
(
result
.as_ptr
(),
&
mut
*
buf
,
result
.len
());
buf
as
*
const
c_char
}
...
...
@@ -86,7 +86,7 @@ pub unsafe extern "C" fn partial_merge_callback(
let
buf
=
buf
as
*
mut
u8
;
assert
!
(
!
buf
.is_null
());
*
new_value_length
=
result
.len
()
as
size_t
;
*
success
=
1
as
u8
;
*
success
=
1
_
u8
;
ptr
::
copy
(
result
.as_ptr
(),
&
mut
*
buf
,
result
.len
());
buf
as
*
const
c_char
}
...
...
src/rocksdb.rs
View file @
42a4d130
...
...
@@ -84,10 +84,10 @@ fn ensure_default_cf_exists<'a>(
}
}
fn
split_descriptors
<
'a
>
(
list
:
Vec
<
ColumnFamilyDescriptor
<
'a
>
>
,
fn
split_descriptors
(
list
:
Vec
<
ColumnFamilyDescriptor
>
,
is_titan
:
bool
,
)
->
(
Vec
<&
'a
str
>
,
Vec
<
ColumnFamilyOptions
>
)
{
)
->
(
Vec
<&
str
>
,
Vec
<
ColumnFamilyOptions
>
)
{
let
mut
v1
=
Vec
::
with_capacity
(
list
.len
());
let
mut
v2
=
Vec
::
with_capacity
(
list
.len
());
for
mut
d
in
list
{
...
...
@@ -345,7 +345,6 @@ impl<D> DBIterator<D> {
#[deprecated]
pub
type
Kv
=
(
Vec
<
u8
>
,
Vec
<
u8
>
);
#[deprecated]
impl
<
'b
,
D
>
Iterator
for
&
'b
mut
DBIterator
<
D
>
{
#[allow(deprecated)]
type
Item
=
Kv
;
...
...
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