Merge pull request #4 from riptano/2.14.0_prep

2.14.0 release preparation

Author: mikefero

CHANGELOG.md

@@ -1,17 +1,24 @@
+2.14.0
+===========
+
+Bug Fixes
+--------
+* [CPP-819] - Ensure port is updated on already assigned contact points
+
 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
+* [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
+* [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.32.0
+  LIBUV_VERSION: 1.33.0
   OPENSSL_1_0_VERSION: 1.0.2s
   OPENSSL_1_1_VERSION: 1.1.1c
   ZLIB_VERSION: 1.2.11

build.yaml

@@ -33,7 +33,7 @@ os:
   - centos/7-64/cpp
   - osx/high-sierra
 env:
-  LIBUV_VERSION: 1.32.0
+  LIBUV_VERSION: 1.33.0
 build:
   - script: |
       . .build.sh

docs.yaml

@@ -53,6 +53,7 @@ rewrites:
   - http://www.datastax.com/documentation/cql/3.1: https://docs.datastax.com/en/archived/cql/3.1
   - http://www.datastax.com/documentation/cassandra/2.: https://docs.datastax.com/en/archived/cassandra/2.
   - http://downloads.datastax.com/cpp-driver: https://downloads.datastax.com/cpp-driver/
+  - http://www.datastax.com/dev/blog/datastax-c-driver(.*)$: https://www.datastax.com/blog/
 rules:
   use_path_nav_files_only: true
 

gtests/src/integration/integration.cpp

@@ -65,7 +65,7 @@ Integration::Integration()
   // Determine if the schema keyspaces table should be updated
   // TODO: Make cass_version (and dse_version) available for all tests
   CCM::CassVersion cass_version = server_version_;
-  if (Options::is_dse()) {
+  if (!Options::is_cassandra()) {
     cass_version = static_cast<CCM::DseVersion>(cass_version).get_cass_version();
   }
   if (cass_version >= "3.0.0") {
@@ -145,7 +145,7 @@ void Integration::SetUp() {
       // Create and start the CCM cluster (if not already created)
       ccm_ = new CCM::Bridge(
           server_version_, Options::use_git(), Options::branch_tag(), Options::use_install_dir(),
-          Options::install_dir(), Options::is_dse(), dse_workload_, Options::cluster_prefix(),
+          Options::install_dir(), Options::server_type(), dse_workload_, Options::cluster_prefix(),
           Options::dse_credentials(), Options::dse_username(), Options::dse_password(),
           Options::deployment_type(), Options::authentication_type(), Options::host(),
           Options::port(), Options::username(), Options::password(), Options::public_key(),
@@ -319,6 +319,10 @@ void Integration::connect(Cluster cluster) {
 
   // Update the server version if branch_tag was specified
   if (Options::use_git() && !Options::branch_tag().empty()) {
+    if (Options::is_ddac()) {
+      FAIL() << "Unable to build DDAC from Branch/Tag";
+      return;
+    }
     if (Options::is_dse()) {
       server_version_ = ccm_->get_dse_version();
     } else {

gtests/src/integration/integration.hpp

@@ -37,11 +37,13 @@
 
 // Macros for grouping tests together
 #define GROUP_TEST_F(group_name, test_case, test_name) TEST_F(test_case, group_name##_##test_name)
+#define GROUP_TEST(group_name, test_case, test_name) TEST(test_case, group_name##_##test_name)
 #define GROUP_TYPED_TEST_P(group_name, test_case, test_name) \
   TYPED_TEST_P(test_case, group_name##_##test_name)
 
 // Macros to use for grouping integration tests together
-#define GROUP_INTEGRATION_TEST(server_type) GROUP_CONCAT(Integration, server_type)
+#define INTEGRATION_TEST(server_type, test_case, test_name) \
+  GROUP_TEST(Integration##_##server_type, test_case, test_name)
 #define INTEGRATION_TEST_F(server_type, test_case, test_name) \
   GROUP_TEST_F(Integration##_##server_type, test_case, test_name)
 #define INTEGRATION_TYPED_TEST_P(server_type, test_case, test_name) \
@@ -52,7 +54,8 @@
   GROUP_TYPED_TEST_P(DISABLED##_##Integration##_##server_type, test_case, est_name)
 
 // Macros to use for grouping Cassandra integration tests together
-#define CASSANDRA_TEST_NAME(test_name) Integration##_##Cassandra##_##test_name
+#define CASSANDRA_INTEGRATION_TEST(test_case, test_name) \
+  INTEGRATION_TEST(Cassandra, test_case, test_name)
 #define CASSANDRA_INTEGRATION_TEST_F(test_case, test_name) \
   INTEGRATION_TEST_F(Cassandra, test_case, test_name)
 #define CASSANDRA_INTEGRATION_TYPED_TEST_P(test_case, test_name) \
@@ -83,7 +86,7 @@
 #define CHECK_VERSION(version)                                                      \
   do {                                                                              \
     CCM::CassVersion cass_version = this->server_version_;                          \
-    if (Options::is_dse()) {                                                        \
+    if (!Options::is_cassandra()) {                                                 \
       cass_version = static_cast<CCM::DseVersion>(cass_version).get_cass_version(); \
     }                                                                               \
     if (cass_version < #version) {                                                  \
@@ -98,7 +101,7 @@
 
 #define CHECK_VALUE_TYPE_VERSION(type)                                            \
   CCM::CassVersion cass_version = this->server_version_;                          \
-  if (Options::is_dse()) {                                                        \
+  if (!Options::is_cassandra()) {                                                 \
     cass_version = static_cast<CCM::DseVersion>(cass_version).get_cass_version(); \
   }                                                                               \
   if (cass_version < type::supported_server_version()) {                          \

gtests/src/integration/options.cpp

@@ -24,15 +24,15 @@
 #include <iostream>
 
 #define DEFAULT_OPTIONS_CASSSANDRA_VERSION CCM::CassVersion("3.11.4")
-#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.0.8")
+#define DEFAULT_OPTIONS_DSE_VERSION CCM::DseVersion("6.7.5")
+#define DEFAULT_OPTIONS_DDAC_VERSION CCM::DseVersion("5.1.17")
 
 // Initialize the defaults for all the options
 bool Options::is_initialized_ = false;
 bool Options::is_help_ = false;
 bool Options::is_keep_clusters_ = false;
 bool Options::is_log_tests_ = true;
 CCM::CassVersion Options::server_version_ = DEFAULT_OPTIONS_CASSSANDRA_VERSION;
-bool Options::is_dse_ = false;
 bool Options::use_git_ = false;
 std::string Options::branch_tag_;
 bool Options::use_install_dir_ = false;
@@ -55,6 +55,7 @@ CCM::DseCredentialsType Options::dse_credentials_type_;
 CCM::AuthenticationType Options::authentication_type_;
 CCM::DeploymentType Options::deployment_type_;
 std::set<TestCategory> Options::categories_;
+CCM::ServerType Options::server_type_;
 
 bool Options::initialize(int argc, char* argv[]) {
   // Only allow initialization to occur once
@@ -63,6 +64,7 @@ bool Options::initialize(int argc, char* argv[]) {
     dse_credentials_type_ = CCM::DseCredentialsType::USERNAME_PASSWORD;
     authentication_type_ = CCM::AuthenticationType::USERNAME_PASSWORD;
     deployment_type_ = CCM::DeploymentType::LOCAL;
+    server_type_ = CCM::ServerType::CASSANDRA;
 
     // Check for the help argument first (keeps defaults for help display)
     for (int i = 1; i < argc; ++i) {
@@ -77,6 +79,8 @@ bool Options::initialize(int argc, char* argv[]) {
     for (int i = 1; i < argc; ++i) {
       if (std::string(argv[i]) == "--dse") {
         server_version_ = DEFAULT_OPTIONS_DSE_VERSION;
+      } else if (std::string(argv[i]) == "--ddac") {
+        server_version_ = DEFAULT_OPTIONS_DDAC_VERSION;
       }
     }
 
@@ -107,7 +111,9 @@ bool Options::initialize(int argc, char* argv[]) {
                     << std::endl;
         }
       } else if (key == "--dse") {
-        is_dse_ = true;
+        server_type_ = CCM::ServerType::DSE;
+      } else if (key == "--ddac") {
+        server_type_ = CCM::ServerType::DDAC;
       } else if (key == "--dse-username") {
         if (!value.empty()) {
           dse_username_ = value;
@@ -129,7 +135,7 @@ bool Options::initialize(int argc, char* argv[]) {
           }
         }
         if (!is_found) {
-          std::cerr << "Invalid DSE Credentials Type: Using default "
+          std::cerr << "Invalid DSE/DDAC Credentials Type: Using default "
                     << dse_credentials_type_.to_string() << std::endl;
         }
       } else if (key == "--git") {
@@ -272,7 +278,7 @@ bool Options::initialize(int argc, char* argv[]) {
       for (TestCategory::iterator iterator = TestCategory::begin(); iterator != TestCategory::end();
            ++iterator) {
         // Only add the DSE test category if DSE is enabled
-        if (*iterator != TestCategory::DSE || is_dse_) {
+        if (*iterator != TestCategory::DSE || is_dse()) {
           categories_.insert(*iterator);
         } else {
           std::cerr << "DSE Category Will be Ignored: DSE is not enabled [--dse]" << std::endl;
@@ -282,11 +288,11 @@ bool Options::initialize(int argc, char* argv[]) {
     if (deployment_type_ == CCM::DeploymentType::LOCAL) {
       host_ = "127.0.0.1";
     }
-    if (is_dse_ && !use_install_dir_) {
-      // Determine if the DSE credentials type should be updated
+    if (!is_cassandra() && !use_install_dir_) {
+      // Determine if the DSE/DDAC credentials type should be updated
       if (dse_credentials_type_ == CCM::DseCredentialsType::USERNAME_PASSWORD) {
         if (dse_username_.empty() || dse_password_.empty()) {
-          std::cerr << "Invalid Username and/or Password: Default to INI_FILE DSE credentials"
+          std::cerr << "Invalid Username and/or Password: Default to INI_FILE DSE/DDAC credentials"
                     << std::endl;
           dse_credentials_type_ = CCM::DseCredentialsType::INI_FILE;
         }
@@ -309,10 +315,11 @@ void Options::print_help() {
   std::cout << std::endl << "CCM Options:" << std::endl;
   std::cout << "  --version=[VERSION]" << std::endl
             << "      "
-            << "Cassandra/DSE version to use." << std::endl
+            << "Cassandra/DSE/DDAC version to use." << std::endl
             << "      Default:" << std::endl
             << "        Cassandra Version: " << server_version().to_string() << std::endl
-            << "        DSE Version: " << DEFAULT_OPTIONS_DSE_VERSION.to_string() << std::endl;
+            << "        DSE Version: " << DEFAULT_OPTIONS_DSE_VERSION.to_string() << std::endl
+            << "        DDAC Version: " << DEFAULT_OPTIONS_DDAC_VERSION.to_string() << std::endl;
   std::string categories;
   for (TestCategory::iterator iterator = TestCategory::begin(); iterator != TestCategory::end();
        ++iterator) {
@@ -330,16 +337,20 @@ void Options::print_help() {
   std::cout << "  --dse" << std::endl
             << "      "
             << "Indicate server version supplied is DSE." << std::endl;
+  std::cout << "  --ddac" << std::endl
+            << "      "
+            << "Indicate server version supplied is DDAC." << std::endl;
   std::cout << "  --dse-credentials=(USERNAME_PASSWORD|INI_FILE)" << std::endl
             << "      "
-            << "DSE credentials to use for download authentication. The default is " << std::endl
+            << "DSE/DDAC credentials to use for download authentication. The default is "
+            << std::endl
             << "      " << dse_credentials().to_string() << "." << std::endl;
   std::cout << "  --dse-username=[USERNAME]" << std::endl
             << "      "
-            << "Username to use for DSE download authentication." << std::endl;
+            << "Username to use for DSE/DDAC download authentication." << std::endl;
   std::cout << "  --dse-password=[PASSWORD]" << std::endl
             << "      "
-            << "Password to use for DSE download authentication." << std::endl;
+            << "Password to use for DSE/DDAC download authentication." << std::endl;
   std::cout << "  --git" << std::endl
             << "      "
             << "Indicate Cassandra/DSE server download should be obtained from" << std::endl
@@ -408,18 +419,20 @@ void Options::print_settings() {
   if (log_tests()) {
     std::cout << "  Logging driver messages" << std::endl;
   }
-  if (is_dse()) {
-    std::cout << "  DSE Version: " << CCM::DseVersion(server_version()).to_string() << std::endl;
+  if (!is_cassandra()) {
+    std::cout << "  " << server_type_.to_string()
+              << " Version: " << CCM::DseVersion(server_version()).to_string() << std::endl;
     if (!use_install_dir()) {
       if (dse_credentials() == CCM::DseCredentialsType::USERNAME_PASSWORD) {
         std::cout << "      Username: " << dse_username() << std::endl;
         std::cout << "      Password: " << dse_password() << std::endl;
       } else {
-        std::cout << "      Using INI file for DSE download authentication" << std::endl;
+        std::cout << "      Using INI file for DSE/DDAC download authentication" << std::endl;
       }
     }
   } else {
-    std::cout << "  Cassandra Version: " << server_version().to_string() << std::endl;
+    std::cout << "  " << server_type_.to_string() << " Version: " << server_version().to_string()
+              << std::endl;
   }
   if (use_install_dir()) {
     std::cout << "    Using installation directory [" << install_dir() << "]" << std::endl;
@@ -456,7 +469,13 @@ bool Options::log_tests() { return is_log_tests_; }
 
 CCM::CassVersion Options::server_version() { return server_version_; }
 
-bool Options::is_dse() { return is_dse_; }
+CCM::ServerType Options::server_type() { return server_type_; }
+
+bool Options::is_cassandra() { return server_type_ == CCM::ServerType::CASSANDRA; }
+
+bool Options::is_dse() { return server_type_ == CCM::ServerType::DSE; }
+
+bool Options::is_ddac() { return server_type_ == CCM::ServerType::DDAC; }
 
 CCM::DseCredentialsType Options::dse_credentials() {
   // Static initialization cannot be guaranteed
@@ -514,7 +533,7 @@ const std::string& Options::private_key() { return private_key_; }
 
 SharedPtr<CCM::Bridge, StdDeleter<CCM::Bridge> > Options::ccm() {
   return new CCM::Bridge(Options::server_version(), Options::use_git(), Options::branch_tag(),
-                         Options::use_install_dir(), Options::install_dir(), Options::is_dse(),
+                         Options::use_install_dir(), Options::install_dir(), Options::server_type(),
                          CCM::Bridge::DEFAULT_DSE_WORKLOAD, Options::cluster_prefix(),
                          Options::dse_credentials(), Options::dse_username(),
                          Options::dse_password(), Options::deployment_type(),

gtests/src/integration/options.hpp

@@ -67,17 +67,35 @@ class Options {
    */
   static bool log_tests();
   /**
-   * Get the server version (Cassandra/DSE) to use
+   * Get the server version (Cassandra/DSE/DDAC) to use
    *
-   * @return Cassandra/DSE version to use
+   * @return Cassandra/DSE/DDAC version to use
    */
   static CCM::CassVersion server_version();
+  /**
+   * Get the server type (Cassandra/DSE/DDAC)
+   *
+   * @return Server type
+   */
+  static CCM::ServerType server_type();
+  /**
+   * Flag to determine if Cassandra should be used or not
+   *
+   * @return True if Cassandra should be used; false otherwise
+   */
+  static bool is_cassandra();
   /**
    * Flag to determine if DSE should be used or not
    *
    * @return True if DSE should be used; false otherwise
    */
   static bool is_dse();
+  /**
+   * Flag to determine if DDAC should be used or not
+   *
+   * @return True if DDAC should be used; false otherwise
+   */
+  static bool is_ddac();
   /**
    * Get the DSE credentials type (username|password/INI file)
    *
@@ -240,13 +258,13 @@ class Options {
    */
   static bool is_log_tests_;
   /**
-   * Server version to use (Cassandra/DSE)
+   * Server version to use (Cassandra/DSE/DDAC)
    */
   static CCM::CassVersion server_version_;
   /**
-   * Flag to indicate if DSE should be used instead of Cassandra
+   * Server type to use
    */
-  static bool is_dse_;
+  static CCM::ServerType server_type_;
   /**
    * Flag to determine if Cassandra should be built from ASF git (github if DSE)
    */

gtests/src/integration/simulacron/simulacron_cluster.cpp

@@ -66,7 +66,7 @@ test::SimulacronCluster::SimulacronCluster()
 
   // Determine the release version (for priming nodes)
   CCM::CassVersion cassandra_version = Options::server_version();
-  if (Options::is_dse()) {
+  if (!Options::is_cassandra()) {
     CCM::DseVersion dse_version(cassandra_version);
     cassandra_version = dse_version.get_cass_version();
     if (cassandra_version == "0.0.0") {
@@ -127,7 +127,7 @@ void test::SimulacronCluster::create_cluster(
   }
 
   // Add the DSE version (if applicable)
-  if (Options::is_dse()) {
+  if (!Options::is_cassandra()) {
     paramters << "&dse_version=" << dse_version_;
     cluster_name << dse_version_;
   } else {

gtests/src/integration/simulacron/simulacron_integration.hpp

@@ -22,11 +22,12 @@
 #include <uv.h>
 
 // Macros to use for grouping Simulacron integration tests together
-#define SIMULACRON_TEST_NAME(test_name) Integration##_##simulacron##_##test_name
+#define SIMULACRON_INTEGRATION_TEST(test_case, test_name) \
+  INTEGRATION_TEST(Simulacron, test_case, test_name)
 #define SIMULACRON_INTEGRATION_TEST_F(test_case, test_name) \
-  INTEGRATION_TEST_F(simulacron, test_case, test_name)
+  INTEGRATION_TEST_F(Simulacron, test_case, test_name)
 #define SIMULACRON_INTEGRATION_TYPED_TEST_P(test_case, test_name) \
-  INTEGRATION_TYPED_TEST_P(simulacron, test_case, test_name)
+  INTEGRATION_TYPED_TEST_P(Simulacron, test_case, test_name)
 
 #define CHECK_SIMULACRON_AVAILABLE \
   if (!sc_) {                      \