Merge pull request #2 from riptano/2.14.0-alpha-2_prep

2.14.0 alpha-2 release preparation

Author: mikefero

.build.sh

@@ -74,7 +74,7 @@ build_driver() {
   (
     cd build
     BUILD_INTEGRATION_TESTS=Off
-    if [ "${RELEASE}" = "bionic64" ]; then
+    if [ "${CI_SCHEDULE}" != "commit" ]; then
       BUILD_INTEGRATION_TESTS=On
     fi
     cmake -DCMAKE_BUILD_TYPE=Release \

CHANGELOG.md

@@ -1,3 +1,18 @@
+2.14.0-alpha2
+===========
+
+Features
+--------
+[CPP-812] - Enable warnings for implicit casts and fix problems
+[CPP-813] - Detect CaaS and change consistency default
+[CPP-817] - Provide error if mixed usage of secure connect bundle and contact points/ssl context
+
+Bug Fixes
+--------
+[CPP-802] - Handle prepared id mismatch when repreparing on the fly
+[CPP-815] - Schema agreement fails with SNI
+[CPP-811] - Requests won't complete if they exceed the number of streams on a connection
+
 2.14.0-alpha
 ===========
 

appveyor.yml

@@ -39,7 +39,7 @@ environment:
   DRIVER_TYPE: CASS
   BOOST_VERSION: 1.69.0
   LIBSSH2_VERSION: 1.9.0
-  LIBUV_VERSION: 1.31.0
+  LIBUV_VERSION: 1.32.0
   OPENSSL_1_0_VERSION: 1.0.2s
   OPENSSL_1_1_VERSION: 1.1.1c
   ZLIB_VERSION: 1.2.11

build.yaml

@@ -9,6 +9,19 @@ schedules:
       slack: cpp-driver-dev-bots
     branches:
       include: ["/CPP-\\d+/", "master"]
+    env_vars: |
+      CI_SCHEDULE=commit
+  nightly:
+    schedule: nightly
+    notify:
+      slack: cpp-driver-dev-bots
+    branches:
+      include: ["/CPP-\\d+/", "master"]
+    matrix:
+      exclude:
+        - os: ['ubuntu/trusty64/cpp', 'ubuntu/xenial64/cpp', 'centos/6-64/cpp', 'centos/7-64/cpp', 'osx/high-sierra']
+    env_vars: |
+      CI_SCHEDULE=nightly
 architecture:
   - x64
 os:
@@ -19,7 +32,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.31.0
+  LIBUV_VERSION: 1.32.0
 build:
   - script: |
       . .build.sh

cmake/modules/CppDriver.cmake

@@ -151,11 +151,18 @@ macro(CassConfigureShared prefix)
   if("${prefix}" STREQUAL "DSE")
     set(STATIC_COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -DCASS_BUILDING")
   endif()
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
-     "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set_property(
+        TARGET ${PROJECT_LIB_NAME}
+        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Wconversion -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-undefined-var-template -Werror")
+  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # To many superfluous warnings generated with GCC when using -Wconversion (see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40752)
     set_property(
         TARGET ${PROJECT_LIB_NAME}
         APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Werror")
+  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set_property(
+        TARGET ${PROJECT_LIB_NAME}
+        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} /we4800")
   endif()
 endmacro()
 
@@ -181,11 +188,18 @@ macro(CassConfigureStatic prefix)
   if("${prefix}" STREQUAL "DSE")
     set(STATIC_COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -DCASS_STATIC")
   endif()
-  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
-     "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    set_property(
+        TARGET ${PROJECT_LIB_NAME_STATIC}
+        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Wconversion -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-undefined-var-template -Werror")
+  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # To many superfluous warnings generated with GCC when using -Wconversion (see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40752)
     set_property(
         TARGET ${PROJECT_LIB_NAME_STATIC}
         APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Werror")
+  elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    set_property(
+        TARGET ${PROJECT_LIB_NAME_STATIC}
+        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} /we4800")
   endif()
 
   # Update the CXX flags to indicate the use of the static library
@@ -874,7 +888,6 @@ macro(CassSetCompilerFlags)
     # TODO(mpenick): Fix these "possible loss of data" warnings
     add_definitions(/wd4244)
     add_definitions(/wd4267)
-    add_definitions(/wd4800) # Performance warning due to automatic compiler casting from int to bool
 
     # Add preprocessor definitions for proper compilation
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)  # Remove warnings for not using safe functions (TODO: Fix codebase to be more secure for Visual Studio)

cmake/modules/ExternalProject-libuv.cmake

@@ -22,7 +22,7 @@ if(NOT LIBUV_INSTALL_PREFIX)
 endif()
 option(LIBUV_VERSION "libuv version to build and install")
 if(NOT LIBUV_VERSION)
-  set(LIBUV_VERSION "1.31.0")
+  set(LIBUV_VERSION "1.32.0")
 endif()
 set(LIBUV_VERSION ${LIBUV_VERSION} CACHE STRING "libuv version to build and install" FORCE)
 

gtests/src/integration/integration.cpp

@@ -56,6 +56,7 @@ Integration::Integration()
     , is_ccm_start_requested_(true)
     , is_ccm_start_node_individually_(false)
     , is_session_requested_(true)
+    , is_keyspace_change_requested_(true)
     , is_test_chaotic_(false)
     , is_beta_protocol_(Options::is_beta_protocol())
     , protocol_version_(CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION)
@@ -209,7 +210,9 @@ void Integration::TearDown() {
   // Determine if the CCM cluster should be destroyed
   if (is_test_chaotic_) {
     // Destroy the current cluster and reset the chaos flag for the next test
-    ccm_->remove_cluster();
+    if (!Options::keep_clusters()) {
+      ccm_->remove_cluster();
+    }
     is_test_chaotic_ = false;
   }
 }
@@ -298,6 +301,16 @@ void Integration::drop_type(const std::string& type_name) {
   session_.execute(drop_type_query.str(), CASS_CONSISTENCY_ANY, false, false);
 }
 
+bool Integration::use_keyspace(const std::string& keyspace_name) {
+  std::stringstream use_keyspace_query;
+  use_keyspace_query << "USE " << keyspace_name;
+  session_.execute(use_keyspace_query.str());
+  if (this->HasFailure()) {
+    return false;
+  }
+  return true;
+}
+
 void Integration::connect(Cluster cluster) {
   // Establish the session connection
   cluster_ = cluster;
@@ -320,9 +333,9 @@ void Integration::connect(Cluster cluster) {
   CHECK_FAILURE;
 
   // Update the session to use the new keyspace by default
-  std::stringstream use_keyspace_query;
-  use_keyspace_query << "USE " << keyspace_name_;
-  session_.execute(use_keyspace_query.str());
+  if (is_keyspace_change_requested_) {
+    use_keyspace(keyspace_name_);
+  }
 }
 
 void Integration::connect() {

gtests/src/integration/integration.hpp

@@ -107,8 +107,12 @@
 
 #define CHECK_CONTINUE(flag, message) ASSERT_TRUE(flag) << message;
 
-#define CASSANDRA_KEY_VALUE_TABLE_FORMAT "CREATE TABLE %s (key %s PRIMARY KEY, value %s)"
+#define CASSANDRA_KEY_VALUE_TABLE_FORMAT \
+  "CREATE TABLE IF NOT EXISTS %s (key %s PRIMARY KEY, value %s)"
+#define CASSANDRA_KEY_VALUE_QUALIFIED_TABLE_FORMAT \
+  "CREATE TABLE IF NOT EXISTS %s.%s (key %s PRIMARY KEY, value %s)"
 #define CASSANDRA_KEY_VALUE_INSERT_FORMAT "INSERT INTO %s (key, value) VALUES(%s, %s)"
+#define CASSANDRA_KEY_VALUE_QUALIFIED_INSERT_FORMAT "INSERT INTO %s.%s (key, value) VALUES(%s, %s)"
 #define CASSANDRA_SELECT_VALUE_FORMAT "SELECT value FROM %s WHERE key=%s"
 #define CASSANDRA_DELETE_ROW_FORMAT "DELETE FROM %s WHERE key=%s"
 #define CASSANDRA_UPDATE_VALUE_FORMAT "UPDATE %s SET value=%s WHERE key=%s"
@@ -278,6 +282,11 @@ class Integration : public testing::Test {
    * (DEFAULT: true)
    */
   bool is_session_requested_;
+  /**
+   * Flag to indicate if the newly created keyspace should be set for the session connection.
+   * (DEFAULT: true)
+   */
+  bool is_keyspace_change_requested_;
   /**
    * Flag to indicate if a test is chaotic and should have its CCM cluster
    * destroyed
@@ -375,6 +384,14 @@ class Integration : public testing::Test {
    */
   virtual void drop_type(const std::string& type_name);
 
+  /**
+   * Update the current keyspace used by the session
+   *
+   * @param keyspace_name Keyspace to use
+   * @return True if keyspace was changed; false otherwise
+   */
+  virtual bool use_keyspace(const std::string& keyspace_name);
+
   /**
    * Establish the session connection using provided cluster object.
    *