fixed cursor memory leaks - free rows data and don't wait for gc to release occi cursor

Author: bjouhier

src/executeBaton.cpp

@@ -33,14 +33,7 @@ ExecuteBaton::~ExecuteBaton() {
     delete val;
   }
 
-  if(rows) {
-    for (std::vector<row_t*>::iterator iterator = rows->begin(), end = rows->end(); iterator != end; ++iterator) {
-      row_t* currentRow = *iterator;
-      delete currentRow;
-    }
-
-    delete rows;
-  }
+  ResetRows();
 
   if(outputs) {
     for (std::vector<output_t*>::iterator iterator = outputs->begin(), end = outputs->end(); iterator != end; ++iterator) {
@@ -53,6 +46,18 @@ ExecuteBaton::~ExecuteBaton() {
   if(error) delete error;
 }
 
+void ExecuteBaton::ResetRows() {
+  if(rows) {
+    for (std::vector<row_t*>::iterator iterator = rows->begin(), end = rows->end(); iterator != end; ++iterator) {
+      row_t* currentRow = *iterator;
+      delete currentRow;
+    }
+
+    delete rows;
+    rows = NULL;
+  }
+}
+
 double CallDateMethod(v8::Local<v8::Date> date, const char* methodName) {
   Handle<Value> args[1]; // should be zero but on windows the compiler will not allow a zero length array
   Local<Value> result = Local<Function>::Cast(date->Get(String::New(methodName)))->Call(date, 0, args);

src/executeBaton.h

@@ -61,6 +61,7 @@ class ExecuteBaton {
 public:
   ExecuteBaton(Connection* connection, const char* sql, v8::Local<v8::Array>* values, v8::Handle<v8::Function>* callback);
   ~ExecuteBaton();
+  void ResetRows();
 
   Connection *connection;
   v8::Persistent<v8::Function> callback;

src/reader.cpp

@@ -72,8 +72,8 @@ uni::CallbackType Reader::NextRows(const uni::FunctionCallbackInfo& args) {
 void Reader::EIO_NextRows(uv_work_t* req) {
   ReaderBaton* baton = static_cast<ReaderBaton*>(req->data);
 
-  baton->rows = NULL;
-  baton->error = NULL;
+  baton->rows = new vector<row_t*>();
+  if (baton->done) return;
 
   try {
     if(! baton->connection->getConnection()) {
@@ -96,13 +96,13 @@ void Reader::EIO_NextRows(uv_work_t* req) {
       Connection::CreateColumnsFromResultSet(baton->rs, baton, baton->columns);
       if (baton->error) goto cleanup;
     }
-    baton->rows = new vector<row_t*>();
 
     for (int i = 0; i < baton->count && baton->rs->next(); i++) {
       row_t* row = Connection::CreateRowFromCurrentResultSetRow(baton->rs, baton, baton->columns);
       if (baton->error) goto cleanup;
       baton->rows->push_back(row);
     }
+    if (baton->rows->size() < (size_t)baton->count) baton->done = true;
   } catch(oracle::occi::SQLException &ex) {
     baton->error = new string(ex.getMessage());
   } catch (const exception& ex) {
@@ -135,5 +135,12 @@ void Reader::EIO_AfterNextRows(uv_work_t* req, int status) {
     argv[1] = Undefined();
     node::MakeCallback(Context::GetCurrent()->Global(), cb, 2, argv);
   }
+  
+  baton->ResetRows();
+  if (baton->done || baton->error) {
+    // free occi resources so that we don't run out of cursors if gc is not fast enough
+    // reader destructor will delete the baton and everything else.
+    baton->ResetStatement();
+  }
 }
 

src/readerBaton.h

@@ -10,10 +10,15 @@ class ReaderBaton : public ExecuteBaton {
   ReaderBaton(Connection* connection, const char* sql, v8::Local<v8::Array>* values) : ExecuteBaton(connection, sql, values, NULL) {
     stmt = NULL;
     rs = NULL;
+    done = false;
   }
   ~ReaderBaton() {
-	if(stmt && rs) {
-	  stmt->closeResultSet(rs);
+    ResetStatement();
+  }
+
+  void ResetStatement() {
+	  if(stmt && rs) {
+      stmt->closeResultSet(rs);
       rs = NULL;
     }
     if(stmt) {
@@ -27,6 +32,7 @@ class ReaderBaton : public ExecuteBaton {
   oracle::occi::Statement* stmt;
   oracle::occi::ResultSet* rs;
   int count;
+  bool done;
 };
 
 #endif