diff src/org/dancres/blitz/txn/PersistentPersonality.java @ 33:a77f0a9ed93c 2.1.1

Add support for optimistic log batching.
author Dan Creswell <dan.creswell@gmail.com>
date Sat, 12 Jun 2010 10:42:31 +0100
parents 4580bb12db30
children
line wrap: on
line diff
--- a/src/org/dancres/blitz/txn/PersistentPersonality.java	Sat Jun 12 10:41:47 2010 +0100
+++ b/src/org/dancres/blitz/txn/PersistentPersonality.java	Sat Jun 12 10:42:31 2010 +0100
@@ -34,9 +34,9 @@
         TxnManager.theLogger.log(Level.INFO, "Write barrier window: " +
                           theModel.getBatchWriteWindowSizeMs() + ", " + theModel.getBatchWriteWindowSizeNs());
 
-        if (theModel.useConcurrentWriteBatcher())
+        if (!theModel.dontUseExperimentalBatcher())
                 TxnManager.theLogger.log(Level.INFO,
-                                         "*** Concurrent batching enabled ***");
+                                         "*** Experimental batcher enabled ***");
 
         if (theModel.shouldCleanLogs()) {
             TxnManager.theLogger.log(Level.WARNING,
@@ -70,10 +70,10 @@
             long myWindowSizeMs = theModel.getBatchWriteWindowSizeMs();
             int myWindowSizeNs = theModel.getBatchWriteWindowSizeNs();
 
-            if (theModel.useConcurrentWriteBatcher()) {
+            if (theModel.dontUseExperimentalBatcher()) {
                 return new ConcurrentWriteBatcher(myPrevayler, myWindowSizeMs, myWindowSizeNs);
             } else {
-                return new WriteBatcher(myPrevayler, myWindowSizeMs, myWindowSizeNs);
+                return new OptimisticBatcher(myPrevayler);
             }
         } else
             return new NullBatcher(myPrevayler);