Initial Result Set code

Author: cjbj

binding.gyp

@@ -6,6 +6,7 @@
              "src/njs/src/njsOracle.cpp",
              "src/njs/src/njsPool.cpp",
              "src/njs/src/njsConnection.cpp",
+             "src/njs/src/njsResultSet.cpp",
              "src/njs/src/njsMessages.cpp",
              "src/dpi/src/dpiEnv.cpp",
              "src/dpi/src/dpiEnvImpl.cpp",

src/dpi/include/dpiStmt.h

@@ -146,6 +146,8 @@ class Stmt
                                 // properties
   virtual DpiStmtType stmtType() const = 0;
 
+  virtual void prefetchRows ( int prefetchRows ) = 0;
+
   virtual bool        isDML() const = 0 ;
 
   virtual bool        isReturning() = 0 ;

src/dpi/src/dpiStmtImpl.cpp

@@ -196,15 +196,34 @@ unsigned int StmtImpl::numCols ()
 }
 
 
+/*****************************************************************************/
+/*
+  DESCRIPTION
+    Prefetch Rows set on statement handle 
+
+  PARAMETERS
+    prefetchRows count
+
+  RETURNS
+    NONE
+
+*/
+void StmtImpl::prefetchRows (int prefetchRows)
+{
+  ociCall(OCIAttrSet(stmth_, OCI_HTYPE_STMT,  &prefetchRows,  0,
+                     OCI_ATTR_PREFETCH_ROWS, errh_), errh_);
+}
+
+
 
 
 /*****************************************************************************/
 /*
   DESCRIPTION
-    bind the variable(s) by pdpition
+    bind the variable(s) by position
 
   PARAMETERS
-    pos           - pdpition of the variable 1 based
+    pos           - position of the variable 1 based
     type          - Data type
     buf (IN/OUT)  - data buffer for the variable's value
     bufSize       - size of the buffer

src/dpi/src/dpiStmtImpl.h

@@ -66,6 +66,7 @@ class StmtImpl : public Stmt
   virtual DpiStmtType stmtType () const;
   virtual DPI_SZ_TYPE  rowsAffected () const;
   virtual unsigned int numCols() ;
+  virtual void prefetchRows( int prefetchRows ) ;
   virtual unsigned int rowsFetched () const ;
 
   // Methods

src/njs/src/njsConnection.cpp

@@ -49,6 +49,7 @@
  *****************************************************************************/
 
 #include "njsConnection.h"
+#include "njsResultSet.h"
 #include <stdlib.h>
 #include <iostream>
 using namespace std;
@@ -340,10 +341,12 @@ NAN_METHOD(Connection::Execute)
   NJSString (executeBaton->sql, sql);
 
   executeBaton->maxRows      = connection->oracledb_->getMaxRows();
+  executeBaton->prefetchRows = connection->oracledb_->getPrefetchRows();
   executeBaton->outFormat    = connection->oracledb_->getOutFormat();
   executeBaton->autoCommit = connection->oracledb_->getAutoCommit();
   executeBaton->dpienv       = connection->oracledb_->getDpiEnv();
   executeBaton->dpiconn      = connection->dpiconn_;
+  executeBaton->njsconn      = connection;
 
   if(args.Length() > 2)
   {
@@ -411,8 +414,12 @@ void Connection::ProcessOptions (_NAN_METHOD_ARGS, unsigned int index,
     options = args[index]->ToObject();
     NJS_GET_UINT_FROM_JSON   ( executeBaton->maxRows, executeBaton->error,
                                options, "maxRows", 2, exitProcessOptions );
+    NJS_GET_UINT_FROM_JSON   ( executeBaton->prefetchRows, executeBaton->error,
+                               options, "prefetchRows", 2, exitProcessOptions );
     NJS_GET_UINT_FROM_JSON   ( executeBaton->outFormat, executeBaton->error,
                                options, "outFormat", 2, exitProcessOptions );
+    NJS_GET_BOOL_FROM_JSON   ( executeBaton->getRS, executeBaton->error,
+                               options, "resultSet", 2, exitProcessOptions );
     NJS_GET_BOOL_FROM_JSON   ( executeBaton->autoCommit, executeBaton->error,
                                options, "autoCommit", 2, exitProcessOptions );
   }
@@ -731,10 +738,22 @@ void Connection::Async_Execute (uv_work_t *req)
     if (executeBaton->st == DpiStmtSelect)
     {
       executeBaton->dpistmt->execute(0, executeBaton->autoCommit);
-      Connection::GetDefines(executeBaton);
+      const dpi::MetaData* meta   = executeBaton->dpistmt->getMetaData();
+      executeBaton->numCols       = executeBaton->dpistmt->numCols();
+      executeBaton->columnNames = new std::string[executeBaton->numCols];
+      Connection::metaData( executeBaton->columnNames, meta, 
+                            executeBaton->numCols );
+      if( executeBaton->getRS ) goto exitAsyncExecute;
+      Connection::GetDefines(executeBaton, meta, executeBaton->numCols);
     }
     else
     {
+      if( executeBaton->getRS )
+      {
+        executeBaton->error = NJSMessages::getErrorMsg(
+                                errInvalidNonQueryExecution );
+        goto exitAsyncExecute;
+      }
       executeBaton->dpistmt->execute(1, executeBaton->autoCommit);
       executeBaton->rowsAffected = executeBaton->dpistmt->rowsAffected();
 
@@ -797,7 +816,7 @@ void Connection::Async_Execute (uv_work_t *req)
     // In Case of DML Returning, if the buffer is small, and if the callback
     // is called multiple times, an ORA error 24343 was reported. Converting
     // that error to errInsufficientBufferForBinds.
-    if ( !executeBaton->stmtIsReturning && 
+    if ( !executeBaton->stmtIsReturning &&
          (e.errnum() != 24343) )
     {
       executeBaton->error = std::string(e.what ());
@@ -826,6 +845,9 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
     executeBaton->st = executeBaton->dpistmt->stmtType ();
     executeBaton->stmtIsReturning = executeBaton->dpistmt->isReturning ();
 
+    if(executeBaton->getRS && executeBaton->prefetchRows > -1)
+      executeBaton->dpistmt->prefetchRows(executeBaton->prefetchRows);
+
     if(!executeBaton->binds.empty())
     {
       if(!executeBaton->binds[0]->key.empty())
@@ -930,6 +952,24 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
     }
 }
 
+/*****************************************************************************/
+/*
+   DESCRIPTION
+     get meta data into baton 
+
+   PARAMETERS:
+     string arrat, metaData, numCols 
+ */
+void Connection::metaData ( std::string* names, const dpi::MetaData* meta,
+                            unsigned int numCols )
+{
+  for (unsigned int i = 0; i < numCols; i++)
+  {
+    names[i] = std::string( (const char*)meta[i].colName,
+                            meta[i].colNameLen );
+  }
+}
+
 /*****************************************************************************/
 /*
    DESCRIPTION
@@ -939,19 +979,13 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
    PARAMETERS:
      eBaton struct
  */
-void Connection::GetDefines (eBaton* executeBaton)
+void Connection::GetDefines ( eBaton* executeBaton, const dpi::MetaData* meta,
+                              unsigned int numCols )
 {
-  unsigned int     numCols   = executeBaton->dpistmt->numCols();
   Define *defines            = new Define[numCols];
-  const dpi::MetaData* meta  = executeBaton->dpistmt->getMetaData();
-  executeBaton->columnNames  = new std::string[numCols];
 
   for (unsigned int i = 0; i < numCols; i++)
   {
-
-    executeBaton->columnNames[i] = std::string((const char*)meta[i].colName,
-                                               meta[i].colNameLen );
-
     switch(meta[i].dbType)
     {
       case dpi::DpiNumber :
@@ -993,8 +1027,22 @@ void Connection::GetDefines (eBaton* executeBaton)
   executeBaton->defines = defines;
   executeBaton->numCols = numCols;
   executeBaton->rowsFetched = executeBaton->dpistmt->rowsFetched();
+  Connection::descr2Dbl (executeBaton->defines, numCols, 
+                         executeBaton->rowsFetched,
+                         executeBaton->getRS);
+}
+
+/*****************************************************************************/
+/*
+   DESCRIPTION
+     Special processing for datetime, as it is obtained as descriptors
 
-  /* Special processing for datetime, as it is obtained as descriptors */
+   PARAMETERS:
+     Define struct, numCols
+ */
+void Connection::descr2Dbl( Define* defines, unsigned int numCols, 
+                            unsigned int rowsFetched, bool getRS )
+{
   for (unsigned int col = 0; col < numCols; col ++ )
   {
     if ( defines[col].dttmarr )
@@ -1003,15 +1051,18 @@ void Connection::GetDefines (eBaton* executeBaton)
 
       defines[col].buf =
       dblArr = (long double *)malloc ( sizeof ( long double ) *
-                                                executeBaton->rowsFetched );
+                                                rowsFetched );
 
-      for ( int row = 0; row < (int) executeBaton->rowsFetched; row ++ )
+      for ( int row = 0; row < (int) rowsFetched; row ++ )
       {
         dblArr[row] = defines[col].dttmarr->getDateTime (row) * NJS_DAY2MS;
       }
       defines[col].buf = (void *) dblArr;
-      defines[col].dttmarr->release ();
-      defines[col].extbuf = NULL;
+      if ( !getRS )
+      {
+        defines[col].dttmarr->release ();
+        defines[col].extbuf = NULL;
+      }
     }
   }
 
@@ -1055,7 +1106,23 @@ void Connection::Async_AfterExecute(uv_work_t *req)
           argv[1] = NanUndefined();
           goto exitAsyncAfterExecute;
         }
-        result->Set(NanNew<v8::String>("rows"), rowArray);//, v8::ReadOnly); 
+        if( executeBaton->getRS )
+        {
+          result->Set(NanNew<v8::String>("rows"), NanUndefined());
+          Handle<Object> resultSet = NanNew(ResultSet::resultSetTemplate_s)->
+                                GetFunction() ->NewInstance();
+         (ObjectWrap::Unwrap<ResultSet> (resultSet))->
+                                  setResultSet( executeBaton->dpistmt,
+                                                executeBaton->dpienv,
+                                                executeBaton->njsconn,
+                                                executeBaton->outFormat );
+          result->Set(NanNew<v8::String>("resultSet"), resultSet );
+        }
+        else
+        {
+          result->Set(NanNew<v8::String>("rows"), rowArray);
+          result->Set(NanNew<v8::String>("resultSet"), NanUndefined());
+        }
         result->Set(NanNew<v8::String>("outBinds"),NanUndefined());
         result->Set(NanNew<v8::String>("rowsAffected"), NanUndefined());
         result->Set(NanNew<v8::String>("metaData"), Connection::GetMetaData(

src/njs/src/njsConnection.h

@@ -63,6 +63,8 @@ using namespace v8;
 using namespace node;
 using namespace dpi;
 
+
+class Connection;
 /**
 * Structure used for binds
 **/
@@ -113,8 +115,11 @@ typedef struct eBaton
   std::string   error;
   dpi::Env*     dpienv;
   dpi::Conn*    dpiconn;
+  Connection    *njsconn;
   DPI_SZ_TYPE   rowsAffected;
   unsigned int  maxRows;
+  int           prefetchRows;
+  bool          getRS;
   bool          autoCommit;
   unsigned int  rowsFetched;
   unsigned int  outFormat;
@@ -128,9 +133,10 @@ typedef struct eBaton
   Define               *defines;
   Persistent<Function> cb;
 
-  eBaton() : sql(""), error(""), dpienv(NULL), dpiconn(NULL),
-             rowsAffected(0), maxRows(0), autoCommit(false),
-             rowsFetched(0), outFormat(0), numCols(0), dpistmt(NULL),
+  eBaton() : sql(""), error(""), dpienv(NULL), dpiconn(NULL), njsconn(NULL),
+             rowsAffected(0), maxRows(0), prefetchRows(0),
+             getRS(false), autoCommit(false), rowsFetched(0), 
+             outFormat(0), numCols(0), dpistmt(NULL),
              st(DpiStmtUnknown), stmtIsReturning (false), numOutBinds(0),
              columnNames(NULL), defines(NULL)
   {}
@@ -171,7 +177,7 @@ typedef struct eBaton
      }
      if( columnNames )
        delete [] columnNames;
-     if( defines )
+     if( defines && !getRS )
      {
        for( unsigned int i=0; i<numCols; i++ )
        {
@@ -192,6 +198,15 @@ class Connection: public ObjectWrap
   // Define Connection Constructor
   static Persistent<FunctionTemplate> connectionTemplate_s;
   static void Init (Handle<Object> target);
+  static Handle<Value> GetRows (eBaton* executeBaton);
+  static Handle<Value> GetMetaData (std::string* columnNames,
+                                    unsigned int numCols);
+  static void GetDefines ( eBaton* executeBaton, const dpi::MetaData*,
+                           unsigned int numCols );
+  static void metaData ( std::string*, const dpi::MetaData*, unsigned int ); 
+  static void descr2Dbl ( Define* defines, unsigned int numCols,
+                          unsigned int rowsFetched, bool getRS );
+  bool getIsValid() { return isValid_; }
 
 private:
   static NAN_METHOD(New);
@@ -241,7 +256,6 @@ class Connection: public ObjectWrap
 
 
   static void PrepareAndBind (eBaton* executeBaton);
-  static void GetDefines (eBaton* executeBaton);
   static void ProcessBinds (_NAN_METHOD_ARGS, unsigned int index,
                             eBaton* executeBaton);
   static void ProcessOptions (_NAN_METHOD_ARGS, unsigned int index,
@@ -266,9 +280,6 @@ class Connection: public ObjectWrap
   static v8::Handle<v8::Value> GetOutBindObject (std::vector<Bind*> &binds,
                                                  bool bDMLReturn = false,
                                                  unsigned long rowcount = 1);
-  static v8::Handle<v8::Value> GetRows (eBaton* executeBaton);
-  static v8::Handle<v8::Value> GetMetaData (std::string* columnNames,
-                                            unsigned int numCols);
   static v8::Handle<v8::Value> GetArrayValue (Bind *bind, unsigned long count);
   static v8::Handle<v8::Value> GetValue (short ind, unsigned short type, void* val,
                                          DPI_BUFLEN_TYPE len,

src/njs/src/njsMessages.cpp

@@ -50,7 +50,10 @@ static const char *errMsg[] =
   "NJS-013: invalid bind direction",
   "NJS-014: %s is a read-only property",
   "NJS-015: %s is a write-only property",
-  "NJS-016: Buffer is too small for OUT binds"
+  "NJS-016: buffer is too small for OUT binds",
+  "NJS-017: concurrent operations on resultSet are not allowed",
+  "NJS-018: invalid result set",
+  "NJS-019: getResultSet set for non-query execution",
 };
 
 string NJSMessages::getErrorMsg ( NJSErrorType err, ... )

src/njs/src/njsMessages.h

@@ -50,6 +50,9 @@ typedef enum
   errReadOnly,
   errWriteOnly,
   errInsufficientBufferForBinds,
+  errBusyResultSet,
+  errInvalidResultSet,
+  errInvalidNonQueryExecution,
 
   // New ones should be added here