db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r345583 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: jdbcapi/ lang/ store/
Date Fri, 18 Nov 2005 22:02:25 GMT
Author: djd
Date: Fri Nov 18 14:02:19 2005
New Revision: 345583

URL: http://svn.apache.org/viewcvs?rev=345583&view=rev
Log:
DERBY-571 Convert java tests to use the new form of the diagnostic (no argument) tables.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.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/lang/procedure.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java?rev=345583&r1=345582&r2=345583&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/blobclob4BLOB.java
Fri Nov 18 14:02:19 2005
@@ -2571,7 +2571,7 @@
             System.out.println("\nLock table\n----------------------------------------");
 			stmt = conn.createStatement();
 			rs = stmt.executeQuery(
-                "select xid,type,lockcount,mode,tablename,lockname,state from new LockTable()
t where t.tableType <> 'S'");
+                "select xid,type,lockcount,mode,tablename,lockname,state from SYSCS_DIAG.LOCK_TABLE
t where t.tableType <> 'S'");
             while (rs.next())
             {
                 String xid = rs.getString("xid");

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java?rev=345583&r1=345582&r2=345583&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
Fri Nov 18 14:02:19 2005
@@ -764,7 +764,7 @@
 	}
 	private static void checkLocks(Connection conn) throws SQLException {
 		Statement s = conn.createStatement();
-		ResultSet rs = s.executeQuery("SELECT XID, sum(cast (LOCKCOUNT AS INT)) FROM new org.apache.derby.diag.LockTable()
AS L GROUP BY XID");
+		ResultSet rs = s.executeQuery("SELECT XID, sum(cast (LOCKCOUNT AS INT)) FROM SYSCS_DIAG.LOCK_TABLE
AS L GROUP BY XID");
 		System.out.println("LOCK TABLE");
 
         // Don't output actual XID's as they tend for every catalog change

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java?rev=345583&r1=345582&r2=345583&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/resultset.java
Fri Nov 18 14:02:19 2005
@@ -918,7 +918,7 @@
 	private static void showLocks() throws Exception {
 		System.out.println("  LOCK TABLE");
 		Connection con2 = ij.startJBMS();
-		PreparedStatement ps2 = con2.prepareStatement("select XID, count(*) from new org.apache.derby.diag.LockTable()
as L group by XID");
+		PreparedStatement ps2 = con2.prepareStatement("select XID, count(*) from SYSCS_DIAG.LOCK_TABLE
as L group by XID");
 		ResultSet rs2 = ps2.executeQuery();
 
 		while (rs2.next()) {

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java?rev=345583&r1=345582&r2=345583&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/setTransactionIsolation.java
Fri Nov 18 14:02:19 2005
@@ -231,7 +231,7 @@
 					if (rs != null)
 					{
 						rs.next();
-						ResultSet lockrs = stmt.executeQuery("Select * from new LockTable() l where l.tableType
<> 'S'");
+						ResultSet lockrs = stmt.executeQuery("Select * from SYSCS_DIAG.LOCK_TABLE l where l.tableType
<> 'S'");
 						JDBCDisplayUtil.DisplayResults(System.out,lockrs,con);
 						lockrs.close();
 						rs.close();

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java?rev=345583&r1=345582&r2=345583&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
Fri Nov 18 14:02:19 2005
@@ -641,7 +641,7 @@
 
 		conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
 		System.out.println("auto commit is " + conn.getAutoCommit());
-		PreparedStatement psLocks = conn2.prepareStatement("select count(*) from new org.apache.derby.diag.LockTable()
AS LT");
+		PreparedStatement psLocks = conn2.prepareStatement("select count(*) from SYSCS_DIAG.LOCK_TABLE
AS LT");
 
 		showLocks(psLocks, "lock count before execution ");
 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java?rev=345583&r1=345582&r2=345583&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BaseTest.java
Fri Nov 18 14:02:19 2005
@@ -309,14 +309,14 @@
         //     state,
         //     status
         // from
-        //     new org.apache.derby.diag.LockTable() l  
-        // right outer join new org.apache.derby.diag.TransactionTable() t
+        //     SYSCS_DIAG.LOCK_TABLE l  
+        // right outer join SYSCS_DIAG.TRANSACTION_TABLE t
         //     on l.xid = t.xid where l.tableType <> 'S' and 
         //        t.type='UserTransaction'
         // order by
         //     tabname, type desc, mode, cnt, lockname;
         String lock_query = 
-            "select cast(l.xid as char(8)) as xid, cast(username as char(8)) as username,
cast(t.type as char(8)) as trantype, cast(l.type as char(8)) as type, cast(lockcount as char(3))
as cnt, cast(mode as char(4)) as mode, cast(tablename as char(12)) as tabname, cast(lockname
as char(10)) as lockname, state, status from new org.apache.derby.diag.LockTable() l right
outer join new org.apache.derby.diag.TransactionTable() t on l.xid = t.xid where l.tableType
<> 'S' ";
+            "select cast(l.xid as char(8)) as xid, cast(username as char(8)) as username,
cast(t.type as char(8)) as trantype, cast(l.type as char(8)) as type, cast(lockcount as char(3))
as cnt, cast(mode as char(4)) as mode, cast(tablename as char(12)) as tabname, cast(lockname
as char(10)) as lockname, state, status from SYSCS_DIAG.LOCK_TABLE l right outer join SYSCS_DIAG.LOCK_TABLE
t on l.xid = t.xid where l.tableType <> 'S' ";
         if (!include_system_locks)
             lock_query += "and t.type='UserTransaction' ";
         



Mime
View raw message