db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r366987 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ suites/ tests/lang/
Date Sun, 08 Jan 2006 05:34:22 GMT
Author: kmarsden
Date: Sat Jan  7 21:34:06 2006
New Revision: 366987

URL: http://svn.apache.org/viewcvs?rev=366987&view=rev
Log:
DERBY-398 - Include tests for J2ME/CDC/foundation

* lang/wisconsin.sql test currenly did not work in J2ME environment because the test setup
uses stored procedures with nested connection. To make this test run in this environment,
I moved the setup (sql for table creation and inserts) to a Java class (wisconsin). From the
Java class, the remaining sql is run using ij.
* Modified master files
* Modified the test name from wisconsin.sql to wisconsin.java in the runall and exclude files

Ran lang/wisconsin.java successfully using Sun JDK1.4.2 in all 3 frameworks and also with
j9_foundation in IBM WCTME5.7. Please take a look at this patch. Thanks.

Contributed by Deepa Remesh



Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
  (with props)
Modified:
    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
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/wisconsin.out
Sat Jan  7 21:34:06 2006
@@ -26,134 +26,6 @@
 autocommit off;
 ij> set isolation serializable;
 0 rows inserted/updated/deleted
-ij> -- the method refers to a method in performance suite that takes a Connection.
------create function WISCInsert(rowcount int, tableName varchar(20)) returns int language
java parameter style java external name 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI';
-CREATE PROCEDURE WISCINSERT(rowcount int, tableName varchar(20)) LANGUAGE JAVA PARAMETER
STYLE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI.WISCInsertWOConnection';
-0 rows inserted/updated/deleted
-ij> create table TENKTUP1 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52) not null,
-		stringu2 char(52) not null,
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> --insert 10000 rows into TENKTUP1 
-call WISCINSERT( 10000, 'TENKTUP1');
-Statement executed.
-ij> create unique index TK1UNIQUE1 on TENKTUP1(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index TK1UNIQUE2 on TENKTUP1(unique2);
-0 rows inserted/updated/deleted
-ij> create index TK1TWO on TENKTUP1(two);
-0 rows inserted/updated/deleted
-ij> create index TK1FOUR on TENKTUP1(four);
-0 rows inserted/updated/deleted
-ij> create index TK1TEN on TENKTUP1(ten);
-0 rows inserted/updated/deleted
-ij> create index TK1TWENTY on TENKTUP1(twenty);
-0 rows inserted/updated/deleted
-ij> create index TK1ONEPERCENT on TENKTUP1(onePercent);
-0 rows inserted/updated/deleted
-ij> create index TK1TWENTYPERCENT on TENKTUP1(twentyPercent);
-0 rows inserted/updated/deleted
-ij> create index TK1EVENONEPERCENT on TENKTUP1(evenOnePercent);
-0 rows inserted/updated/deleted
-ij> create index TK1ODDONEPERCENT on TENKTUP1(oddOnePercent);
-0 rows inserted/updated/deleted
-ij> create unique index TK1STRINGU1 on TENKTUP1(stringu1);
-0 rows inserted/updated/deleted
-ij> create unique index TK1STRINGU2 on TENKTUP1(stringu2);
-0 rows inserted/updated/deleted
-ij> create index TK1STRING4 on TENKTUP1(string4);
-0 rows inserted/updated/deleted
-ij> create table TENKTUP2 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> -- insert 10000 rows into TENKTUP2
-call WISCInsert( 10000, 'TENKTUP2');
-Statement executed.
-ij> create unique index TK2UNIQUE1 on TENKTUP2(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index TK2UNIQUE2 on TENKTUP2(unique2);
-0 rows inserted/updated/deleted
-ij> create table ONEKTUP (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> -- insert 1000 rows into ONEKTUP
-call WISCInsert( 1000, 'ONEKTUP');
-Statement executed.
-ij> create unique index ONEKUNIQUE1 on ONEKTUP(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index ONEKUNIQUE2 on ONEKTUP(unique2);
-0 rows inserted/updated/deleted
-ij> create table BPRIME (
-		unique1 int,
-		unique2 int,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> insert into BPRIME
-select * from TENKTUP2
-where TENKTUP2.unique2 < 1000;
-1000 rows inserted/updated/deleted
-ij> commit;
 ij> call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1);
 Statement executed.
 ij> maximumdisplaywidth 8000;
@@ -30669,7 +30541,5 @@
 ij> drop table ONEKTUP;
 0 rows inserted/updated/deleted
 ij> drop table BPRIME;
-0 rows inserted/updated/deleted
-ij> drop procedure WISCINSERT;
 0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/wisconsin.out
Sat Jan  7 21:34:06 2006
@@ -26,134 +26,6 @@
 autocommit off;
 ij> set isolation serializable;
 0 rows inserted/updated/deleted
-ij> -- the method refers to a method in performance suite that takes a Connection.
------create function WISCInsert(rowcount int, tableName varchar(20)) returns int language
java parameter style java external name 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI';
-CREATE PROCEDURE WISCINSERT(rowcount int, tableName varchar(20)) LANGUAGE JAVA PARAMETER
STYLE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI.WISCInsertWOConnection';
-0 rows inserted/updated/deleted
-ij> create table TENKTUP1 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52) not null,
-		stringu2 char(52) not null,
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> --insert 10000 rows into TENKTUP1 
-call WISCINSERT( 10000, 'TENKTUP1');
-Statement executed.
-ij> create unique index TK1UNIQUE1 on TENKTUP1(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index TK1UNIQUE2 on TENKTUP1(unique2);
-0 rows inserted/updated/deleted
-ij> create index TK1TWO on TENKTUP1(two);
-0 rows inserted/updated/deleted
-ij> create index TK1FOUR on TENKTUP1(four);
-0 rows inserted/updated/deleted
-ij> create index TK1TEN on TENKTUP1(ten);
-0 rows inserted/updated/deleted
-ij> create index TK1TWENTY on TENKTUP1(twenty);
-0 rows inserted/updated/deleted
-ij> create index TK1ONEPERCENT on TENKTUP1(onePercent);
-0 rows inserted/updated/deleted
-ij> create index TK1TWENTYPERCENT on TENKTUP1(twentyPercent);
-0 rows inserted/updated/deleted
-ij> create index TK1EVENONEPERCENT on TENKTUP1(evenOnePercent);
-0 rows inserted/updated/deleted
-ij> create index TK1ODDONEPERCENT on TENKTUP1(oddOnePercent);
-0 rows inserted/updated/deleted
-ij> create unique index TK1STRINGU1 on TENKTUP1(stringu1);
-0 rows inserted/updated/deleted
-ij> create unique index TK1STRINGU2 on TENKTUP1(stringu2);
-0 rows inserted/updated/deleted
-ij> create index TK1STRING4 on TENKTUP1(string4);
-0 rows inserted/updated/deleted
-ij> create table TENKTUP2 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> -- insert 10000 rows into TENKTUP2
-call WISCInsert( 10000, 'TENKTUP2');
-Statement executed.
-ij> create unique index TK2UNIQUE1 on TENKTUP2(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index TK2UNIQUE2 on TENKTUP2(unique2);
-0 rows inserted/updated/deleted
-ij> create table ONEKTUP (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> -- insert 1000 rows into ONEKTUP
-call WISCInsert( 1000, 'ONEKTUP');
-Statement executed.
-ij> create unique index ONEKUNIQUE1 on ONEKTUP(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index ONEKUNIQUE2 on ONEKTUP(unique2);
-0 rows inserted/updated/deleted
-ij> create table BPRIME (
-		unique1 int,
-		unique2 int,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> insert into BPRIME
-select * from TENKTUP2
-where TENKTUP2.unique2 < 1000;
-1000 rows inserted/updated/deleted
-ij> commit;
 ij> call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1);
 Statement executed.
 ij> maximumdisplaywidth 8000;
@@ -30669,7 +30541,5 @@
 ij> drop table ONEKTUP;
 0 rows inserted/updated/deleted
 ij> drop table BPRIME;
-0 rows inserted/updated/deleted
-ij> drop procedure WISCINSERT;
 0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/wisconsin.out
Sat Jan  7 21:34:06 2006
@@ -1,3 +1,4 @@
+WARNING 01J01: Database 'wombat' not created, connection made to existing database instead.
 ij> -- This test is an adaptation of the Wisconsin benchmark, as documented in
 -- The Benchmark Handbook, Second Edition (edited by Jim Gray).  The structure
 -- of the tables and the data in the tables are taken from there.
@@ -26,134 +27,6 @@
 autocommit off;
 ij> set isolation serializable;
 0 rows inserted/updated/deleted
-ij> -- the method refers to a method in performance suite that takes a Connection.
---create function WISCInsert(rowcount int, tableName varchar(20)) returns int language java
parameter style java external name 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI';
-CREATE PROCEDURE WISCINSERT(rowcount int, tableName varchar(20)) LANGUAGE JAVA PARAMETER
STYLE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI.WISCInsertWOConnection';
-0 rows inserted/updated/deleted
-ij> create table TENKTUP1 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52) not null,
-		stringu2 char(52) not null,
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> --insert 10000 rows into TENKTUP1 
-call WISCINSERT( 10000, 'TENKTUP1');
-0 rows inserted/updated/deleted
-ij> create unique index TK1UNIQUE1 on TENKTUP1(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index TK1UNIQUE2 on TENKTUP1(unique2);
-0 rows inserted/updated/deleted
-ij> create index TK1TWO on TENKTUP1(two);
-0 rows inserted/updated/deleted
-ij> create index TK1FOUR on TENKTUP1(four);
-0 rows inserted/updated/deleted
-ij> create index TK1TEN on TENKTUP1(ten);
-0 rows inserted/updated/deleted
-ij> create index TK1TWENTY on TENKTUP1(twenty);
-0 rows inserted/updated/deleted
-ij> create index TK1ONEPERCENT on TENKTUP1(onePercent);
-0 rows inserted/updated/deleted
-ij> create index TK1TWENTYPERCENT on TENKTUP1(twentyPercent);
-0 rows inserted/updated/deleted
-ij> create index TK1EVENONEPERCENT on TENKTUP1(evenOnePercent);
-0 rows inserted/updated/deleted
-ij> create index TK1ODDONEPERCENT on TENKTUP1(oddOnePercent);
-0 rows inserted/updated/deleted
-ij> create unique index TK1STRINGU1 on TENKTUP1(stringu1);
-0 rows inserted/updated/deleted
-ij> create unique index TK1STRINGU2 on TENKTUP1(stringu2);
-0 rows inserted/updated/deleted
-ij> create index TK1STRING4 on TENKTUP1(string4);
-0 rows inserted/updated/deleted
-ij> create table TENKTUP2 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> -- insert 10000 rows into TENKTUP2
-call WISCInsert( 10000, 'TENKTUP2');
-0 rows inserted/updated/deleted
-ij> create unique index TK2UNIQUE1 on TENKTUP2(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index TK2UNIQUE2 on TENKTUP2(unique2);
-0 rows inserted/updated/deleted
-ij> create table ONEKTUP (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> -- insert 1000 rows into ONEKTUP
-call WISCInsert( 1000, 'ONEKTUP');
-0 rows inserted/updated/deleted
-ij> create unique index ONEKUNIQUE1 on ONEKTUP(unique1);
-0 rows inserted/updated/deleted
-ij> create unique index ONEKUNIQUE2 on ONEKTUP(unique2);
-0 rows inserted/updated/deleted
-ij> create table BPRIME (
-		unique1 int,
-		unique2 int,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-0 rows inserted/updated/deleted
-ij> insert into BPRIME
-select * from TENKTUP2
-where TENKTUP2.unique2 < 1000;
-1000 rows inserted/updated/deleted
-ij> commit;
 ij> call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1);
 0 rows inserted/updated/deleted
 ij> maximumdisplaywidth 8000;
@@ -30669,7 +30542,5 @@
 ij> drop table ONEKTUP;
 0 rows inserted/updated/deleted
 ij> drop table BPRIME;
-0 rows inserted/updated/deleted
-ij> drop procedure WISCINSERT;
 0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
Sat Jan  7 21:34:06 2006
@@ -51,6 +51,6 @@
 derbynet/DerbyNetNewServer.java
 tools/ieptests.sql
 tools/importExport.java
-lang/wisconsin.sql
+lang/wisconsin.java
 lang/syscat.sql
 junitTests/derbyNet/CompatibilityTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
Sat Jan  7 21:34:06 2006
@@ -51,6 +51,6 @@
 derbynet/DerbyNetNewServer.java
 tools/ieptests.sql
 tools/importExport.java
-lang/wisconsin.sql
+lang/wisconsin.java
 lang/syscat.sql
 junitTests/derbyNet/CompatibilityTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
Sat Jan  7 21:34:06 2006
@@ -144,4 +144,4 @@
 lang/updateCursor.java
 lang/valuesclause.sql
 lang/views.sql
-lang/wisconsin.sql
+lang/wisconsin.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
Sat Jan  7 21:34:06 2006
@@ -37,7 +37,7 @@
 lang/supersimple.sql
 lang/unaryArithmeticDynamicParameter.java
 lang/updatableResultSet.java
-lang/wisconsin.sql
+lang/wisconsin.java
 lang/syscat.sql
 store/holdCursorExternalSortJDBC30.sql
 store/holdCursorJDBC30.sql

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java?rev=366987&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
Sat Jan  7 21:34:06 2006
@@ -0,0 +1,184 @@
+/*
+
+Derby - Class org.apache.derbyTesting.functionTests.tests.lang.wisconsin
+
+Copyright 1999, 2004 The Apache Software Foundation or its licensors, as applicable.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+*/
+package org.apache.derbyTesting.functionTests.tests.lang;
+
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.derby.iapi.tools.i18n.LocalizedInput;
+import org.apache.derby.iapi.tools.i18n.LocalizedOutput;
+import org.apache.derby.iapi.tools.i18n.LocalizedResource;
+import org.apache.derby.impl.tools.ij.utilMain;
+import org.apache.derby.tools.ij;
+import java.util.Hashtable;
+
+public class wisconsin {
+
+	public static void main(String[] args) throws Throwable{
+		ij.getPropertyArg(args); 
+        Connection conn = ij.startJBMS();
+        
+        conn.setAutoCommit(false);
+        conn.setTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
+        
+        createTables(conn);
+        
+		utilMain	utilInstance;
+        LocalizedInput is;
+        BufferedInputStream inStream;
+        
+		// set input stream
+		String filePath = "wisconsin.sql";
+
+		try 
+		{
+			inStream = new BufferedInputStream(new FileInputStream(filePath), 
+							utilMain.BUFFEREDFILESIZE);		
+		} catch (FileNotFoundException e)
+		{
+			System.out.println("unable to find input file "+filePath);
+			throw e;
+		}
+        is = LocalizedResource.getInstance().getNewInput(inStream);
+
+		LocalizedInput [] in = { is };
+		LocalizedOutput out = new LocalizedOutput(System.out);
+		
+	
+		utilInstance = new utilMain(1, out, (Hashtable)null);
+		utilInstance.go(in, out, (java.util.Properties) null);
+		//log.flush();
+		out.flush();
+        
+        
+	}
+	
+	private static void createTables(Connection conn) throws SQLException{
+		Statement stmt = conn.createStatement();
+		
+		stmt.execute("create table TENKTUP1 ( unique1 int not null, " +
+											 "unique2 int not null, " +
+											 "two int, " +
+											 "four int, " +
+											 "ten int, " +
+											 "twenty int, " +
+											 "onePercent int, " +
+											 "tenPercent int, " +
+											 "twentyPercent int, " +
+											 "fiftyPercent int, " +
+											 "unique3 int, " +
+											 "evenOnePercent int, " +
+											 "oddOnePercent int, " +
+											 "stringu1 char(52) not null, " +
+											 "stringu2 char(52) not null, " +
+											 "string4 char(52) )");
+		//--insert 10000 rows into TENKTUP1
+		WISCInsert wi = new WISCInsert();
+		wi.doWISCInsert(10000, "TENKTUP1", conn);
+		
+		stmt.execute("create unique index TK1UNIQUE1 on TENKTUP1(unique1)");
+		stmt.execute("create unique index TK1UNIQUE2 on TENKTUP1(unique2)");
+		stmt.execute("create index TK1TWO on TENKTUP1(two)");
+		stmt.execute("create index TK1FOUR on TENKTUP1(four)");
+		stmt.execute("create index TK1TEN on TENKTUP1(ten)");
+		stmt.execute("create index TK1TWENTY on TENKTUP1(twenty)");
+		stmt.execute("create index TK1ONEPERCENT on TENKTUP1(onePercent)");
+		stmt.execute("create index TK1TWENTYPERCENT on TENKTUP1(twentyPercent)");
+		stmt.execute("create index TK1EVENONEPERCENT on TENKTUP1(evenOnePercent)");
+		stmt.execute("create index TK1ODDONEPERCENT on TENKTUP1(oddOnePercent)");
+		stmt.execute("create unique index TK1STRINGU1 on TENKTUP1(stringu1)");
+		stmt.execute("create unique index TK1STRINGU2 on TENKTUP1(stringu2)");
+		stmt.execute("create index TK1STRING4 on TENKTUP1(string4)");
+		
+		stmt.execute("create table TENKTUP2 (unique1 int not null, " +
+											"unique2 int not null, " +
+											"two int, " +
+											"four int, " +
+											"ten int, " +
+											"twenty int, " +
+											"onePercent int, " +
+											"tenPercent int, " +
+											"twentyPercent int, " +
+											"fiftyPercent int, " +
+											"unique3 int, " +
+											"evenOnePercent int, " +
+											"oddOnePercent int, " +
+											"stringu1 char(52), " +
+											"stringu2 char(52), " +
+											"string4 char(52) )");
+		//-- insert 10000 rows into TENKTUP2
+		wi = new WISCInsert();
+		wi.doWISCInsert(10000, "TENKTUP2", conn);
+		
+		stmt.execute("create unique index TK2UNIQUE1 on TENKTUP2(unique1)");
+		stmt.execute("create unique index TK2UNIQUE2 on TENKTUP2(unique2)");
+		
+		stmt.execute("create table ONEKTUP ( unique1 int not null, " +
+											"unique2 int not null, " +
+											"two int, " +
+											"four int, " +
+											"ten int, " +
+											"twenty int, " +
+											"onePercent int, " +
+											"tenPercent int, " +
+											"twentyPercent int, " +
+											"fiftyPercent int, " +
+											"unique3 int, " +
+											"evenOnePercent int, " +
+											"oddOnePercent int, " +
+											"stringu1 char(52), " +
+											"stringu2 char(52), " +
+											"string4 char(52) )");
+		
+		//-- insert 1000 rows into ONEKTUP
+		wi = new WISCInsert();
+		wi.doWISCInsert(1000, "ONEKTUP", conn);
+		
+		stmt.execute("create unique index ONEKUNIQUE1 on ONEKTUP(unique1)");
+		stmt.execute("create unique index ONEKUNIQUE2 on ONEKTUP(unique2)");
+
+		stmt.execute("create table BPRIME (	 unique1 int, " +
+										  	"unique2 int, " +
+											"two int, " +
+											"four int, " +
+											"ten int, " +
+											"twenty int, " +
+											"onePercent int, " +
+											"tenPercent int, " +
+											"twentyPercent int, " +
+											"fiftyPercent int, " +
+											"unique3 int, " +
+											"evenOnePercent int, " +
+											"oddOnePercent int, " +
+											"stringu1 char(52), " +
+											"stringu2 char(52), " +
+											"string4 char(52))");
+
+		stmt.execute("insert into BPRIME select * from TENKTUP2 where TENKTUP2.unique2 < 1000");
+
+		conn.commit();
+
+	}
+	
+}

Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.sql?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin.sql
Sat Jan  7 21:34:06 2006
@@ -27,120 +27,6 @@
 autocommit off;
 
 set isolation serializable;
--- the method refers to a method in performance suite that takes a Connection.
---create function WISCInsert(rowcount int, tableName varchar(20)) returns int language java
parameter style java external name 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI';
-CREATE PROCEDURE WISCINSERT(rowcount int, tableName varchar(20)) LANGUAGE JAVA PARAMETER
STYLE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.tests.lang.WiscVTI.WISCInsertWOConnection';
-
-create table TENKTUP1 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52) not null,
-		stringu2 char(52) not null,
-		string4 char(52)
-	);
-
---insert 10000 rows into TENKTUP1 
-call WISCINSERT( 10000, 'TENKTUP1'); 
-
-create unique index TK1UNIQUE1 on TENKTUP1(unique1);
-create unique index TK1UNIQUE2 on TENKTUP1(unique2);
-create index TK1TWO on TENKTUP1(two);
-create index TK1FOUR on TENKTUP1(four);
-create index TK1TEN on TENKTUP1(ten);
-create index TK1TWENTY on TENKTUP1(twenty);
-create index TK1ONEPERCENT on TENKTUP1(onePercent);
-create index TK1TWENTYPERCENT on TENKTUP1(twentyPercent);
-create index TK1EVENONEPERCENT on TENKTUP1(evenOnePercent);
-create index TK1ODDONEPERCENT on TENKTUP1(oddOnePercent);
-create unique index TK1STRINGU1 on TENKTUP1(stringu1);
-create unique index TK1STRINGU2 on TENKTUP1(stringu2);
-create index TK1STRING4 on TENKTUP1(string4);
-
-create table TENKTUP2 (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-
--- insert 10000 rows into TENKTUP2
-call WISCInsert( 10000, 'TENKTUP2'); 
-
-create unique index TK2UNIQUE1 on TENKTUP2(unique1);
-create unique index TK2UNIQUE2 on TENKTUP2(unique2);
-
-create table ONEKTUP (
-		unique1 int not null,
-		unique2 int not null,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-
--- insert 1000 rows into ONEKTUP
-call WISCInsert( 1000, 'ONEKTUP'); 
-
-create unique index ONEKUNIQUE1 on ONEKTUP(unique1);
-create unique index ONEKUNIQUE2 on ONEKTUP(unique2);
-
-create table BPRIME (
-		unique1 int,
-		unique2 int,
-		two int,
-		four int,
-		ten int,
-		twenty int,
-		onePercent int,
-		tenPercent int,
-		twentyPercent int,
-		fiftyPercent int,
-		unique3 int,
-		evenOnePercent int,
-		oddOnePercent int,
-		stringu1 char(52),
-		stringu2 char(52),
-		string4 char(52)
-	);
-
-insert into BPRIME
-select * from TENKTUP2
-where TENKTUP2.unique2 < 1000;
-
-commit;
 
 call SYSCS_UTIL.SYSCS_SET_RUNTIMESTATISTICS(1);
 maximumdisplaywidth 8000;
@@ -3575,4 +3461,3 @@
 drop table TENKTUP2;
 drop table ONEKTUP;
 drop table BPRIME;
-drop procedure WISCINSERT;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties?rev=366987&r1=366986&r2=366987&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/wisconsin_app.properties
Sat Jan  7 21:34:06 2006
@@ -15,8 +15,7 @@
 
 usedefaults=true
 
-#Exclude for J2ME/Foundation - test requires java.math.BigDecimal
-runwithfoundation=false
-
 # BUG - DERBY-616
 noSecurityManager=true
+
+supportfiles=tests/lang/wisconsin.sql



Mime
View raw message