Merge branch 'master' into unified_driver

Author: Michael Fero

cpp-driver/examples/dse/date_range/date_range.c

@@ -228,11 +228,8 @@ CassError insert_into_collections(CassSession* session, const char* key, const D
   const CassDataType* udt_type = NULL;
   CassUserType* udt = NULL;
 
-  const char** item = NULL;
   const char* query =
       "INSERT INTO examples.drcoll (key, coll_value, tuple_value, udt_value) VALUES (?, ?, ?, ?);";
-  int ind = 0;
-
   statement = cass_statement_new(query, 4);
 
   cass_statement_bind_string(statement, 0, key);

cpp-driver/examples/dse/geotypes/geotypes.c

@@ -316,16 +316,13 @@ void select_line_string(CassSession* session, const char* key) {
   if (cass_future_error_code(future) == CASS_OK) {
     const CassResult* result = cass_future_get_result(future);
     if (result && cass_result_row_count(result) > 0) {
-      cass_uint32_t i, num_points;
       const CassRow* row = cass_result_first_row(result);
       const CassValue* value = cass_row_get_column_by_name(row, "linestring");
 
       DseLineStringIterator* iterator = dse_line_string_iterator_new();
 
       dse_line_string_iterator_reset(iterator, value);
 
-      num_points = dse_line_string_iterator_num_points(iterator);
-
       printf("%s: ", key);
       print_line_string(iterator);
       printf(")\n");

cpp-driver/examples/dse/gssapi/gssapi_proxy.c

@@ -141,7 +141,6 @@ void connect_and_run(const char* hosts, const char* proxy_user) {
 
 int main(int argc, char* argv[]) {
   /* Setup and connect to cluster */
-  CassFuture* connect_future = NULL;
   char* hosts = "127.0.0.1";
   if (argc > 1) {
     hosts = argv[1];

cpp-driver/examples/dse/proxy_execution/proxy_execution.c

@@ -108,7 +108,6 @@ CassError connect_session(CassSession* session, const CassCluster* cluster) {
 
 int main(int argc, char* argv[]) {
   /* Setup and connect to cluster */
-  CassFuture* connect_future = NULL;
   CassCluster* cluster = cass_cluster_new();
   CassSession* session = cass_session_new();
   char* hosts = "127.0.0.1";

cpp-driver/examples/perf/perf.c

@@ -138,8 +138,6 @@ CassCluster* create_cluster(const char* hosts) {
   cass_cluster_set_num_threads_io(cluster, NUM_IO_WORKER_THREADS);
   cass_cluster_set_queue_size_io(cluster, 10000);
   cass_cluster_set_core_connections_per_host(cluster, 1);
-  cass_cluster_set_max_connections_per_host(cluster, 2);
-  cass_cluster_set_max_requests_per_flush(cluster, 10000);
   return cluster;
 }
 

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);