Skip to content

Commit

Permalink
tracing enum
Browse files Browse the repository at this point in the history
  • Loading branch information
@conorbros
conorbros committed Oct 18, 2022
1 parent b0d8d5e commit 57ca1d4
Show file tree
Hide file tree
Showing 9 changed files with 250 additions and 207 deletions.
32 changes: 16 additions & 16 deletions shotover-proxy/benches/benches/chain.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,12 @@ fn criterion_benchmark(c: &mut Criterion) {

let wrapper = Wrapper::new_with_chain_name(
vec![Message::from_bytes(
CassandraFrame {
version: Version::V4,
flags: Flags::default(),
stream_id: 0,
tracing_id: None,
warnings: vec![],
operation: CassandraOperation::Query {
CassandraFrame::new(
Version::V4,
Flags::default(),
0,
vec![],
CassandraOperation::Query {
query: Box::new(parse_statement_single(
"INSERT INTO foo (z, v) VALUES (1, 123)",
)),
Expand All @@ -253,7 +252,8 @@ fn criterion_benchmark(c: &mut Criterion) {
now_in_seconds: None,
}),
},
}
None,
)
.encode()
.encode_with(Compression::None)
.unwrap()
Expand Down Expand Up @@ -339,13 +339,12 @@ fn criterion_benchmark(c: &mut Criterion) {

fn cassandra_parsed_query(query: &str) -> Wrapper {
Wrapper::new_with_chain_name(
vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
stream_id: 0,
tracing_id: None,
warnings: vec![],
operation: CassandraOperation::Query {
vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
0,
vec![],
CassandraOperation::Query {
query: Box::new(parse_statement_single(query)),
params: Box::new(QueryParams {
consistency: Consistency::One,
Expand All @@ -359,7 +358,8 @@ fn cassandra_parsed_query(query: &str) -> Wrapper {
now_in_seconds: None,
}),
},
}))],
None,
)))],
"bench".into(),
"127.0.0.1:6379".parse().unwrap(),
)
Expand Down
32 changes: 16 additions & 16 deletions shotover-proxy/benches/benches/codec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ fn criterion_benchmark(c: &mut Criterion) {
group.noise_threshold(0.2);

{
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
stream_id: 1,
tracing_id: None,
warnings: vec![],
operation: CassandraOperation::Query {
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
1,
vec![],
CassandraOperation::Query {
query: Box::new(parse_statement_single("SELECT * FROM system.local;")),
params: Box::new(QueryParams::default()),
},
}))];
None,
)))];

let mut codec = CassandraCodec::new();

Expand All @@ -46,14 +46,14 @@ fn criterion_benchmark(c: &mut Criterion) {
}

{
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
stream_id: 0,
tracing_id: None,
warnings: vec![],
operation: CassandraOperation::Result(peers_v2_result()),
}))];
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
0,
vec![],
CassandraOperation::Result(peers_v2_result()),
None,
)))];

let mut codec = CassandraCodec::new();

Expand Down
128 changes: 64 additions & 64 deletions shotover-proxy/src/codec/cassandra.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,17 +183,17 @@ fn reject_protocol_version(version: u8) -> CodecReadError {
);

CodecReadError::RespondAndThenCloseConnection(vec![Message::from_frame(Frame::Cassandra(
CassandraFrame {
version: Version::V4,
flags: Flags::default(),
stream_id: 0,
operation: CassandraOperation::Error(ErrorBody {
CassandraFrame::new(
Version::V4,
Flags::default(),
0,
vec![],
CassandraOperation::Error(ErrorBody {
message: "Invalid or unsupported protocol version".into(),
ty: ErrorType::Protocol,
}),
tracing_id: None,
warnings: vec![],
},
None,
),
))])
}

Expand Down Expand Up @@ -280,46 +280,46 @@ mod cassandra_protocol_tests {
fn test_codec_startup() {
let mut codec = CassandraCodec::new();
let bytes = hex!("0400000001000000160001000b43514c5f56455253494f4e0005332e302e30");
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
operation: CassandraOperation::Startup(vec![
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
0,
vec![],
CassandraOperation::Startup(vec![
0, 1, 0, 11, 67, 81, 76, 95, 86, 69, 82, 83, 73, 79, 78, 0, 5, 51, 46, 48, 46, 48,
]),
stream_id: 0,
tracing_id: None,
warnings: vec![],
}))];
None,
)))];
test_frame_codec_roundtrip(&mut codec, &bytes, messages);
}

#[test]
fn test_codec_options() {
let mut codec = CassandraCodec::new();
let bytes = hex!("040000000500000000");
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
operation: CassandraOperation::Options(vec![]),
stream_id: 0,
tracing_id: None,
warnings: vec![],
}))];
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
0,
vec![],
CassandraOperation::Options(vec![]),
None,
)))];
test_frame_codec_roundtrip(&mut codec, &bytes, messages);
}

#[test]
fn test_codec_ready() {
let mut codec = CassandraCodec::new();
let bytes = hex!("840000000200000000");
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
operation: CassandraOperation::Ready(vec![]),
stream_id: 0,
tracing_id: None,
warnings: vec![],
}))];
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
0,
vec![],
CassandraOperation::Ready(vec![]),
None,
)))];
test_frame_codec_roundtrip(&mut codec, &bytes, messages);
}

Expand All @@ -330,20 +330,20 @@ mod cassandra_protocol_tests {
"040000010b000000310003000f544f504f4c4f47595f4348414e4745
000d5354415455535f4348414e4745000d534348454d415f4348414e4745"
);
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
operation: CassandraOperation::Register(BodyReqRegister {
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
1,
vec![],
CassandraOperation::Register(BodyReqRegister {
events: vec![
SimpleServerEvent::TopologyChange,
SimpleServerEvent::StatusChange,
SimpleServerEvent::SchemaChange,
],
}),
stream_id: 1,
tracing_id: None,
warnings: vec![],
}))];
None,
)))];
test_frame_codec_roundtrip(&mut codec, &bytes, messages);
}

Expand All @@ -356,10 +356,12 @@ mod cassandra_protocol_tests {
65727265645f6970001000047261636b000d000f72656c656173655f76657273696f6e000d000b7270635f616464726
573730010000e736368656d615f76657273696f6e000c0006746f6b656e730022000d00000000"
);
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
operation: CassandraOperation::Result(CassandraResult::Rows {
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
2,
vec![],
CassandraOperation::Result(CassandraResult::Rows {
rows: vec![],
metadata: Box::new(RowsMetadata {
flags: RowsMetadataFlags::GLOBAL_TABLE_SPACE,
Expand Down Expand Up @@ -449,10 +451,8 @@ mod cassandra_protocol_tests {
],
}),
}),
stream_id: 2,
tracing_id: None,
warnings: vec![],
}))];
None,
)))];
test_frame_codec_roundtrip(&mut codec, &bytes, messages);
}

Expand All @@ -464,19 +464,19 @@ mod cassandra_protocol_tests {
74656d2e6c6f63616c205748455245206b6579203d20276c6f63616c27000100"
);

let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
stream_id: 3,
tracing_id: None,
warnings: vec![],
operation: CassandraOperation::Query {
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
3,
vec![],
CassandraOperation::Query {
query: Box::new(parse_statement_single(
"SELECT * FROM system.local WHERE key = 'local'",
)),
params: Box::new(QueryParams::default()),
},
}))];
None,
)))];
test_frame_codec_roundtrip(&mut codec, &bytes, messages);
}

Expand All @@ -488,19 +488,19 @@ mod cassandra_protocol_tests {
6d2e666f6f2028626172292056414c554553202827626172322729000100"
);

let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
version: Version::V4,
flags: Flags::default(),
stream_id: 3,
tracing_id: None,
warnings: vec![],
operation: CassandraOperation::Query {
let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
Version::V4,
Flags::default(),
3,
vec![],
CassandraOperation::Query {
query: Box::new(parse_statement_single(
"INSERT INTO system.foo (bar) VALUES ('bar2')",
)),
params: Box::new(QueryParams::default()),
},
}))];
None,
)))];
test_frame_codec_roundtrip(&mut codec, &bytes, messages);
}
}
Loading

0 comments on commit 57ca1d4

Please sign in to comment.