Revert "tracing enum"

This reverts commit c2efee0.
shotover · Oct 19, 2022 · fccc5f4 · fccc5f4
1 parent a1ab307
commit fccc5f4
Show file tree

Hide file tree

Showing 10 changed files with 291 additions and 283 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shotover-proxy/benches/benches/chain.rs b/shotover-proxy/benches/benches/chain.rs
@@ -231,12 +231,13 @@ fn criterion_benchmark(c: &mut Criterion) {
 
  let wrapper = Wrapper::new_with_chain_name(
  vec![Message::from_bytes(
- CassandraFrame::new(
- Version::V4,
- Flags::default(),
- 0,
- vec![],
- CassandraOperation::Query {
+ CassandraFrame {
+ version: Version::V4,
+ flags: Flags::default(),
+ stream_id: 0,
+ tracing_id: None,
+ warnings: vec![],
+ operation: CassandraOperation::Query {
  query: Box::new(parse_statement_single(
  "INSERT INTO foo (z, v) VALUES (1, 123)",
  )),
@@ -252,8 +253,7 @@ fn criterion_benchmark(c: &mut Criterion) {
  now_in_seconds: None,
  }),
  },
- None,
- )
+ }
  .encode()
  .encode_with(Compression::None)
  .unwrap()
@@ -339,12 +339,13 @@ 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::new(
- Version::V4,
- Flags::default(),
- 0,
- vec![],
- CassandraOperation::Query {
+ vec![Message::from_frame(Frame::Cassandra(CassandraFrame {
+ version: Version::V4,
+ flags: Flags::default(),
+ stream_id: 0,
+ tracing_id: None,
+ warnings: vec![],
+ operation: CassandraOperation::Query {
  query: Box::new(parse_statement_single(query)),
  params: Box::new(QueryParams {
  consistency: Consistency::One,
@@ -358,8 +359,7 @@ fn cassandra_parsed_query(query: &str) -> Wrapper {
  now_in_seconds: None,
  }),
  },
- None,
- )))],
+ }))],
  "bench".into(),
  "127.0.0.1:6379".parse().unwrap(),
  )

diff --git a/shotover-proxy/benches/benches/codec.rs b/shotover-proxy/benches/benches/codec.rs
@@ -18,17 +18,17 @@ fn criterion_benchmark(c: &mut Criterion) {
  group.noise_threshold(0.2);
 
  {
- let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
- Version::V4,
- Flags::default(),
- 1,
- vec![],
- CassandraOperation::Query {
+ 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 {
  query: Box::new(parse_statement_single("SELECT * FROM system.local;")),
  params: Box::new(QueryParams::default()),
  },
- None,
- )))];
+ }))];
 
  let mut codec = CassandraCodec::new();
 
@@ -46,14 +46,14 @@ fn criterion_benchmark(c: &mut Criterion) {
  }
 
  {
- let messages = vec![Message::from_frame(Frame::Cassandra(CassandraFrame::new(
- Version::V4,
- Flags::default(),
- 0,
- vec![],
- CassandraOperation::Result(peers_v2_result()),
- None,
- )))];
+ 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 mut codec = CassandraCodec::new();