datastax · mpenick · Oct 20, 2016 · Sep 1, 2016 · Sep 1, 2016 · Sep 1, 2016
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+2.5.0
+===========
+October 20, 2016
+
+Features
+--------
+* Added constant specultive exectution which preemptively runs mutiple of the
+  same query in an effort to smooth out latency spikes.
+* Added idempotent queries to support speculative execution and allow automatic
+  retries. Use `cass_statement_set_is_idempotent()` or
+  `cass_batch_set_is_idempotent()`.
+* SSL can be now be used without initializing the underlying implmentation
+  (e.g. OpenSSL). Use `cass_ssl_new_no_lib_init()`.
+
+Other
+--------
+* Fixed an issue where a connection is incorrectly marked READY after it''s
+  already been marked DEFUNCT (CPP-401)
+* Fixed pointer aliasing issues in `cass::Address` (CPP-406)
+* Fixed an issue where random partitioner hash values were being incorrectly
+  generated (CPP-403)
+
 2.4.3
 ===========
 August 22, 2016

diff --git a/README.md b/README.md
@@ -14,14 +14,11 @@ Cassandra's native protocol and Cassandra Query Language v3.
 - Mailing List: https://groups.google.com/a/lists.datastax.com/forum/#!forum/cpp-driver-user
 - IRC: [#datastax-drivers on `irc.freenode.net <http://freenode.net>`](http://webchat.freenode.net/?channels=datastax-drivers)
 
-## What's New in 2.3 and 2.4
+## What's New in 2.5
 
-- Support for materialized view and secondary index metadata
-- Support for clustering key order, `frozen<>` and Cassandra version metadata
-- [Blacklist], [whitelist DC], and [blacklist DC] load balancing policies
-- [Custom] authenticators
-- [Reverse DNS] with SSL peer identity verification support
-- Randomized contact points
+- [Speculative execution]
+- [Idempotent statements]
+- [SSL] can be enabled without re-initializing the underlying library (e.g. OpenSSL)
 
 More information about features included in 2.3 can be found in this [blog
 post](http://www.datastax.com/dev/blog/datastax-c-driver-2-3-ga-released).
@@ -58,6 +55,13 @@ There were a couple breaking API changes between 1.0 and 2.0 that are documented
 - [Client-side timestamps]
 - [Data types]
 - [Idle connection heartbeats]
+- Support for materialized view and secondary index metadata
+- Support for clustering key order, `frozen<>` and Cassandra version metadata
+- [Blacklist], [whitelist DC], and [blacklist DC] load balancing policies
+- [Custom] authenticators
+- [Reverse DNS] with SSL peer identity verification support
+- Randomized contact points
+
 
 ## Compatibility
 
@@ -208,3 +212,5 @@ limitations under the License.
 [blacklist DC]: http://datastax.github.io/cpp-driver/topics/configuration/#datacenter
 [Custom]: http://datastax.github.io/cpp-driver/topics/security/#custom
 [Reverse DNS]: http://datastax.github.io/cpp-driver/topics/security/ssl/#enabling-cassandra-identity-verification
+[Speculative execution]: http://datastax.github.io/cpp-driver/topics/configuration/#speculative-execution
+[Idempotent statements]: http://datastax.github.io/cpp-driver/topics/configuration/#query-idempotence
diff --git a/cmake/modules/CppDriver.cmake b/cmake/modules/CppDriver.cmake
@@ -429,7 +429,7 @@ macro(CassAddIncludes)
       ${CASS_SOURCE_DIR}/src/third_party/sparsehash/src
       ${CASS_INCLUDES}
       )
-  add_subdirectory(src/third_party/sparsehash)
+  add_subdirectory(${CASS_SOURCE_DIR}/src/third_party/sparsehash)
 endmacro()
 
 #------------------------

diff --git a/docs.yaml b/docs.yaml
@@ -36,15 +36,17 @@ rewrites:
   - http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el5.rf.i386.rpm: http://dl.fedoraproject.org/pub/epel/5/i386/epel-release-5-4.noarch.rpm
   - http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el5.rf.x86_64.rpm: http://dl.fedoraproject.org/pub/epel/5/x86_64/epel-release-5-4.noarch.rpm
 versions:
-  - name: v2.4
+  - name: 2.5
     ref: HEAD
-  - name: v2.3
+  - name: 2.4
+    ref: 2b94bd1119c4bc6e005ce191cf7ec0fba6d823e9
+  - name: 2.3
     ref: 6f72bb8b5bd251e63846ebc9f0fba7adbc8c7e72
-  - name: v2.2
+  - name: 2.2
     ref: b4bb435129bab533612fa2caf194555fa943f925
-  - name: v2.1
+  - name: 2.1
     ref: 2c97015988e0a9e9342b233db5f37ca9386e4d7d
-  - name: v2.0
+  - name: 2.0
     ref: fc9c25a3db879894d40306642864413ef8f7d979
-  - name: v1.0
+  - name: 1.0
     ref: b2146f44ba5df28e37af28031f7609342023b329
diff --git a/examples/perf/perf.c b/examples/perf/perf.c
@@ -120,7 +120,7 @@ CassCluster* create_cluster(const char* hosts) {
 
 CassError connect_session(CassSession* session, const CassCluster* cluster) {
   CassError rc = CASS_OK;
-  CassFuture* future = cass_session_connect_keyspace(session, cluster, "examples");
+  CassFuture* future = cass_session_connect(session, cluster);
 
   cass_future_wait(future);
   rc = cass_future_error_code(future);
@@ -198,6 +198,8 @@ void insert_into_perf(CassSession* session, const char* query, const CassPrepare
       statement = cass_statement_new(query, 5);
     }
 
+    cass_statement_set_is_idempotent(statement, cass_true);
+
     cass_uuid_gen_time(uuid_gen, &id);
     cass_statement_bind_uuid(statement, 0, id);
     cass_statement_bind_string(statement, 1, big_string);
@@ -227,7 +229,7 @@ void run_insert_queries(void* data) {
   CassSession* session = (CassSession*)data;
 
   const CassPrepared* insert_prepared = NULL;
-  const char* insert_query = "INSERT INTO songs (id, title, album, artist, tags) VALUES (?, ?, ?, ?, ?);";
+  const char* insert_query = "INSERT INTO stress.songs (id, title, album, artist, tags) VALUES (?, ?, ?, ?, ?);";
 
 #if USE_PREPARED
   if (prepare_query(session, insert_query, &insert_prepared) == CASS_OK) {
@@ -256,6 +258,8 @@ void select_from_perf(CassSession* session, const char* query, const CassPrepare
       statement = cass_statement_new(query, 0);
     }
 
+    cass_statement_set_is_idempotent(statement, cass_true);
+
     futures[i] = cass_session_execute(session, statement);
 
     cass_statement_free(statement);
@@ -279,7 +283,7 @@ void run_select_queries(void* data) {
   int i;
   CassSession* session = (CassSession*)data;
   const CassPrepared* select_prepared = NULL;
-  const char* select_query = "SELECT * FROM songs WHERE id = a98d21b2-1900-11e4-b97b-e5e358e71e0d";
+  const char* select_query = "SELECT * FROM stress.songs WHERE id = a98d21b2-1900-11e4-b97b-e5e358e71e0d";
 
 #if USE_PREPARED
   if (prepare_query(session, select_query, &select_prepared) == CASS_OK) {
@@ -301,7 +305,6 @@ int main(int argc, char* argv[]) {
   uv_thread_t threads[NUM_THREADS];
   CassCluster* cluster = NULL;
   CassSession* session = NULL;
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
   if (argc > 1) {
     hosts = argv[1];
@@ -321,8 +324,17 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
+  execute_query(session, "DROP KEYSPACE stress");
+
+  execute_query(session, "CREATE KEYSPACE IF NOT EXISTS stress WITH "
+                         "replication = { 'class': 'SimpleStrategy', 'replication_factor': '3'}");
+
+  execute_query(session, "CREATE TABLE IF NOT EXISTS stress.songs (id uuid PRIMARY KEY, "
+                         "title text, album text, artist text, "
+                         "tags set<text>, data blob)");
+
   execute_query(session,
-                "INSERT INTO songs (id, title, album, artist, tags) VALUES "
+                "INSERT INTO stress.songs (id, title, album, artist, tags) VALUES "
                 "(a98d21b2-1900-11e4-b97b-e5e358e71e0d, "
                 "'La Petite Tonkinoise', 'Bye Bye Blackbird', 'Joséphine Baker', { 'jazz', '2013' });");
 
@@ -355,10 +367,8 @@ int main(int argc, char* argv[]) {
     uv_thread_join(&threads[i]);
   }
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
   cass_cluster_free(cluster);
+  cass_session_free(session);
   cass_uuid_gen_free(uuid_gen);
 
   status_destroy(&status);

diff --git a/include/cassandra.h b/include/cassandra.h
@@ -51,8 +51,8 @@
  */
 
 #define CASS_VERSION_MAJOR 2
-#define CASS_VERSION_MINOR 4
-#define CASS_VERSION_PATCH 3
+#define CASS_VERSION_MINOR 5
+#define CASS_VERSION_PATCH 0
 #define CASS_VERSION_SUFFIX ""
 
 #ifdef __cplusplus
@@ -1714,13 +1714,39 @@ cass_cluster_set_use_hostname_resolution(CassCluster* cluster,
  * @param[in] cluster
  * @param[in] enabled
  * @return CASS_OK if successful, otherwise an error occurred
- *
- * @see cass_cluster_set_resolve_timeout()
  */
 CASS_EXPORT CassError
 cass_cluster_set_use_randomized_contact_points(CassCluster* cluster,
                                                cass_bool_t enabled);
 
+/**
+ * Enable constant speculative executions with the supplied settings.
+ *
+ * @public @memberof CassCluster
+ *
+ * @param[in] cluster
+ * @param[in] constant_delay_ms
+ * @param[in] max_speculative_executions
+ * @return CASS_OK if successful, otherwise an error occurred
+ */
+CASS_EXPORT CassError
+cass_cluster_set_constant_speculative_execution_policy(CassCluster* cluster,
+                                                       cass_int64_t constant_delay_ms,
+                                                       int max_speculative_executions);
+
+/**
+ * Disable speculative executions
+ *
+ * <b>Default:</b> This is the default speculative execution policy.
+ *
+ * @public @memberof CassCluster
+ *
+ * @param[in] cluster
+ * @return CASS_OK if successful, otherwise an error occurred
+ */
+CASS_EXPORT CassError
+cass_cluster_set_no_speculative_execution_policy(CassCluster* cluster);
+
 /***********************************************************************************
  *
  * Session
@@ -3247,6 +3273,37 @@ cass_aggregate_meta_field_by_name_n(const CassAggregateMeta* aggregate_meta,
 CASS_EXPORT CassSsl*
 cass_ssl_new();
 
+/**
+ * Creates a new SSL context <b>without</b> initializing the underlying library
+ * implementation. The integrating application is responsible for
+ * initializing the underlying SSL implementation. The driver uses the SSL
+ * implmentation from several threads concurrently so it's important that it's
+ * properly setup for multithreaded use e.g. lock callbacks for OpenSSL.
+ *
+ * <b>Important:</b> The SSL library must be initialized before calling this
+ * function.
+ *
+ * When using OpenSSL the following components need to be initialized:
+ *
+ * SSL_library_init();
+ * SSL_load_error_strings();
+ * OpenSSL_add_all_algorithms();
+ *
+ * The following thread-safety callbacks also need to be set:
+ *
+ * CRYPTO_set_locking_callback(...);
+ * CRYPTO_set_id_callback(...);
+ *
+ * @public @memberof CassSsl
+ *
+ * @return Returns a SSL context that must be freed.
+ *
+ * @see cass_ssl_new()
+ * @see cass_ssl_free()
+ */
+CASS_EXPORT CassSsl*
+cass_ssl_new_no_lib_init();
+
 /**
  * Frees a SSL context instance.
  *
@@ -3938,6 +3995,22 @@ CASS_EXPORT CassError
 cass_statement_set_request_timeout(CassStatement* statement,
                                    cass_uint64_t timeout_ms);
 
+/**
+ * Sets whether the statement is idempotent. Idempotent statements are able to be
+ * automatically retried after timeouts/errors and can be speculatively executed.
+ *
+ * @public @memberof CassStatement
+ *
+ * @param[in] statement
+ * @param[in] is_idempotent
+ * @return CASS_OK if successful, otherwise an error occurred.
+ *
+ * @see cass_cluster_set_constant_speculative_execution_policy()
+ */
+CASS_EXPORT CassError
+cass_statement_set_is_idempotent(CassStatement* statement,
+                                 cass_bool_t is_idempotent);
+
 /**
  * Sets the statement's retry policy.
  *
@@ -5214,6 +5287,23 @@ CASS_EXPORT CassError
 cass_batch_set_request_timeout(CassBatch* batch,
                                cass_uint64_t timeout_ms);
 
+/**
+ * Sets whether the statements in a batch are idempotent. Idempotent batches
+ * are able to be automatically retried after timeouts/errors and can be
+ * speculatively executed.
+ *
+ * @public @memberof CassBatch
+ *
+ * @param[in] batch
+ * @param[in] is_idempotent
+ * @return CASS_OK if successful, otherwise an error occurred.
+ *
+ * @see cass_cluster_set_constant_speculative_execution_policy()
+ */
+CASS_EXPORT CassError
+cass_batch_set_is_idempotent(CassBatch* batch,
+                             cass_bool_t is_idempotent);
+
 /**
  * Sets the batch's retry policy.
  *