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 [6/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/tests/store/rlliso2multi.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso2multi.sql?rev=754894&r1=754893&r2=754894&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso2multi.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso2multi.sql
Mon Mar 16 13:55:49 2009
@@ -119,11 +119,13 @@
 next scan_cursor;
 
 --------------------------------------------------------------------------------
--- 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;
 autocommit off;
 insert into a values (PADSTRING('d',1200), PADSTRING('d',1000));
+rollback;
 
 --------------------------------------------------------------------------------
 -- The scan should continue unaffected.
@@ -141,6 +143,7 @@
 --------------------------------------------------------------------------------
 -- 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;
 insert into a values (PADSTRING('d',1200), PADSTRING('d',1000));
@@ -693,6 +696,7 @@
 --------------------------------------------------------------------------------
 -- 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.)
 --
 --------------------------------------------------------------------------------
 
@@ -743,8 +747,9 @@
 commit;
 
 -- 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');
-commit;
+rollback;
 
 set connection scanner;
 next scan_cursor;

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso3multi.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso3multi.sql?rev=754894&r1=754893&r2=754894&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso3multi.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/rlliso3multi.sql
Mon Mar 16 13:55:49 2009
@@ -111,7 +111,8 @@
 next scan_cursor;
 
 --------------------------------------------------------------------------------
--- 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;
 autocommit off;
@@ -133,6 +134,7 @@
 --------------------------------------------------------------------------------
 -- 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;
 insert into a values (PADSTRING('d',1000), PADSTRING('d',1000));

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java?rev=754894&r1=754893&r2=754894&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
Mon Mar 16 13:55:49 2009
@@ -3069,11 +3069,10 @@
 		T_RawStoreRow row1 = new T_RawStoreRow(REC_001);
 
 		RecordHandle valid = t_util.t_insert(page1, row1);
-		RecordHandle special = page1.makeRecordHandle(RecordHandle.RECORD_ID_PROTECTION_HANDLE);
 
 		RecordHandle[] rhs = new RecordHandle[RecordHandle.FIRST_RECORD_ID];
 		rhs[0] = page1.getInvalidRecordHandle();
-		rhs[1] = page1.makeRecordHandle(RecordHandle.RECORD_ID_PROTECTION_HANDLE);
+		rhs[1] = page1.makeRecordHandle(RecordHandle.RESERVED1_RECORD_HANDLE);
 		rhs[2] = page1.makeRecordHandle(RecordHandle.DEALLOCATE_PROTECTION_HANDLE);
 		rhs[3] = page1.makeRecordHandle(RecordHandle.PREVIOUS_KEY_HANDLE);
 		rhs[4] = page1.makeRecordHandle(RecordHandle.RESERVED4_RECORD_HANDLE);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java?rev=754894&r1=754893&r2=754894&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_b2i.java Mon
Mar 16 13:55:49 2009
@@ -3064,9 +3064,7 @@
         String[] latch_debug_strings = {
             "B2iRowLocking3_1_lockScanRow1",
             "B2iRowLocking3_2_lockScanRow1",
-            "B2iRowLocking3_3_lockScanRow1",
             "BTreeScan_positionAtStartPosition1",
-            "BTreeScan_positionAtNextPage1",
             // "BTreeScan_reposition1",
             "BTreeScan_fetchNextGroup1",
         };
@@ -3210,10 +3208,8 @@
         String[] deadlock_debug_strings = {
             "B2iRowLocking3_1_lockScanRow2",
             "B2iRowLocking3_2_lockScanRow2",
-            "B2iRowLocking3_3_lockScanRow2",
             // "BTreeController_doIns2",
             "BTreeScan_positionAtStartPosition2",
-            "BTreeScan_positionAtNextPage2",
             // "BTreeScan_reposition2",
             "BTreeScan_fetchNextGroup2"
         };



Mime
View raw message