Fix bug when reconnecting to Sparrow

Author: Brendan Plougonven

storage/sparrow/api/thread.h

@@ -65,7 +65,8 @@ class Thread {
 Guard guard(lock_);
 stop_ = true;
 notifyStop();
-stopCond_.wait(2000, true);
+join();
+stop_ = false;
 } 
 }
 
@@ -88,6 +89,7 @@ class Thread {
 private:
 
 static void* handler(void *p) {
+PRINT_DBUG("Thread started");
 Thread* thread = (Thread*)p;
 thread->running_ = true;
 thread->threadId_ = my_thread_self();

storage/sparrow/api_test/all_types.cpp

@@ -23,6 +23,10 @@ void TestAlltypes::run() {
 printf("OK\n");
 
 runMasterFileTest( table.get() );
+if (reconnect_) {
+disconnect();
+connect();
+}
 
 runGetTableTest( table.get() );
 

storage/sparrow/api_test/all_types.h

@@ -231,6 +231,8 @@ class TestAlltypes : public Test {
 void run();
 
 public:
+void setReconnect(bool reconnect) { reconnect_ = reconnect; }
+
 void runMasterFileTest(const Table*);
 void runGetTableTest(const Table* table);
 void runDisableCoalescingGlobTest(bool loop=false);
@@ -239,6 +241,9 @@ class TestAlltypes : public Test {
 void sendSampleData(const Table* table);
 void sendErrorData(const Table* table);
 void sendDataFlow(const Table* table);
+
+private:
+bool reconnect_{ false };
 };
 
 #endif// _spw_test_all_types_h

storage/sparrow/api_test/common.cpp

@@ -14,7 +14,8 @@ using namespace Sparrow;
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 //Test
 
-Test::Test(const SQLparams& sql_params) : sql_params_(sql_params) {
+Test::Test(const SQLparams& sql_params) : sql_params_(sql_params)
+{
 try
 {
 initialize();
@@ -29,21 +30,52 @@ Test::Test(const SQLparams& sql_params) : sql_params_(sql_params) {
 }
 }
 
-Test::~Test() {
-if ( connect_ ) {
-if ( !connect_->isClosed() ) {
-printf( "Disconnecting..." );
-connect_->disconnect();
-printf( "done\n" );
+
+Test::~Test()
+{
+disconnect(true);
+}
+
+
+void Test::connect()
+{
+try
+{
+if (connect_ == nullptr) {
+printf("Creating connection object.\n");
+if (!(connect_ = createConnect()))
+throw MyException::create(false, "Failed to get Connection object.");
 }
-printf( "Deleting connection object..." );
-delete connect_;
-connect_= NULL;
-printf( "done\n" );
+printf("Setting connection properties.\n");
+if (connect_->setProperties(sql_params_.getHost(), sql_params_.getLogin(), sql_params_.getPsswd(), sql_params_.getMySQLPort(), sql_params_.getSpwPort()) < 0)
+throw MyException::create(false, "Failed to set Properties.");
+printf("Connecting...\n");
+if (connect_->connect() < 0)
+throw MyException::create(false, "Failed to set Connect to Sparrow.");
+printf("Connected.\n");
 }
+catch (const MyException& e) {
+printf("Failed to connect to Sparrow: %s : %s\n", e.getText(), errmsg());
+}
+}
 
+void Test::disconnect(bool free_object)
+{
+if (connect_ != nullptr) {
+if (!connect_->isClosed()) {
+printf("Disconnecting...\n");
+connect_->disconnect();
+printf("Disconnected.\n");
+}
+if (free_object) {
+delete connect_;
+connect_ = nullptr;
+printf("Deleted connection object.\n");
+}
+}
 }
 
+
 void Test::dropTable(const char* table_name) {
 printf( "Dropping Sparrow table '%s'.'%s' ...", sql_params_.getSchema(), table_name);
 MySQLGuardmysql(sql_params_.getLogin(), sql_params_.getPsswd(), sql_params_.getMySQLPort());

storage/sparrow/api_test/common.h

@@ -13,12 +13,15 @@ class Test {
 
 protected:
 SQLparams	sql_params_;
-Sparrow::Connection*connect_;
+Sparrow::Connection* connect_{ nullptr };
 
 public:
 Test(const SQLparams& sql_params);
 virtual ~Test();
 
+void connect();
+void disconnect(bool free_object=false);
+
 void reset(Sparrow::Table*& table);
 void dropTable(const char* table_name);
 uint getFlushInterval();

storage/sparrow/api_test/sparrow_api_test.cpp

@@ -18,7 +18,7 @@
 #include "too_many_columns.h"
 #include "vl.h"
 
-//#define TEST_BASIC
+#define TEST_BASIC
 //#define TEST_CREATETABLE_TOO_MANY_COLS
 //#define TEST_COALESCING
 //#define TEST_CREATETABLE
@@ -31,7 +31,7 @@
 //#define TEST_INSERT_INTERLACED_TS_MASS
 //#define TEST_INSERT_SELECT_COLUMNS
 //#define TEST_INSERT_SELECT_COLUMNS_MASSIVE
-#define TEST_COLUMN_OPTIM
+//#define TEST_COLUMN_OPTIM
 //#define TEST_ERRORS
 //#define TEST_DISABLE_COALESCING
 
@@ -70,6 +70,7 @@ int main (int argc, char* argv[])
 
 #ifdef TEST_BASIC
 TestAlltypestest_all(sql_params);
+test_all.setReconnect(true);
 test_all.run();
 #endif