db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r387214 [1/3] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ tests/jdbcapi/ tests/lang/
Date Mon, 20 Mar 2006 14:21:10 GMT
Author: kahatlen
Date: Mon Mar 20 06:20:56 2006
New Revision: 387214

URL: http://svn.apache.org/viewcvs?rev=387214&view=rev
Log:
DERBY-1014: Make tests less sensitive to pre-fetching

Attached a patch (DERBY-1014-v1.diff) which modifies tests in
preparation for DERBY-822. There are two types of changes:

  1) Invoke ResultSet.next() to expose error even when the driver
     isn't pre-fetching data.

  2) Filter out some of the run-time statistics before comparing with
     the canon.

lang/wisconsin.java:

  * Added patterns to the sed file. Cursor names and some of the
    run-time statistics are filtered out.

  * Canons for DerbyNet and DerbyNetClient were deleted since they are
    no longer needed. Each of these files is 1.5M, so the diff is
    huge.

lang/scrollCursors1.sql:

  * Added patterns to the sed file. Number of rows seen and number of
    reads from hash table will be filtered out.

jdbcapi/parameterMetaDataJdbc30.java:

  * Added a call to ResultSet.next() to provoke an error in a test
    case for DERBY-44 regardless of framework/pre-fetching.

jdbcapi/resultset.java:

  * Don't print column headers until one row is successfully retrieved
    (achieved by calling ResultSet.next() earlier).

jdbcapi/setTransactionIsolation.java:

  * Added a call to ResultSet.next() to provoke a timeout regardless
    of framework/pre-fetching.

  * Added patterns to the sed file. Filtered out number of pages
    visited, number of rows qualified/visited etc.

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/scrollCursors1_sed.properties
Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/resultset.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/scrollCursors1.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/scrollCursors1.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/setTransactionIsolation.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/scrollCursors1.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/parameterMetaDataJdbc30.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation_sed.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/copyfiles.ant
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_sed.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/resultset.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/resultset.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/resultset.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/resultset.out Mon Mar 20 06:20:56 2006
@@ -1464,16 +1464,10 @@
 SELECT NULLIF(CHARCOL,CLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'CHAR' and 'CLOB' are not supported.
 SELECT NULLIF(CHARCOL,DATECOL) from AllDataTypesTable
-	 COL1(datatype : CHAR, precision : 60, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(CHARCOL,TIMECOL) from AllDataTypesTable
-	 COL1(datatype : CHAR, precision : 60, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(CHARCOL,TIMESTAMPCOL) from AllDataTypesTable
-	 COL1(datatype : CHAR, precision : 60, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(CHARCOL,BLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'CHAR' and 'BLOB' are not supported.
@@ -1514,16 +1508,10 @@
 SELECT NULLIF(VARCHARCOL,CLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'VARCHAR' and 'CLOB' are not supported.
 SELECT NULLIF(VARCHARCOL,DATECOL) from AllDataTypesTable
-	 COL1(datatype : VARCHAR, precision : 60, scale : 0)
-	 ---------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(VARCHARCOL,TIMECOL) from AllDataTypesTable
-	 COL1(datatype : VARCHAR, precision : 60, scale : 0)
-	 ---------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(VARCHARCOL,TIMESTAMPCOL) from AllDataTypesTable
-	 COL1(datatype : VARCHAR, precision : 60, scale : 0)
-	 ---------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(VARCHARCOL,BLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'VARCHAR' and 'BLOB' are not supported.
@@ -1730,12 +1718,8 @@
 SELECT NULLIF(DATECOL,DOUBLECOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'DATE' and 'DOUBLE' are not supported.
 SELECT NULLIF(DATECOL,CHARCOL) from AllDataTypesTable
-	 COL1(datatype : DATE, precision : 10, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(DATECOL,VARCHARCOL) from AllDataTypesTable
-	 COL1(datatype : DATE, precision : 10, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(DATECOL,LONGVARCHARCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'DATE' and 'LONG VARCHAR' are not supported.
@@ -1773,12 +1757,8 @@
 SELECT NULLIF(TIMECOL,DOUBLECOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIME' and 'DOUBLE' are not supported.
 SELECT NULLIF(TIMECOL,CHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIME, precision : 8, scale : 0)
-	 -----------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMECOL,VARCHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIME, precision : 8, scale : 0)
-	 -----------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMECOL,LONGVARCHARCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIME' and 'LONG VARCHAR' are not supported.
@@ -1816,12 +1796,8 @@
 SELECT NULLIF(TIMESTAMPCOL,DOUBLECOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIMESTAMP' and 'DOUBLE' are not supported.
 SELECT NULLIF(TIMESTAMPCOL,CHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIMESTAMP, precision : 26, scale : 6)
-	 -----------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMESTAMPCOL,VARCHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIMESTAMP, precision : 26, scale : 6)
-	 -----------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMESTAMPCOL,LONGVARCHARCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIMESTAMP' and 'LONG VARCHAR' are not supported.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/scrollCursors1.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/scrollCursors1.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/scrollCursors1.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/scrollCursors1.out Mon Mar 20 06:20:56 2006
@@ -575,8 +575,8 @@
 Statement Execution Plan Text: 
 Scroll Insensitive ResultSet:
 Number of opens = 1
-Rows seen = 11
-Number of reads from hash table = 15
+<filtered rows seen>
+<filtered number of reads from hash table>
 Number of writes to hash table = 12
 	constructor time (milliseconds) = 0
 	open time (milliseconds) = 0
@@ -585,7 +585,7 @@
 Source result set:
 	Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
 	Number of opens = 1
-	Rows seen = 12
+	<filtered rows seen>
 	Rows filtered = 0
 	Fetch Size = 16
 		constructor time (milliseconds) = 0

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/setTransactionIsolation.out Mon Mar 20 06:20:56 2006
@@ -26,8 +26,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -37,9 +37,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -67,8 +67,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -78,9 +78,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -108,8 +108,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -119,9 +119,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -149,8 +149,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at serializable isolation level using share table locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -160,9 +160,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -216,8 +216,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -227,9 +227,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -239,84 +239,12 @@
 con.getTransactionIsolation() =TRANSACTION_REAPEATABLE_READ:4
 con.prepareStatement(select * from t1)
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_READ_COMMITTED:2)
 con.getTransactionIsolation() =TRANSACTION_READ_COMMITTED:2
 con.prepareStatement(select * from t1)
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_SERIALIZABLE:8)
 con.getTransactionIsolation() =TRANSACTION_SERIALIZABLE:8
 con.prepareStatement(select * from t1)
@@ -369,8 +297,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -380,9 +308,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -409,8 +337,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -420,9 +348,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -449,8 +377,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -460,9 +388,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -489,8 +417,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -500,9 +428,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/resultset.out Mon Mar 20 06:20:56 2006
@@ -1464,16 +1464,10 @@
 SELECT NULLIF(CHARCOL,CLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'CHAR' and 'CLOB' are not supported.
 SELECT NULLIF(CHARCOL,DATECOL) from AllDataTypesTable
-	 COL1(datatype : CHAR, precision : 60, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(CHARCOL,TIMECOL) from AllDataTypesTable
-	 COL1(datatype : CHAR, precision : 60, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(CHARCOL,TIMESTAMPCOL) from AllDataTypesTable
-	 COL1(datatype : CHAR, precision : 60, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(CHARCOL,BLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'CHAR' and 'BLOB' are not supported.
@@ -1514,16 +1508,10 @@
 SELECT NULLIF(VARCHARCOL,CLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'VARCHAR' and 'CLOB' are not supported.
 SELECT NULLIF(VARCHARCOL,DATECOL) from AllDataTypesTable
-	 COL1(datatype : VARCHAR, precision : 60, scale : 0)
-	 ---------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(VARCHARCOL,TIMECOL) from AllDataTypesTable
-	 COL1(datatype : VARCHAR, precision : 60, scale : 0)
-	 ---------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(VARCHARCOL,TIMESTAMPCOL) from AllDataTypesTable
-	 COL1(datatype : VARCHAR, precision : 60, scale : 0)
-	 ---------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(VARCHARCOL,BLOBCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'VARCHAR' and 'BLOB' are not supported.
@@ -1730,12 +1718,8 @@
 SELECT NULLIF(DATECOL,DOUBLECOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'DATE' and 'DOUBLE' are not supported.
 SELECT NULLIF(DATECOL,CHARCOL) from AllDataTypesTable
-	 COL1(datatype : DATE, precision : 10, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(DATECOL,VARCHARCOL) from AllDataTypesTable
-	 COL1(datatype : DATE, precision : 10, scale : 0)
-	 ------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(DATECOL,LONGVARCHARCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'DATE' and 'LONG VARCHAR' are not supported.
@@ -1773,12 +1757,8 @@
 SELECT NULLIF(TIMECOL,DOUBLECOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIME' and 'DOUBLE' are not supported.
 SELECT NULLIF(TIMECOL,CHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIME, precision : 8, scale : 0)
-	 -----------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMECOL,VARCHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIME, precision : 8, scale : 0)
-	 -----------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMECOL,LONGVARCHARCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIME' and 'LONG VARCHAR' are not supported.
@@ -1816,12 +1796,8 @@
 SELECT NULLIF(TIMESTAMPCOL,DOUBLECOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIMESTAMP' and 'DOUBLE' are not supported.
 SELECT NULLIF(TIMESTAMPCOL,CHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIMESTAMP, precision : 26, scale : 6)
-	 -----------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMESTAMPCOL,VARCHARCOL) from AllDataTypesTable
-	 COL1(datatype : TIMESTAMP, precision : 26, scale : 6)
-	 -----------------------------------------------------
 Data Conversion SQLException
 SELECT NULLIF(TIMESTAMPCOL,LONGVARCHARCOL) from AllDataTypesTable
 ERROR 42818: Comparisons between 'TIMESTAMP' and 'LONG VARCHAR' are not supported.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/scrollCursors1.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/scrollCursors1.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/scrollCursors1.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/scrollCursors1.out Mon Mar 20 06:20:56 2006
@@ -577,8 +577,8 @@
 Statement Execution Plan Text: 
 Scroll Insensitive ResultSet:
 Number of opens = 1
-Rows seen = 11
-Number of reads from hash table = 15
+<filtered rows seen>
+<filtered number of reads from hash table>
 Number of writes to hash table = 12
 	constructor time (milliseconds) = 0
 	open time (milliseconds) = 0
@@ -587,7 +587,7 @@
 Source result set:
 	Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
 	Number of opens = 1
-	Rows seen = 12
+	<filtered rows seen>
 	Rows filtered = 0
 	Fetch Size = 16
 		constructor time (milliseconds) = 0

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/setTransactionIsolation.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/setTransactionIsolation.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/setTransactionIsolation.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/setTransactionIsolation.out Mon Mar 20 06:20:56 2006
@@ -26,8 +26,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -37,9 +37,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -67,8 +67,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -78,9 +78,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -108,8 +108,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -119,9 +119,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -149,8 +149,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at serializable isolation level using share table locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -160,9 +160,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -216,8 +216,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -227,9 +227,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -239,84 +239,12 @@
 con.getTransactionIsolation() =TRANSACTION_REAPEATABLE_READ:4
 con.prepareStatement(select * from t1)
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_READ_COMMITTED:2)
 con.getTransactionIsolation() =TRANSACTION_READ_COMMITTED:2
 con.prepareStatement(select * from t1)
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_SERIALIZABLE:8)
 con.getTransactionIsolation() =TRANSACTION_SERIALIZABLE:8
 con.prepareStatement(select * from t1)
@@ -369,8 +297,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -380,9 +308,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -409,8 +337,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -420,9 +348,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -449,8 +377,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -460,9 +388,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -489,8 +417,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at serializable isolation level using share table locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -500,9 +428,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -551,8 +479,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -562,9 +490,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -573,83 +501,11 @@
 con.setTransactionIsolation(TRANSACTION_REAPEATABLE_READ:4)
 con.getTransactionIsolation() =TRANSACTION_REAPEATABLE_READ:4
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_READ_COMMITTED:2)
 con.getTransactionIsolation() =TRANSACTION_READ_COMMITTED:2
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_SERIALIZABLE:8)
 con.getTransactionIsolation() =TRANSACTION_SERIALIZABLE:8
 select * from t1

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/scrollCursors1.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/scrollCursors1.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/scrollCursors1.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/scrollCursors1.out Mon Mar 20 06:20:56 2006
@@ -577,8 +577,8 @@
 Statement Execution Plan Text: 
 Scroll Insensitive ResultSet:
 Number of opens = 1
-Rows seen = 1
-Number of reads from hash table = 3
+<filtered rows seen>
+<filtered number of reads from hash table>
 Number of writes to hash table = 12
 	constructor time (milliseconds) = 0
 	open time (milliseconds) = 0
@@ -587,7 +587,7 @@
 Source result set:
 	Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
 	Number of opens = 1
-	Rows seen = 12
+	<filtered rows seen>
 	Rows filtered = 0
 	Fetch Size = 16
 		constructor time (milliseconds) = 0

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out?rev=387214&r1=387213&r2=387214&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/setTransactionIsolation.out Mon Mar 20 06:20:56 2006
@@ -26,8 +26,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -37,9 +37,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -67,8 +67,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -78,9 +78,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -108,8 +108,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -119,9 +119,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -149,8 +149,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at serializable isolation level using share table locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -160,9 +160,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -216,8 +216,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -227,9 +227,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -239,84 +239,12 @@
 con.getTransactionIsolation() =TRANSACTION_REAPEATABLE_READ:4
 con.prepareStatement(select * from t1)
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_READ_COMMITTED:2)
 con.getTransactionIsolation() =TRANSACTION_READ_COMMITTED:2
 con.prepareStatement(select * from t1)
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_SERIALIZABLE:8)
 con.getTransactionIsolation() =TRANSACTION_SERIALIZABLE:8
 con.prepareStatement(select * from t1)
@@ -369,8 +297,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -380,9 +308,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -409,8 +337,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -420,9 +348,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -449,8 +377,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -460,9 +388,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -489,8 +417,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at serializable isolation level using share table locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -500,9 +428,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -551,8 +479,8 @@
 End Execution Timestamp : null
 Statement Execution Plan Text: 
 Table Scan ResultSet for T1 at read uncommitted isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
+<filtered number of opens>
+<filtered rows seen>
 Rows filtered = 0
 Fetch Size = 16
 	constructor time (milliseconds) = 0
@@ -562,9 +490,9 @@
 scan information: 
 	Bit set of columns fetched=All
 	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
+	<filtered number of pages visited>
+	<filtered number of rows qualified>
+	<filtered number of rows visited>
 	Scan type=heap
 	start position: 
 null	stop position: 
@@ -573,83 +501,11 @@
 con.setTransactionIsolation(TRANSACTION_REAPEATABLE_READ:4)
 con.getTransactionIsolation() =TRANSACTION_REAPEATABLE_READ:4
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at repeatable read isolation level using share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_READ_COMMITTED:2)
 con.getTransactionIsolation() =TRANSACTION_READ_COMMITTED:2
 select * from t1
-1                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
                                    
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -----------------------------------
-Statement Name: 
-	null
-Statement Text: 
-	select * from t1
-Parse Time: 0
-Bind Time: 0
-Optimize Time: 0
-Generate Time: 0
-Compile Time: 0
-Execute Time: 0
-Begin Compilation Timestamp : null
-End Compilation Timestamp : null
-Begin Execution Timestamp : null
-End Execution Timestamp : null
-Statement Execution Plan Text: 
-Table Scan ResultSet for T1 at read committed isolation level using instantaneous share row locking chosen by the optimizer
-Number of opens = 1
-Rows seen = 0
-Rows filtered = 0
-Fetch Size = 16
-	constructor time (milliseconds) = 0
-	open time (milliseconds) = 0
-	next time (milliseconds) = 0
-	close time (milliseconds) = 0
-scan information: 
-	Bit set of columns fetched=All
-	Number of columns fetched=2
-	Number of pages visited=0
-	Number of rows qualified=0
-	Number of rows visited=0
-	Scan type=heap
-	start position: 
-null	stop position: 
-null	qualifiers:
-None
+A lock could not be obtained within the time requested
 con.setTransactionIsolation(TRANSACTION_SERIALIZABLE:8)
 con.getTransactionIsolation() =TRANSACTION_SERIALIZABLE:8
 select * from t1



Mime
View raw message