Merge branch 'main' into assert_on_tracing

shotover · Dec 20, 2022 · 474dd55 · 474dd55
2 parents 11632b6 + 84d14e7
commit 474dd55
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 17 deletions.
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,4 @@
 [toolchain]
-channel = "1.65"
+channel = "1.66"
 components = [ "rustfmt", "clippy" ]
 targets = [ "aarch64-unknown-linux-gnu" ]
diff --git a/shotover-proxy/benches/benches/codec.rs b/shotover-proxy/benches/benches/codec.rs
@@ -2,7 +2,7 @@ use bytes::BytesMut;
 use cassandra_protocol::frame::message_result::{
     ColSpec, ColType, ColTypeOption, ColTypeOptionValue, RowsMetadata, RowsMetadataFlags, TableSpec,
 };
-use cassandra_protocol::{frame::Version, query::QueryParams};
+use cassandra_protocol::frame::Version;
 use criterion::{black_box, criterion_group, BatchSize, Criterion};
 use shotover_proxy::codec::cassandra::CassandraCodec;
 use shotover_proxy::frame::cassandra::{parse_statement_single, Tracing};
@@ -22,7 +22,7 @@ fn criterion_benchmark(c: &mut Criterion) {
             warnings: vec![],
             operation: CassandraOperation::Query {
                 query: Box::new(parse_statement_single("SELECT * FROM system.local;")),
-                params: Box::new(QueryParams::default()),
+                params: Box::default(),
             },
         }))];
 

diff --git a/shotover-proxy/src/codec/cassandra.rs b/shotover-proxy/src/codec/cassandra.rs
@@ -236,7 +236,6 @@ mod cassandra_protocol_tests {
         TableSpec,
     };
     use cassandra_protocol::frame::Version;
-    use cassandra_protocol::query::QueryParams;
     use hex_literal::hex;
     use tokio_util::codec::{Decoder, Encoder};
 
@@ -467,7 +466,7 @@ mod cassandra_protocol_tests {
                 query: Box::new(parse_statement_single(
                     "SELECT * FROM system.local WHERE key = 'local'",
                 )),
-                params: Box::new(QueryParams::default()),
+                params: Box::default(),
             },
         }))];
         test_frame_codec_roundtrip(&mut codec, &bytes, messages);
@@ -490,7 +489,7 @@ mod cassandra_protocol_tests {
                 query: Box::new(parse_statement_single(
                     "INSERT INTO system.foo (bar) VALUES ('bar2')",
                 )),
-                params: Box::new(QueryParams::default()),
+                params: Box::default(),
             },
         }))];
         test_frame_codec_roundtrip(&mut codec, &bytes, messages);

diff --git a/shotover-proxy/src/message/mod.rs b/shotover-proxy/src/message/mod.rs
@@ -628,7 +628,7 @@ impl MessageValue {
             MessageValue::Bytes(b) => serialize_bytes(cursor, b),
             MessageValue::Strings(s) => serialize_bytes(cursor, s.as_bytes()),
             MessageValue::Integer(x, size) => match size {
-                IntSize::I64 => serialize_bytes(cursor, &(*x as i64).to_be_bytes()),
+                IntSize::I64 => serialize_bytes(cursor, &(*x).to_be_bytes()),
                 IntSize::I32 => serialize_bytes(cursor, &(*x as i32).to_be_bytes()),
                 IntSize::I16 => serialize_bytes(cursor, &(*x as i16).to_be_bytes()),
                 IntSize::I8 => serialize_bytes(cursor, &(*x as i8).to_be_bytes()),

diff --git a/shotover-proxy/src/transforms/cassandra/sink_cluster/mod.rs b/shotover-proxy/src/transforms/cassandra/sink_cluster/mod.rs
@@ -13,7 +13,6 @@ use cassandra_protocol::frame::message_execute::BodyReqExecuteOwned;
 use cassandra_protocol::frame::message_result::BodyResResultPrepared;
 use cassandra_protocol::frame::message_result::PreparedMetadata;
 use cassandra_protocol::frame::{Opcode, Version};
-use cassandra_protocol::query::QueryParams;
 use cassandra_protocol::types::CBytesShort;
 use cql3_parser::cassandra_statement::CassandraStatement;
 use cql3_parser::common::{FQName, Identifier, Operand, RelationElement, RelationOperator};
@@ -225,7 +224,7 @@ fn create_query(messages: &Messages, query: &str, version: Version) -> Result<Me
         warnings: vec![],
         operation: CassandraOperation::Query {
             query: Box::new(parse_statement_single(query)),
-            params: Box::new(QueryParams::default()),
+            params: Box::default(),
         },
     })))
 }

diff --git a/shotover-proxy/src/transforms/cassandra/sink_cluster/topology.rs b/shotover-proxy/src/transforms/cassandra/sink_cluster/topology.rs
@@ -9,8 +9,8 @@ use anyhow::{anyhow, Result};
 use cassandra_protocol::events::{ServerEvent, SimpleServerEvent};
 use cassandra_protocol::frame::events::{StatusChangeType, TopologyChangeType};
 use cassandra_protocol::frame::message_register::BodyReqRegister;
+use cassandra_protocol::frame::Version;
 use cassandra_protocol::token::Murmur3Token;
-use cassandra_protocol::{frame::Version, query::QueryParams};
 use std::collections::HashMap;
 use std::net::SocketAddr;
 use tokio::sync::mpsc::unbounded_channel;
@@ -253,7 +253,7 @@ mod system_keyspaces {
                         "SELECT keyspace_name, replication FROM system_schema.keyspaces",
                     )),
 
-                    params: Box::new(QueryParams::default()),
+                    params: Box::default(),
                 },
             })),
             tx,
@@ -380,7 +380,7 @@ mod system_local {
                     query: Box::new(parse_statement_single(
                         "SELECT rack, tokens, host_id, data_center FROM system.local",
                     )),
-                    params: Box::new(QueryParams::default()),
+                    params: Box::default(),
                 },
             })),
             tx,
@@ -467,7 +467,7 @@ mod system_peers {
                     query: Box::new(parse_statement_single(
                         "SELECT native_port, native_address, rack, tokens, host_id, data_center FROM system.peers_v2",
                     )),
-                    params: Box::new(QueryParams::default()),
+                params: Box::default(),
                 },
             })),
             tx,
@@ -487,7 +487,7 @@ mod system_peers {
                         query: Box::new(parse_statement_single(
                             "SELECT peer, rack, tokens, host_id, data_center FROM system.peers",
                         )),
-                        params: Box::new(QueryParams::default()),
+                        params: Box::default(),
                     },
                 })),
                 tx,

diff --git a/shotover-proxy/src/transforms/protect/key_management.rs b/shotover-proxy/src/transforms/protect/key_management.rs
@@ -62,7 +62,7 @@ impl KeyManagerConfig {
                 grant_tokens,
             })),
             KeyManagerConfig::Local { kek, kek_id } => {
-                let decoded_base64 = base64::decode(&kek)?;
+                let decoded_base64 = base64::decode(kek)?;
 
                 if decoded_base64.len() != 32 {
                     return Err(anyhow!("Invalid key length"));

diff --git a/shotover-proxy/src/transforms/redis/cache.rs b/shotover-proxy/src/transforms/redis/cache.rs
@@ -580,7 +580,6 @@ impl SimpleRedisCacheBuilder {
     }
 
     pub fn validate(&self) -> Vec<String> {
-        println!("HIII");
         let mut errors = self
             .cache_chain
             .validate()
@@ -809,7 +808,6 @@ mod test {
 
     #[test]
     fn test_validate_invalid_chain() {
-        println!("START");
         let transform = SimpleRedisCacheBuilder {
             cache_chain: TransformChainBuilder::new(vec![], "test-chain".to_string()),
             caching_schema: HashMap::new(),