From 7d976f8aeadcf7412007d83886930ac4881545ce Mon Sep 17 00:00:00 2001 From: muzarski Date: Fri, 6 Sep 2024 18:04:48 +0200 Subject: [PATCH 1/2] testing: remove cass_cluster_set_RP from testing_unimplemented This function is implemented, so it should not be in this file. --- src/testing_unimplemented.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/testing_unimplemented.cpp b/src/testing_unimplemented.cpp index 5ec6b2ad..209b526e 100644 --- a/src/testing_unimplemented.cpp +++ b/src/testing_unimplemented.cpp @@ -131,11 +131,6 @@ cass_cluster_set_prepare_on_up_or_add_host(CassCluster* cluster, throw std::runtime_error("UNIMPLEMENTED cass_cluster_set_prepare_on_up_or_add_host\n"); } CASS_EXPORT void -cass_cluster_set_retry_policy(CassCluster* cluster, - CassRetryPolicy* retry_policy){ - throw std::runtime_error("UNIMPLEMENTED cass_cluster_set_retry_policy\n"); -} -CASS_EXPORT void cass_cluster_set_timestamp_gen(CassCluster* cluster, CassTimestampGen* timestamp_gen){ throw std::runtime_error("UNIMPLEMENTED cass_cluster_set_timestamp_gen\n"); From 9f43fb0c73a84c6e215bf6e1323132419b0f211f Mon Sep 17 00:00:00 2001 From: muzarski Date: Fri, 6 Sep 2024 18:06:42 +0200 Subject: [PATCH 2/2] testing: remove cass_session_connect_keyspace from testing_unimplemented This function is implemented, so it should not be in this file. For some reason, during dynamic linking, the "unimplemented" version of this function is taken and some tests fail due to this. The corresponding tests are now enabled in CI. --- .github/workflows/build.yml | 6 +++++- .github/workflows/cassandra.yml | 6 +++++- src/testing_unimplemented.cpp | 6 ------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53ef254e..db8707d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,9 +50,13 @@ jobs: :ByNameTests.*\ :CompressionTests.*\ :LoggingTests.*\ +:PreparedMetadataTests.*\ +:UseKeyspaceCaseSensitiveTests.*\ :-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\ :ExecutionProfileTest.InvalidName\ -:*NoCompactEnabledConnection" +:*NoCompactEnabledConnection\ +:PreparedMetadataTests.Integration_Cassandra_AlterDoesntUpdateColumnCount\ +:UseKeyspaceCaseSensitiveTests.Integration_Cassandra_ConnectWithKeyspace" run: valgrind --error-exitcode=123 --leak-check=full --errors-for-leak-kinds=definite ./cassandra-integration-tests --scylla --version=release:6.0.0 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests" - name: Upload test logs diff --git a/.github/workflows/cassandra.yml b/.github/workflows/cassandra.yml index 98660a1f..2c6d3b07 100644 --- a/.github/workflows/cassandra.yml +++ b/.github/workflows/cassandra.yml @@ -51,11 +51,15 @@ jobs: :ByNameTests.*\ :CompressionTests.*\ :LoggingTests.*\ +:PreparedMetadataTests.*\ +:UseKeyspaceCaseSensitiveTests.*\ :-PreparedTests.Integration_Cassandra_PreparedIDUnchangedDuringReprepare\ :PreparedTests.Integration_Cassandra_FailFastWhenPreparedIDChangesDuringReprepare\ :SslTests.Integration_Cassandra_ReconnectAfterClusterCrashAndRestart\ :ExecutionProfileTest.InvalidName\ -:*NoCompactEnabledConnection" +:*NoCompactEnabledConnection\ +:PreparedMetadataTests.Integration_Cassandra_AlterDoesntUpdateColumnCount\ +:UseKeyspaceCaseSensitiveTests.Integration_Cassandra_ConnectWithKeyspace" run: valgrind --error-exitcode=123 --leak-check=full --errors-for-leak-kinds=definite ./cassandra-integration-tests --version=4.0.7 --category=CASSANDRA --verbose=ccm --gtest_filter="$Tests" - name: Upload test logs diff --git a/src/testing_unimplemented.cpp b/src/testing_unimplemented.cpp index 209b526e..7fec19fe 100644 --- a/src/testing_unimplemented.cpp +++ b/src/testing_unimplemented.cpp @@ -295,12 +295,6 @@ CASS_EXPORT CassVersion cass_schema_meta_version(const CassSchemaMeta* schema_meta){ throw std::runtime_error("UNIMPLEMENTED cass_schema_meta_version\n"); } -CASS_EXPORT CassFuture* -cass_session_connect_keyspace(CassSession* session, - const CassCluster* cluster, - const char* keyspace){ - throw std::runtime_error("UNIMPLEMENTED cass_session_connect_keyspace\n"); -} CASS_EXPORT void cass_session_get_metrics(const CassSession* session, CassMetrics* output){