Merge pull request #325 from wprzytula/enable-more-tests

IT: Enable more tests

Author: wprzytula

Makefile

@@ -35,12 +35,9 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :ExecutionProfileTest.*\
 :DCExecutionProfileTest.*\
 :DisconnectedNullStringApiArgsTest.*\
-:MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
-:MetricsTests.Integration_Cassandra_Requests\
-:MetricsTests.Integration_Cassandra_StatsShardConnections\
+:MetricsTests.*\
 :DcAwarePolicyTest.*\
-:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
-:SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
+:-SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
 :SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\
 :HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
 :TimestampTests.Integration_Cassandra_MonotonicTimestampGenerator\
@@ -52,9 +49,10 @@ SCYLLA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :ControlConnectionTests.Integration_Cassandra_TerminatedUsingMultipleIoThreadsWithError\
 :ServerSideFailureTests.Integration_Cassandra_ErrorFunctionFailure\
 :ServerSideFailureTests.Integration_Cassandra_ErrorFunctionAlreadyExists\
+:MetricsTests.Integration_Cassandra_StatsConnections\
+:MetricsTests.Integration_Cassandra_SpeculativeExecutionRequests\
 :*NoCompactEnabledConnection\
-:PreparedMetadataTests.Integration_Cassandra_AlterProperlyUpdatesColumnCount\
-:UseKeyspaceCaseSensitiveTests.Integration_Cassandra_ConnectWithKeyspace)
+:PreparedMetadataTests.Integration_Cassandra_AlterProperlyUpdatesColumnCount)
 endif
 
 ifndef SCYLLA_NO_VALGRIND_TEST_FILTER
@@ -95,12 +93,9 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :ExecutionProfileTest.*\
 :DCExecutionProfileTest.*\
 :DisconnectedNullStringApiArgsTest.*\
-:MetricsTests.Integration_Cassandra_ErrorsRequestTimeouts\
-:MetricsTests.Integration_Cassandra_Requests\
-:MetricsTests.Integration_Cassandra_StatsShardConnections\
+:MetricsTests.*\
 :DcAwarePolicyTest.*\
-:-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\
-:PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
+:-PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\
 :SchemaMetadataTest.Integration_Cassandra_RegularMetadataNotMarkedVirtual\
 :SchemaMetadataTest.Integration_Cassandra_VirtualMetadata\
 :HeartbeatTests.Integration_Cassandra_HeartbeatFailed\
@@ -114,9 +109,10 @@ CASSANDRA_TEST_FILTER := $(subst ${SPACE},${EMPTY},ClusterTests.*\
 :ServerSideFailureTests.Integration_Cassandra_ErrorFunctionFailure\
 :ServerSideFailureTests.Integration_Cassandra_ErrorFunctionAlreadyExists\
 :SslTests.Integration_Cassandra_ReconnectAfterClusterCrashAndRestart\
+:MetricsTests.Integration_Cassandra_StatsConnections\
+:MetricsTests.Integration_Cassandra_SpeculativeExecutionRequests\
 :*NoCompactEnabledConnection\
-:PreparedMetadataTests.Integration_Cassandra_AlterProperlyUpdatesColumnCount\
-:UseKeyspaceCaseSensitiveTests.Integration_Cassandra_ConnectWithKeyspace)
+:PreparedMetadataTests.Integration_Cassandra_AlterProperlyUpdatesColumnCount)
 endif
 
 ifndef CASSANDRA_NO_VALGRIND_TEST_FILTER

scylla-rust-wrapper/src/session.rs

@@ -129,8 +129,21 @@ impl CassSessionInner {
             exec_profile_map.insert(name, builder.build(&default_profile).await.into_handle());
         }
 
-        if let Some(keyspace) = keyspace {
-            session_builder = session_builder.use_keyspace(keyspace, false);
+        if let Some(maybe_quoted_keyspace) = keyspace {
+            // Handle case-sensitivity. If the keyspace name is enclosed in quotes, it is case-sensitive.
+            let (unquoted_keyspace, case_sensitive) =
+                if maybe_quoted_keyspace.starts_with('"') && maybe_quoted_keyspace.ends_with('"') {
+                    // Keyspace is case-sensitive. We acknowledge that and remove the quotes,
+                    // as the Rust Driver expects keyspace name without quotes and rejects non-alphanumeric characters.
+                    let mut quoted_keyspace = maybe_quoted_keyspace;
+                    quoted_keyspace.remove(0); // Remove the first quote.
+                    quoted_keyspace.pop(); // Remove the last quote.
+                    (quoted_keyspace, true)
+                } else {
+                    (maybe_quoted_keyspace, false)
+                };
+
+            session_builder = session_builder.use_keyspace(unquoted_keyspace, case_sensitive);
         }
 
         let session = session_builder

tests/src/integration/objects/session.hpp

@@ -286,7 +286,7 @@ class Session : public Object<CassSession, cass_session_free> {
     session.connect_future_.wait(false);
     if (assert_ok && session.connect_error_code() != CASS_OK) {
       throw Exception("Unable to Establish Session Connection: " +
-                          session.connect_error_description(),
+                          session.connect_error_description() + " - " + session.connect_error_message(),
                       session.connect_error_code(), session.connect_error_message());
     }
     return session;

tests/src/integration/tests/test_prepared.cpp

@@ -62,12 +62,13 @@ CASSANDRA_INTEGRATION_TEST_F(PreparedTests, FailFastWhenPreparedIDChangesDuringR
                                  table_name_.c_str(), "int", "int"));
 
   // Execute the insert statement and validate the error code
-  logger_.add_critera("ID mismatch while trying to prepare query");
+  logger_.add_critera("Prepared statement id changed after repreparation");
   Statement insert_statement = insert_prepared.bind();
   insert_statement.bind<Integer>(0, Integer(0));
   insert_statement.bind<Integer>(1, Integer(1));
   Result result = session_.execute(insert_statement, false);
   EXPECT_TRUE(contains(result.error_message(), "Prepared statement id changed after repreparation"));
+  EXPECT_EQ(1u, logger_.count());
 }
 
 /**
@@ -100,7 +101,7 @@ CASSANDRA_INTEGRATION_TEST_F(PreparedTests, PreparedIDUnchangedDuringReprepare)
       format_string(CASSANDRA_KEY_VALUE_TABLE_FORMAT, table_name_.c_str(), "int", "int"));
 
   // Execute the insert statement and validate success
-  logger_.add_critera("Prepared query with ID");
+  logger_.add_critera("repreparing statement with id");
   Statement insert_statement = insert_prepared.bind();
   insert_statement.bind<Integer>(0, Integer(0));
   insert_statement.bind<Integer>(1, Integer(1));