Consolidate all executeXXX() methods in dpiStmt to single dpiStmt::execute () method.

Author: cjbj

src/dpi/include/dpiStmt.h

@@ -152,12 +152,8 @@ class Stmt
   virtual void bind(const unsigned char *name, int nameLen,
                     unsigned short type,  void *buf, DPI_SZ_TYPE  bufSize,
                     short *ind, DPI_BUFLEN_TYPE *bufLen) = 0;
-  
-  virtual void executeDML(bool isAutoCommit) = 0;
-  
-  virtual void executeMany(int numIterations, bool isAutoCommit ) = 0;
-  
-  virtual void executeQuery() = 0;
+
+  virtual void execute ( int numIterations, bool isAutoCommit = false) = 0;
 
   virtual void define(unsigned int pos, unsigned short type, void *buf,
                       DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen) = 0;

src/dpi/src/dpiStmtImpl.cpp

@@ -86,7 +86,7 @@ StmtImpl::StmtImpl (EnvImpl *env, OCIEnv *envh, ConnImpl *conn,
                     OCISvcCtx *svch, const string &sql)
 
   try : conn_(conn), errh_(NULL), svch_(svch),
-        stmth_(NULL), numCols_ (0),meta_(NULL)
+        stmth_(NULL), numCols_ (0),meta_(NULL), stmtType_ (DpiStmtUnknown)
 
 {
   // create an OCIError object for this execution 
@@ -137,12 +137,14 @@ StmtImpl::~StmtImpl ()
 */
 DpiStmtType StmtImpl::stmtType () const
 {
-  ub2 stmtType ;
-  
-  ociCall (OCIAttrGet (stmth_, OCI_HTYPE_STMT, &stmtType, NULL, 
-                       OCI_ATTR_STMT_TYPE, errh_), errh_);
+  // Try to query the statement type only once.
+  if ( stmtType_ == DpiStmtUnknown )
+  {    
+    ociCall (OCIAttrGet (stmth_, OCI_HTYPE_STMT, (ub2 * )&stmtType_, NULL, 
+                         OCI_ATTR_STMT_TYPE, errh_), errh_);
+  }
 
-  return (DpiStmtType)stmtType;
+  return stmtType_;
 }
 
 
@@ -251,65 +253,34 @@ void StmtImpl::bind (const unsigned char *name, int nameLen,
 /****************************************************************************/
 /*
     DESCRIPTION
-      Execute the DML statement.
+      Execute the SQL statement.
       
     PARAMETERS
       isAutoCommit   - true/false - autocommit enabled or not
+      numIterations  - iterations to repeat
     
     RETURNS:
       -None-
 */
-void StmtImpl::executeDML (bool isAutoCommit )
+void StmtImpl::execute (int numIterations,  bool isAutoCommit)
 {
-  executeMany ( 1 , isAutoCommit );  // Use execute Many special case only one iteration.
-}
-
-
-/*****************************************************************************/
-/* 
-  DESCRIPTION
-    Execute the DML statement multiple times.
+  ub4 mode = isAutoCommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT;
 
-  PARAMETERS:
-    numIterations  - number of times to execute
-    isAutoCommit   - true/false - autocommit enabled or not
+  ociCall (OCIStmtExecute ( svch_, stmth_, errh_, (ub4)numIterations, (ub4)0,
+                            (OCISnapshot *)NULL, (OCISnapshot *)NULL, mode),
+           errh_ );
 
-  RETURNS
-    -None-
-*/
-void StmtImpl::executeMany (int numIterations, bool isAutoCommit )
-{
-  ub4 mode = isAutoCommit ? OCI_COMMIT_ON_SUCCESS : OCI_DEFAULT ;
-  
-  ociCall (OCIStmtExecute (svch_, stmth_, errh_, (ub4)numIterations, (ub4)0, 
-                           (OCISnapshot *)NULL, (OCISnapshot *)NULL, mode),
-           errh_);
-  #if OCI_MAJOR_VERSION < 12
-    if(!conn_->hasTxn())
-      conn_->hasTxn(true); /* Not to be reset, till thread safety is ensured in 
-                              NJS  */
-  #endif
+#if OCI_MAJOR_VERSION < 12 
+  if ( IsDML () && !conn_->hasTxn () )
+  {
+    /* Not to be reset, till thread safety is ensured in NJS */
+    conn_->hasTxn (true );
+  }
+#endif
 }
 
 
 
-/*****************************************************************************/
-/*
-  DESCRIPTION
-    Execute the SELECT statement
-  
-  PARAMETERS
-    -None-
-  
-  RETURNS:
-    -None-
-*/
-void StmtImpl::executeQuery ()
-{
-  ociCall (OCIStmtExecute (svch_, stmth_, errh_, 0, (ub4)0,
-                           (OCISnapshot *)NULL, (OCISnapshot *)NULL,
-                           OCI_DEFAULT), errh_);
-}
 
 
 /****************************************************************************/

src/dpi/src/dpiStmtImpl.h

@@ -67,10 +67,8 @@ class StmtImpl : public Stmt
   virtual void bind (const unsigned char *name, int nameLen,
                      unsigned short type, void *buf, DPI_SZ_TYPE bufSize, short *ind,
                      DPI_BUFLEN_TYPE *bufLen);
-  
-  virtual void executeDML ( bool isAutoCommit );
-  virtual void executeMany (int numIterations, bool isAutoCommit );
-  virtual void executeQuery ();
+
+  virtual void execute ( int numIterations, bool isAutoCommit );
 
   virtual void define (unsigned int pos, unsigned short type, void *buf,
                        DPI_SZ_TYPE bufSize, short *ind, DPI_BUFLEN_TYPE *bufLen);
@@ -79,6 +77,15 @@ class StmtImpl : public Stmt
   virtual const MetaData *getMetaData ();
 
   virtual OCIError *     getError () { return errh_;  }
+
+  // Is the SQL statement DML or not ?
+  virtual inline bool IsDML ()  
+  {
+    return ( ( stmtType_ == DpiStmtInsert ) ||
+             ( stmtType_ == DpiStmtUpdate ) ||
+             ( stmtType_ == DpiStmtDelete ) );
+  }
+  
 
 private:
   void cleanup ();
@@ -95,6 +102,7 @@ class StmtImpl : public Stmt
 
   unsigned int   numCols_;         // # of cols this stmt execution will return
   MetaData       *meta_;           // Meta data array
+  DpiStmtType    stmtType_;        // Statement Type (Query, DML, ... )
 };
 
 

src/njs/src/njsConnection.cpp

@@ -713,12 +713,12 @@ void Connection::Async_Execute (uv_work_t *req)
     executeBaton->st = executeBaton->dpistmt->stmtType();
     if (executeBaton->st == DpiStmtSelect)
     {
-      executeBaton->dpistmt->executeQuery();
+      executeBaton->dpistmt->execute(executeBaton->isAutoCommit);
       Connection::GetDefines(executeBaton);
     }
     else
     {
-      executeBaton->dpistmt->executeDML(executeBaton->isAutoCommit);
+      executeBaton->dpistmt->execute(executeBaton->isAutoCommit);
       executeBaton->rowsAffected = executeBaton->dpistmt->rowsAffected();
 
      /* Process date/timestamp INOUT/OUT bind values */