Merge pull request #215 from riptano/1.7.0_prep

mpenick · web-flow · commit 55d5e0bf3d2b · 2018-12-10T09:23:57.000-05:00
Release prep 1.7.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,29 @@
+1.7.0
+===========
+
+Features
+--------
+* [CPP-108] Add tracing support
+* [CPP-402] Add support for host event callback
+* [CPP-524] Add client configuration information to STARTUP message
+* [CPP-597] Provide a means of sending query to a specific node to facilitate virtual table queries
+
+Bug Fixes
+--------
+* [CPP-632] It's possible for RequestProcessor to miss add/remove event during initialization
+* [CPP-701] Don't use Host::is_up() flag inside of load balancing policies
+* [CPP-711] Memory leak in `WaitForHandler`/`SchemaChangeHandler` (reference cycle)
+
+Other
+--------
+* [CPP-183] Concurrent Control Connection Establishment
+* [CPP-405] Namespace rapidjson to avoid conflicts with other rapidjson usages
+* [CPP-413] Enable Client Timestamps by Default
+* [CPP-510] Try all contact points until one succeeds
+* [CPP-585] Deprecate DowngradingConsistencyRetryPolicy
+* [CPP-686] Pull in the latest rapidjson changes from master
+* [CPP-688] Use plugin architecture for protocol version handling
+
 1.6.0
 ===========
 
diff --git a/cpp-driver/CHANGELOG.md b/cpp-driver/CHANGELOG.md
@@ -1,3 +1,30 @@
+2.11.0
+===========
+
+Features
+--------
+* [CPP-108] Add tracing support
+* [CPP-402] Add support for host event callback
+* [CPP-524] Add client configuration information to STARTUP message
+* [CPP-597] Provide a means of sending query to a specific node to facilitate virtual table queries
+
+Bug Fixes
+--------
+* [CPP-632] It's possible for RequestProcessor to miss add/remove event during initialization
+* [CPP-701] Don't use Host::is_up() flag inside of load balancing policies
+* [CPP-711] Memory leak in `WaitForHandler`/`SchemaChangeHandler` (reference cycle)
+
+Other
+--------
+* [CPP-183] Concurrent Control Connection Establishment
+* [CPP-405] Namespace rapidjson to avoid conflicts with other rapidjson usages
+* [CPP-413] Enable Client Timestamps by Default
+* [CPP-510] Try all contact points until one succeeds
+* [CPP-585] Deprecate DowngradingConsistencyRetryPolicy
+* [CPP-686] Pull in the latest rapidjson changes from master
+* [CPP-688] Use plugin architecture for protocol version handling
+* Added ${CMAKE_LIBRARY_ARCHITECTURE} path suffix for libuv search
+
 2.10.0
 ===========
 
diff --git a/cpp-driver/cmake/modules/FindLibuv.cmake b/cpp-driver/cmake/modules/FindLibuv.cmake
@@ -53,7 +53,7 @@ endif()
 find_library(LIBUV_LIBRARY
   NAMES ${_LIBUV_NAMES}
   ${_LIBUV_ROOT_HINTS_AND_PATHS}
-  PATH_SUFFIXES lib
+  PATH_SUFFIXES lib lib/${CMAKE_LIBRARY_ARCHITECTURE}
   NO_DEFAULT_PATH)
 
 # Extract version number if possible.
diff --git a/cpp-driver/docs.yaml b/cpp-driver/docs.yaml
@@ -1,6 +1,7 @@
 title:   DataStax C/C++ Driver
 summary: DataStax C++ Driver for Apache Cassandra Documentation
 homepage: http://datastax.github.io/cpp-driver/
+swiftype_drivers: cppdrivers
 sections:
   - title:     Features
     prefix:    /topics
diff --git a/cpp-driver/gtests/src/integration/integration.cpp b/cpp-driver/gtests/src/integration/integration.cpp
@@ -55,7 +55,7 @@ Integration::Integration()
   , is_ccm_start_node_individually_(false)
   , is_session_requested_(true)
   , is_test_chaotic_(false)
-  , is_beta_protocol_(true)
+  , is_beta_protocol_(Options::is_beta_protocol())
   , protocol_version_(CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION)
   , create_keyspace_query_("")
   , start_time_(0ull) {
diff --git a/cpp-driver/gtests/src/integration/options.cpp b/cpp-driver/gtests/src/integration/options.cpp
@@ -48,6 +48,7 @@ std::string Options::public_key_ = "public.key";
 std::string Options::private_key_ = "private.key";
 bool Options::is_verbose_ccm_ = false;
 bool Options::is_verbose_integration_ = false;
+bool Options::is_beta_protocol_ = true;
 
 // Static initialization is not guaranteed for the following types
 CCM::DseCredentialsType Options::dse_credentials_type_;
@@ -181,6 +182,8 @@ bool Options::initialize(int argc, char* argv[]) {
           is_verbose_ccm_ = true;
           is_verbose_integration_ = true;
         }
+      } else if (key == "--disable-beta-protocol") {
+        is_beta_protocol_ = false;
       }
 #ifdef CASS_USE_LIBSSH2
       else if (key == "--authentication") {
@@ -355,6 +358,9 @@ void Options::print_help() {
     << std::endl;
   std::cout << "  --verbose(=ccm,integration)" << std::endl << "      "
     << "Enable verbose output for component(s)." << std::endl;
+  std::cout << "  --disable-beta-protocol" << std::endl << "      "
+    << "Disable beta protocol use by default." << std::endl << "      "
+    << "NOTE: Individual tests may override this setting." << std::endl;
   std::cout << std::endl;
 }
 
@@ -533,6 +539,10 @@ bool Options::is_verbose_integration() {
   return is_verbose_integration_;
 }
 
+bool Options::is_beta_protocol() {
+  return is_beta_protocol_;
+}
+
 Options::Options() {
 }
 
diff --git a/cpp-driver/gtests/src/integration/options.hpp b/cpp-driver/gtests/src/integration/options.hpp
@@ -208,6 +208,13 @@ class Options {
    *         otherwise
    */
   static bool is_verbose_integration();
+  /**
+   * Flag to determine if beta protocol should be enabled or not; should only
+   * pertain to the default setting.
+   *
+   * @return True if beta protocol should be enabled; false otherwise
+   */
+  static bool is_beta_protocol();
   /**
    * Get a CCM instance based on the options
    *
@@ -325,6 +332,13 @@ class Options {
    * Flag to determine if verbose integration output should enabled
    */
   static bool is_verbose_integration_;
+  /**
+   * Flag to determine if beta protocol should be enabled or not; should only
+   * pertain to the default setting.
+   *
+   * NOTE: Individual tests can still override this.
+   */
+  static bool is_beta_protocol_;
 
   /**
    * Hidden default constructor
diff --git a/cpp-driver/gtests/src/integration/tests/test_auth.cpp b/cpp-driver/gtests/src/integration/tests/test_auth.cpp
@@ -182,7 +182,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullPasswordCredentials
      */
     Session session = connect_using_credentials(i, "user", NULL);
     ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);
-    ASSERT_EQ(logger_.count(), 1u);
+    ASSERT_GE(logger_.count(), 1u);
     logger_.reset_count();
   }
 }
@@ -219,7 +219,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, BadCredentials) {
      */
     Session session = connect_using_credentials(i, "invalid", "invalid");
     ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);
-    ASSERT_EQ(logger_.count(), 1u);
+    ASSERT_GE(logger_.count(), 1u);
     logger_.reset_count();
   }
 }
@@ -258,5 +258,5 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, AuthenticatorSetErrorNull) {
   Session session = connect_using_credentials(CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION,
                                               "invalid", "invalid");
   ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);
-  ASSERT_EQ(logger_.count(), 1u);
+  ASSERT_GE(logger_.count(), 1u);
 }
diff --git a/cpp-driver/gtests/src/integration/tests/test_basics.cpp b/cpp-driver/gtests/src/integration/tests/test_basics.cpp
@@ -340,6 +340,11 @@ CASSANDRA_INTEGRATION_TEST_F(BasicsTests, NoCompactEnabledConnection) {
   CHECK_VERSION(3.11.2);
   CCM::CassVersion cass_version = server_version_;
   if (Options::is_dse()) {
+    if (server_version_ >= "6.0.0") {
+      SKIP_TEST("Unsupported for DataStax Enterprise Version " << server_version_.to_string()
+                << ": Apache Cassandra server version must be used and less than"
+                << " v4.0.0 and either 3.0.16+ or 3.11.2+ in order to execute");
+    }
     cass_version = static_cast<CCM::DseVersion>(cass_version).get_cass_version();
   }
   if (cass_version >= "4.0.0") {
diff --git a/cpp-driver/include/cassandra.h b/cpp-driver/include/cassandra.h
@@ -52,7 +52,7 @@
  */
 
 #define CASS_VERSION_MAJOR 2
-#define CASS_VERSION_MINOR 10
+#define CASS_VERSION_MINOR 11
 #define CASS_VERSION_PATCH 0
 #define CASS_VERSION_SUFFIX ""
 
diff --git a/cpp-driver/test/ccm_bridge/src/bridge.cpp b/cpp-driver/test/ccm_bridge/src/bridge.cpp
@@ -92,7 +92,7 @@
 #define CCM_CONFIGURATION_KEY_USE_INSTALL_DIR "use_install_dir"
 #define CCM_CONFIGURATION_KEY_INSTALL_DIR "install_dir"
 #define CCM_CONFIGURATION_KEY_DEPLOYMENT_TYPE "deployment_type"
-#define CCM_CONFIGURATION_VERBOSE "verbose"
+#define CCM_CONFIGURATION_KEY_VERBOSE "verbose"
 #define CCM_CONFIGURATION_KEY_USE_DSE "use_dse"
 #define CCM_CONFIGURATION_KEY_DSE_VERSION "dse_version"
 #define CCM_CONFIGURATION_KEY_DSE_CREDENTIALS_TYPE "dse_credentials_type"
@@ -355,14 +355,14 @@ CCM::Bridge::Bridge(const std::string& configuration_file)
           } else if (key.compare(CCM_CONFIGURATION_KEY_SSH_PRIVATE_KEY) == 0) {
             private_key = value;
 #endif
-          } else if (key.compare(CCM_CONFIGURATION_VERBOSE) == 0) {
+          } else if (key.compare(CCM_CONFIGURATION_KEY_VERBOSE) == 0) {
             //Convert the value
             std::stringstream ss(value);
             if (!(ss >> std::boolalpha >> is_verbose_).fail()) {
               continue;
             } else {
               LOG_ERROR("Invalid flag \"" << value << "\" for "
-                        << CCM_CONFIGURATION_VERBOSE << "; defaulting to \""
+                        << CCM_CONFIGURATION_KEY_VERBOSE << "; defaulting to \""
                         << (DEFAULT_IS_VERBOSE ? "true" : "false") << "\"");
               is_verbose_ = DEFAULT_IS_VERBOSE;
             }
@@ -586,7 +586,6 @@ bool CCM::Bridge::create_cluster(std::vector<unsigned short> data_center_nodes,
         } else {
           create_command.push_back(dse_version_.to_string());
         }
-        create_command.push_back("--dse");
         if (dse_credentials_type_ == DseCredentialsType::USERNAME_PASSWORD) {
           create_command.push_back("--dse-username=" + dse_username_);
           create_command.push_back("--dse-password=" + dse_password_);
@@ -603,6 +602,9 @@ bool CCM::Bridge::create_cluster(std::vector<unsigned short> data_center_nodes,
         }
       }
     }
+    if (use_dse_) {
+      create_command.push_back("--dse");
+    }
     create_command.push_back("-b");
 
     // Determine if password authenticator or SSL and client authentication
diff --git a/cpp-driver/test/integration_tests/src/test_utils.cpp b/cpp-driver/test/integration_tests/src/test_utils.cpp
@@ -246,7 +246,8 @@ MultipleNodesTest::MultipleNodesTest(unsigned int num_nodes_dc1,
   cass_cluster_set_max_concurrent_creation(cluster, 8);
   if (version.major_version >= 3 && version.minor_version >= 10 &&
       protocol_version == CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION) {
-    cass_cluster_set_use_beta_protocol_version(cluster, cass_true);
+    cass_cluster_set_use_beta_protocol_version(cluster,
+                                               is_beta_protocol() ? cass_true : cass_false);
   } else {
     cass_cluster_set_protocol_version(cluster, protocol_version);
   }
@@ -259,6 +260,16 @@ bool MultipleNodesTest::check_version(const std::string& required) {
   return false;
 }
 
+bool MultipleNodesTest::is_beta_protocol() {
+  std::string value;
+  char* temp = getenv("BETA_PROTOCOL");
+  if (temp) {
+    value.assign(temp);
+    std::transform(value.begin(), value.end(), value.begin(), ::tolower);
+  }
+  return !value.empty() && value != "0" && value != "false";
+}
+
 MultipleNodesTest::~MultipleNodesTest() {
   cass_uuid_gen_free(uuid_gen);
   cass_cluster_free(cluster);
diff --git a/cpp-driver/test/integration_tests/src/test_utils.hpp b/cpp-driver/test/integration_tests/src/test_utils.hpp
@@ -1196,6 +1196,7 @@ struct MultipleNodesTest {
     bool is_ssl = false);
 
   bool check_version(const std::string& required);
+  bool is_beta_protocol();
 
   virtual ~MultipleNodesTest();
 
diff --git a/include/dse.h b/include/dse.h
@@ -49,7 +49,7 @@
  */
 
 #define DSE_VERSION_MAJOR 1
-#define DSE_VERSION_MINOR 6
+#define DSE_VERSION_MINOR 7
 #define DSE_VERSION_PATCH 0
 #define DSE_VERSION_SUFFIX ""
 

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, InvalidNullPasswordCredentials`
`182`	`182`	`*/`
`183`	`183`	`Session session = connect_using_credentials(i, "user", NULL);`
`184`	`184`	`ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);`
`185`		`- ASSERT_EQ(logger_.count(), 1u);`
	`185`	`+ ASSERT_GE(logger_.count(), 1u);`
`186`	`186`	`logger_.reset_count();`
`187`	`187`	`}`
`188`	`188`	`}`
`@@ -219,7 +219,7 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, BadCredentials) {`
`219`	`219`	`*/`
`220`	`220`	`Session session = connect_using_credentials(i, "invalid", "invalid");`
`221`	`221`	`ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);`
`222`		`- ASSERT_EQ(logger_.count(), 1u);`
	`222`	`+ ASSERT_GE(logger_.count(), 1u);`
`223`	`223`	`logger_.reset_count();`
`224`	`224`	`}`
`225`	`225`	`}`
`@@ -258,5 +258,5 @@ CASSANDRA_INTEGRATION_TEST_F(AuthenticationTests, AuthenticatorSetErrorNull) {`
`258`	`258`	`Session session = connect_using_credentials(CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION,`
`259`	`259`	`"invalid", "invalid");`
`260`	`260`	`ASSERT_EQ(session.connect_error_code(), CASS_ERROR_SERVER_BAD_CREDENTIALS);`
`261`		`- ASSERT_EQ(logger_.count(), 1u);`
	`261`	`+ ASSERT_GE(logger_.count(), 1u);`
`262`	`262`	`}`