Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
picodata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
core
picodata
Commits
089b38f3
Unverified
Commit
089b38f3
authored
3 years ago
by
Sergey V
Browse files
Options
Downloads
Patches
Plain Diff
chore: rustfmt picolib
parent
c490858b
No related branches found
No related tags found
1 merge request
!9
chore: rustfmt picolib
Pipeline
#3390
passed
3 years ago
Stage: build
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
picolib/lib.rs
+16
-18
16 additions, 18 deletions
picolib/lib.rs
picolib/traft/mod.rs
+3
-3
3 additions, 3 deletions
picolib/traft/mod.rs
picolib/traft/node.rs
+8
-7
8 additions, 7 deletions
picolib/traft/node.rs
picolib/traft/storage.rs
+17
-16
17 additions, 16 deletions
picolib/traft/storage.rs
with
44 additions
and
44 deletions
picolib/lib.rs
+
16
−
18
View file @
089b38f3
use
slog
::{
debug
,
info
,
o
,
error
};
use
std
::
os
::
raw
::
c_int
;
use
::
tarantool
::
tlua
;
use
rmp_serde
;
use
serde
::{
Deserialize
,
Serialize
};
use
slog
::{
debug
,
error
,
info
,
o
};
use
std
::
os
::
raw
::
c_int
;
mod
tarantool
;
mod
traft
;
...
...
@@ -13,9 +13,9 @@ pub struct InnerTest {
}
inventory
::
collect!
(
InnerTest
);
use
std
::
cell
::
Ref
;
use
std
::
cell
::
RefCell
;
use
std
::
cell
::
RefMut
;
use
std
::
cell
::
Ref
;
use
std
::
convert
::{
TryFrom
,
TryInto
};
use
std
::
rc
::
Rc
;
...
...
@@ -46,9 +46,9 @@ pub extern "C" fn luaopen_picolib(l: *mut std::ffi::c_void) -> c_int {
match
command
.as_deref
()
{
Ok
(
"run"
)
=>
{
main_run
(
&
stash
);
}
,
Ok
(
_
)
=>
{}
,
Err
(
_
)
=>
{}
,
}
Ok
(
_
)
=>
{}
Err
(
_
)
=>
{}
}
unsafe
{
...
...
@@ -76,29 +76,29 @@ pub extern "C" fn luaopen_picolib(l: *mut std::ffi::c_void) -> c_int {
let
stash
=
stash
.clone
();
luamod
.set
(
"raft_test_propose"
,
tlua
::
function1
(
move
|
x
:
String
|
raft_propose
(
&
stash
,
RaftEntryData
::
Info
(
format!
(
"{}"
,
x
)))),
tlua
::
function1
(
move
|
x
:
String
|
{
raft_propose
(
&
stash
,
RaftEntryData
::
Info
(
format!
(
"{}"
,
x
)))
}),
);
}
{
let
stash
=
stash
.clone
();
luamod
.set
(
"broadcast_lua_eval"
,
tlua
::
function1
(
move
|
x
:
String
|
{
raft_propose
(
&
stash
,
RaftEntryData
::
EvalLua
(
x
))
}
)
tlua
::
function1
(
move
|
x
:
String
|
raft_propose
(
&
stash
,
RaftEntryData
::
EvalLua
(
x
))),
)
}
{
l
.exec
(
r#"
l
.exec
(
r#"
function inspect()
return
{raft_log = box.space.raft_log:fselect()},
{raft_state = box.space.raft_state:fselect()}
end
"#
)
.unwrap
();
"#
,
)
.unwrap
();
}
use
tlua
::
AsLua
;
...
...
@@ -204,9 +204,7 @@ fn handle_committed_data(logger: &slog::Logger, data: &[u8]) {
Ok
(
x
)
=>
match
x
{
EvalLua
(
code
)
=>
crate
::
tarantool
::
eval
(
&
code
),
Info
(
msg
)
=>
info!
(
logger
,
"{}"
,
msg
),
}
}
,
Err
(
why
)
=>
error!
(
logger
,
"cannot decode raft entry data: {}"
,
why
),
}
}
This diff is collapsed.
Click to expand it.
picolib/traft/mod.rs
+
3
−
3
View file @
089b38f3
...
...
@@ -4,8 +4,8 @@ mod storage;
pub
use
node
::
Node
;
pub
use
storage
::
Storage
;
pub
use
raft
::
Ready
;
pub
use
raft
::
Config
;
pub
use
raft
::
eraftpb
::
Message
;
pub
use
raft
::
eraftpb
::
Entry
;
pub
use
raft
::
eraftpb
::
Message
;
pub
use
raft
::
Config
;
pub
use
raft
::
Ready
;
// pub use raft::prelude::*;
This diff is collapsed.
Click to expand it.
picolib/traft/node.rs
+
8
−
7
View file @
089b38f3
use
slog
::{
info
,
};
use
std
::
ops
::{
Deref
,
DerefMut
};
use
raft
::
prelude
::
*
;
use
raft
::
Error
as
RaftError
;
use
slog
::
info
;
use
std
::
ops
::{
Deref
,
DerefMut
};
use
std
::
cell
::
RefCell
;
use
std
::
rc
::
Rc
;
use
std
::
time
::
Duration
;
use
super
::
storage
::
Storage
;
use
crate
::
tarantool
::
SlogDrain
;
use
::
tarantool
::
fiber
;
...
...
@@ -25,11 +22,15 @@ pub struct Node {
}
impl
Node
{
pub
fn
new
(
cfg
:
&
raft
::
Config
)
->
Result
<
Self
,
RaftError
>
{
pub
fn
new
(
cfg
:
&
raft
::
Config
)
->
Result
<
Self
,
RaftError
>
{
let
logger
=
slog
::
Logger
::
root
(
SlogDrain
,
slog
::
o!
());
let
raw_node
=
RawNode
::
new
(
cfg
,
Storage
,
&
logger
)
?
;
let
raw_node
=
Rc
::
from
(
RefCell
::
from
(
raw_node
));
let
ret
=
Node
{
logger
,
raw_node
,
main_loop
:
None
};
let
ret
=
Node
{
logger
,
raw_node
,
main_loop
:
None
,
};
Ok
(
ret
)
}
...
...
This diff is collapsed.
Click to expand it.
picolib/traft/storage.rs
+
17
−
16
View file @
089b38f3
use
slog
::{
debug
,
o
};
use
::
tarantool
::
index
::
IteratorType
;
use
::
tarantool
::
space
::
Space
;
use
::
tarantool
::
tuple
::
Tuple
;
use
raft
::
eraftpb
::
ConfState
;
use
raft
::
StorageError
;
use
serde
::{
Deserialize
,
Serialize
};
use
::
tarantool
::
space
::
Space
;
use
::
tarantool
::
tuple
::
Tuple
;
use
::
tarantool
::
index
::
IteratorType
;
use
slog
::{
debug
,
o
};
use
raft
::
prelude
::
*
;
use
raft
::
Error
as
RaftError
;
...
...
@@ -104,10 +104,13 @@ impl Storage {
space
.replace
(
&
(
"applied"
,
applied
))
.unwrap
();
}
pub
fn
entries
(
low
:
u64
,
high
:
u64
,
)
->
Vec
<
Entry
>
{
pub
fn
entries
(
low
:
u64
,
high
:
u64
)
->
Vec
<
Entry
>
{
let
mut
ret
:
Vec
<
Entry
>
=
vec!
[];
let
space
=
Space
::
find
(
"raft_log"
)
.unwrap
();
let
iter
=
space
.primary_key
()
.select
(
IteratorType
::
GE
,
&
(
low
,))
.unwrap
();
let
iter
=
space
.primary_key
()
.select
(
IteratorType
::
GE
,
&
(
low
,))
.unwrap
();
for
tuple
in
iter
{
let
row
:
LogRow
=
tuple
.into_struct
()
.unwrap
();
...
...
@@ -177,13 +180,12 @@ impl raft::Storage for Storage {
let
space
=
Space
::
find
(
"raft_log"
)
.unwrap
();
let
tuple
=
space
.primary_key
()
.get
(
&
(
idx
,))
.unwrap
();
let
row
:
Option
<
LogRow
>
=
tuple
.and_then
(|
t
|
t
.into_struct
()
.unwrap
());
let
row
:
Option
<
LogRow
>
=
tuple
.and_then
(|
t
|
t
.into_struct
()
.unwrap
());
let
logger
=
slog
::
Logger
::
root
(
crate
::
tarantool
::
SlogDrain
,
o!
());
if
let
Some
(
row
)
=
row
{
debug!
(
logger
,
"+++ term(idx={}) -> {:?}"
,
idx
,
row
.raft_term
);
return
Ok
(
row
.raft_term
)
return
Ok
(
row
.raft_term
)
;
}
else
{
debug!
(
logger
,
"+++ term(idx={}) -> Unavailable"
,
idx
);
return
Err
(
RaftError
::
Store
(
StorageError
::
Unavailable
));
...
...
@@ -197,11 +199,8 @@ impl raft::Storage for Storage {
fn
last_index
(
&
self
)
->
Result
<
u64
,
RaftError
>
{
let
space
:
Space
=
Space
::
find
(
"raft_log"
)
.unwrap
();
let
tuple
:
Option
<
Tuple
>
=
space
.primary_key
()
.max
(
&
())
.unwrap
();
let
row
:
Option
<
LogRow
>
=
tuple
.and_then
(|
t
|
t
.into_struct
()
.unwrap
());
let
ret
:
u64
=
row
.map
(|
row
|
row
.raft_index
)
.unwrap_or
(
0
);
let
row
:
Option
<
LogRow
>
=
tuple
.and_then
(|
t
|
t
.into_struct
()
.unwrap
());
let
ret
:
u64
=
row
.map
(|
row
|
row
.raft_index
)
.unwrap_or
(
0
);
let
logger
=
slog
::
Logger
::
root
(
crate
::
tarantool
::
SlogDrain
,
o!
());
debug!
(
logger
,
"+++ last_index() -> {:?}"
,
ret
);
...
...
@@ -210,7 +209,10 @@ impl raft::Storage for Storage {
fn
snapshot
(
&
self
,
request_index
:
u64
)
->
Result
<
Snapshot
,
RaftError
>
{
let
logger
=
slog
::
Logger
::
root
(
crate
::
tarantool
::
SlogDrain
,
o!
());
debug!
(
logger
,
"+++ snapshot(idx={}) -> unimplemented"
,
request_index
);
debug!
(
logger
,
"+++ snapshot(idx={}) -> unimplemented"
,
request_index
);
unimplemented!
();
}
}
...
...
@@ -251,7 +253,6 @@ impl From<LogRow> for Entry {
ret
.set_data
(
row
.data
.into
());
ret
}
}
impl
::
tarantool
::
tuple
::
AsTuple
for
LogRow
{}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment