db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1629705 - in /db/derby/code/branches/10.10: ./ java/testing/org/apache/derbyTesting/functionTests/master/ java/testing/org/apache/derbyTesting/functionTests/suites/ java/testing/org/apache/derbyTesting/functionTests/tests/store/
Date Mon, 06 Oct 2014 16:37:06 GMT
Author: myrnavl
Date: Mon Oct  6 16:37:05 2014
New Revision: 1629705

URL: http://svn.apache.org/r1629705
Log:
DERBY-6247; updatelocksJDBC30 test failing in nightly regression tests
   backport of revision 162099 from 10.11 branch.

Removed:
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/master/updatelocksJDBC30.out
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storemats.properties
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storemats.runall
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/updateBtreeHoldCursorLocksJDBC30.subsql
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/updateholdcursorlocksJDBC30.subsql
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/updatelocksJDBC30.sql
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/updatelocksJDBC30_app.properties
Modified:
    db/derby/code/branches/10.10/   (props changed)
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeall.properties
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties
    db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java

Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
  Merged /db/derby/code/branches/10.11:r1629334
  Merged /db/derby/code/trunk:r1629099

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties?rev=1629705&r1=1629704&r2=1629705&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/encryption.properties
Mon Oct  6 16:37:05 2014
@@ -16,7 +16,7 @@
 encryption=true
 testEncryptionAlgorithm=DESede/CBC/NoPadding
 testJavaFlags=testDataEncryption=Thursday
-suites=encryption propertyinfo storemats
+suites=encryption propertyinfo 
 
 #Exclude for J2ME/Foundation - encryption not supported
 runwithfoundation=false

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeall.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeall.properties?rev=1629705&r1=1629704&r2=1629705&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeall.properties
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeall.properties
Mon Oct  6 16:37:05 2014
@@ -17,7 +17,6 @@
 #
 #    The store suites include each other, and are set up as follows:
 #    storeall
-#        storemats
 #        storemore
 #        storetests
 #        storeunit
@@ -26,9 +25,8 @@
 #    so that the nightly run doesn't run tests twice.
 #
 #    store*.runall files:
-#        storemats.runall       - all other store tests to be run in storemats
-#        storemore.runall       - any other store function test not to be included in
-#                                 storemats, but to be run nightly.
+#        storemore.runall       - store function tests not to be included in
+#                                 the old storemats, but to be run nightly.
 #        storetests.runall      - set of store tests that use one database 
 #        storeunit.runall       - set of store unit tests 
 #        storerecovery.runall   - set of recovery tests that use one database

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties?rev=1629705&r1=1629704&r2=1629705&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/suites/storeunit.properties
Mon Oct  6 16:37:05 2014
@@ -17,7 +17,6 @@
 #
 #    The store suites include each other, and are set up as follows:
 #    storeall
-#        storemats - basic set
 #        storemore - more tests
 #        storetests- use 1 database
 #        storeunit - unit tests

Modified: db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java?rev=1629705&r1=1629704&r2=1629705&view=diff
==============================================================================
--- db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
(original)
+++ db/derby/code/branches/10.10/java/testing/org/apache/derbyTesting/functionTests/tests/store/UpdateLocksTest.java
Mon Oct  6 16:37:05 2014
@@ -59,6 +59,49 @@ public class UpdateLocksTest extends Bas
 
     public void setUp() throws Exception {
         super.setUp();
+        Statement s = createStatement();
+        try {
+            s.executeUpdate(
+                "create function PADSTRING (data varchar(32000), " +
+                "                           length integer) " +
+                "    returns varchar(32000) " +
+                "    external name " +
+                "    'org.apache.derbyTesting.functionTests." +
+                "util.Formatters.padString' " +
+                "    language java parameter style java");
+
+            s.executeUpdate(
+                "create view LOCK_TABLE as " +
+                "select  " +
+                "    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, " +
+                "    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.transaction_table t " +
+                "on l.xid = t.xid " +
+                "where l.tableType <> 'S' and " +
+                "      t.type='UserTransaction'");
+            
+            // Create a procedure to be called before checking on contents
+            // to ensure that the background worker thread has completed 
+            // all the post-commit work.
+            s.execute(
+                "CREATE PROCEDURE WAIT_FOR_POST_COMMIT() " +
+                "LANGUAGE JAVA EXTERNAL NAME " +
+                "'org.apache.derbyTesting.functionTests.util." +
+                "T_Access.waitForPostCommitToFinish' " +
+                "PARAMETER STYLE JAVA");
+            commit();
+        } catch (SQLException sqle) {
+            //ignore
+        }
         getLocksQuery = prepareStatement(lock_table_query);
     }
 
@@ -80,57 +123,13 @@ public class UpdateLocksTest extends Bas
 
     public static Test suite() {
 
-        Test suite = TestConfiguration.embeddedSuite(UpdateLocksTest.class);
+        Test suite = TestConfiguration.defaultSuite(UpdateLocksTest.class);
 
         Properties p = new Properties();
         p.put("derby.storage.pageSize", "4096");
 
         return new CleanDatabaseTestSetup(
-            new SystemPropertyTestSetup(suite, p, false)) {
-
-            /**
-             * Creates the views and procedures used by the test cases.
-             */
-            protected void decorateSQL(Statement s) throws SQLException {
-                s.executeUpdate(
-                    "create function PADSTRING (data varchar(32000), " +
-                    "                           length integer) " +
-                    "    returns varchar(32000) " +
-                    "    external name " +
-                    "    'org.apache.derbyTesting.functionTests." +
-                    "util.Formatters.padString' " +
-                    "    language java parameter style java");
-
-                s.executeUpdate(
-                    "create view LOCK_TABLE as " +
-                    "select  " +
-                    "    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, " +
-                    "    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.transaction_table t " +
-                    "on l.xid = t.xid " +
-                    "where l.tableType <> 'S' and " +
-                    "      t.type='UserTransaction'");
-                
-                // Create a procedure to be called before checking on contents
-                // to ensure that the background worker thread has completed 
-                // all the post-commit work.
-                s.execute(
-                    "CREATE PROCEDURE WAIT_FOR_POST_COMMIT() " +
-                    "LANGUAGE JAVA EXTERNAL NAME " +
-                    "'org.apache.derbyTesting.functionTests.util." +
-                    "T_Access.waitForPostCommitToFinish' " +
-                    "PARAMETER STYLE JAVA");
-            }
-        };
+            new SystemPropertyTestSetup(suite, p, false)); 
     }
 
 
@@ -155,21 +154,37 @@ public class UpdateLocksTest extends Bas
      * Should be the same as SERIALIZABLE results except no previous key locks.
      */
     public void testRepeatableRead () throws Exception {
-        doRunTests(Connection.TRANSACTION_REPEATABLE_READ);
+        doRunTests(Connection.TRANSACTION_REPEATABLE_READ, false);
     }
 
     public void testReadCommitted() throws Exception {
-        doRunTests(Connection.TRANSACTION_READ_COMMITTED);
+        doRunTests(Connection.TRANSACTION_READ_COMMITTED, false);
     }
 
     public void testSerializable() throws Exception {
-        doRunTests(Connection.TRANSACTION_SERIALIZABLE);
+        doRunTests(Connection.TRANSACTION_SERIALIZABLE, false);
     }
 
     public void testReadUncommitted() throws Exception {
-        doRunTests(Connection.TRANSACTION_READ_UNCOMMITTED);
+        doRunTests(Connection.TRANSACTION_READ_UNCOMMITTED, false);
+    }
+    
+    public void testRepeatableReadJDBC30 () throws Exception {
+        doRunTests(Connection.TRANSACTION_REPEATABLE_READ, true);
+    }
+
+    public void testReadCommittedJDBC30() throws Exception {
+        doRunTests(Connection.TRANSACTION_READ_COMMITTED, true);
+    }
+
+    public void testSerializableJDBC30() throws Exception {
+        doRunTests(Connection.TRANSACTION_SERIALIZABLE, true);
     }
 
+    public void testReadUncommittedJDBC30() throws Exception {
+        doRunTests(Connection.TRANSACTION_READ_UNCOMMITTED, true);
+    }
+    
     private void insertValuesUnpaddedVarchar(Statement s) throws SQLException {
         s.executeUpdate("insert into a values (1, 10, 'one')");
         s.executeUpdate("insert into a values (2, 20, 'two')");
@@ -180,7 +195,8 @@ public class UpdateLocksTest extends Bas
         s.executeUpdate("insert into a values (7, 70, 'seven')");
     }
 
-    private void doRunTests (int isolation) throws Exception {
+    private void doRunTests (int isolation, boolean withhold) 
+            throws Exception {
         setAutoCommit(false);
         getConnection().setTransactionIsolation(
             isolation);
@@ -198,7 +214,7 @@ public class UpdateLocksTest extends Bas
         s.executeUpdate("alter table a add column c varchar(1900)");
         insertValuesUnpaddedVarchar(s);
         commit();
-        updatecursorlocks(getConnection(), isolation, 0, NO_IDX_1);
+        updatecursorlocks(getConnection(), isolation, 0, NO_IDX_1, withhold);
 
         // non cursor, no index run
         // to create tables of page size 4k and still keep the following tbl
@@ -221,11 +237,11 @@ public class UpdateLocksTest extends Bas
         updateBtreeCursorLocks1(getConnection(),
                                 isolation,
                                 UNIQUE_INDEX,
-                                true, 0, 0);
+                                true, 0, 0, withhold);
         updateBtreeCursorLocks2(getConnection(),
                                 isolation,
                                 UNIQUE_INDEX,
-                                true, 0, 0);
+                                true, 0, 0, withhold);
 
         // cursor, non-unique index run
         // to create tables of page size 4k and still keep the following tbl
@@ -237,10 +253,10 @@ public class UpdateLocksTest extends Bas
         commit();
         updateBtreeCursorLocks1(getConnection(), isolation,
                                 NON_UNIQUE_INDEX,
-                                true, 0, 0);
+                                true, 0, 0, withhold);
         updateBtreeCursorLocks2(getConnection(), isolation,
                                 NON_UNIQUE_INDEX,
-                                true, 0, 0);
+                                true, 0, 0, withhold);
 
         // non cursor, unique index run
         // to create tables of page size 4k and still keep the following tbl
@@ -287,7 +303,8 @@ public class UpdateLocksTest extends Bas
         s.executeUpdate("insert into a values (7, 70, " +
                         "    PADSTRING('seven',1900))");
         commit();
-        updatecursorlocks(getConnection(), isolation, 1900, NO_IDX_2);
+        updatecursorlocks(getConnection(), isolation, 1900, NO_IDX_2,
+                withhold);
 
         // non cursor, no index run
         s.executeUpdate("create table a (a int, b int, c varchar(1900))");
@@ -335,9 +352,9 @@ public class UpdateLocksTest extends Bas
         s.executeUpdate("create unique index a_idx on a (a, index_pad)");
         commit();
         updateBtreeCursorLocks1(getConnection(), isolation,
-                                UNIQUE_INDEX, false, 1900, 600);
+                                UNIQUE_INDEX, false, 1900, 600, withhold);
         updateBtreeCursorLocks2(getConnection(), isolation,
-                                UNIQUE_INDEX, false, 1900, 600);
+                                UNIQUE_INDEX, false, 1900, 600, withhold);
 
         // cursor, non-unique index run
         s.executeUpdate("create table a (a int, b int, c varchar(1900)," +
@@ -366,9 +383,9 @@ public class UpdateLocksTest extends Bas
         s.executeUpdate("create index a_idx on a (a, index_pad)");
         commit();
         updateBtreeCursorLocks1(getConnection(), isolation,
-                                NON_UNIQUE_INDEX, false, 1900, 700);
+                                NON_UNIQUE_INDEX, false, 1900, 700, withhold);
         updateBtreeCursorLocks2(getConnection(), isolation,
-                                NON_UNIQUE_INDEX, false, 1900, 700);
+                                NON_UNIQUE_INDEX, false, 1900, 700, withhold);
 
         // non cursor, unique index run
         s.executeUpdate("create table a (a int, b int, c varchar(1900)," +
@@ -433,10 +450,17 @@ public class UpdateLocksTest extends Bas
 
 
     private void updatecursorlocks(
-        Connection c, int isolation, int pad, int mode) throws SQLException {
+        Connection c, int isolation, int pad, int mode, boolean withhold)
+                throws SQLException {
 
-        Statement s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
-                                        ResultSet.CONCUR_UPDATABLE);
+        Statement s;
+        if (withhold)
+            s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+                                  ResultSet.CONCUR_UPDATABLE,
+                                  ResultSet.HOLD_CURSORS_OVER_COMMIT);
+        else
+            s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+                                  ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = s.executeQuery(
             "select a, b, c from a for update");
 
@@ -3038,11 +3062,18 @@ public class UpdateLocksTest extends Bas
         int mode,
         boolean unPadded,
         int pad,
-        int idxPad) throws SQLException {
+        int idxPad,
+        boolean withhold) throws SQLException {
 
         c.setAutoCommit(false);
-        Statement s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
-                                        ResultSet.CONCUR_UPDATABLE);
+        Statement s;
+        if (withhold)
+            s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+                                  ResultSet.CONCUR_UPDATABLE,
+                                  ResultSet.HOLD_CURSORS_OVER_COMMIT);
+        else
+            s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+                                  ResultSet.CONCUR_UPDATABLE);
 
         ResultSet rs = s.executeQuery(
             "select a, b, c from a for update");
@@ -4806,10 +4837,17 @@ public class UpdateLocksTest extends Bas
         int mode,
         boolean unPadded,
         int pad,
-        int idxPad) throws SQLException {
+        int idxPad, 
+        boolean withhold) throws SQLException {
 
-        Statement s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
-                                        ResultSet.CONCUR_UPDATABLE);
+        Statement s;
+        if (withhold)
+            s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+                                  ResultSet.CONCUR_UPDATABLE,
+                                  ResultSet.HOLD_CURSORS_OVER_COMMIT);
+        else
+            s = c.createStatement(ResultSet.TYPE_FORWARD_ONLY,
+                                  ResultSet.CONCUR_UPDATABLE);
         ResultSet rs = null;
 
         ResultSet ltrs = getLocks();
@@ -4947,6 +4985,19 @@ public class UpdateLocksTest extends Bas
 
         ltrs = getLocks();
 
+        // With network server/client, locks for the first chunk of 
+        // pre-fetched rows are acquired on execute/executeQuery 
+        // instead of on the first call to next().
+        String[][] expectedValues;
+        if (!usingDerbyNetClient())
+            expectedValues = new String[][]{
+                {_app, _ut, _t, "2", _IX, _A, _tl, _g, _a},
+                {_app, _ut, _r, "1", _U, _A, "(1,9)", _g, _a},
+                {_app, _ut, _r, "1", _X, _A, "(1,9)", _g, _a}};
+        else
+            expectedValues = new String[][]{
+                {_app, _ut, _t, "2", _IX, _A, _tl, _g, _a},
+                {_app, _ut, _r, "1", _X, _A, "(1,9)", _g, _a}};
         JDBC.assertUnorderedResultSet(
             ltrs,
             isolation == Connection.TRANSACTION_SERIALIZABLE ?
@@ -4995,10 +5046,7 @@ public class UpdateLocksTest extends Bas
                 :
                 unPadded ?
                 (mode == UNIQUE_INDEX ?
-                 new String[][]{
-                    {_app, _ut, _t, "2", _IX, _A, _tl, _g, _a},
-                    {_app, _ut, _r, "1", _U, _A, "(1,9)", _g, _a},
-                    {_app, _ut, _r, "1", _X, _A, "(1,9)", _g, _a}}
+                 expectedValues
                  :
                  new String[][]{
                      {_app, _ut, _t, "2", _IX, _A, _tl, _g, _a},
@@ -5903,6 +5951,18 @@ public class UpdateLocksTest extends Bas
 
         ltrs = getLocks();
 
+        // With network server/client, locks for the first chunk of 
+        // pre-fetched rows are acquired on execute/executeQuery 
+        // instead of on the first call to next().
+        if (usingDerbyNetClient() && (isolation != Connection.TRANSACTION_SERIALIZABLE))
+            expectedValues = new String[][]{
+                {_app, _ut, _t, "3", _IX, _A, _tl, _g, _a},
+                {_app, _ut, _r, "2", _X, _A, "(1,7)", _g, _a}};
+        else
+            expectedValues = new String[][]{
+                {_app, _ut, _t, "3", _IX, _A, _tl, _g, _a},
+                {_app, _ut, _r, "1", _U, _A, "(1,7)", _g, _a},
+                {_app, _ut, _r, "2", _X, _A, "(1,7)", _g, _a}};
         JDBC.assertUnorderedResultSet(
             ltrs,
             (isolation == Connection.TRANSACTION_SERIALIZABLE &&
@@ -5940,10 +6000,7 @@ public class UpdateLocksTest extends Bas
                  (
                      unPadded ?
                      (mode == UNIQUE_INDEX ?
-                      new String[][]{
-                         {_app, _ut, _t, "3", _IX, _A, _tl, _g, _a},
-                         {_app, _ut, _r, "1", _U, _A, "(1,7)", _g, _a},
-                         {_app, _ut, _r, "2", _X, _A, "(1,7)", _g, _a}}
+                      expectedValues
                       :
                       new String[][]{
                           {_app,_ut, _t, "3", _IX, _A, _tl, _g, _a},



Mime
View raw message