Merge branch 'main' into cassandra_mock_bench

shotover · Feb 9, 2023 · aefe54c · aefe54c
2 parents 7955d92 + bec920f
commit aefe54c
Show file tree

Hide file tree

Showing 10 changed files with 203 additions and 153 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml
@@ -16,7 +16,7 @@ cassandra-cpp-driver-tests = ["test-helpers/cassandra-cpp-driver-tests"]
 [dependencies]
 pretty-hex = "0.3.0"
 hex = "0.4.3"
-tokio = { version = "1.21.1", features = ["full", "macros"] }
+tokio = { version = "1.25.0", features = ["full", "macros"] }
 tokio-util = { version = "0.7.0" }
 tokio-stream = "0.1.2"
 bytes = "1.0.0"
@@ -85,7 +85,7 @@ redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] }
 pcap = "1.0.0"
 pktparse = { version = "0.7.0", features = ["serde"] }
 tls-parser = "0.11.0"
-serial_test = "0.10.0"
+serial_test = "1.0.0"
 cassandra-cpp = { version = "1.2.0" }
 test-helpers = { path = "../test-helpers", features = ["cassandra-cpp-driver-tests"] }
 hex-literal = "0.3.3"

diff --git a/shotover-proxy/src/frame/cassandra.rs b/shotover-proxy/src/frame/cassandra.rs
@@ -266,6 +266,7 @@ impl CassandraFrame {
  CassandraResult::SchemaChange(Box::new(schema_change)),
  ),
  ResResultBody::Void => CassandraOperation::Result(CassandraResult::Void),
+ _ => unreachable!(),
  }
  } else {
  unreachable!("We already know the operation is a result")
@@ -349,6 +350,7 @@ impl CassandraFrame {
  Opcode::AuthChallenge => CassandraOperation::AuthChallenge(frame.body),
  Opcode::AuthResponse => CassandraOperation::AuthResponse(frame.body),
  Opcode::AuthSuccess => CassandraOperation::AuthSuccess(frame.body),
+ _ => unreachable!(),
  };
 
  Ok(CassandraFrame {

diff --git a/shotover-proxy/src/message/mod.rs b/shotover-proxy/src/message/mod.rs
@@ -620,6 +620,7 @@ impl MessageValue {
  MessageValue::Tuple(value_list)
  }
  CassandraType::Null => MessageValue::Null,
+ _ => unreachable!(),
  }
  }
 

diff --git a/shotover-proxy/src/transforms/cassandra/sink_cluster/mod.rs b/shotover-proxy/src/transforms/cassandra/sink_cluster/mod.rs
@@ -1372,6 +1372,7 @@ impl Transform for CassandraSinkCluster {
  ServerEvent::TopologyChange(_) => false,
  ServerEvent::StatusChange(_) => false,
  ServerEvent::SchemaChange(_) => true,
+ _ => unreachable!(),
  }
  } else {
  true

diff --git a/shotover-proxy/src/transforms/cassandra/sink_cluster/topology.rs b/shotover-proxy/src/transforms/cassandra/sink_cluster/topology.rs
@@ -145,13 +145,15 @@ async fn topology_task_process(
  return Ok(());
  }
  }
+ _ => unreachable!(),
  },
  ServerEvent::StatusChange(status) => {
  for node in &mut nodes {
  if node.address == status.addr {
  node.is_up = match status.change_type {
  StatusChangeType::Up => true,
  StatusChangeType::Down => false,
+ _ => unreachable!(),
  }
  }
  }
@@ -171,6 +173,7 @@ async fn topology_task_process(
  return Ok(());
  }
  }
+ _ => unreachable!(),
  }
  }
  }

diff --git a/shotover-proxy/tests/cassandra_int_tests/collections.rs b/shotover-proxy/tests/cassandra_int_tests/collections.rs
@@ -53,6 +53,7 @@ fn get_type_str(col_type: ColType) -> &'static str {
  ColType::Udt => "udt",
  ColType::Tuple => "tuple",
  ColType::Duration => "duration",
+ _ => unreachable!(),
  }
 }
 

diff --git a/test-helpers/Cargo.toml b/test-helpers/Cargo.toml
@@ -23,9 +23,9 @@ cassandra-protocol = { git = "https://github.com/krojew/cdrs-tokio", branch = "8
 cassandra-cpp = { version = "1.2.0", optional = true }
 openssl = { version = "0.10.36", features = ["vendored"] }
 bytes = "1.0.0"
-scylla = { git = "https://github.com/scylladb/scylla-rust-driver", features = ["ssl"] }
+scylla = { version = "0.7.0", features = ["ssl"] }
 ordered-float = { version = "3.0.0", features = ["serde"] }
-tokio = { version = "1.21.1", features = ["full", "macros"] }
+tokio = { version = "1.25.0", features = ["full", "macros"] }
 uuid = { version = "1.0.0", features = ["serde", "v4"] }
 redis = { version = "0.22.0", features = ["tokio-comp", "cluster"] }
 tokio-io-timeout = "1.1.1"

diff --git a/test-helpers/src/connection/cassandra.rs b/test-helpers/src/connection/cassandra.rs
@@ -721,6 +721,7 @@ impl CassandraConnection {
  ResResultBody::SchemaChange(_) => vec![],
  ResResultBody::SetKeyspace(_) => vec![],
  ResResultBody::Void => vec![],
+ _ => unreachable!(),
  },
  _ => todo!(),
  })
@@ -916,6 +917,7 @@ impl ResultValue {
  .collect(),
  ),
  CassandraType::Null => ResultValue::Null,
+ _ => unreachable!(),
  }
  }
 

diff --git a/tokio-bin-process/Cargo.toml b/tokio-bin-process/Cargo.toml
@@ -14,7 +14,7 @@ subprocess = "0.2.7"
 anyhow = "1.0.42"
 nix = "0.26.0"
 rcgen = "0.10.0"
-tokio = { version = "1.21.1", features = ["full", "macros"] }
+tokio = { version = "1.25.0", features = ["full", "macros"] }
 serde = { version = "1.0.111", features = ["derive"] }
 serde_json = "1.0.89"
 nu-ansi-term = "0.46.0"