Prefetching support

Author: cjbj

src/dpi/include/dpiStmt.h

@@ -147,7 +147,7 @@ class Stmt
   virtual DpiStmtType stmtType() const = 0;
 
   // If NJS layer doesn't set any value, default prefetch is done by OCI.
-  virtual void prefetchRows ( int prefetchRows ) = 0;
+  virtual void prefetchRows ( unsigned int prefetchRows ) = 0;
 
   virtual bool        isDML() const = 0 ;
 

src/dpi/src/dpiStmtImpl.cpp

@@ -208,7 +208,7 @@ unsigned int StmtImpl::numCols ()
     NONE
 
 */
-void StmtImpl::prefetchRows (int prefetchRows)
+void StmtImpl::prefetchRows (unsigned int prefetchRows)
 {
   ociCall(OCIAttrSet(stmth_, OCI_HTYPE_STMT,  &prefetchRows,  0,
                      OCI_ATTR_PREFETCH_ROWS, errh_), errh_);

src/dpi/src/dpiStmtImpl.h

@@ -66,7 +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 void prefetchRows( unsigned int prefetchRows ) ;
   virtual unsigned int rowsFetched () const ;
 
   // Methods

src/njs/src/njsConnection.cpp

@@ -849,10 +849,8 @@ void Connection::PrepareAndBind (eBaton* executeBaton)
     executeBaton->st = executeBaton->dpistmt->stmtType ();
     executeBaton->stmtIsReturning = executeBaton->dpistmt->isReturning ();
 
-    // prefetch is set by user, pass it to DPI.
-    if( executeBaton->getRS && 
-        executeBaton->prefetchRows > NJS_PREFETCH_ROWS_NOT_SET )
-      executeBaton->dpistmt->prefetchRows(executeBaton->prefetchRows);
+    // set prefetch
+    executeBaton->dpistmt->prefetchRows(executeBaton->prefetchRows);
 
     if(!executeBaton->binds.empty())
     {

src/njs/src/njsConnection.h

@@ -118,7 +118,7 @@ typedef struct eBaton
   Connection    *njsconn;
   DPI_SZ_TYPE   rowsAffected;
   unsigned int  maxRows;
-  int           prefetchRows;
+  unsigned int  prefetchRows;
   bool          getRS;
   bool          autoCommit;
   unsigned int  rowsFetched;

src/njs/src/njsOracle.cpp

@@ -64,6 +64,7 @@ Persistent<FunctionTemplate> Oracledb::oracledbTemplate_s;
 #define NJS_POOL_MAX          4
 #define NJS_POOL_INCR         1
 #define NJS_POOL_TIMEOUT     60
+#define NJS_PREFETCH_ROWS   100
 
 /*****************************************************************************/
 /*
@@ -81,7 +82,7 @@ Oracledb::Oracledb()
   poolMin_        = NJS_POOL_MIN;
   poolIncrement_  = NJS_POOL_INCR;
   poolTimeout_    = NJS_POOL_TIMEOUT;
-  prefetchRows_   = NJS_PREFETCH_ROWS_NOT_SET;
+  prefetchRows_   = NJS_PREFETCH_ROWS;
   connClass_      = "";
   externalAuth_   = false;
 }
@@ -137,6 +138,10 @@ void Oracledb::Init(Handle<Object> target)
                               NanNew<v8::String>("stmtCacheSize"),
                               Oracledb::GetStmtCacheSize,
                               Oracledb::SetStmtCacheSize );
+  temp->InstanceTemplate()->SetAccessor(
+                              NanNew<v8::String>("prefetchRows"),
+                              Oracledb::GetPrefetchRows,
+                              Oracledb::SetPrefetchRows );
   temp->InstanceTemplate()->SetAccessor(
                               NanNew<v8::String>("autoCommit"),
                               Oracledb::GetAutoCommit,

src/njs/src/njsOracle.h

@@ -77,8 +77,6 @@ using namespace v8;
                                       (NJS_NODE_ORACLEDB_MINOR * 100) +   \
                                       (NJS_NODE_ORACLEDB_PATCH) )
 
-#define NJS_PREFETCH_ROWS_NOT_SET    -1  // by default prefetch is not set, so -1
-
 class Oracledb: public ObjectWrap
 {
  public:
@@ -95,7 +93,7 @@ class Oracledb: public ObjectWrap
    unsigned int getPoolMax () const  { return poolMax_; }
    unsigned int getPoolIncrement () const  { return poolIncrement_; }
    unsigned int getPoolTimeout () const  { return poolTimeout_; }
-   signed   int getPrefetchRows () const  { return prefetchRows_; }
+   unsigned int getPrefetchRows () const  { return prefetchRows_; }
    const std::string& getConnectionClass () const { return connClass_; }
 
 
@@ -153,7 +151,7 @@ class Oracledb: public ObjectWrap
    unsigned int maxRows_;
 
    unsigned int stmtCacheSize_;
-   signed   int prefetchRows_;
+   unsigned int prefetchRows_;
 
    unsigned int poolMin_;
    unsigned int poolMax_;