Int test function propogation (#731)

shotover · Aug 9, 2022 · b672548 · b672548
1 parent 6224a67
commit b672548
Show file tree

Hide file tree

Showing 5 changed files with 242 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/shotover-proxy/Cargo.toml b/shotover-proxy/Cargo.toml
@@ -91,6 +91,7 @@ nix = "0.24.0"
 reqwest = "0.11.6"
 metrics-util = "0.14.0"
 cdrs-tokio = { git = "https://github.com/krojew/cdrs-tokio" }
+scylla = "0.4.7"
 
 [[bench]]
 name = "redis_benches"

diff --git a/shotover-proxy/tests/cassandra_int_tests/functions.rs b/shotover-proxy/tests/cassandra_int_tests/functions.rs
@@ -1,29 +1,45 @@
+use crate::cassandra_int_tests::schema_awaiter::SchemaAwaiter;
 use crate::helpers::cassandra::{assert_query_result, run_query, CassandraConnection, ResultValue};
 
 fn drop_function(session: &CassandraConnection) {
- assert_query_result(session, "SELECT test_function_keyspace.my_function(x, y) FROM test_function_keyspace.test_function_table WHERE id=1;", &[&[ResultValue::Int(4)]]);
+ assert_query_result(
+ session,
+ "SELECT test_function_keyspace.my_function(x, y) FROM test_function_keyspace.test_function_table WHERE id=1;",
+ &[&[ResultValue::Int(4)]]
+ );
  run_query(session, "DROP FUNCTION test_function_keyspace.my_function");
 
  let statement = "SELECT test_function_keyspace.my_function(x) FROM test_function_keyspace.test_function_table WHERE id=1;";
  let result = session.execute_expect_err(statement).to_string();
 
- assert_eq!(result, "Cassandra detailed error SERVER_INVALID_QUERY: Unknown function 'test_function_keyspace.my_function'");
+ assert_eq!(
+ result,
+ "Cassandra detailed error SERVER_INVALID_QUERY: Unknown function 'test_function_keyspace.my_function'"
+ );
 }
 
-fn create_function(session: &CassandraConnection) {
+async fn create_function(session: &CassandraConnection, direct_connections: &SchemaAwaiter) {
  run_query(
- session,
- "CREATE FUNCTION test_function_keyspace.my_function (a int, b int) RETURNS NULL ON NULL INPUT RETURNS int LANGUAGE javascript AS 'a * b';",
- );
- assert_query_result(session, "SELECT test_function_keyspace.my_function(x, y) FROM test_function_keyspace.test_function_table;",&[&[ResultValue::Int(4)], &[ResultValue::Int(9)], &[ResultValue::Int(16)]]);
+ session,
+ "CREATE FUNCTION test_function_keyspace.my_function (a int, b int) RETURNS NULL ON NULL INPUT RETURNS int LANGUAGE javascript AS 'a * b';",
+ );
+ direct_connections.await_schema_agreement().await;
+ assert_query_result(
+ session,
+ "SELECT test_function_keyspace.my_function(x, y) FROM test_function_keyspace.test_function_table;",
+ &[&[ResultValue::Int(4)], &[ResultValue::Int(9)], &[ResultValue::Int(16)]]
+ );
 }
 
-pub fn test(session: &CassandraConnection) {
- run_query(session, "CREATE KEYSPACE test_function_keyspace WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };");
+pub async fn test(session: &CassandraConnection, direct_connections: &SchemaAwaiter) {
+ run_query(
+ session,
+ "CREATE KEYSPACE test_function_keyspace WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };"
+ );
  run_query(
-  session,
-  "CREATE TABLE test_function_keyspace.test_function_table (id int PRIMARY KEY, x int, y int);",
-  );
+ session,
+ "CREATE TABLE test_function_keyspace.test_function_table (id int PRIMARY KEY, x int, y int);",
+ );
  run_query(
  session,
  r#"BEGIN BATCH
@@ -33,6 +49,6 @@ INSERT INTO test_function_keyspace.test_function_table (id, x, y) VALUES (3, 4,
 APPLY BATCH;"#,
  );
 
- create_function(session);
+ create_function(session, direct_connections).await;
  drop_function(session);
 }