A concurrent list, to replace the array list of old roots (work in progress)

h2/src/test/org/h2/test/store/TestConcurrentLinkedList.java

@@ -10,7 +10,7 @@ import java.util.LinkedList;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.h2.mvstore.ConcurrentRing;
+import org.h2.mvstore.ConcurrentLinkedList;
 import org.h2.test.TestBase;
 import org.h2.util.Task;
 
@@ -32,8 +32,8 @@ public class TestConcurrentLinkedList extends TestBase {
 
     @Override
     public void test() throws Exception {
-        testConcurrent();
         testRandomized();
+        testConcurrent();
     }
     
     private void testPerformance() {
@@ -48,8 +48,8 @@ public class TestConcurrentLinkedList extends TestBase {
     private void testPerformance(final boolean stock) {
         System.out.print(stock ? "stock " : "custom ");
         long start = System.currentTimeMillis();
-        // final ConcurrentLinkedList<Integer> test = new ConcurrentLinkedList<Integer>();
-        final ConcurrentRing<Integer> test = new ConcurrentRing<Integer>();
+        final ConcurrentLinkedList<Integer> test = new ConcurrentLinkedList<Integer>();
+        // final ConcurrentRing<Integer> test = new ConcurrentRing<Integer>();
         final LinkedList<Integer> x = new LinkedList<Integer>();
         final AtomicInteger counter = new AtomicInteger();
         Task task = new Task() {
@@ -107,8 +107,8 @@ public class TestConcurrentLinkedList extends TestBase {
     }
 
     private void testConcurrent() {
-//         final ConcurrentLinkedList<Integer> test = new ConcurrentLinkedList<Integer>();
-        final ConcurrentRing<Integer> test = new ConcurrentRing<Integer>();
+        final ConcurrentLinkedList<Integer> test = new ConcurrentLinkedList<Integer>();
+        // final ConcurrentRing<Integer> test = new ConcurrentRing<Integer>();
         final AtomicInteger counter = new AtomicInteger();
         final AtomicInteger size = new AtomicInteger();
         Task task = new Task() {
@@ -140,7 +140,8 @@ public class TestConcurrentLinkedList extends TestBase {
     private void testRandomized() {
         Random r = new Random(0);
         for (int i = 0; i < 100; i++) {
-            ConcurrentRing<Integer> test = new ConcurrentRing<Integer>();
+            ConcurrentLinkedList<Integer> test = new ConcurrentLinkedList<Integer>();
+            // ConcurrentRing<Integer> test = new ConcurrentRing<Integer>();
             LinkedList<Integer> x = new LinkedList<Integer>();
             StringBuilder buff = new StringBuilder();
             for (int j = 0; j < 10000; j++) {

h2/src/test/org/h2/test/store/TestMVStoreTool.java

@@ -51,8 +51,9 @@ public class TestMVStoreTool extends TestBase {
             }
         }
         s.close();
-        MVStoreTool.dump(fileName);
-        MVStoreTool.dump(fileName + ".new");
+        ; // TODO testing
+//        MVStoreTool.dump(fileName);
+//        MVStoreTool.dump(fileName + ".new");
         MVStoreTool.compress(fileName, fileName + ".new");
         MVStore s1 = new MVStore.Builder().
                 fileName(fileName).readOnly().open();