[=] Move all assoc array param data from value_t to a new struct

Author: ValYouW

src/connection.cpp

@@ -205,6 +205,7 @@ int Connection::SetValuesOnStatement(oracle::occi::Statement* stmt, ExecuteBaton
   uint32_t index = 1;
   int outputParam = -1;
   OutParam * outParam = NULL;
+  arrayParam_t* arrParam;
   for (vector<value_t*>::iterator iterator = values.begin(), end = values.end(); iterator != end; ++iterator, index++) {
     value_t* val = *iterator;
     int outParamType;
@@ -224,7 +225,8 @@ int Connection::SetValuesOnStatement(oracle::occi::Statement* stmt, ExecuteBaton
         break;
       case VALUE_TYPE_ARRAY:
         stmt->setDatabaseNCHARParam(index, true);
-        stmt->setDataBufferArray(index, val->value, val->elemetnsType, val->collectionLength, &val->collectionLength, val->elementsSize, val->elementLength, NULL, NULL);
+        arrParam = (arrayParam_t*)val->value;        
+        stmt->setDataBufferArray(index, arrParam->value, arrParam->elemetnsType, arrParam->collectionLength, &arrParam->collectionLength, arrParam->elementsSize, arrParam->elementLength, NULL, NULL);
         break;
       case VALUE_TYPE_OUTPUT:
         outParam = static_cast<OutParam*>(val->value);

src/executeBaton.cpp

@@ -46,14 +46,16 @@ void ExecuteBaton::ResetValues() {
         delete (oracle::occi::Timestamp*)val->value;
         break;
       case VALUE_TYPE_ARRAY:
-        if (val->value != NULL && val->elemetnsType == oracle::occi::OCCI_SQLT_STR)
-          delete (char*)val->value;
-        else if (val->value != NULL && val->elemetnsType == oracle::occi::OCCI_SQLT_NUM)
-          delete (char*)val->value;
+        arrayParam_t* arrParam = (arrayParam_t*)val->value;
+        if (arrParam->value != NULL && arrParam->elemetnsType == oracle::occi::OCCI_SQLT_STR)
+          delete (char*)arrParam->value;
+        else if (arrParam->value != NULL && arrParam->elemetnsType == oracle::occi::OCCI_SQLT_NUM)
+          delete (char*)arrParam->value;
 
-        if (val->elementLength != NULL)
-          delete val->elementLength;
+        if (arrParam->elementLength != NULL)
+          delete arrParam->elementLength;
 
+        delete (arrayParam_t*)val->value;
         break;
     }
     delete val;
@@ -150,7 +152,8 @@ void ExecuteBaton::CopyValuesToBaton(ExecuteBaton* baton, v8::Local<v8::Array>*
     else if (val->IsArray()) {
       value->type = VALUE_TYPE_ARRAY;
       Local<Array> arr = Local<Array>::Cast(val);
-      GetVectorParam(baton, value, arr);
+      value->value = new arrayParam_t();
+      GetVectorParam(baton, (arrayParam_t*)value->value, arr);
       baton->values.push_back(value);
     }
 
@@ -182,14 +185,14 @@ void ExecuteBaton::CopyValuesToBaton(ExecuteBaton* baton, v8::Local<v8::Array>*
   }
 }
 
-void ExecuteBaton::GetVectorParam(ExecuteBaton* baton, value_t *value, Local<Array> arr) {
+void ExecuteBaton::GetVectorParam(ExecuteBaton* baton, arrayParam_t* arrParam, Local<Array> arr) {
   // In case the array is empty just initialize the fields as we would need something in Connection::SetValuesOnStatement
   if (arr->Length() < 1) {
-    value->value = new int[0];
-    value->collectionLength = 0;
-    value->elementsSize = 0;
-    value->elementLength = new ub2[0];
-    value->elemetnsType = oracle::occi::OCCIINT;
+    arrParam->value = new int[0];
+    arrParam->collectionLength = 0;
+    arrParam->elementsSize = 0;
+    arrParam->elementLength = new ub2[0];
+    arrParam->elemetnsType = oracle::occi::OCCIINT;
     return;
   }
 
@@ -199,7 +202,7 @@ void ExecuteBaton::GetVectorParam(ExecuteBaton* baton, value_t *value, Local<Arr
 
   // String array
   if (val->IsString()) {
-    value->elemetnsType = oracle::occi::OCCI_SQLT_STR;
+    arrParam->elemetnsType = oracle::occi::OCCI_SQLT_STR;
 
     // Find the longest string, this is necessary in order to create a buffer later.
     int longestString = 0;
@@ -215,7 +218,7 @@ void ExecuteBaton::GetVectorParam(ExecuteBaton* baton, value_t *value, Local<Arr
     // Create a long char* that will hold the entire array, it is important to create a FIXED SIZE array,
     // meaning all strings have the same allocated length.
     char* strArr = new char[arr->Length() * longestString];
-    value->elementLength = new ub2[arr->Length()];
+    arrParam->elementLength = new ub2[arr->Length()];
 
     // loop thru the arr and copy the strings into the strArr
     int bytesWritten = 0;
@@ -236,21 +239,21 @@ void ExecuteBaton::GetVectorParam(ExecuteBaton* baton, value_t *value, Local<Arr
       bytesWritten += longestString;
 
       // Set the length of this element, add +1 for the '\0'
-      value->elementLength[i] = utfStr.length() + 1;
+      arrParam->elementLength[i] = utfStr.length() + 1;
     }
 
-    value->value = strArr;
-    value->collectionLength = arr->Length();
-    value->elementsSize = longestString;
+    arrParam->value = strArr;
+    arrParam->collectionLength = arr->Length();
+    arrParam->elementsSize = longestString;
   }
 
   // Integer array.
   else if (val->IsNumber()) {
-    value->elemetnsType = oracle::occi::OCCI_SQLT_NUM;
+    arrParam->elemetnsType = oracle::occi::OCCI_SQLT_NUM;
 
     // Allocate memory for the numbers array, Number in Oracle is 21 bytes
     unsigned char* numArr = new unsigned char[arr->Length() * 21];
-    value->elementLength = new ub2[arr->Length()];
+    arrParam->elementLength = new ub2[arr->Length()];
 
     for(unsigned int i = 0; i < arr->Length(); i++) {
       Local<Value> currVal = arr->Get(i);
@@ -273,13 +276,13 @@ void ExecuteBaton::GetVectorParam(ExecuteBaton* baton, value_t *value, Local<Arr
       // Convert the JS number into Oracle Number and get its bytes representation
       oracle::occi::Number n = d;
       oracle::occi::Bytes b = n.toBytes();
-      value->elementLength[i] = b.length ();
+      arrParam->elementLength[i] = b.length ();
       b.getBytes(&numArr[i*21], b.length());
     }
 
-    value->value = numArr;
-    value->collectionLength = arr->Length();
-    value->elementsSize = 21;
+    arrParam->value = numArr;
+    arrParam->collectionLength = arr->Length();
+    arrParam->elementsSize = 21;
   }
 
   // Unsupported type

src/executeBaton.h

@@ -40,8 +40,11 @@ struct row_t {
 struct value_t {
   int type;
   void* value;
+};
 
+struct arrayParam_t {
   // This will hold the info needed for binding vectors values
+  void* value;  
   ub4 collectionLength;
   sb4 elementsSize; // The size of each element in the array
   ub2* elementLength; //  An array that holds the actual length of each element in the array (in case of strings)
@@ -84,7 +87,7 @@ class ExecuteBaton {
   int updateCount;
 
   static void CopyValuesToBaton(ExecuteBaton* baton, v8::Local<v8::Array>* values);
-  static void GetVectorParam(ExecuteBaton* baton, value_t *value, v8::Local<v8::Array> arr);
+  static void GetVectorParam(ExecuteBaton* baton, arrayParam_t *value, v8::Local<v8::Array> arr);
 };
 
 #endif