Skip to content
Snippets Groups Projects
Unverified Commit 089b38f3 authored by Sergey V's avatar Sergey V
Browse files

chore: rustfmt picolib

parent c490858b
No related branches found
No related tags found
1 merge request!9chore: rustfmt picolib
Pipeline #3390 passed
use slog::{debug, info, o, error};
use std::os::raw::c_int;
use ::tarantool::tlua; use ::tarantool::tlua;
use rmp_serde; use rmp_serde;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use slog::{debug, error, info, o};
use std::os::raw::c_int;
mod tarantool; mod tarantool;
mod traft; mod traft;
...@@ -13,9 +13,9 @@ pub struct InnerTest { ...@@ -13,9 +13,9 @@ pub struct InnerTest {
} }
inventory::collect!(InnerTest); inventory::collect!(InnerTest);
use std::cell::Ref;
use std::cell::RefCell; use std::cell::RefCell;
use std::cell::RefMut; use std::cell::RefMut;
use std::cell::Ref;
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};
use std::rc::Rc; use std::rc::Rc;
...@@ -46,9 +46,9 @@ pub extern "C" fn luaopen_picolib(l: *mut std::ffi::c_void) -> c_int { ...@@ -46,9 +46,9 @@ pub extern "C" fn luaopen_picolib(l: *mut std::ffi::c_void) -> c_int {
match command.as_deref() { match command.as_deref() {
Ok("run") => { Ok("run") => {
main_run(&stash); main_run(&stash);
}, }
Ok(_) => {}, Ok(_) => {}
Err(_) => {}, Err(_) => {}
} }
unsafe { unsafe {
...@@ -76,29 +76,29 @@ pub extern "C" fn luaopen_picolib(l: *mut std::ffi::c_void) -> c_int { ...@@ -76,29 +76,29 @@ pub extern "C" fn luaopen_picolib(l: *mut std::ffi::c_void) -> c_int {
let stash = stash.clone(); let stash = stash.clone();
luamod.set( luamod.set(
"raft_test_propose", "raft_test_propose",
tlua::function1(move |x: String| tlua::function1(move |x: String| {
raft_propose(&stash, RaftEntryData::Info(format!("{}", x)))), raft_propose(&stash, RaftEntryData::Info(format!("{}", x)))
}),
); );
} }
{ {
let stash = stash.clone(); let stash = stash.clone();
luamod.set( luamod.set(
"broadcast_lua_eval", "broadcast_lua_eval",
tlua::function1( tlua::function1(move |x: String| raft_propose(&stash, RaftEntryData::EvalLua(x))),
move |x: String| {
raft_propose(&stash, RaftEntryData::EvalLua(x))
}
)
) )
} }
{ {
l.exec(r#" l.exec(
r#"
function inspect() function inspect()
return return
{raft_log = box.space.raft_log:fselect()}, {raft_log = box.space.raft_log:fselect()},
{raft_state = box.space.raft_state:fselect()} {raft_state = box.space.raft_state:fselect()}
end end
"#).unwrap(); "#,
)
.unwrap();
} }
use tlua::AsLua; use tlua::AsLua;
...@@ -204,9 +204,7 @@ fn handle_committed_data(logger: &slog::Logger, data: &[u8]) { ...@@ -204,9 +204,7 @@ fn handle_committed_data(logger: &slog::Logger, data: &[u8]) {
Ok(x) => match x { Ok(x) => match x {
EvalLua(code) => crate::tarantool::eval(&code), EvalLua(code) => crate::tarantool::eval(&code),
Info(msg) => info!(logger, "{}", msg), Info(msg) => info!(logger, "{}", msg),
} },
Err(why) => error!(logger, "cannot decode raft entry data: {}", why), Err(why) => error!(logger, "cannot decode raft entry data: {}", why),
} }
} }
...@@ -4,8 +4,8 @@ mod storage; ...@@ -4,8 +4,8 @@ mod storage;
pub use node::Node; pub use node::Node;
pub use storage::Storage; 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::Entry;
pub use raft::eraftpb::Message;
pub use raft::Config;
pub use raft::Ready;
// pub use raft::prelude::*; // pub use raft::prelude::*;
use slog::{
info,
};
use std::ops::{Deref, DerefMut};
use raft::prelude::*; use raft::prelude::*;
use raft::Error as RaftError; use raft::Error as RaftError;
use slog::info;
use std::ops::{Deref, DerefMut};
use std::cell::RefCell; use std::cell::RefCell;
use std::rc::Rc; use std::rc::Rc;
use std::time::Duration; use std::time::Duration;
use super::storage::Storage; use super::storage::Storage;
use crate::tarantool::SlogDrain; use crate::tarantool::SlogDrain;
use ::tarantool::fiber; use ::tarantool::fiber;
...@@ -25,11 +22,15 @@ pub struct Node { ...@@ -25,11 +22,15 @@ pub struct Node {
} }
impl 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 logger = slog::Logger::root(SlogDrain, slog::o!());
let raw_node = RawNode::new(cfg, Storage, &logger)?; let raw_node = RawNode::new(cfg, Storage, &logger)?;
let raw_node = Rc::from(RefCell::from(raw_node)); 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) Ok(ret)
} }
......
use slog::{debug, o}; use ::tarantool::index::IteratorType;
use ::tarantool::space::Space;
use ::tarantool::tuple::Tuple;
use raft::eraftpb::ConfState; use raft::eraftpb::ConfState;
use raft::StorageError; use raft::StorageError;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use ::tarantool::space::Space; use slog::{debug, o};
use ::tarantool::tuple::Tuple;
use ::tarantool::index::IteratorType;
use raft::prelude::*; use raft::prelude::*;
use raft::Error as RaftError; use raft::Error as RaftError;
...@@ -104,10 +104,13 @@ impl Storage { ...@@ -104,10 +104,13 @@ impl Storage {
space.replace(&("applied", applied)).unwrap(); 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 mut ret: Vec<Entry> = vec![];
let space = Space::find("raft_log").unwrap(); 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 { for tuple in iter {
let row: LogRow = tuple.into_struct().unwrap(); let row: LogRow = tuple.into_struct().unwrap();
...@@ -177,13 +180,12 @@ impl raft::Storage for Storage { ...@@ -177,13 +180,12 @@ impl raft::Storage for Storage {
let space = Space::find("raft_log").unwrap(); let space = Space::find("raft_log").unwrap();
let tuple = space.primary_key().get(&(idx,)).unwrap(); let tuple = space.primary_key().get(&(idx,)).unwrap();
let row: Option<LogRow> = tuple let row: Option<LogRow> = tuple.and_then(|t| t.into_struct().unwrap());
.and_then(|t| t.into_struct().unwrap());
let logger = slog::Logger::root(crate::tarantool::SlogDrain, o!()); let logger = slog::Logger::root(crate::tarantool::SlogDrain, o!());
if let Some(row) = row { if let Some(row) = row {
debug!(logger, "+++ term(idx={}) -> {:?}", idx, row.raft_term); debug!(logger, "+++ term(idx={}) -> {:?}", idx, row.raft_term);
return Ok(row.raft_term) return Ok(row.raft_term);
} else { } else {
debug!(logger, "+++ term(idx={}) -> Unavailable", idx); debug!(logger, "+++ term(idx={}) -> Unavailable", idx);
return Err(RaftError::Store(StorageError::Unavailable)); return Err(RaftError::Store(StorageError::Unavailable));
...@@ -197,11 +199,8 @@ impl raft::Storage for Storage { ...@@ -197,11 +199,8 @@ impl raft::Storage for Storage {
fn last_index(&self) -> Result<u64, RaftError> { fn last_index(&self) -> Result<u64, RaftError> {
let space: Space = Space::find("raft_log").unwrap(); let space: Space = Space::find("raft_log").unwrap();
let tuple: Option<Tuple> = space.primary_key().max(&()).unwrap(); let tuple: Option<Tuple> = space.primary_key().max(&()).unwrap();
let row: Option<LogRow> = tuple let row: Option<LogRow> = tuple.and_then(|t| t.into_struct().unwrap());
.and_then(|t| t.into_struct().unwrap()); let ret: u64 = row.map(|row| row.raft_index).unwrap_or(0);
let ret: u64 = row
.map(|row| row.raft_index)
.unwrap_or(0);
let logger = slog::Logger::root(crate::tarantool::SlogDrain, o!()); let logger = slog::Logger::root(crate::tarantool::SlogDrain, o!());
debug!(logger, "+++ last_index() -> {:?}", ret); debug!(logger, "+++ last_index() -> {:?}", ret);
...@@ -210,7 +209,10 @@ impl raft::Storage for Storage { ...@@ -210,7 +209,10 @@ impl raft::Storage for Storage {
fn snapshot(&self, request_index: u64) -> Result<Snapshot, RaftError> { fn snapshot(&self, request_index: u64) -> Result<Snapshot, RaftError> {
let logger = slog::Logger::root(crate::tarantool::SlogDrain, o!()); let logger = slog::Logger::root(crate::tarantool::SlogDrain, o!());
debug!(logger, "+++ snapshot(idx={}) -> unimplemented", request_index); debug!(
logger,
"+++ snapshot(idx={}) -> unimplemented", request_index
);
unimplemented!(); unimplemented!();
} }
} }
...@@ -251,7 +253,6 @@ impl From<LogRow> for Entry { ...@@ -251,7 +253,6 @@ impl From<LogRow> for Entry {
ret.set_data(row.data.into()); ret.set_data(row.data.into());
ret ret
} }
} }
impl ::tarantool::tuple::AsTuple for LogRow {} impl ::tarantool::tuple::AsTuple for LogRow {}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment