[svn:dbd-oracle] r13047 - dbd-oracle/branches/rs_array

Author: byterock
Date: Sun Jul 12 17:57:17 2009
New Revision: 13047

Modified:
   dbd-oracle/branches/rs_array/oci8.c

Log:
latests


Modified: dbd-oracle/branches/rs_array/oci8.c
==============================================================================
--- dbd-oracle/branches/rs_array/oci8.c	(original)
+++ dbd-oracle/branches/rs_array/oci8.c	Sun Jul 12 17:57:17 2009
@@ -2720,13 +2720,13 @@
 		++num_errors;
 	}
 
-    if (imp_sth->ret_lobs){
-		imp_sth->rs_array_size=1;
-	}
-	else {
-	    imp_sth->rs_array_size=cache_rows;
-    /*set the size of the array buffer*/
+/*    if (imp_sth->ret_lobs){
+		cache_rows=30;
+
 	}
+*/
+	imp_sth->rs_array_size=cache_rows;
+
     if (max_cache_rows){/* limited by a cursor or something else*/
 		imp_sth->rs_array_size=max_cache_rows;
 	}
@@ -3185,11 +3185,11 @@
 				}
 				else if (imp_sth->piece_lob){ /*get by peice with polling slowest*/
 
-					fbh->piece_lob	  = 1;
+					fbh->piece_lob		= 1;
 					fbh->define_mode	= OCI_DYNAMIC_FETCH; /* piecwise fetch*/
 					fbh->disize 		= imp_sth->long_readlen; /*user set max value for the fetch*/
 					fbh->piece_size		= imp_sth->piece_size; /*the size for each piece*/
-					fbh->fetch_cleanup = fetch_cleanup_pres_lobs; /* clean up buffer before each fetch*/
+					fbh->fetch_cleanup 	= fetch_cleanup_pres_lobs; /* clean up buffer before each fetch*/
 
 					if (!imp_sth->piece_size){ /*if not set use max value*/
 						imp_sth->piece_size=imp_sth->long_readlen;
@@ -3398,7 +3398,7 @@
 	/* Initialise cache counters */
 	imp_sth->in_cache  = 0;
 	imp_sth->eod_errno = 0;
-	rs_array_init(imp_sth);
+	/*rs_array_init(imp_sth);*/
 
 
 
@@ -3557,7 +3557,7 @@
 		}
 		else {
 
-			if (!imp_sth->row_cache_off){ /*Do not use array fetch or local cache */
+			if (imp_sth->row_cache_off){ /*Do not use array fetch or local cache */
 				OCIStmtFetch_log_stat(imp_sth->stmhp, imp_sth->errhp,1,(ub2)OCI_FETCH_NEXT, OCI_DEFAULT, status);
 				imp_sth->rs_fetch_count++;
 				imp_sth->rs_array_idx=0;
@@ -3568,10 +3568,10 @@
 /* 			PerlIO_printf(DBILOGFP, "	dbd_st_fetch fields...a\n");*/
 				imp_dbh->RowsInCache--;
 				imp_sth->rs_array_idx++;
-					PerlIO_printf(DBILOGFP," \n imp_sth->rs_array_idx=%d,rs_array_num_rows=%d\n",imp_sth->rs_array_idx,imp_sth->rs_array_num_rows);
-
-				if (imp_sth->rs_array_num_rows<=imp_sth->rs_array_idx && (imp_sth->rs_array_status==OCI_SUCCESS || imp_sth->rs_array_status==OCI_SUCCESS_WITH_INFO)) { 			PerlIO_printf(DBILOGFP, "	dbd_st_fetch %d fields...a\n");
- 			PerlIO_printf(DBILOGFP, "	dbd_st_fetch fields...b\n");
+					/*PerlIO_printf(DBILOGFP," \n imp_sth->rs_array_idx=%d,rs_array_num_rows=%d\n",imp_sth->rs_array_idx,imp_sth->rs_array_num_rows);
+*/
+				if (imp_sth->rs_array_num_rows<=imp_sth->rs_array_idx && (imp_sth->rs_array_status==OCI_SUCCESS || imp_sth->rs_array_status==OCI_SUCCESS_WITH_INFO)) {
+/* 			PerlIO_printf(DBILOGFP, "	dbd_st_fetch fields...b\n");*/
 
 					OCIStmtFetch_log_stat(imp_sth->stmhp,imp_sth->errhp,imp_sth->rs_array_size,(ub2)OCI_FETCH_NEXT,OCI_DEFAULT,status);
 					imp_sth->rs_array_status=status;