db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r754894 [4/6] - in /db/derby/code/trunk/java: engine/org/apache/derby/iapi/store/access/conglomerate/ engine/org/apache/derby/iapi/store/raw/ engine/org/apache/derby/impl/store/access/ engine/org/apache/derby/impl/store/access/btree/ engine...
Date Mon, 16 Mar 2009 13:55:50 GMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out?rev=754894&r1=754893&r2=754894&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso2multi.out
Mon Mar 16 13:55:49 2009
@@ -143,12 +143,14 @@
 --------------------------------------------------------------------------------------------------------------------------------
 a                                                                                       
                                      &
 ij(SCANNER)> --------------------------------------------------------------------------------
--- This should block and timeout on the scan lock held by the scanner on the first page.
+-- Before DERBY-2991 the attempt to split the root would time out because the
+-- scan had locked the first page.
 --------------------------------------------------------------------------------
 set connection rootgrower;
 ij(ROOTGROWER)> autocommit off;
 ij(ROOTGROWER)> insert into a values (PADSTRING('d',1200), PADSTRING('d',1000));
-ERROR 40XL1: A lock could not be obtained within the time requested
+1 row inserted/updated/deleted
+ij(ROOTGROWER)> rollback;
 ij(ROOTGROWER)> --------------------------------------------------------------------------------
 -- The scan should continue unaffected.
 --------------------------------------------------------------------------------
@@ -168,6 +170,7 @@
 ij(ROOTGROWER)> --------------------------------------------------------------------------------
 -- Now the grow root should be allowed (note that cursor scan has locks
 -- on the leaf page being grown - just not the scan lock).
+-- (Scan locks are no longer used after DERBY-2991.)
 --------------------------------------------------------------------------------
 set connection rootgrower;
 ij(ROOTGROWER)> insert into a values (PADSTRING('d',1200), PADSTRING('d',1000));
@@ -819,6 +822,7 @@
 ij> --------------------------------------------------------------------------------
 -- Test 9: Make sure scan positioning in the beginning of a unique scan
 --         properly gets the scan lock to block with splits.
+--         (Scan locks are no longer used after DERBY-2991.)
 --
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------
@@ -879,9 +883,10 @@
 1 row inserted/updated/deleted
 ij(SPLITTER)> commit;
 ij(SPLITTER)> -- insert ahead in the cursor to make sure we pick it up later.
+-- This would time out before DERBY-2991.
 insert into test_9 values (0, 10, PADSTRING('dd',1000), 'test 9.1');
-ERROR 40XL1: A lock could not be obtained within the time requested
-ij(SPLITTER)> commit;
+1 row inserted/updated/deleted
+ij(SPLITTER)> rollback;
 ij(SPLITTER)> set connection scanner;
 ij(SCANNER)> next scan_cursor;
 B                                                                                       
                                       
@@ -1079,7 +1084,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11UPDATER)> set connection t11scanner;
 ij(T11SCANNER)> autocommit off;
@@ -1097,7 +1101,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
@@ -1116,7 +1119,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|TABLE   |2   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |3   |X   |TEST_11     |(1,9)     |GRANT|ACTIVE  
 ij(T11SCANNER)> commit;
@@ -1124,7 +1126,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
@@ -1137,7 +1138,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
@@ -1149,7 +1149,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11SCANNER)> --
 --------------------------------------------------
@@ -1162,7 +1161,6 @@
 -----------------------------------------------
 TABLE   |1  |IX  |TEST_11     |Tablelock |GRANT
 TABLE   |1  |IX  |TEST_11     |Tablelock |GRANT
-ROW     |1  |S   |TEST_11     |(1,1)     |GRANT
 ROW     |1  |U   |TEST_11     |(1,7)     |GRANT
 ij(T11SCANNER)> next update_cursor3;
 B          
@@ -1173,8 +1171,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,9)     |GRANT|ACTIVE  
 ij(T11SCANNER)> commit;
@@ -1213,7 +1209,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_11     |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_11     |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_11     |(1,7)     |GRANT|ACTIVE  
 ij(T11UPDATER)> commit;
 ij(T11UPDATER)> close update_cursor;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out?rev=754894&r1=754893&r2=754894&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/rlliso3multi.out
Mon Mar 16 13:55:49 2009
@@ -142,12 +142,13 @@
 --------------------------------------------------------------------------------------------------------------------------------
 a                                                                                       
                                      &
 ij(SCANNER)> --------------------------------------------------------------------------------
--- This should block on the scan lock held by the scanner on the first page.
+-- Before DERBY-2991 the attempt to split the root would time out because the
+-- scan had locked the first page.
 --------------------------------------------------------------------------------
 set connection rootgrower;
 ij(ROOTGROWER)> autocommit off;
 ij(ROOTGROWER)> insert into a values (PADSTRING('d',1000), PADSTRING('d',1000));
-ERROR 40XL1: A lock could not be obtained within the time requested
+1 row inserted/updated/deleted
 ij(ROOTGROWER)> --------------------------------------------------------------------------------
 -- The scan should continue unaffected.
 --------------------------------------------------------------------------------
@@ -167,6 +168,7 @@
 ij(ROOTGROWER)> --------------------------------------------------------------------------------
 -- Now the grow root should be allowed (note that cursor scan has locks
 -- on the leaf page being grown - just not the scan lock).
+-- (Scan locks are no longer used after DERBY-2991.)
 --------------------------------------------------------------------------------
 set connection rootgrower;
 ij(ROOTGROWER)> insert into a values (PADSTRING('d',1000), PADSTRING('d',1000));
@@ -504,7 +506,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6UPDATER)> set connection t6scanner;
@@ -519,7 +520,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
@@ -545,7 +545,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|TABLE   |2   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |X   |TEST_6      |(1,8)     |GRANT|ACTIVE  
@@ -555,7 +554,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
@@ -569,7 +567,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
@@ -582,7 +579,6 @@
 USERNAME|TRANTYPE|TYPE    |CNT |MODE|TABNAME     |LOCKNAME  |STATE|STATUS  
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 ij(T6SCANNER)> --
@@ -596,7 +592,6 @@
 -----------------------------------------------
 TABLE   |1  |IX  |TEST_6      |Tablelock |GRANT
 TABLE   |1  |IX  |TEST_6      |Tablelock |GRANT
-ROW     |1  |S   |TEST_6      |(1,1)     |GRANT
 ROW     |1  |U   |TEST_6      |(1,3)     |GRANT
 ROW     |1  |U   |TEST_6      |(1,7)     |GRANT
 ij(T6SCANNER)> next update_cursor3;
@@ -608,8 +603,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,8)     |GRANT|ACTIVE  
@@ -654,7 +647,6 @@
 ---------------------------------------------------------------------------
 APP     |UserTran|TABLE   |1   |IS  |TEST_6      |Tablelock |GRANT|ACTIVE  
 APP     |UserTran|TABLE   |1   |IX  |TEST_6      |Tablelock |GRANT|ACTIVE  
-APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,1)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,3)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |S   |TEST_6      |(1,7)     |GRANT|ACTIVE  
 APP     |UserTran|ROW     |1   |U   |TEST_6      |(1,3)     |GRANT|ACTIVE  



Mime
View raw message