Merge branch 'master' into upgrades
This commit is contained in:
commit
8cb9e81d28
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "artillery-core"
|
||||
version = "0.1.1-alpha.0"
|
||||
version = "0.1.2-alpha.0"
|
||||
authors = ["Mahmut Bulut <vertexclique@gmail.com>"]
|
||||
description = "Fire-forged cluster management & Distributed data protocol"
|
||||
keywords = ["cluster", "distributed", "data", "replication"]
|
||||
|
|
|
@ -14,6 +14,7 @@ use std::{
|
|||
};
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct Cluster {
|
||||
pub events: Receiver<ArtilleryClusterEvent>,
|
||||
comm: Sender<ArtilleryClusterRequest>,
|
||||
|
|
|
@ -2,7 +2,6 @@ use criterion::{criterion_group, criterion_main, Criterion};
|
|||
|
||||
use artillery_ddata::craq::prelude::*;
|
||||
|
||||
use futures::stream::StreamExt;
|
||||
use rand::distributions::Alphanumeric;
|
||||
use rand::prelude::*;
|
||||
|
||||
|
|
|
@ -77,7 +77,8 @@ fn main() {
|
|||
assert_eq!(nodes.len(), varargs.len(), "Node address parsing failed");
|
||||
|
||||
let chain = CraqChain::new(&nodes, node_index).unwrap();
|
||||
CraqNode::start(cr_mode, chain, CraqConfig::default());
|
||||
CraqNode::start(cr_mode, chain, CraqConfig::default())
|
||||
.expect("couldn't start CRAQ node");
|
||||
}
|
||||
}
|
||||
("client", Some(client_matches)) => {
|
||||
|
|
|
@ -8,8 +8,7 @@ use super::{
|
|||
use std::net::{SocketAddr, ToSocketAddrs};
|
||||
use thrift::protocol::{TBinaryInputProtocol, TBinaryOutputProtocol};
|
||||
use thrift::transport::{
|
||||
TFramedReadTransport, TFramedReadTransportFactory, TFramedWriteTransport,
|
||||
TFramedWriteTransportFactory, TIoChannel, TTcpChannel as BiTcp,
|
||||
TFramedReadTransport, TFramedWriteTransport, TIoChannel, TTcpChannel as BiTcp,
|
||||
};
|
||||
|
||||
pub struct ReadObject {
|
||||
|
@ -47,6 +46,8 @@ impl fmt::Display for ReadObject {
|
|||
}
|
||||
}
|
||||
|
||||
// Will be fixed as we implement stuff
|
||||
#[allow(dead_code)]
|
||||
pub struct DDataCraqClient {
|
||||
host: SocketAddr,
|
||||
cc: CraqClient,
|
||||
|
|
Loading…
Reference in New Issue