db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1451262 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ tests/store/ tests/storetests/
Date Thu, 28 Feb 2013 17:33:16 GMT
Author: myrnavl
Date: Thu Feb 28 17:33:16 2013
New Revision: 1451262

URL: http://svn.apache.org/r1451262
Log:
DERBY-5977; Run storemore and possibly other store .sql tests in junit harness using ScriptTest
mechanism
  moving st_b5772 and st_derby1189 from the storetests directory to the store
  directory so they can run in the StoreScriptsTest. Removing st_1.sql as its
  functionality is tested elsewhere.

Added:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/st_b5772.sql
      - copied unchanged from r1450533, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_b5772.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/st_derby1189.sql
      - copied unchanged from r1450533, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_derby1189.sql
Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_1.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_1.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_1_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_1_sed.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_b5772.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_b5772_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_derby1189.sql
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_derby1189_app.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_b5772.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_derby1189.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storetests.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_b5772.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_b5772.out?rev=1451262&r1=1451261&r2=1451262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_b5772.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_b5772.out
Thu Feb 28 17:33:16 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -15,160 +15,160 @@ ij> --
 --   limitations under the License.
 --
 autocommit off;
-ij> create table foo (a int, b char(250), c char(250), d int);
+ij(CONNECTION1)> create table foo (a int, b char(250), c char(250), d int);
 0 rows inserted/updated/deleted
-ij> insert into foo values (1, '1', '1', 1);
+ij(CONNECTION1)> insert into foo values (1, '1', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (11, '11', '1', 1);
+ij(CONNECTION1)> insert into foo values (11, '11', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (12, '12', '1', 1);
+ij(CONNECTION1)> insert into foo values (12, '12', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (13, '13', '1', 1);
+ij(CONNECTION1)> insert into foo values (13, '13', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (14, '14', '1', 1);
+ij(CONNECTION1)> insert into foo values (14, '14', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (15, '15', '1', 1);
+ij(CONNECTION1)> insert into foo values (15, '15', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (16, '16', '1', 1);
+ij(CONNECTION1)> insert into foo values (16, '16', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (17, '17', '1', 1);
+ij(CONNECTION1)> insert into foo values (17, '17', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (18, '18', '1', 1);
+ij(CONNECTION1)> insert into foo values (18, '18', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (11, '111', '1', 1);
+ij(CONNECTION1)> insert into foo values (11, '111', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (12, '121', '1', 1);
+ij(CONNECTION1)> insert into foo values (12, '121', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (13, '131', '1', 1);
+ij(CONNECTION1)> insert into foo values (13, '131', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (14, '141', '1', 1);
+ij(CONNECTION1)> insert into foo values (14, '141', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (15, '151', '1', 1);
+ij(CONNECTION1)> insert into foo values (15, '151', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (16, '161', '1', 1);
+ij(CONNECTION1)> insert into foo values (16, '161', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (17, '171', '1', 1);
+ij(CONNECTION1)> insert into foo values (17, '171', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (18, '181', '1', 1);
+ij(CONNECTION1)> insert into foo values (18, '181', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (2, '2', '1', 1);
+ij(CONNECTION1)> insert into foo values (2, '2', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (3, '3', '1', 1);
+ij(CONNECTION1)> insert into foo values (3, '3', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (4, '4', '1', 1);
+ij(CONNECTION1)> insert into foo values (4, '4', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (5, '5', '1', 1);
+ij(CONNECTION1)> insert into foo values (5, '5', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (6, '6', '1', 1);
+ij(CONNECTION1)> insert into foo values (6, '6', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (7, '7', '1', 1);
+ij(CONNECTION1)> insert into foo values (7, '7', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (8, '8', '1', 1);
+ij(CONNECTION1)> insert into foo values (8, '8', '1', 1);
 1 row inserted/updated/deleted
-ij> insert into foo values (9, '9', '1', 1);
+ij(CONNECTION1)> insert into foo values (9, '9', '1', 1);
 1 row inserted/updated/deleted
-ij> create index foox on foo (b);
+ij(CONNECTION1)> create index foox on foo (b);
 0 rows inserted/updated/deleted
-ij> -- normal max optimization, last row in index is not deleted.
+ij(CONNECTION1)> -- normal max optimization, last row in index is not deleted.
 select max(b) from foo;
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 9                                                                                       
                                      &
-ij> -- new max optimization, last row in index is deleted but others on page aren't.
+ij(CONNECTION1)> -- new max optimization, last row in index is deleted but others on page
aren't.
 delete from foo where a = 9;
 1 row inserted/updated/deleted
-ij> select max(b) from foo;
+ij(CONNECTION1)> select max(b) from foo;
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 8                                                                                       
                                      &
-ij> -- new max optimization, last row in index is deleted but others on page aren't.
+ij(CONNECTION1)> -- new max optimization, last row in index is deleted but others on page
aren't.
 delete from foo where a = 8;
 1 row inserted/updated/deleted
-ij> select max(b) from foo;
+ij(CONNECTION1)> select max(b) from foo;
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 7                                                                                       
                                      &
-ij> -- new max optimization, last row in index is null, real max on last page.
+ij(CONNECTION1)> -- new max optimization, last row in index is null, real max on last
page.
 insert into foo values (9, null, '1', 1);
 1 row inserted/updated/deleted
-ij> select max(b) from foo;
+ij(CONNECTION1)> select max(b) from foo;
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 7                                                                                       
                                      &
-ij> -- new max optimization, last is null and deleted, real max on last page.
+ij(CONNECTION1)> -- new max optimization, last is null and deleted, real max on last page.
 delete from foo where a > 2;
 22 rows inserted/updated/deleted
-ij> select max(b) from foo;
+ij(CONNECTION1)> select max(b) from foo;
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 2                                                                                       
                                      &
-ij> -- max optimization does not work - fail over to scan, all rows on last page are
+ij(CONNECTION1)> -- max optimization does not work - fail over to scan, all rows on last
page are
 -- deleted, except for non-deleted null row on last page. max row on 1st page.
 delete from foo where a > 1;
 1 row inserted/updated/deleted
-ij> insert into foo values (9, null, '1', 1);
+ij(CONNECTION1)> insert into foo values (9, null, '1', 1);
 1 row inserted/updated/deleted
-ij> select max(b) from foo;
+ij(CONNECTION1)> select max(b) from foo;
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 1                                                                                       
                                      &
-ij> -- max optimization does not work - fail over to scan, all rows on last page are
+ij(CONNECTION1)> -- max optimization does not work - fail over to scan, all rows on last
page are
 -- deleted.  non-deleted null row on last page. max row is on 1st page.
 delete from foo where a > 1;
 1 row inserted/updated/deleted
-ij> select max(b) from foo;
+ij(CONNECTION1)> select max(b) from foo;
 1                                                                                       
                                       
 --------------------------------------------------------------------------------------------------------------------------------
 1                                                                                       
                                      &
-ij> create table b5772 (a int, b int);
+ij(CONNECTION1)> create table b5772 (a int, b int);
 0 rows inserted/updated/deleted
-ij> create index b1 on b5772(b);
+ij(CONNECTION1)> create index b1 on b5772(b);
 0 rows inserted/updated/deleted
-ij> -- 0 row case
+ij(CONNECTION1)> -- 0 row case
 select max(b) from b5772;
 1          
 -----------
 NULL       
-ij> select min(b) from b5772;
+ij(CONNECTION1)> select min(b) from b5772;
 1          
 -----------
 NULL       
-ij> -- 1 row case
+ij(CONNECTION1)> -- 1 row case
 insert into b5772 values (1, 1);
 1 row inserted/updated/deleted
-ij> select max(b) from b5772;
+ij(CONNECTION1)> select max(b) from b5772;
 1          
 -----------
 1          
-ij> select min(b) from b5772;
+ij(CONNECTION1)> select min(b) from b5772;
 1          
 -----------
 1          
-ij> -- 1 null row case
+ij(CONNECTION1)> -- 1 null row case
 drop table b5772;
 0 rows inserted/updated/deleted
-ij> create table b5772 (a int, b int);
+ij(CONNECTION1)> create table b5772 (a int, b int);
 0 rows inserted/updated/deleted
-ij> create index b1 on b5772(b);
+ij(CONNECTION1)> create index b1 on b5772(b);
 0 rows inserted/updated/deleted
-ij> insert into b5772 values (2, null);
+ij(CONNECTION1)> insert into b5772 values (2, null);
 1 row inserted/updated/deleted
-ij> select max(b) from b5772;
+ij(CONNECTION1)> select max(b) from b5772;
 1          
 -----------
 NULL       
-ij> select min(b) from b5772;
+ij(CONNECTION1)> select min(b) from b5772;
 1          
 -----------
 NULL       
 WARNING 01003: Null values were eliminated from the argument of a column function.
-ij> -- 1 row plus, one null row.
+ij(CONNECTION1)> -- 1 row plus, one null row.
 insert into b5772 values (1, 1);
 1 row inserted/updated/deleted
-ij> -- cleanup
+ij(CONNECTION1)> -- cleanup
 drop table b5772;
 0 rows inserted/updated/deleted
-ij> drop table foo;
+ij(CONNECTION1)> drop table foo;
 0 rows inserted/updated/deleted
-ij> commit;
-ij> 
+ij(CONNECTION1)> commit;
+ij(CONNECTION1)> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_derby1189.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_derby1189.out?rev=1451262&r1=1451261&r2=1451262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_derby1189.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/st_derby1189.out
Thu Feb 28 17:33:16 2013
@@ -1,4 +1,4 @@
-ij> --
+ij(CONNECTION1)> --
 --   Licensed to the Apache Software Foundation (ASF) under one or more
 --   contributor license agreements.  See the NOTICE file distributed with
 --   this work for additional information regarding copyright ownership.
@@ -16,45 +16,46 @@ ij> --
 --
 drop table t1;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'T1' because it does not exist.
-ij> create table t1 (i integer primary key, j integer, c char(200));
+ij(CONNECTION1)> create table t1 (i integer primary key, j integer, c char(200));
 0 rows inserted/updated/deleted
-ij> insert into t1 values (1, 1, 'a');
+ij(CONNECTION1)> insert into t1 values (1, 1, 'a');
 1 row inserted/updated/deleted
-ij> insert into t1 (select t1.i + 2,    t1.j + 2,    t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 2,    t1.j + 2,    t1.c from t1);
 1 row inserted/updated/deleted
-ij> insert into t1 (select t1.i + 4,    t1.j + 4,    t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 4,    t1.j + 4,    t1.c from t1);
 2 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 8,    t1.j + 8,    t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 8,    t1.j + 8,    t1.c from t1);
 4 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 16,   t1.j + 16,   t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 16,   t1.j + 16,   t1.c from t1);
 8 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 32,   t1.j + 32,   t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 32,   t1.j + 32,   t1.c from t1);
 16 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 64,   t1.j + 64,   t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 64,   t1.j + 64,   t1.c from t1);
 32 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 128,  t1.j + 128,  t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 128,  t1.j + 128,  t1.c from t1);
 64 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 256,  t1.j + 256,  t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 256,  t1.j + 256,  t1.c from t1);
 128 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 512,  t1.j + 512,  t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 512,  t1.j + 512,  t1.c from t1);
 256 rows inserted/updated/deleted
-ij> insert into t1 (select t1.i + 1024, t1.j + 1024, t1.c from t1);
+ij(CONNECTION1)> insert into t1 (select t1.i + 1024, t1.j + 1024, t1.c from t1);
 512 rows inserted/updated/deleted
-ij> delete from t1 where j=1;
+ij(CONNECTION1)> delete from t1 where j=1;
 1 row inserted/updated/deleted
-ij> CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('APP', 'T1', 1, 1, 1);
+ij(CONNECTION1)> CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('APP', 'T1', 1, 1, 1);
 0 rows inserted/updated/deleted
-ij> delete from t1 where j=2;
+ij(CONNECTION1)> delete from t1 where j=2;
 0 rows inserted/updated/deleted
-ij> CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('APP', 'T1', 1, 1, 1);
+WARNING 02000: No row was found for FETCH, UPDATE or DELETE; or the result of a query is
an empty table.
+ij(CONNECTION1)> CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('APP', 'T1', 1, 1, 1);
 0 rows inserted/updated/deleted
-ij> delete from t1 where i > 1024;
+ij(CONNECTION1)> delete from t1 where i > 1024;
 512 rows inserted/updated/deleted
-ij> CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('APP', 'T1', 1, 1, 1);
+ij(CONNECTION1)> CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('APP', 'T1', 1, 1, 1);
 0 rows inserted/updated/deleted
-ij> delete from t1 where i < 512;
+ij(CONNECTION1)> delete from t1 where i < 512;
 255 rows inserted/updated/deleted
-ij> -- prior to the fix the following compress would result in a deadlock
+ij(CONNECTION1)> -- prior to the fix the following compress would result in a deadlock
 CALL SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('APP', 'T1', 1, 1, 1);
 0 rows inserted/updated/deleted
-ij> 
+ij(CONNECTION1)> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storetests.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storetests.runall?rev=1451262&r1=1451261&r2=1451262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storetests.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/storetests.runall
Thu Feb 28 17:33:16 2013
@@ -1,8 +1,5 @@
 storetests/st_schema.sql
 storetests/st_derby1939.java
-storetests/st_derby1189.sql
 storetests/st_reclaim_longcol.java
 storetests/st_derby715.java
-storetests/st_1.sql
-storetests/st_b5772.sql
 storetests/derby94.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java?rev=1451262&r1=1451261&r2=1451262&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StoreScriptsTest.java
Thu Feb 28 17:33:16 2013
@@ -98,7 +98,15 @@ public class StoreScriptsTest extends Sc
         //"backupRestore", // uses another database than wombat
         "bug3498", 
         //"onlineBackupTest2", // runs into lock time out 
-        //"onlineBackupTest4" // runs into security exception 
+        //"onlineBackupTest4" // runs into security exception
+        // Following scripts were part of the 'storetests' suite
+        "st_derby1189",
+        // "st_1",// this one can just be removed - was the
+        // first initial test for the SYSCS_UTIL schema. All functionality
+        // is now better tested elsewhere.
+        "st_b5772",
+        //"derby94" // this one needs special property 
+        // derby.locks.escalationThreshold=102
         };
 
     public StoreScriptsTest(String script) {



Mime
View raw message