CPP-720 - Improve custom memory alloc

Author: mpenick

cpp-driver/gtests/src/integration/policies/ignore_retry_policy.hpp

@@ -38,7 +38,7 @@ class IgnoreRetryPolicy : public cass::DefaultRetryPolicy {
    * @return Driver ready retry policy
    */
   static ::test::driver::RetryPolicy policy() {
-    cass::RetryPolicy* policy = cass::Memory::allocate<IgnoreRetryPolicy>();
+    cass::RetryPolicy* policy = new IgnoreRetryPolicy();
     policy->inc_ref();
     return CassRetryPolicy::to(policy);
   }

cpp-driver/gtests/src/integration/policies/next_host_retry_policy.hpp

@@ -38,7 +38,7 @@ class NextHostRetryPolicy : public cass::DefaultRetryPolicy {
    * @return Driver ready retry policy
    */
   static ::test::driver::RetryPolicy policy() {
-    cass::RetryPolicy* policy = cass::Memory::allocate<NextHostRetryPolicy>();
+    cass::RetryPolicy* policy = new NextHostRetryPolicy();
     policy->inc_ref();
     return CassRetryPolicy::to(policy);
   }

cpp-driver/gtests/src/integration/shared_ptr.hpp

@@ -62,7 +62,7 @@ class SharedPtr {
   SharedPtr(T* ptr = NULL)
     : object_(NULL) {
     if (ptr) {
-      ObjectRef<T, D>* object_ref = cass::Memory::allocate<ObjectRef<T, D> >(ptr);
+      ObjectRef<T, D>* object_ref = new ObjectRef<T, D>(ptr);
       object_ = cass::SharedRefPtr<ObjectRef<T, D> >(object_ref);
     }
   }

cpp-driver/gtests/src/integration/simulacron/priming_requests.hpp

@@ -39,7 +39,7 @@ class Request {
   };
 
   Request()
-    : then_(cass::Memory::allocate<Success>()) { };
+    : then_(new Success()) { };
 
   /**
    * Generate the JSON for the priming request

cpp-driver/gtests/src/integration/simulacron/simulacron_integration.cpp

@@ -33,7 +33,7 @@ SimulacronIntegration::~SimulacronIntegration() {
 
 void SimulacronIntegration::SetUpTestCase() {
   try {
-    sc_ = cass::Memory::allocate<test::SimulacronCluster>();
+    sc_ = new test::SimulacronCluster();
   } catch (SimulacronCluster::Exception scce) {
     TEST_LOG_ERROR(scce.what());
   }

cpp-driver/gtests/src/integration/tests/simulacron/test_simulacron_idempotent.cpp

@@ -79,7 +79,7 @@ SIMULACRON_INTEGRATION_TEST_F(IdempotentTest, WriteTimeoutNonIdempotentNoRetry)
   SKIP_TEST_IF_SIMULACRON_UNAVAILABLE;
 
   // Simulate a write timeout on node 1
-  prime_mock_query_with_result(cass::Memory::allocate<prime::WriteTimeout>(), 1);
+  prime_mock_query_with_result(new prime::WriteTimeout(), 1);
 
   // Loop through all the nodes in the cluster execute the mock query
   for (unsigned int n = 0; n < number_dc1_nodes_; ++n) {
@@ -108,7 +108,7 @@ SIMULACRON_INTEGRATION_TEST_F(IdempotentTest, WriteTimeoutIdempotentRetry) {
   SKIP_TEST_IF_SIMULACRON_UNAVAILABLE;
 
   // Simulate a write timeout on node 1
-  prime_mock_query_with_result(cass::Memory::allocate<prime::WriteTimeout>(), 1);
+  prime_mock_query_with_result(new prime::WriteTimeout(), 1);
 
   // Loop through all the nodes in the cluster execute the mock query
   bool was_node_one_attempted = false;
@@ -141,7 +141,7 @@ SIMULACRON_INTEGRATION_TEST_F(IdempotentTest, ClosedConnectionNonIdempotentNoRet
   SKIP_TEST_IF_SIMULACRON_UNAVAILABLE;
 
   // Simulate a closed connection on node 1
-  prime_mock_query_with_result(cass::Memory::allocate<prime::CloseConnection>(), 1);
+  prime_mock_query_with_result(new prime::CloseConnection(), 1);
 
   // Loop through all the nodes in the cluster execute the mock query
   for (unsigned int n = 0; n < number_dc1_nodes_; ++n) {
@@ -171,7 +171,7 @@ SIMULACRON_INTEGRATION_TEST_F(IdempotentTest, ClosedConnectionIdempotentRetry) {
   SKIP_TEST_IF_SIMULACRON_UNAVAILABLE;
 
   // Simulate a closed connection on node 1
-  prime_mock_query_with_result(cass::Memory::allocate<prime::CloseConnection>(), 1);
+  prime_mock_query_with_result(new prime::CloseConnection(), 1);
 
   // Loop through all the nodes in the cluster execute the mock query
   bool was_node_one_attempted = false;

cpp-driver/gtests/src/integration/tests/test_control_connection.cpp

@@ -119,7 +119,7 @@ class ControlConnectionFourNodeClusterTests : public ControlConnectionTests {
  * each
  */
 class ControlConnectionSingleNodeDataCentersClusterTests
-  : public ControlConnectionTests {
+    : public ControlConnectionTests {
 public:
   ControlConnectionSingleNodeDataCentersClusterTests() {
     number_dc1_nodes_ = 1;
@@ -250,7 +250,7 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests,
   logger_.add_critera("Unable to establish a control connection to host " \
                       "1.1.1.1 because of the following error:");
   Cluster cluster = Cluster::build().with_contact_points("1.1.1.1")
-    .with_local_address("127.0.0.1");
+                    .with_local_address("127.0.0.1");
   try {
     cluster.connect();
     FAIL() << "Connection was established using invalid IP address";
@@ -289,8 +289,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTwoNodeClusterTests,
    * node discovery of the second node
    */
   Cluster cluster = default_cluster()
-    .with_load_balance_round_robin()
-    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
+                    .with_load_balance_round_robin()
+                    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
   Session session = cluster.connect();
 
   // Stop the first node and bootstrap a third node into the cluster
@@ -331,7 +331,7 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests, TopologyChange) {
    * to ensure all nodes can be accessed during request execution
    */
   Cluster cluster = default_cluster()
-    .with_load_balance_round_robin();
+                    .with_load_balance_round_robin();
   Session session = cluster.connect();
 
   // Bootstrap a second node and ensure all hosts are actively used
@@ -374,8 +374,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTwoNodeClusterTests,
    * to ensure all nodes can be accessed during request execution
    */
   Cluster cluster = default_cluster()
-    .with_load_balance_round_robin()
-    .with_reconnect_wait_time(10); // Ensure reconnect timeout is quick
+                    .with_load_balance_round_robin()
+                    .with_reconnect_wait_time(10); // Ensure reconnect timeout is quick
   Session session = cluster.connect();
 
   // Ensure all hosts are actively used
@@ -422,8 +422,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionThreeNodeClusterTests,
    * node discovery
    */
   Cluster cluster = default_cluster()
-    .with_load_balance_round_robin()
-    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
+                    .with_load_balance_round_robin()
+                    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
   Session session = cluster.connect();
 
   // Ensure all hosts are actively used
@@ -461,10 +461,10 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionThreeNodeClusterTests,
   logger_.add_critera("to host 192.0.2.2 closed");
   logger_.add_critera("to host 192.0.2.3 closed");
   Cluster cluster = default_cluster(false) // Do not add the default contact points
-    .with_load_balance_round_robin()
-    .with_contact_points(generate_contact_points("192.0.2.", 3)) // Invalid IPs
-    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1)) // Single valid contact point
-    .with_connect_timeout(1000u); // Handle initial invalid IPs
+                    .with_load_balance_round_robin()
+                    .with_contact_points(generate_contact_points("192.0.2.", 3)) // Invalid IPs
+                    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1)) // Single valid contact point
+                    .with_connect_timeout(1000u); // Handle initial invalid IPs
   Session session = cluster.connect();
 
   // Ensure the invalid IPs were not reached
@@ -501,8 +501,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionThreeNodeClusterTests,
    * node discovery
    */
   Cluster cluster = default_cluster()
-    .with_load_balance_round_robin()
-    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
+                    .with_load_balance_round_robin()
+                    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
   Session session = cluster.connect();
 
   // Delete the `local` row from the system table (control connection info)
@@ -538,8 +538,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionThreeNodeClusterTests,
   connect(); // Create the default session
   std::stringstream update_system_table;
   update_system_table
-    << "UPDATE system.peers SET rpc_address = null WHERE peer = '"
-    << ccm_->get_ip_prefix() << "3'";
+      << "UPDATE system.peers SET rpc_address = null WHERE peer = '"
+      << ccm_->get_ip_prefix() << "3'";
   for (int i = 0; i < 3; ++i) { // Ensure all the nodes in the cluster are updated
     session_.execute(update_system_table.str());
   }
@@ -550,8 +550,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionThreeNodeClusterTests,
    * node discovery
    */
   Cluster cluster = default_cluster(false)
-    .with_load_balance_round_robin()
-    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
+                    .with_load_balance_round_robin()
+                    .with_contact_points(generate_contact_points(ccm_->get_ip_prefix(), 1));
   Session session = cluster.connect();
 
   // Ensure nodes one and two are actively used
@@ -665,8 +665,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionFourNodeClusterTests,
 
   // Create a cluster object using randomized contact points
   Cluster cluster = default_cluster()
-    .with_load_balance_round_robin()
-    .with_randomized_contact_points(true);
+                    .with_load_balance_round_robin()
+                    .with_randomized_contact_points(true);
 
   // Establish a connect and ensure the first established host is not node 1
   Session session;
@@ -691,7 +691,7 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionFourNodeClusterTests,
 
     // Ensure the next host is the expected host
     std::string current_host =
-      session.execute(SELECT_ALL_SYSTEM_LOCAL_CQL).host();
+        session.execute(SELECT_ALL_SYSTEM_LOCAL_CQL).host();
     ASSERT_STREQ(expected_host.str().c_str(), current_host.c_str());
   }
 
@@ -723,7 +723,7 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionSingleNodeDataCentersClusterTests,
    * policy
    */
   Cluster cluster = default_cluster()
-    .with_load_balance_dc_aware("invalid_data_center", 0, false);
+                    .with_load_balance_dc_aware("invalid_data_center", 0, false);
   try {
     Session session = cluster.connect();
     FAIL() << "Connection was established using invalid data center";
@@ -766,8 +766,8 @@ CASSANDRA_INTEGRATION_TEST_F(ControlConnectionTests,
     std::stringstream expected_message;
     // Message to validate number of I/O worker threads
     expected_message << "Unable to connect to host " << ccm_->get_ip_prefix()
-      << "1 because of the following error: Received error response "
-      << "'Keyspace '" << inavlid_keyspace_name << "' does not exist'";
+                     << "1 because of the following error: Received error response "
+                     << "'Keyspace '" << inavlid_keyspace_name << "' does not exist'";
     logger_.add_critera(expected_message.str());
     // Message to validate connection/host is ready/up
     expected_message.str("");

cpp-driver/gtests/src/unit/event_loop_test.hpp

@@ -55,8 +55,8 @@ class EventLoopTest : public Unit {
    * @return Generic future instance.
    */
   cass::Future::Ptr execute_outage_plan(OutagePlan* outage_plan) {
-    cass::Future::Ptr future(cass::Memory::allocate<cass::Future>(cass::Future::FUTURE_TYPE_GENERIC));
-    add_task(cass::Memory::allocate<ExecuteOutagePlan>(outage_plan, future));
+    cass::Future::Ptr future(new cass::Future(cass::Future::FUTURE_TYPE_GENERIC));
+    add_task(new ExecuteOutagePlan(outage_plan, future));
     return future;
   }
 

cpp-driver/gtests/src/unit/loop_test.hpp

@@ -19,7 +19,6 @@
 
 #include "unit.hpp"
 #include "test_utils.hpp"
-#include "memory.hpp"
 
 #include <uv.h>
 
@@ -61,7 +60,7 @@ class LoopTest : public Unit {
    */
   void starve_thread_pool(unsigned int sleep_ms) {
     for (int i = 0; i < NUM_WORKERS; ++i) {
-      workers[i].data = cass::Memory::allocate<unsigned int>(sleep_ms);
+      workers[i].data = new unsigned int(sleep_ms);
       uv_queue_work(loop(), &workers[i], on_work, NULL);
     }
   }
@@ -70,7 +69,7 @@ class LoopTest : public Unit {
   static void on_work(uv_work_t* req) {
     unsigned int* sleep_ms = static_cast<unsigned int*>(req->data);
     test::Utils::msleep(*sleep_ms);
-    cass::Memory::deallocate(sleep_ms);
+    delete sleep_ms;
   }
 
 private: