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
2d58615b
Commit
2d58615b
authored
Mar 25, 2019
by
yiwu-arbug
Committed by
zhangjinpeng1987
Mar 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade rocksdb to 5.18 (#280)
parent
9dd89787
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
6 deletions
+14
-6
c.cc
librocksdb_sys/crocksdb/c.cc
+13
-5
rocksdb
librocksdb_sys/rocksdb
+1
-1
No files found.
librocksdb_sys/crocksdb/c.cc
View file @
2d58615b
...
...
@@ -51,6 +51,8 @@
#include <stdlib.h>
#include <limits>
#if !defined(ROCKSDB_MAJOR) || !defined(ROCKSDB_MINOR) || !defined(ROCKSDB_PATCH)
#error Only rocksdb 5.7.3+ is supported.
#endif
...
...
@@ -159,6 +161,8 @@ using rocksdb::IOStatsContext;
using
rocksdb
::
BottommostLevelCompaction
;
using
rocksdb
::
LDBTool
;
using
rocksdb
::
kMaxSequenceNumber
;
using
rocksdb
::
titandb
::
BlobIndex
;
using
rocksdb
::
titandb
::
TitanCFDescriptor
;
using
rocksdb
::
titandb
::
TitanCFOptions
;
...
...
@@ -4314,9 +4318,11 @@ crocksdb_get_all_key_versions(crocksdb_t *db, const char *begin_key,
size_t
begin_keylen
,
const
char
*
end_key
,
size_t
end_keylen
,
char
**
errptr
)
{
crocksdb_keyversions_t
*
result
=
new
crocksdb_keyversions_t
;
constexpr
size_t
kMaxNumKeys
=
std
::
numeric_limits
<
size_t
>::
max
();
SaveError
(
errptr
,
GetAllKeyVersions
(
db
->
rep
,
Slice
(
begin_key
,
begin_keylen
),
Slice
(
end_key
,
end_keylen
),
&
result
->
rep
));
Slice
(
end_key
,
end_keylen
),
kMaxNumKeys
,
&
result
->
rep
));
return
result
;
}
...
...
@@ -4371,11 +4377,13 @@ struct ExternalSstFileModifier {
handle_
->
GetDescriptor
(
&
desc
);
auto
cfd
=
reinterpret_cast
<
ColumnFamilyHandleImpl
*>
(
handle_
)
->
cfd
();
auto
ioptions
=
*
cfd
->
ioptions
();
auto
table_opt
=
TableReaderOptions
(
ioptions
,
desc
.
options
.
prefix_extractor
.
get
(),
env_options_
,
cfd
->
internal_comparator
());
// Get around global seqno check.
table_opt
.
largest_seqno
=
kMaxSequenceNumber
;
status
=
ioptions
.
table_factory
->
NewTableReader
(
TableReaderOptions
(
ioptions
,
desc
.
options
.
prefix_extractor
.
get
(),
env_options_
,
cfd
->
internal_comparator
()),
std
::
move
(
sst_file_reader
),
file_size
,
&
table_reader_
);
table_opt
,
std
::
move
(
sst_file_reader
),
file_size
,
&
table_reader_
);
return
status
;
}
...
...
rocksdb
@
3db17e0b
Subproject commit
eda6519f2322c35eb83d772db502eb38350af32c
Subproject commit
3db17e0be16f48bd1483424eefe0eaaaa7077260
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