[jboss-cvs] JBoss Messaging SVN: r7502 - branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2009-06-30 02:07:44 -0400 (Tue, 30 Jun 2009)
New Revision: 7502

Modified:
   branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java
Log:
tweaks

Modified: branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java
===================================================================
--- branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java	2009-06-30 05:52:22 UTC (rev 7501)
+++ branches/clebert_temp_expirement/tests/src/org/jboss/messaging/tests/integration/journal/NIOJournalCompactTest.java	2009-06-30 06:07:44 UTC (rev 7502)
@@ -69,47 +69,63 @@
 
    public void testCompactwithPendingCommit() throws Exception
    {
-      InternalCompactTest(false, false, false, false, true, false, false);
+      internalCompactTest(false, false, false, false, false, true, false, false);
    }
 
    public void testCompactwithDelayedCommit() throws Exception
    {
-      InternalCompactTest(false, false, false, false, true, false, true);
+      internalCompactTest(false, false, false, false, false, true, false, true);
    }
 
    public void testCompactwithPendingCommitFollowedByDelete() throws Exception
    {
-      InternalCompactTest(false, false, false, false, true, true, false);
+      internalCompactTest(false, false, false, false, false, true, true, false);
    }
 
    public void testCompactwithConcurrentUpdateAndDeletes() throws Exception
    {
-      InternalCompactTest(true, false, true, true, false, false, false);
+      internalCompactTest(true, false, true, true, false, false, false, false);
+      tearDown();
+      setUp();
+      internalCompactTest(true, false, true, false, true, false, false, false);
    }
 
    public void testCompactwithConcurrentDeletes() throws Exception
    {
-      InternalCompactTest(true, false, false, true, false, false, false);
+      internalCompactTest(true, false, false, true, false, false, false, false);
+      tearDown();
+      setUp();
+      internalCompactTest(true, false, false, false, true, false, false, false);
    }
 
    public void testCompactwithConcurrentUpdates() throws Exception
    {
-      InternalCompactTest(true, false, true, false, false, false, false);
+      internalCompactTest(true, false, true, false, false, false, false, false);
    }
 
    public void testCompactWithConcurrentAppend() throws Exception
    {
-      InternalCompactTest(true, true, false, false, false, false, false);
+      internalCompactTest(true, true, false, false, false, false, false, false);
    }
 
-   private void InternalCompactTest(final boolean regularAdd,
+   private void internalCompactTest(final boolean regularAdd,
                                     final boolean performAppend,
                                     final boolean performUpdate,
-                                    final boolean performDelete,
+                                    boolean performDelete,
+                                    boolean performNonTransactionalDelete,
                                     final boolean pendingTransactions,
                                     final boolean deleteTransactRecords,
                                     final boolean delayCommit) throws Exception
    {
+      if (performNonTransactionalDelete)
+      {
+         performDelete = false;
+      }
+      if (performDelete)
+      {
+         performNonTransactionalDelete = false;
+      }
+      
       setup(50, 60 * 1024, true);
 
       ArrayList<Long> liveIDs = new ArrayList<Long>();
@@ -270,12 +286,12 @@
          {
             if (count++ % 2 == 0)
             {
-               System.out.println("Deleting no trans " + liveID );
+               System.out.println("Deleting no trans " + liveID);
                delete(liveID);
             }
             else
             {
-               System.out.println("Deleting TX " + liveID );
+               System.out.println("Deleting TX " + liveID);
                // A Total new transaction (that was created after the compact started) to delete a record that is being
                // compacted
                deleteTx(transactionID, liveID);
@@ -286,6 +302,14 @@
          }
       }
 
+      if (performNonTransactionalDelete)
+      {
+         for (long liveID : liveIDs)
+         {
+            delete(liveID);
+         }
+      }
+
       if (pendingTransactions && !delayCommit)
       {
          for (Pair<Long, Long> tx : transactedRecords)
@@ -307,18 +331,17 @@
       }
 
       /** Some independent adds and updates */
-//      for (int i = 0; i < 1000; i++)
-//      {
-//         long id = idGenerator.generateID();
-//         add(id);
-//         delete(id);
-//
-//         if (i % 100 == 0)
-//         {
-//            journal.forceMoveNextFile();
-//         }
-//      }
+       for (int i = 0; i < 1000; i++)
+      {
+         long id = idGenerator.generateID();
+         add(id);
+         delete(id);
 
+         if (i % 100 == 0)
+         {
+            journal.forceMoveNextFile();
+         }
+       }
       journal.forceMoveNextFile();
 
       latchWait.countDown();