Fix additional warnings and quiet downgrade retry policy deprecation (#354)

Author: mikefero

cpp-driver/src/third_party/minizip/zip.c

@@ -516,16 +516,18 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
     if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
       break;
 
-    for (i=(int)uReadSize-3; (i--)>0;)
+    for (i=(int)uReadSize-3; (i--)>0;) {
       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
         ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
       {
         uPosFound = uReadPos+i;
         break;
       }
+    }
 
-      if (uPosFound!=0)
-        break;
+    if (uPosFound!=0) {
+      break;
+    }
   }
   TRYFREE(buf);
   return uPosFound;

cpp-driver/tests/src/integration/objects/retry_policy.cpp

@@ -0,0 +1,22 @@
+/*
+  Copyright (c) DataStax, Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+*/
+
+#include "retry_policy.hpp"
+
+using namespace test::driver;
+
+DowngradingConsistencyRetryPolicy::DowngradingConsistencyRetryPolicy()
+    : RetryPolicy(cass_retry_policy_downgrading_consistency_new()) {}

cpp-driver/tests/src/integration/objects/retry_policy.hpp

@@ -66,8 +66,7 @@ class DowngradingConsistencyRetryPolicy : public RetryPolicy {
    * Create the downgrading consistency retry policy object from the native
    * driver downgrading consistency retry policy object
    */
-  DowngradingConsistencyRetryPolicy()
-      : RetryPolicy(cass_retry_policy_downgrading_consistency_new()) {}
+  DowngradingConsistencyRetryPolicy();
 };
 
 /**

cpp-driver/tests/src/integration/strptime.cpp

@@ -156,7 +156,7 @@ char* strptime(const char* s, const char* f, struct tm* v) {
         *dest = 0;
         for (i = 1; i <= min + range && isdigit(*s); i *= 10)
           *dest = *dest * 10 + *s++ - '0';
-        if (*dest - min >= (unsigned)range) return 0;
+        if ((unsigned)(*dest - min) >= (unsigned)range) return 0;
         *dest -= adj;
         switch ((char*)dest - (char*)v) { case offsetof(struct tm, tm_yday):; }
         goto update;

cpp-driver/tests/src/integration/tests/test_metrics.cpp

@@ -90,11 +90,10 @@ CASSANDRA_INTEGRATION_TEST_F(MetricsTests, ErrorsPendingRequestTimeouts) {
     session_.execute_async(SELECT_ALL_SYSTEM_LOCAL_CQL);
   }
 
-  CassMetrics metrics;
-  start_timer();
-  while (elapsed_time() < 10000 && metrics.errors.pending_request_timeouts == 0) {
-    msleep(100);
+  CassMetrics metrics = session_.metrics();
+  for (int i = 0; i < 100 && metrics.errors.pending_request_timeouts == 0; ++i) {
     metrics = session_.metrics();
+    msleep(100);
   }
   EXPECT_GT(metrics.errors.pending_request_timeouts, 0u);
 }
@@ -117,11 +116,10 @@ CASSANDRA_INTEGRATION_TEST_F(MetricsTests, ErrorsRequestTimeouts) {
     session.execute_async(SELECT_ALL_SYSTEM_LOCAL_CQL);
   }
 
-  CassMetrics metrics;
-  start_timer();
-  while (elapsed_time() < 10000 && metrics.errors.request_timeouts == 0) {
-    msleep(100);
+  CassMetrics metrics = session.metrics();
+  for (int i = 0; i < 100 && metrics.errors.request_timeouts == 0; ++i) {
     metrics = session.metrics();
+    msleep(100);
   }
   EXPECT_GT(metrics.errors.request_timeouts, 0u);
 }
@@ -138,11 +136,11 @@ CASSANDRA_INTEGRATION_TEST_F(MetricsTests, ErrorsRequestTimeouts) {
 CASSANDRA_INTEGRATION_TEST_F(MetricsTests, Requests) {
   CHECK_FAILURE;
 
-  CassMetrics metrics;
-  start_timer();
-  while (elapsed_time() < 60000 && metrics.requests.fifteen_minute_rate == 0.0) {
+  CassMetrics metrics = session_.metrics();
+  for (int i = 0; i < 600 && metrics.requests.fifteen_minute_rate == 0; ++i) {
     session_.execute_async(SELECT_ALL_SYSTEM_LOCAL_CQL);
     metrics = session_.metrics();
+    msleep(100);
   }
 
   EXPECT_LT(metrics.requests.min, CASS_UINT64_MAX);
@@ -187,11 +185,11 @@ CASSANDRA_INTEGRATION_TEST_F(MetricsTests, SpeculativeExecutionRequests) {
   statement.set_idempotent(true);
   statement.set_request_timeout(30000);
 
-  CassSpeculativeExecutionMetrics metrics;
-  start_timer();
-  while (elapsed_time() < 60000 && metrics.count < 1000u) {
+  CassSpeculativeExecutionMetrics metrics = session.speculative_execution_metrics();
+  for (int i = 0; i < 600 && metrics.count < 1000u; ++i) {
     session.execute_async(statement);
     metrics = session.speculative_execution_metrics();
+    msleep(100);
   }
 
   EXPECT_LT(metrics.min, CASS_UINT64_MAX);

cpp-driver/tests/src/integration/tests/test_speculative_execution.cpp

@@ -52,7 +52,7 @@ class SpeculativeExecutionTests : public Integration {
   }
 
   void wait_for_count(const Session& session, cass_uint64_t expected_count) {
-    CassSpeculativeExecutionMetrics metrics;
+    CassSpeculativeExecutionMetrics metrics = session.speculative_execution_metrics();
     for (int i = 0; i < 600 && metrics.count != expected_count; ++i) {
       metrics = session.speculative_execution_metrics();
       msleep(100);

cpp-driver/tests/src/unit/tests/test_load_balancing.cpp

@@ -649,7 +649,7 @@ TEST(TokenAwareLoadBalancingUnitTest, Simple) {
   // 4.0.0.0  9223372036854775804
 
   const uint64_t partition_size = CASS_UINT64_MAX / num_hosts;
-  Murmur3Partitioner::Token token = CASS_INT64_MIN + partition_size;
+  Murmur3Partitioner::Token token = CASS_INT64_MIN + static_cast<int64_t>(partition_size);
 
   for (size_t i = 1; i <= num_hosts; ++i) {
     Host::Ptr host(create_host(addr_for_sequence(i), single_token(token),
@@ -718,7 +718,7 @@ TEST(TokenAwareLoadBalancingUnitTest, NetworkTopology) {
   // 7.0.0.0 local   9223372036854775806
 
   const uint64_t partition_size = CASS_UINT64_MAX / num_hosts;
-  Murmur3Partitioner::Token token = CASS_INT64_MIN + partition_size;
+  Murmur3Partitioner::Token token = CASS_INT64_MIN + static_cast<int64_t>(partition_size);
 
   for (size_t i = 1; i <= num_hosts; ++i) {
     Host::Ptr host(create_host(addr_for_sequence(i), single_token(token),
@@ -788,7 +788,7 @@ TEST(TokenAwareLoadBalancingUnitTest, ShuffleReplicas) {
   // 4.0.0.0  9223372036854775804
 
   const uint64_t partition_size = CASS_UINT64_MAX / num_hosts;
-  Murmur3Partitioner::Token token = CASS_INT64_MIN + partition_size;
+  Murmur3Partitioner::Token token = CASS_INT64_MIN + static_cast<int64_t>(partition_size);
 
   for (size_t i = 1; i <= num_hosts; ++i) {
     Host::Ptr host(create_host(addr_for_sequence(i), single_token(token),