CPP-707 - Simplify example code

Michael Fero · mikefero · commit 487f2a1ac50b · 2018-11-30T12:09:48.000-05:00
Removes usage of `cass_session_close()` as `cass_session_free()` will
properly close the session without the need to utilize futures.
diff --git a/cpp-driver/examples/async/async.c b/cpp-driver/examples/async/async.c
@@ -123,7 +123,6 @@ void insert_into_async(CassSession* session, const char* key) {
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
   if (argc > 1) {
     hosts = argv[1];
@@ -152,10 +151,6 @@ int main(int argc, char* argv[]) {
 
   insert_into_async(session, "test");
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/auth/auth.c b/cpp-driver/examples/auth/auth.c
@@ -132,14 +132,7 @@ int main(int argc, char* argv[]) {
   connect_future = cass_session_connect(session, cluster);
 
   if (cass_future_error_code(connect_future) == CASS_OK) {
-    CassFuture* close_future = NULL;
-
     printf("Successfully connected!\n");
-
-    /* Close the session */
-    close_future = cass_session_close(session);
-    cass_future_wait(close_future);
-    cass_future_free(close_future);
   } else {
     /* Handle error */
     const char* message;
diff --git a/cpp-driver/examples/basic/basic.c b/cpp-driver/examples/basic/basic.c
@@ -159,7 +159,6 @@ CassError select_from_basic(CassSession* session, const char* key, Basic* basic)
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
 
   Basic input = { cass_true, 0.001f, 0.0002, 1, 2 };
@@ -197,10 +196,6 @@ int main(int argc, char* argv[]) {
   assert(input.i32 == output.i32);
   assert(input.i64 == output.i64);
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_session_free(session);
   cass_cluster_free(cluster);
 
diff --git a/cpp-driver/examples/batch/batch.c b/cpp-driver/examples/batch/batch.c
@@ -151,7 +151,6 @@ CassError insert_into_batch_with_prepared(CassSession* session, const CassPrepar
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   const CassPrepared* prepared = NULL;
   char* hosts = "127.0.0.1";
 
@@ -184,10 +183,6 @@ int main(int argc, char* argv[]) {
 
   cass_prepared_free(prepared);
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/bind_by_name/bind_by_name.c b/cpp-driver/examples/bind_by_name/bind_by_name.c
@@ -177,7 +177,6 @@ CassError select_from_basic(CassSession* session, const CassPrepared * prepared,
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   Basic input = { cass_true, 0.001f, 0.0002, 1, 2 };
   Basic output;
   const CassPrepared* insert_prepared = NULL;
@@ -229,10 +228,6 @@ int main(int argc, char* argv[]) {
     cass_prepared_free(select_prepared);
   }
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/callbacks/callbacks.c b/cpp-driver/examples/callbacks/callbacks.c
@@ -37,7 +37,6 @@
 uv_mutex_t mutex;
 uv_cond_t cond;
 int exit_flag = 0;
-CassFuture* close_future = NULL;
 CassUuidGen* uuid_gen = NULL;
 
 void wait_exit() {
@@ -46,17 +45,10 @@ void wait_exit() {
     uv_cond_wait(&cond, &mutex);
   }
   uv_mutex_unlock(&mutex);
-  if (close_future) {
-    cass_future_wait(close_future);
-    cass_future_free(close_future);
-  }
 }
 
-void signal_exit(CassSession* session) {
+void signal_exit() {
   uv_mutex_lock(&mutex);
-  if (session) {
-    close_future = cass_session_close(session);
-  }
   exit_flag = 1;
   uv_cond_signal(&cond);
   uv_mutex_unlock(&mutex);
@@ -70,7 +62,6 @@ void on_insert(CassFuture* future, void* data);
 void on_select(CassFuture* future, void* data);
 
 void on_session_connect(CassFuture* future, void* data);
-void on_session_close(CassFuture* future, void* data);
 
 void print_error(CassFuture* future) {
   const char* message;
@@ -106,7 +97,7 @@ void on_session_connect(CassFuture* future, void* data) {
 
   if (code != CASS_OK) {
     print_error(future);
-    signal_exit(NULL);
+    signal_exit();
     return;
   }
 
@@ -169,7 +160,7 @@ void on_insert(CassFuture* future, void* data) {
   CassError code = cass_future_error_code(future);
   if (code != CASS_OK) {
     print_error(future);
-    signal_exit((CassSession*)data);
+    signal_exit();
   } else {
     const char* select_query = "SELECT * FROM callbacks";
     CassStatement* statement
@@ -208,7 +199,7 @@ void on_select(CassFuture* future, void* data) {
     cass_result_free(result);
   }
 
-  signal_exit((CassSession*)data);
+  signal_exit();
 }
 
 int main(int argc, char* argv[]) {
diff --git a/cpp-driver/examples/collections/collections.c b/cpp-driver/examples/collections/collections.c
@@ -160,7 +160,6 @@ CassError select_from_collections(CassSession* session, const char* key) {
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
 
   const char* items[] = { "apple", "orange", "banana", "mango", NULL };
@@ -189,10 +188,6 @@ int main(int argc, char* argv[]) {
   insert_into_collections(session, "test", items);
   select_from_collections(session, "test");
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/date_time/data_time.c b/cpp-driver/examples/date_time/data_time.c
@@ -157,7 +157,6 @@ CassError select_from(CassSession* session, const char* key) {
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
   if (argc > 1) {
     hosts = argv[1];
@@ -181,10 +180,6 @@ int main(int argc, char* argv[]) {
   insert_into(session, "test");
   select_from(session, "test");
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/duration/duration.c b/cpp-driver/examples/duration/duration.c
@@ -143,7 +143,6 @@ CassError select_from(CassSession* session, const char* key) {
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
 
   if (argc > 1) {
@@ -176,10 +175,6 @@ int main(int argc, char* argv[]) {
   select_from(session, "one_month_two_days_three_seconds");
   select_from(session, "negative_one_month_two_days_three_seconds");
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/execution_profiles/execution_profiles.c b/cpp-driver/examples/execution_profiles/execution_profiles.c
@@ -183,7 +183,6 @@ int main(int argc, char* argv[]) {
   /* Setup default objects */
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   CassExecProfile* profile = NULL;
   cass_bool_t value = cass_false;
   const char* hosts = "127.0.0.1,127.0.0.2,127.0.0.3";
@@ -243,10 +242,6 @@ int main(int argc, char* argv[]) {
   select_from_examples(session, "quorum", "five", &value);
   assert(value == cass_true);
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/logging/logging.c b/cpp-driver/examples/logging/logging.c
@@ -72,7 +72,6 @@ void on_log(const CassLogMessage* message, void* data) {
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = NULL;
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
 
   FILE* log_file = fopen("driver.log", "w+");
@@ -96,10 +95,6 @@ int main(int argc, char* argv[]) {
     return -1;
   }
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/maps/maps.c b/cpp-driver/examples/maps/maps.c
@@ -166,7 +166,6 @@ CassError select_from_maps(CassSession* session, const char* key) {
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
 
   const Pair items[] = { { "apple", 1 }, { "orange", 2 }, { "banana", 3 }, { "mango", 4 }, { NULL, 0 } };
@@ -195,10 +194,6 @@ int main(int argc, char* argv[]) {
   insert_into_maps(session, "test", items);
   select_from_maps(session, "test");
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/named_parameters/named_parameters.c b/cpp-driver/examples/named_parameters/named_parameters.c
@@ -164,7 +164,6 @@ CassError select_from_basic(CassSession* session, const char* key, Basic* basic)
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   Basic input = { cass_true, 0.001f, 0.0002, 1, 2 };
   Basic output;
   char* hosts = "127.0.0.1";
@@ -201,10 +200,6 @@ int main(int argc, char* argv[]) {
   assert(input.i32 == output.i32);
   assert(input.i64 == output.i64);
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/paging/paging.c b/cpp-driver/examples/paging/paging.c
@@ -171,7 +171,6 @@ int main(int argc, char* argv[]) {
   CassUuidGen* uuid_gen = cass_uuid_gen_new();
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   char* hosts = "127.0.0.1";
   if (argc > 1) {
     hosts = argv[1];
@@ -199,10 +198,6 @@ int main(int argc, char* argv[]) {
   insert_into_paging(session, uuid_gen);
   select_from_paging(session);
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_uuid_gen_free(uuid_gen);
   cass_cluster_free(cluster);
   cass_session_free(session);
diff --git a/cpp-driver/examples/prepared/prepared.c b/cpp-driver/examples/prepared/prepared.c
@@ -179,7 +179,6 @@ CassError select_from_basic(CassSession* session, const CassPrepared * prepared,
 int main(int argc, char* argv[]) {
   CassCluster* cluster = NULL;
   CassSession* session = cass_session_new();
-  CassFuture* close_future = NULL;
   Basic input = { cass_true, 0.001f, 0.0002, 1, 2 };
   Basic output;
   const CassPrepared* prepared = NULL;
@@ -220,10 +219,6 @@ int main(int argc, char* argv[]) {
     cass_prepared_free(prepared);
   }
 
-  close_future = cass_session_close(session);
-  cass_future_wait(close_future);
-  cass_future_free(close_future);
-
   cass_cluster_free(cluster);
   cass_session_free(session);
 
diff --git a/cpp-driver/examples/schema_meta/schema_meta.c b/cpp-driver/examples/schema_meta/schema_meta.c
@@ -139,7 +139,6 @@ int main(int argc, char* argv[]) {
   connect_future = cass_session_connect(session, cluster);
 
   if (cass_future_error_code(connect_future) == CASS_OK) {
-    CassFuture* close_future = NULL;
     const CassSchemaMeta* schema_meta = cass_session_get_schema_meta(session);
     CassVersion version = cass_schema_meta_version(schema_meta);
 
@@ -198,11 +197,6 @@ int main(int argc, char* argv[]) {
     print_aggregate(session, "examples", "average", "int");
 
     cass_schema_meta_free(schema_meta);
-
-    /* Close the session */
-    close_future = cass_session_close(session);
-    cass_future_wait(close_future);
-    cass_future_free(close_future);
   } else {
     print_error(connect_future);
   }
diff --git a/cpp-driver/examples/simple/simple.c b/cpp-driver/examples/simple/simple.c
@@ -45,8 +45,6 @@ int main(int argc, char* argv[]) {
   connect_future = cass_session_connect(session, cluster);
 
   if (cass_future_error_code(connect_future) == CASS_OK) {
-    CassFuture* close_future = NULL;
-
     /* Build statement and execute query */
     const char* query = "SELECT release_version FROM system.local";
     CassStatement* statement = cass_statement_new(query, 0);
@@ -80,11 +78,6 @@ int main(int argc, char* argv[]) {
 
     cass_statement_free(statement);
     cass_future_free(result_future);
-
-    /* Close the session */
-    close_future = cass_session_close(session);
-    cass_future_wait(close_future);
-    cass_future_free(close_future);
   } else {
     /* Handle error */
     const char* message;
diff --git a/cpp-driver/examples/ssl/ssl.c b/cpp-driver/examples/ssl/ssl.c
@@ -88,8 +88,6 @@ int main(int argc, char* argv[]) {
   connect_future = cass_session_connect(session, cluster);
 
   if (cass_future_error_code(connect_future) == CASS_OK) {
-    CassFuture* close_future = NULL;
-
     /* Build statement and execute query */
     const char* query = "SELECT release_version FROM system.local";
     CassStatement* statement = cass_statement_new(query, 0);
@@ -123,11 +121,6 @@ int main(int argc, char* argv[]) {
 
     cass_statement_free(statement);
     cass_future_free(result_future);
-
-    /* Close the session */
-    close_future = cass_session_close(session);
-    cass_future_wait(close_future);
-    cass_future_free(close_future);
   } else {
       /* Handle error */
       const char* message;
diff --git a/cpp-driver/examples/tuple/tuple.c b/cpp-driver/examples/tuple/tuple.c
diff --git a/cpp-driver/examples/udt/udt.c b/cpp-driver/examples/udt/udt.c
diff --git a/cpp-driver/examples/uuids/uuids.c b/cpp-driver/examples/uuids/uuids.c
diff --git a/examples/geotypes/geotypes.c b/examples/geotypes/geotypes.c
diff --git a/examples/plaintext/plaintext_proxy.c b/examples/plaintext/plaintext_proxy.c
