oracledb 2.2.0 → 2.3.0

package/odpi/src/dpiImpl.h

@@ -92,6 +92,9 @@ extern unsigned long dpiDebugLevel;
 // define maximum buffer size permitted in variables
 #define DPI_MAX_VAR_BUFFER_SIZE                     (1024 * 1024 * 1024 - 2)
 
+// define subscription grouping repeat count
+#define DPI_SUBSCR_GROUPING_FOREVER                 -1
+
 // define number of rows to prefetch
 #define DPI_PREFETCH_ROWS_DEFAULT                   2
 
@@ -129,6 +132,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_DTYPE_AQMSG_PROPERTIES              59
 #define DPI_OCI_DTYPE_INTERVAL_YM                   62
 #define DPI_OCI_DTYPE_INTERVAL_DS                   63
+#define DPI_OCI_DTYPE_AQNFY_DESCRIPTOR              64
 #define DPI_OCI_DTYPE_TIMESTAMP                     68
 #define DPI_OCI_DTYPE_TIMESTAMP_TZ                  69
 #define DPI_OCI_DTYPE_TIMESTAMP_LTZ                 70
@@ -178,6 +182,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_ENQ_TIME                       62
 #define DPI_OCI_ATTR_MSG_STATE                      63
 #define DPI_OCI_ATTR_ORIGINAL_MSGID                 69
+#define DPI_OCI_ATTR_QUEUE_NAME                     70
 #define DPI_OCI_ATTR_NUM_DML_ERRORS                 73
 #define DPI_OCI_ATTR_DML_ROW_OFFSET                 74
 #define DPI_OCI_ATTR_SUBSCR_NAME                    94
@@ -207,6 +212,10 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_SUBSCR_CQ_QOSFLAGS             229
 #define DPI_OCI_ATTR_LIST_TYPE_ATTRS                229
 #define DPI_OCI_ATTR_SUBSCR_CQ_REGID                230
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_CLASS     231
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_VALUE     232
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_TYPE      233
+#define DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_REPEAT_COUNT 235
 #define DPI_OCI_ATTR_NCHARSET_ID                    262
 #define DPI_OCI_ATTR_APPCTX_SIZE                    273
 #define DPI_OCI_ATTR_APPCTX_LIST                    274
@@ -229,6 +238,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_CHNF_OPERATIONS                403
 #define DPI_OCI_ATTR_CHDES_DBNAME                   405
 #define DPI_OCI_ATTR_CHDES_NFYTYPE                  406
+#define DPI_OCI_ATTR_NFY_FLAGS                      406
 #define DPI_OCI_ATTR_CHDES_XID                      407
 #define DPI_OCI_ATTR_MSG_DELIVERY_MODE              407
 #define DPI_OCI_ATTR_CHDES_TABLE_CHANGES            408
@@ -246,6 +256,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_CONNECTION_CLASS               425
 #define DPI_OCI_ATTR_PURITY                         426
 #define DPI_OCI_ATTR_RECEIVE_TIMEOUT                436
+#define DPI_OCI_ATTR_SUBSCR_IPADDR                  452
 #define DPI_OCI_ATTR_UB8_ROW_COUNT                  457
 #define DPI_OCI_ATTR_SPOOL_AUTH                     460
 #define DPI_OCI_ATTR_LTXID                          462
@@ -257,6 +268,7 @@ extern unsigned long dpiDebugLevel;
 #define DPI_OCI_ATTR_BREAK_ON_NET_TIMEOUT           495
 #define DPI_OCI_ATTR_SHARDING_KEY                   496
 #define DPI_OCI_ATTR_SUPER_SHARDING_KEY             497
+#define DPI_OCI_ATTR_SPOOL_WAIT_TIMEOUT             506
 
 // define OCI object type constants
 #define DPI_OCI_OTYPE_NAME                          1
@@ -465,6 +477,9 @@ typedef enum {
     DPI_ERR_SUBSCR_CLOSED,
     DPI_ERR_NO_EDITION_WITH_NEW_PASSWORD,
     DPI_ERR_UNEXPECTED_OCI_RETURN_VALUE,
+    DPI_ERR_EXEC_MODE_ONLY_FOR_DML,
+    DPI_ERR_ARRAY_VAR_NOT_SUPPORTED,
+    DPI_ERR_EVENTS_MODE_REQUIRED,
     DPI_ERR_MAX
 } dpiErrorNum;
 
@@ -511,7 +526,6 @@ typedef enum {
 // old type definitions (to be dropped)
 //-----------------------------------------------------------------------------
 
-// structure used for creating connections (2.0)
 typedef struct {
     dpiAuthMode authMode;
     const char *connectionClass;
@@ -532,6 +546,34 @@ typedef struct {
     int outTagFound;
 } dpiConnCreateParams__v20;
 
+typedef struct {
+    dpiSubscrNamespace subscrNamespace;
+    dpiSubscrProtocol protocol;
+    dpiSubscrQOS qos;
+    dpiOpCode operations;
+    uint32_t portNumber;
+    uint32_t timeout;
+    const char *name;
+    uint32_t nameLength;
+    dpiSubscrCallback callback;
+    void *callbackContext;
+    const char *recipientName;
+    uint32_t recipientNameLength;
+} dpiSubscrCreateParams__v23;
+
+typedef struct {
+    uint32_t minSessions;
+    uint32_t maxSessions;
+    uint32_t sessionIncrement;
+    int pingInterval;
+    int pingTimeout;
+    int homogeneous;
+    int externalAuth;
+    dpiPoolGetMode getMode;
+    const char *outPoolName;
+    uint32_t outPoolNameLength;
+} dpiPoolCreateParams__v23;
+
 
 //-----------------------------------------------------------------------------
 // OCI type definitions
@@ -603,6 +645,7 @@ typedef struct {
     dpiVersionInfo *versionInfo;
     void *baseDate;
     int threaded;
+    int events;
 } dpiEnv;
 
 typedef struct {
@@ -851,9 +894,11 @@ struct dpiSubscr {
     dpiType_HEAD
     dpiConn *conn;
     void *handle;
+    dpiSubscrNamespace subscrNamespace;
     dpiSubscrQOS qos;
     dpiSubscrCallback callback;
     void *callbackContext;
+    int registered;
 };
 
 struct dpiDeqOptions {
@@ -881,8 +926,7 @@ struct dpiMsgProps {
 // definition of internal dpiContext methods
 //-----------------------------------------------------------------------------
 void dpiContext__initCommonCreateParams(dpiCommonCreateParams *params);
-void dpiContext__initConnCreateParams(const dpiContext *context,
-        dpiConnCreateParams *params, size_t *structSize);
+void dpiContext__initConnCreateParams(dpiConnCreateParams *params);
 void dpiContext__initPoolCreateParams(dpiPoolCreateParams *params);
 void dpiContext__initSubscrCreateParams(dpiSubscrCreateParams *params);
 
@@ -1320,7 +1364,8 @@ int dpiOci__stringResize(void *envHandle, void **handle, uint32_t newSize,
 int dpiOci__stringSize(void *envHandle, void *handle, uint32_t *size);
 int dpiOci__subscriptionRegister(dpiConn *conn, void **handle,
         dpiError *error);
-int dpiOci__subscriptionUnRegister(dpiSubscr *subscr, dpiError *error);
+int dpiOci__subscriptionUnRegister(dpiConn *conn, dpiSubscr *subscr,
+        dpiError *error);
 int dpiOci__tableDelete(dpiObject *obj, int32_t index, dpiError *error);
 int dpiOci__tableExists(dpiObject *obj, int32_t index, int *exists,
         dpiError *error);

package/odpi/src/dpiOci.c

@@ -2792,15 +2792,16 @@ int dpiOci__subscriptionRegister(dpiConn *conn, void **handle, dpiError *error)
 // dpiOci__subscriptionUnRegister() [INTERNAL]
 //   Wrapper for OCISubscriptionUnRegister().
 //-----------------------------------------------------------------------------
-int dpiOci__subscriptionUnRegister(dpiSubscr *subscr, dpiError *error)
+int dpiOci__subscriptionUnRegister(dpiConn *conn, dpiSubscr *subscr,
+        dpiError *error)
 {
     int status;
 
     DPI_OCI_LOAD_SYMBOL("OCISubscriptionUnRegister",
             dpiOciSymbols.fnSubscriptionUnRegister)
-    status = (*dpiOciSymbols.fnSubscriptionUnRegister)(subscr->conn->handle,
+    status = (*dpiOciSymbols.fnSubscriptionUnRegister)(conn->handle,
             subscr->handle, error->handle, DPI_OCI_DEFAULT);
-    return dpiError__check(error, status, subscr->conn, "unregister");
+    return dpiError__check(error, status, conn, "unregister");
 }
 
 

package/odpi/src/dpiPool.c

@@ -119,6 +119,31 @@ static int dpiPool__create(dpiPool *pool, const char *userName,
             DPI_OCI_ATTR_SPOOL_GETMODE, "set get mode", error) < 0)
         return DPI_FAILURE;
 
+    // set the session timeout on the pool
+    if (dpiOci__attrSet(pool->handle, DPI_OCI_HTYPE_SPOOL, (void*)
+            &createParams->timeout, 0, DPI_OCI_ATTR_SPOOL_TIMEOUT,
+            "set timeout", error) < 0)
+        return DPI_FAILURE;
+
+    // set the wait timeout on the pool (valid in 12.2 and higher)
+    if (pool->env->versionInfo->versionNum > 12 ||
+            (pool->env->versionInfo->versionNum == 12 &&
+             pool->env->versionInfo->releaseNum >= 2)) {
+        if (dpiOci__attrSet(pool->handle, DPI_OCI_HTYPE_SPOOL, (void*)
+                &createParams->waitTimeout, 0, DPI_OCI_ATTR_SPOOL_WAIT_TIMEOUT,
+                "set wait timeout", error) < 0)
+            return DPI_FAILURE;
+    }
+
+    // set the maximum lifetime session on the pool (valid in 12.1 and higher)
+    if (pool->env->versionInfo->versionNum >= 12) {
+        if (dpiOci__attrSet(pool->handle, DPI_OCI_HTYPE_SPOOL, (void*)
+                &createParams->maxLifetimeSession, 0,
+                DPI_OCI_ATTR_SPOOL_MAX_LIFETIME_SESSION,
+                "set max lifetime session", error) < 0)
+            return DPI_FAILURE;
+    }
+
     // set reamining attributes directly
     pool->homogeneous = createParams->homogeneous;
     pool->externalAuth = createParams->externalAuth;
@@ -154,26 +179,37 @@ void dpiPool__free(dpiPool *pool, dpiError *error)
 static int dpiPool__getAttributeUint(dpiPool *pool, uint32_t attribute,
         uint32_t *value, const char *fnName)
 {
+    int status, supported = 1;
     dpiError error;
-    int status;
 
     if (dpiPool__checkConnected(pool, fnName, &error) < 0)
         return dpiGen__endPublicFn(pool, DPI_FAILURE, &error);
     DPI_CHECK_PTR_NOT_NULL(pool, value)
     switch (attribute) {
-        case DPI_OCI_ATTR_SPOOL_BUSY_COUNT:
         case DPI_OCI_ATTR_SPOOL_MAX_LIFETIME_SESSION:
+            if (pool->env->versionInfo->versionNum < 12)
+                supported = 0;
+            break;
+        case DPI_OCI_ATTR_SPOOL_WAIT_TIMEOUT:
+            if (pool->env->versionInfo->versionNum < 12 ||
+                    (pool->env->versionInfo->versionNum == 12 &&
+                     pool->env->versionInfo->releaseNum < 2))
+                supported = 0;
+            break;
+        case DPI_OCI_ATTR_SPOOL_BUSY_COUNT:
         case DPI_OCI_ATTR_SPOOL_OPEN_COUNT:
         case DPI_OCI_ATTR_SPOOL_STMTCACHESIZE:
         case DPI_OCI_ATTR_SPOOL_TIMEOUT:
-            status = dpiOci__attrGet(pool->handle, DPI_OCI_HTYPE_SPOOL, value,
-                    NULL, attribute, "get attribute value", &error);
             break;
         default:
-            status = dpiError__set(&error, "get attribute",
-                    DPI_ERR_NOT_SUPPORTED);
+            supported = 0;
             break;
     }
+    if (supported)
+        status = dpiOci__attrGet(pool->handle, DPI_OCI_HTYPE_SPOOL, value,
+                NULL, attribute, "get attribute value", &error);
+    else status = dpiError__set(&error, "get attribute value",
+            DPI_ERR_NOT_SUPPORTED);
     return dpiGen__endPublicFn(pool, status, &error);
 }
 
@@ -185,10 +221,10 @@ static int dpiPool__getAttributeUint(dpiPool *pool, uint32_t attribute,
 static int dpiPool__setAttributeUint(dpiPool *pool, uint32_t attribute,
         uint32_t value, const char *fnName)
 {
+    int status, supported = 1;
+    void *ociValue = &value;
     uint8_t shortValue;
-    void *ociValue;
     dpiError error;
-    int status;
 
     // make sure session pool is connected
     if (dpiPool__checkConnected(pool, fnName, &error) < 0)
@@ -201,18 +237,29 @@ static int dpiPool__setAttributeUint(dpiPool *pool, uint32_t attribute,
             ociValue = &shortValue;
             break;
         case DPI_OCI_ATTR_SPOOL_MAX_LIFETIME_SESSION:
+            if (pool->env->versionInfo->versionNum < 12)
+                supported = 0;
+            break;
+        case DPI_OCI_ATTR_SPOOL_WAIT_TIMEOUT:
+            if (pool->env->versionInfo->versionNum < 12 ||
+                    (pool->env->versionInfo->versionNum == 12 &&
+                     pool->env->versionInfo->releaseNum < 2))
+                supported = 0;
+            break;
         case DPI_OCI_ATTR_SPOOL_STMTCACHESIZE:
         case DPI_OCI_ATTR_SPOOL_TIMEOUT:
-            ociValue = &value;
             break;
         default:
-            dpiError__set(&error, "set attribute", DPI_ERR_NOT_SUPPORTED);
-            return dpiGen__endPublicFn(pool, DPI_FAILURE, &error);
+            supported = 0;
+            break;
     }
 
     // set value in the OCI
-    status = dpiOci__attrSet(pool->handle, DPI_OCI_HTYPE_SPOOL, ociValue, 0,
-            attribute, "set attribute value", &error);
+    if (supported)
+        status = dpiOci__attrSet(pool->handle, DPI_OCI_HTYPE_SPOOL, ociValue,
+                0, attribute, "set attribute value", &error);
+    else status = dpiError__set(&error, "set attribute value",
+            DPI_ERR_NOT_SUPPORTED);
     return dpiGen__endPublicFn(pool, status, &error);
 }
 
@@ -226,7 +273,6 @@ int dpiPool_acquireConnection(dpiPool *pool, const char *userName,
         dpiConnCreateParams *params, dpiConn **conn)
 {
     dpiConnCreateParams localParams;
-    size_t structSize;
     dpiError error;
     int status;
 
@@ -239,10 +285,9 @@ int dpiPool_acquireConnection(dpiPool *pool, const char *userName,
 
     // use default parameters if none provided
     if (!params || pool->env->context->dpiMinorVersion == 0) {
-        dpiContext__initConnCreateParams(pool->env->context, &localParams,
-                &structSize);
+        dpiContext__initConnCreateParams(&localParams);
         if (params)
-            memcpy(&localParams, params, structSize);
+            memcpy(&localParams, params, sizeof(dpiConnCreateParams__v20));
         params = &localParams;
     }
 
@@ -309,8 +354,11 @@ int dpiPool_create(const dpiContext *context, const char *userName,
         dpiContext__initCommonCreateParams(&localCommonParams);
         commonParams = &localCommonParams;
     }
-    if (!createParams) {
+    if (!createParams || context->dpiMinorVersion < 4) {
         dpiContext__initPoolCreateParams(&localCreateParams);
+        if (createParams)
+            memcpy(&localCreateParams, createParams,
+                    sizeof(dpiPoolCreateParams__v23));
         createParams = &localCreateParams;
     }
 
@@ -433,6 +481,17 @@ int dpiPool_getTimeout(dpiPool *pool, uint32_t *value)
 }
 
 
+//-----------------------------------------------------------------------------
+// dpiPool_getWaitTimeout() [PUBLIC]
+//   Return the pool's wait timeout value.
+//-----------------------------------------------------------------------------
+int dpiPool_getWaitTimeout(dpiPool *pool, uint32_t *value)
+{
+    return dpiPool__getAttributeUint(pool, DPI_OCI_ATTR_SPOOL_WAIT_TIMEOUT,
+            value, __func__);
+}
+
+
 //-----------------------------------------------------------------------------
 // dpiPool_release() [PUBLIC]
 //   Release a reference to the pool.
@@ -486,3 +545,14 @@ int dpiPool_setTimeout(dpiPool *pool, uint32_t value)
             __func__);
 }
 
+
+//-----------------------------------------------------------------------------
+// dpiPool_setWaitTimeout() [PUBLIC]
+//   Set the pool's wait timeout value.
+//-----------------------------------------------------------------------------
+int dpiPool_setWaitTimeout(dpiPool *pool, uint32_t value)
+{
+    return dpiPool__setAttributeUint(pool, DPI_OCI_ATTR_SPOOL_WAIT_TIMEOUT,
+            value, __func__);
+}
+

package/odpi/src/dpiStmt.c

@@ -22,7 +22,7 @@ static int dpiStmt__getQueryInfo(dpiStmt *stmt, uint32_t pos,
 static int dpiStmt__getQueryInfoFromParam(dpiStmt *stmt, void *param,
         dpiQueryInfo *info, dpiError *error);
 static int dpiStmt__postFetch(dpiStmt *stmt, dpiError *error);
-static int dpiStmt__preFetch(dpiStmt *stmt, dpiError *error);
+static int dpiStmt__beforeFetch(dpiStmt *stmt, dpiError *error);
 static int dpiStmt__reExecute(dpiStmt *stmt, uint32_t numIters,
         uint32_t mode, dpiError *error);
 
@@ -538,6 +538,9 @@ static int dpiStmt__execute(dpiStmt *stmt, uint32_t numIters,
     // buffer structures
     for (i = 0; i < stmt->numBindVars; i++) {
         var = stmt->bindVars[i].var;
+        if (var->isArray && numIters > 1)
+            return dpiError__set(error, "bind array var",
+                    DPI_ERR_ARRAY_VAR_NOT_SUPPORTED);
         for (j = 0; j < var->buffer.maxArraySize; j++) {
             data = &var->buffer.externalData[j];
             if (var->type->oracleTypeNum == DPI_ORACLE_TYPE_STMT &&
@@ -546,13 +549,17 @@ static int dpiStmt__execute(dpiStmt *stmt, uint32_t numIters,
                         DPI_ERR_NOT_SUPPORTED);
             if (dpiVar__setValue(var, &var->buffer, j, data, error) < 0)
                 return DPI_FAILURE;
+            if (var->dynBindBuffers)
+                var->dynBindBuffers[j].actualArraySize = 0;
         }
         if (stmt->isReturning || var->isDynamic)
             var->error = error;
     }
 
-    // for queries, set the prefetch rows to the fetch array size in order to
-    // avoid the network round trip for the first fetch
+    // for queries, set the OCI prefetch to a fixed value; this prevents an
+    // additional round trip for single row fetches while avoiding the overhead
+    // of copying from the OCI prefetch buffer to our own buffers for larger
+    // fetches
     if (stmt->statementType == DPI_STMT_TYPE_SELECT) {
         prefetchSize = DPI_PREFETCH_ROWS_DEFAULT;
         if (dpiOci__attrSet(stmt->handle, DPI_OCI_HTYPE_STMT, &prefetchSize,
@@ -615,7 +622,7 @@ static int dpiStmt__execute(dpiStmt *stmt, uint32_t numIters,
 static int dpiStmt__fetch(dpiStmt *stmt, dpiError *error)
 {
     // perform any pre-fetch activities required
-    if (dpiStmt__preFetch(stmt, error) < 0)
+    if (dpiStmt__beforeFetch(stmt, error) < 0)
         return DPI_FAILURE;
 
     // perform fetch
@@ -848,13 +855,13 @@ static int dpiStmt__postFetch(dpiStmt *stmt, dpiError *error)
 
 
 //-----------------------------------------------------------------------------
-// dpiStmt__preFetch() [INTERNAL]
+// dpiStmt__beforeFetch() [INTERNAL]
 //   Performs work that needs to be done prior to fetch for each variable. In
 // addition, variables are created if they do not already exist. A check is
 // also made to ensure that the variable has enough space to support a fetch
 // of the requested size.
 //-----------------------------------------------------------------------------
-static int dpiStmt__preFetch(dpiStmt *stmt, dpiError *error)
+static int dpiStmt__beforeFetch(dpiStmt *stmt, dpiError *error)
 {
     dpiQueryInfo *queryInfo;
     dpiData *data;
@@ -1193,6 +1200,18 @@ int dpiStmt_executeMany(dpiStmt *stmt, dpiExecMode mode, uint32_t numIters)
         return dpiGen__endPublicFn(stmt, DPI_FAILURE, &error);
     }
 
+    // batch errors and array DML row counts are only supported with DML
+    // statements (insert, update, delete and merge)
+    if ((mode & DPI_MODE_EXEC_BATCH_ERRORS ||
+                mode & DPI_MODE_EXEC_ARRAY_DML_ROWCOUNTS) &&
+            stmt->statementType != DPI_STMT_TYPE_INSERT &&
+            stmt->statementType != DPI_STMT_TYPE_UPDATE &&
+            stmt->statementType != DPI_STMT_TYPE_DELETE &&
+            stmt->statementType != DPI_STMT_TYPE_MERGE) {
+        dpiError__set(&error, "check mode", DPI_ERR_EXEC_MODE_ONLY_FOR_DML);
+        return dpiGen__endPublicFn(stmt, DPI_FAILURE, &error);
+    }
+
     // ensure that all bind variables have a big enough maxArraySize to
     // support this operation
     for (i = 0; i < stmt->numBindVars; i++) {
@@ -1567,8 +1586,9 @@ int dpiStmt_getQueryValue(dpiStmt *stmt, uint32_t pos,
 
 //-----------------------------------------------------------------------------
 // dpiStmt_getRowCount() [PUBLIC]
-//   Return the number of rows affected by the last SQL executed (for insert,
-// update or delete) or the number of rows fetched (for queries).
+//   Return the number of rows affected by the last DML executed (for insert,
+// update, delete and merge) or the number of rows fetched (for queries). In
+// all other cases, 0 is returned.
 //-----------------------------------------------------------------------------
 int dpiStmt_getRowCount(dpiStmt *stmt, uint64_t *count)
 {
@@ -1580,7 +1600,12 @@ int dpiStmt_getRowCount(dpiStmt *stmt, uint64_t *count)
     DPI_CHECK_PTR_NOT_NULL(stmt, count)
     if (stmt->statementType == DPI_STMT_TYPE_SELECT)
         *count = stmt->rowCount;
-    else if (stmt->env->versionInfo->versionNum < 12) {
+    else if (stmt->statementType != DPI_STMT_TYPE_INSERT &&
+            stmt->statementType != DPI_STMT_TYPE_UPDATE &&
+            stmt->statementType != DPI_STMT_TYPE_DELETE &&
+            stmt->statementType != DPI_STMT_TYPE_MERGE) {
+        *count = 0;
+    } else if (stmt->env->versionInfo->versionNum < 12) {
         if (dpiOci__attrGet(stmt->handle, DPI_OCI_HTYPE_STMT, &rowCount32, 0,
                 DPI_OCI_ATTR_ROW_COUNT, "get row count", &error) < 0)
             return dpiGen__endPublicFn(stmt, DPI_FAILURE, &error);
@@ -1699,7 +1724,7 @@ int dpiStmt_scroll(dpiStmt *stmt, dpiFetchMode mode, int32_t offset,
     }
 
     // perform any pre-fetch activities required
-    if (dpiStmt__preFetch(stmt, &error) < 0)
+    if (dpiStmt__beforeFetch(stmt, &error) < 0)
         return dpiGen__endPublicFn(stmt, DPI_FAILURE, &error);
 
     // perform fetch; when fetching the last row, only fetch a single row

package/odpi/src/dpiSubscr.c

@@ -50,6 +50,7 @@ static void dpiSubscr__callback(dpiSubscr *subscr, UNUSED void *handle,
         dpiError__getInfo(&error, &errorInfo);
         message.errorInfo = &errorInfo;
     }
+    message.registered = subscr->registered;
 
     // invoke user callback
     (*subscr->callback)(subscr->callbackContext, &message);
@@ -86,6 +87,7 @@ int dpiSubscr__create(dpiSubscr *subscr, dpiConn *conn,
         dpiSubscrCreateParams *params, uint64_t *subscrId, dpiError *error)
 {
     uint32_t qosFlags;
+    int32_t int32Val;
     int rowids;
 
     // retain a reference to the connection
@@ -93,6 +95,7 @@ int dpiSubscr__create(dpiSubscr *subscr, dpiConn *conn,
     subscr->conn = conn;
     subscr->callback = params->callback;
     subscr->callbackContext = params->callbackContext;
+    subscr->subscrNamespace = params->subscrNamespace;
     subscr->qos = params->qos;
 
     // create the subscription handle
@@ -118,6 +121,13 @@ int dpiSubscr__create(dpiSubscr *subscr, dpiConn *conn,
             DPI_OCI_ATTR_SUBSCR_TIMEOUT, "set timeout", error) < 0)
         return DPI_FAILURE;
 
+    // set the IP address used on the client to listen for events
+    if (params->ipAddress && params->ipAddressLength > 0 &&
+            dpiOci__attrSet(subscr->env->handle, DPI_OCI_HTYPE_ENV,
+                    (void*) params->ipAddress, params->ipAddressLength,
+                    DPI_OCI_ATTR_SUBSCR_IPADDR, "set IP address", error) < 0)
+        return DPI_FAILURE;
+
     // set the port number used on the client to listen for events
     if (params->portNumber > 0 && dpiOci__attrSet(subscr->env->handle,
             DPI_OCI_HTYPE_ENV, (void*) &params->portNumber, 0,
@@ -180,9 +190,44 @@ int dpiSubscr__create(dpiSubscr *subscr, dpiConn *conn,
             DPI_OCI_ATTR_CHNF_OPERATIONS, "set operations", error) < 0)
         return DPI_FAILURE;
 
+    // set grouping information, if applicable
+    if (params->groupingClass) {
+
+        // set grouping class
+        if (dpiOci__attrSet(subscr->handle, DPI_OCI_HTYPE_SUBSCRIPTION,
+                (void*) &params->groupingClass, 0,
+                DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_CLASS, "set grouping class",
+                error) < 0)
+            return DPI_FAILURE;
+
+        // set grouping value
+        if (dpiOci__attrSet(subscr->handle, DPI_OCI_HTYPE_SUBSCRIPTION,
+                (void*) &params->groupingValue, 0,
+                DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_VALUE, "set grouping value",
+                error) < 0)
+            return DPI_FAILURE;
+
+        // set grouping type
+        if (dpiOci__attrSet(subscr->handle, DPI_OCI_HTYPE_SUBSCRIPTION,
+                (void*) &params->groupingType, 0,
+                DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_TYPE, "set grouping type",
+                error) < 0)
+            return DPI_FAILURE;
+
+        // set grouping repeat count
+        int32Val = DPI_SUBSCR_GROUPING_FOREVER;
+        if (dpiOci__attrSet(subscr->handle, DPI_OCI_HTYPE_SUBSCRIPTION,
+                (void*) &int32Val, 0,
+                DPI_OCI_ATTR_SUBSCR_NTFN_GROUPING_REPEAT_COUNT,
+                "set grouping repeat count", error) < 0)
+            return DPI_FAILURE;
+
+    }
+
     // register the subscription
     if (dpiOci__subscriptionRegister(conn, &subscr->handle, error) < 0)
         return DPI_FAILURE;
+    subscr->registered = 1;
 
     // get the registration id, if applicable
     if (subscrId && dpiOci__attrGet(subscr->handle, DPI_OCI_HTYPE_SUBSCRIPTION,
@@ -201,7 +246,9 @@ int dpiSubscr__create(dpiSubscr *subscr, dpiConn *conn,
 void dpiSubscr__free(dpiSubscr *subscr, dpiError *error)
 {
     if (subscr->handle) {
-        dpiOci__subscriptionUnRegister(subscr, error);
+        if (subscr->registered)
+            dpiOci__subscriptionUnRegister(subscr->conn, subscr, error);
+        dpiOci__handleFree(subscr->handle, DPI_OCI_HTYPE_SUBSCRIPTION);
         subscr->handle = NULL;
     }
     if (subscr->conn) {
@@ -247,6 +294,41 @@ static void dpiSubscr__freeMessage(dpiSubscrMessage *message)
 }
 
 
+//-----------------------------------------------------------------------------
+// dpiSubscr__populateAQMessage() [INTERNAL]
+//   Populate message with details.
+//-----------------------------------------------------------------------------
+static int dpiSubscr__populateAQMessage(dpiSubscr *subscr,
+        dpiSubscrMessage *message, void *descriptor, dpiError *error)
+{
+    uint32_t flags = 0;
+
+    // determine if message is a deregistration message
+    if (dpiOci__attrGet(descriptor, DPI_OCI_DTYPE_AQNFY_DESCRIPTOR, &flags,
+            NULL, DPI_OCI_ATTR_NFY_FLAGS, "get flags", error) < 0)
+        return DPI_FAILURE;
+    message->eventType = (flags == 1) ? DPI_EVENT_DEREG : DPI_EVENT_AQ;
+    if (message->eventType == DPI_EVENT_DEREG) {
+        subscr->registered = 0;
+        return DPI_SUCCESS;
+    }
+
+    // determine the name of the queue which spawned the event
+    if (dpiOci__attrGet(descriptor, DPI_OCI_DTYPE_AQNFY_DESCRIPTOR,
+            (void*) &message->queueName, &message->queueNameLength,
+            DPI_OCI_ATTR_QUEUE_NAME, "get queue name", error) < 0)
+        return DPI_FAILURE;
+
+    // determine the consumer name for the queue that spawned the event
+    if (dpiOci__attrGet(descriptor, DPI_OCI_DTYPE_AQNFY_DESCRIPTOR,
+            (void*) &message->consumerName, &message->consumerNameLength,
+            DPI_OCI_ATTR_CONSUMER_NAME, "get consumer name", error) < 0)
+        return DPI_FAILURE;
+
+    return DPI_SUCCESS;
+}
+
+
 //-----------------------------------------------------------------------------
 // dpiSubscr__populateObjectChangeMessage() [INTERNAL]
 //   Populate object change message with details.
@@ -301,6 +383,17 @@ static int dpiSubscr__populateMessage(dpiSubscr *subscr,
 {
     void *rawValue;
 
+    // if quality of service flag indicates that deregistration should take
+    // place when the first notification is received, mark the subscription
+    // as no longer registered
+    if (subscr->qos & DPI_SUBSCR_QOS_DEREG_NFY)
+        subscr->registered = 0;
+
+    // handle AQ messages, if applicable
+    if (subscr->subscrNamespace == DPI_SUBSCR_NAMESPACE_AQ)
+        return dpiSubscr__populateAQMessage(subscr, message, descriptor,
+                error);
+
     // determine the type of event that was spawned
     if (dpiOci__attrGet(descriptor, DPI_OCI_DTYPE_CHDES, &message->eventType,
             NULL, DPI_OCI_ATTR_CHDES_NFYTYPE, "get event type", error) < 0)
@@ -328,7 +421,7 @@ static int dpiSubscr__populateMessage(dpiSubscr *subscr,
             return dpiSubscr__populateQueryChangeMessage(subscr, message,
                     descriptor, error);
         case DPI_EVENT_DEREG:
-            subscr->handle = NULL;
+            subscr->registered = 0;
             break;
         default:
             return dpiError__set(error, "event type", DPI_ERR_NOT_SUPPORTED);
@@ -562,10 +655,10 @@ int dpiSubscr_close(dpiSubscr *subscr)
 
     if (dpiSubscr__checkOpen(subscr, __func__, &error) < 0)
         return dpiGen__endPublicFn(subscr, DPI_FAILURE, &error);
-    if (subscr->handle) {
-        if (dpiOci__subscriptionUnRegister(subscr, &error) < 0)
+    if (subscr->registered) {
+        if (dpiOci__subscriptionUnRegister(subscr->conn, subscr, &error) < 0)
             return dpiGen__endPublicFn(subscr, DPI_FAILURE, &error);
-        subscr->handle = NULL;
+        subscr->registered = 0;
     }
 
     return dpiGen__endPublicFn(subscr, DPI_SUCCESS, &error);

package/odpi/src/dpiVar.c

@@ -207,6 +207,12 @@ static void dpiVar__assignCallbackBuffer(dpiVar *var, dpiVarBuffer *buffer,
         case DPI_ORACLE_TYPE_BFILE:
             *bufpp = buffer->data.asLobLocator[index];
             break;
+        case DPI_ORACLE_TYPE_ROWID:
+            *bufpp = buffer->data.asRowid[index];
+            break;
+        case DPI_ORACLE_TYPE_STMT:
+            *bufpp = buffer->data.asStmt[index];
+            break;
         default:
             *bufpp = buffer->data.asBytes + index * var->sizeInBytes;
             break;
@@ -1639,7 +1645,7 @@ int dpiVar_getReturnedData(dpiVar *var, uint32_t pos, uint32_t *numElements,
     DPI_CHECK_PTR_NOT_NULL(var, numElements)
     DPI_CHECK_PTR_NOT_NULL(var, data)
     if (var->dynBindBuffers) {
-        *numElements = var->dynBindBuffers[pos].maxArraySize;
+        *numElements = var->dynBindBuffers[pos].actualArraySize;
         *data = var->dynBindBuffers[pos].externalData;
     } else {
         *numElements = 0;