Author: byterock
Date: Thu Jul 9 11:28:02 2009
New Revision: 13027
Modified:
dbd-oracle/branches/rs_array/oci8.c
dbd-oracle/branches/rs_array/ocitrace.h
Log:
more stuff getting better
Modified: dbd-oracle/branches/rs_array/oci8.c
==============================================================================
--- dbd-oracle/branches/rs_array/oci8.c (original)
+++ dbd-oracle/branches/rs_array/oci8.c Thu Jul 9 11:28:02 2009
@@ -437,104 +437,104 @@
case OCI_ATTR_DELAY: return
"OCI_ATTR_DELAY"; /* delay */
case OCI_ATTR_EXPIRATION: return
"OCI_ATTR_EXPIRATION"; /* expiration */
case OCI_ATTR_CORRELATION: return
"OCI_ATTR_CORRELATION"; /* correlation id */
- case OCI_ATTR_ATTEMPTS: return "";
/* # of attempts */
- case OCI_ATTR_RECIPIENT_LIST: return "";
/* recipient list */
- case OCI_ATTR_EXCEPTION_QUEUE: return "";
/* exception queue name */
- case OCI_ATTR_ENQ_TIME: return "";/* enqueue
time (only OCIAttrGet) */
- case OCI_ATTR_MSG_STATE: return "";/*
message state (only OCIAttrGet) */
+ case OCI_ATTR_ATTEMPTS: return
"OCI_ATTR_ATTEMPTS"; /* # of attempts */
+ case OCI_ATTR_RECIPIENT_LIST: return
"OCI_ATTR_RECIPIENT_LIST"; /* recipient list */
+ case OCI_ATTR_EXCEPTION_QUEUE: return
"OCI_ATTR_EXCEPTION_QUEUE"; /* exception queue name */
+ case OCI_ATTR_ENQ_TIME: return
"OCI_ATTR_ENQ_TIME";/* enqueue time (only OCIAttrGet) */
+ case OCI_ATTR_MSG_STATE: return
"OCI_ATTR_MSG_STATE";/* message state (only OCIAttrGet) */
/* NOTE: 64-66 used
below */
- case OCI_ATTR_AGENT_NAME: return "";
/* agent name */
- case OCI_ATTR_AGENT_ADDRESS: return "";
/* agent address */
- case OCI_ATTR_AGENT_PROTOCOL: return "";
/* agent protocol */
-
- case OCI_ATTR_SENDER_ID: return "";
/* sender id */
- case OCI_ATTR_ORIGINAL_MSGID: return "";
/* original message id */
-
- case OCI_ATTR_QUEUE_NAME: return "";
/* queue name */
- case OCI_ATTR_NFY_MSGID: return "";
/* message id */
- case OCI_ATTR_MSG_PROP: return "";
/* message properties */
-
- case OCI_ATTR_NUM_DML_ERRORS: return "";
/* num of errs in array DML */
- case OCI_ATTR_DML_ROW_OFFSET: return "";
/* row offset in the array */
-
- case OCI_ATTR_DATEFORMAT: return "";
/* default date format string */
- case OCI_ATTR_BUF_ADDR: return "";
/* buffer address */
- case OCI_ATTR_BUF_SIZE: return "";
/* buffer size */
- case OCI_ATTR_DIRPATH_MODE: return ""; /*
mode of direct path operation */
- case OCI_ATTR_DIRPATH_NOLOG: return "";
/* nologging option */
- case OCI_ATTR_DIRPATH_PARALLEL: return "";
/* parallel (temp seg) option */
- case OCI_ATTR_NUM_ROWS: return ""; /* number of
rows in column array */
+ case OCI_ATTR_AGENT_NAME: return
"OCI_ATTR_AGENT_NAME"; /* agent name */
+ case OCI_ATTR_AGENT_ADDRESS: return
"OCI_ATTR_AGENT_ADDRESS"; /* agent address */
+ case OCI_ATTR_AGENT_PROTOCOL: return
"OCI_ATTR_AGENT_PROTOCOL"; /* agent protocol */
+
+ case OCI_ATTR_SENDER_ID: return
"OCI_ATTR_SENDER_ID"; /* sender id */
+ case OCI_ATTR_ORIGINAL_MSGID: return
"OCI_ATTR_ORIGINAL_MSGID"; /* original message id */
+
+ case OCI_ATTR_QUEUE_NAME: return
"OCI_ATTR_QUEUE_NAME"; /* queue name */
+ case OCI_ATTR_NFY_MSGID: return
"OCI_ATTR_NFY_MSGID"; /* message id */
+ case OCI_ATTR_MSG_PROP: return
"OCI_ATTR_MSG_PROP"; /* message properties */
+
+ case OCI_ATTR_NUM_DML_ERRORS: return
"OCI_ATTR_NUM_DML_ERRORS"; /* num of errs in array DML */
+ case OCI_ATTR_DML_ROW_OFFSET: return
"OCI_ATTR_DML_ROW_OFFSET"; /* row offset in the array */
+
+ case OCI_ATTR_DATEFORMAT: return
"OCI_ATTR_DATEFORMAT"; /* default date format string */
+ case OCI_ATTR_BUF_ADDR: return
"OCI_ATTR_BUF_ADDR"; /* buffer address */
+ case OCI_ATTR_BUF_SIZE: return
"OCI_ATTR_BUF_SIZE"; /* buffer size */
+ case OCI_ATTR_DIRPATH_MODE: return
"OCI_ATTR_DIRPATH_MODE"; /* mode of direct path operation */
+ case OCI_ATTR_DIRPATH_NOLOG: return
"OCI_ATTR_DIRPATH_NOLOG"; /* nologging option */
+ case OCI_ATTR_DIRPATH_PARALLEL: return
"OCI_ATTR_DIRPATH_PARALLEL"; /* parallel (temp seg) option */
+ case OCI_ATTR_NUM_ROWS: return
"OCI_ATTR_NUM_ROWS"; /* number of rows in column array */
/* NOTE that OCI_ATTR_NUM_COLS is a
column
* array attribute too.
*/
- case OCI_ATTR_COL_COUNT: return "";
/* columns of column array
+ case OCI_ATTR_COL_COUNT: return
"OCI_ATTR_COL_COUNT"; /* columns of column array
processed so far.
*/
- case OCI_ATTR_STREAM_OFFSET: return ""; /*
str off of last row processed
+ case OCI_ATTR_STREAM_OFFSET: return
"OCI_ATTR_STREAM_OFFSET"; /* str off of last row processed
case OCI_ATTR_SHARED_HEAPALLO: return "";
/* Shared Heap Allocation Size */
- case OCI_ATTR_SERVER_GROUP: return "";
/* server group name */
+ case OCI_ATTR_SERVER_GROUP: return
"OCI_ATTR_SERVER_GROUP"; /* server group name */
- case OCI_ATTR_MIGSESSION: return ""; /*
migratable session attribute */
+ case OCI_ATTR_MIGSESSION: return
"OCI_ATTR_MIGSESSION"; /* migratable session attribute */
- case OCI_ATTR_NOCACHE: return "";
/* Temporary LOBs */
+ case OCI_ATTR_NOCACHE: return
"OCI_ATTR_NOCACHE"; /* Temporary LOBs */
- case OCI_ATTR_MEMPOOL_SIZE: return "";
/* Pool Size */
- case OCI_ATTR_MEMPOOL_INSTNAME: return "";
/* Instance name */
- case OCI_ATTR_MEMPOOL_APPNAME: return "";
/* Application name */
- case OCI_ATTR_MEMPOOL_HOMENAME: return "";
/* Home Directory name */
- case OCI_ATTR_MEMPOOL_MODEL: return "";
/* Pool Model (proc,thrd,both)*/
- case OCI_ATTR_MODES: return "";
/* Modes */
-
- case OCI_ATTR_SUBSCR_NAME: return "";
/* name of subscription */
- case OCI_ATTR_SUBSCR_CALLBACK: return "";
/* associated callback */
- case OCI_ATTR_SUBSCR_CTX: return ""; /*
associated callback context */
- case OCI_ATTR_SUBSCR_PAYLOAD: return "";
/* associated payload */
- case OCI_ATTR_SUBSCR_NAMESPACE: return "";
/* associated namespace */
-
- case OCI_ATTR_PROXY_CREDENTIALS: return
""; /* Proxy user credentials */
- case OCI_ATTR_INITIAL_CLIENT_ROLES: return
""; /* Initial client role list */
-
- case OCI_ATTR_UNK: return "";
/* unknown attribute */
- case OCI_ATTR_NUM_COLS: return "";
/* number of columns */
- case OCI_ATTR_LIST_COLUMNS: return "";
/* parameter of the column list */
- case OCI_ATTR_RDBA: return ""; /*
DBA of the segment header */
- case OCI_ATTR_CLUSTERED: return "";
/* whether the table is clustered */
- case OCI_ATTR_PARTITIONED: return "";
/* whether the table is partitioned */
- case OCI_ATTR_INDEX_ONLY: return "";
/* whether the table is index only */
- case OCI_ATTR_LIST_ARGUMENTS: return "";
/* parameter of the argument list */
- case OCI_ATTR_LIST_SUBPROGRAMS: return "";
/* parameter of the subprogram list */
- case OCI_ATTR_REF_TDO: return ""; /*
REF to the type descriptor */
- case OCI_ATTR_LINK: return "";
/* the database link name */
- case OCI_ATTR_MIN: return "";
/* minimum value */
- case OCI_ATTR_MAX: return "";
/* maximum value */
- case OCI_ATTR_INCR: return "";
/* increment value */
- case OCI_ATTR_CACHE: return ""; /* number
of sequence numbers cached */
- case OCI_ATTR_ORDER: return ""; /*
whether the sequence is ordered */
- case OCI_ATTR_HW_MARK: return "";
/* high-water mark */
- case OCI_ATTR_TYPE_SCHEMA: return "";
/* type's schema name */
- case OCI_ATTR_TIMESTAMP: return "";
/* timestamp of the object */
- case OCI_ATTR_NUM_ATTRS: return "";
/* number of sttributes */
- case OCI_ATTR_NUM_PARAMS: return "";
/* number of parameters */
- case OCI_ATTR_OBJID: return ""; /*
object id for a table or view */
- case OCI_ATTR_PTYPE: return ""; /*
type of info described by */
- case OCI_ATTR_PARAM: return "";
/* parameter descriptor */
- case OCI_ATTR_OVERLOAD_ID: return "";
/* overload ID for funcs and procs */
- case OCI_ATTR_TABLESPACE: return "";
/* table name space */
- case OCI_ATTR_TDO: return "";
/* TDO of a type */
- case OCI_ATTR_LTYPE: return "";
/* list type */
- case OCI_ATTR_PARSE_ERROR_OFFSET: return
""; /* Parse Error offset */
- case OCI_ATTR_IS_TEMPORARY: return "";
/* whether table is temporary */
- case OCI_ATTR_IS_TYPED: return "";
/* whether table is typed */
- case OCI_ATTR_DURATION: return ""; /*
duration of temporary table */
- case OCI_ATTR_IS_INVOKER_RIGHTS: return
""; /* is invoker rights */
- case OCI_ATTR_OBJ_NAME: return ""; /*
top level schema obj name */
- case OCI_ATTR_OBJ_SCHEMA: return "";
/* schema name */
- case OCI_ATTR_OBJ_ID: return ""; /*
top level schema object id */
+ case OCI_ATTR_MEMPOOL_SIZE: return
"OCI_ATTR_MEMPOOL_SIZE"; /* Pool Size */
+ case OCI_ATTR_MEMPOOL_INSTNAME: return
"OCI_ATTR_MEMPOOL_INSTNAME"; /* Instance name */
+ case OCI_ATTR_MEMPOOL_APPNAME: return
"OCI_ATTR_MEMPOOL_APPNAME"; /* Application name */
+ case OCI_ATTR_MEMPOOL_HOMENAME: return
"OCI_ATTR_MEMPOOL_HOMENAME"; /* Home Directory name */
+ case OCI_ATTR_MEMPOOL_MODEL: return
"OCI_ATTR_MEMPOOL_MODEL"; /* Pool Model (proc,thrd,both)*/
+ case OCI_ATTR_MODES: return
"OCI_ATTR_MODES"; /* Modes */
+
+ case OCI_ATTR_SUBSCR_NAME: return
"OCI_ATTR_SUBSCR_NAME"; /* name of subscription */
+ case OCI_ATTR_SUBSCR_CALLBACK: return
"OCI_ATTR_SUBSCR_CALLBACK"; /* associated callback */
+ case OCI_ATTR_SUBSCR_CTX: return
"OCI_ATTR_SUBSCR_CTX"; /* associated callback context */
+ case OCI_ATTR_SUBSCR_PAYLOAD: return
"OCI_ATTR_SUBSCR_PAYLOAD"; /* associated payload */
+ case OCI_ATTR_SUBSCR_NAMESPACE: return
"OCI_ATTR_SUBSCR_NAMESPACE"; /* associated namespace */
+
+ case OCI_ATTR_PROXY_CREDENTIALS: return
"OCI_ATTR_PROXY_CREDENTIALS"; /* Proxy user credentials */
+ case OCI_ATTR_INITIAL_CLIENT_ROLES: return
"OCI_ATTR_INITIAL_CLIENT_ROLES"; /* Initial client role list */
+
+ case OCI_ATTR_UNK: return "OCI_ATTR_UNK";
/* unknown attribute */
+ case OCI_ATTR_NUM_COLS: return
"OCI_ATTR_NUM_COLS"; /* number of columns */
+ case OCI_ATTR_LIST_COLUMNS: return
"OCI_ATTR_LIST_COLUMNS"; /* parameter of the column list */
+ case OCI_ATTR_RDBA: return "OCI_ATTR_RDBA";
/* DBA of the segment header */
+ case OCI_ATTR_CLUSTERED: return
"OCI_ATTR_CLUSTERED"; /* whether the table is clustered */
+ case OCI_ATTR_PARTITIONED: return
"OCI_ATTR_PARTITIONED"; /* whether the table is partitioned */
+ case OCI_ATTR_INDEX_ONLY: return
"OCI_ATTR_INDEX_ONLY"; /* whether the table is index only */
+ case OCI_ATTR_LIST_ARGUMENTS: return
"OCI_ATTR_LIST_ARGUMENTS"; /* parameter of the argument list */
+ case OCI_ATTR_LIST_SUBPROGRAMS: return
"OCI_ATTR_LIST_SUBPROGRAMS"; /* parameter of the subprogram list */
+ case OCI_ATTR_REF_TDO: return
"OCI_ATTR_REF_TDO"; /* REF to the type descriptor */
+ case OCI_ATTR_LINK: return "OCI_ATTR_LINK";
/* the database link name */
+ case OCI_ATTR_MIN: return "OCI_ATTR_MIN";
/* minimum value */
+ case OCI_ATTR_MAX: return "OCI_ATTR_MAX";
/* maximum value */
+ case OCI_ATTR_INCR: return "OCI_ATTR_INCR";
/* increment value */
+ case OCI_ATTR_CACHE: return
"OCI_ATTR_CACHE"; /* number of sequence numbers cached */
+ case OCI_ATTR_ORDER: return
"OCI_ATTR_ORDER"; /* whether the sequence is ordered */
+ case OCI_ATTR_HW_MARK: return
"OCI_ATTR_HW_MARK"; /* high-water mark */
+ case OCI_ATTR_TYPE_SCHEMA: return
"OCI_ATTR_TYPE_SCHEMA"; /* type's schema name */
+ case OCI_ATTR_TIMESTAMP: return
"OCI_ATTR_TIMESTAMP"; /* timestamp of the object */
+ case OCI_ATTR_NUM_ATTRS: return
"OCI_ATTR_NUM_ATTRS"; /* number of sttributes */
+ case OCI_ATTR_NUM_PARAMS: return
"OCI_ATTR_NUM_PARAMS"; /* number of parameters */
+ case OCI_ATTR_OBJID: return
"OCI_ATTR_OBJID"; /* object id for a table or view */
+ case OCI_ATTR_PTYPE: return
"OCI_ATTR_PTYPE"; /* type of info described by */
+ case OCI_ATTR_PARAM: return
"OCI_ATTR_PARAM"; /* parameter descriptor */
+ case OCI_ATTR_OVERLOAD_ID: return
"OCI_ATTR_OVERLOAD_ID"; /* overload ID for funcs and procs */
+ case OCI_ATTR_TABLESPACE: return
"OCI_ATTR_TABLESPACE"; /* table name space */
+ case OCI_ATTR_TDO: return "OCI_ATTR_TDO";
/* TDO of a type */
+ case OCI_ATTR_LTYPE: return
"OCI_ATTR_LTYPE"; /* list type */
+ case OCI_ATTR_PARSE_ERROR_OFFSET: return
"OCI_ATTR_PARSE_ERROR_OFFSET"; /* Parse Error offset */
+ case OCI_ATTR_IS_TEMPORARY: return
"OCI_ATTR_IS_TEMPORARY"; /* whether table is temporary */
+ case OCI_ATTR_IS_TYPED: return
"OCI_ATTR_IS_TYPED"; /* whether table is typed */
+ case OCI_ATTR_DURATION: return
"OCI_ATTR_DURATION"; /* duration of temporary table */
+ case OCI_ATTR_IS_INVOKER_RIGHTS: return
"OCI_ATTR_IS_INVOKER_RIGHTS"; /* is invoker rights */
+ case OCI_ATTR_OBJ_NAME: return
"OCI_ATTR_OBJ_NAME"; /* top level schema obj name */
+ case OCI_ATTR_OBJ_SCHEMA: return
"OCI_ATTR_OBJ_SCHEMA"; /* schema name */
+ case OCI_ATTR_OBJ_ID: return
"OCI_ATTR_OBJ_ID"; /* top level schema object id */
- case OCI_ATTR_DIRPATH_SORTED_INDEX: return
"";/* index that data is sorted on */
+ case OCI_ATTR_DIRPATH_SORTED_INDEX: return
"OCI_ATTR_DIRPATH_SORTED_INDEX";/* index that data is sorted on */
/* direct path index maint method (see oci8dp.h) */
- case OCI_ATTR_DIRPATH_INDEX_MAINT_METHOD:
return "";
+ case OCI_ATTR_DIRPATH_INDEX_MAINT_METHOD:
return "OCI_ATTR_DIRPATH_INDEX_MAINT_METHOD";
/* parallel load: db file, initial and next extent sizes */
Modified: dbd-oracle/branches/rs_array/ocitrace.h
==============================================================================
--- dbd-oracle/branches/rs_array/ocitrace.h (original)
+++ dbd-oracle/branches/rs_array/ocitrace.h Thu Jul 9 11:28:02 2009
@@ -239,8 +239,8 @@
#define OCIAttrGet_log_stat(th,ht,ah,sp,at,eh,stat)
\
stat = OCIAttrGet(th,ht,ah,sp,at,eh); \
(DBD_OCI_TRACEON) ? PerlIO_printf(DBD_OCI_TRACEFP,
\
- "%sAttrGet(%p,%s,%p,%p,%lu,%p)=%s\n", \
- OciTp,
(void*)th,oci_hdtype_name(ht),(void*)ah,pul_t(sp),ul_t(at),(void*)eh,\
+ "%sAttrGet(%p,%s,%p,%p,%s,%p)=%s\n", \
+ OciTp,
(void*)th,oci_hdtype_name(ht),(void*)ah,pul_t(sp),oci_attr_name(at),(void*)eh,\
oci_status_name(stat)),stat : stat
#define OCIAttrGet_parmap(imp_sth,dh, ht, p1, l, stat)
\
