[Bigdata-commit] SF.net SVN: bigdata:[3320] trunk/bigdata/src/java/com/bigdata

[<tho...@us...>]

Revision: 3320
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3320&view=rev
Author:   thompsonbry
Date:     2010-07-27 19:12:15 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
It turns out that the StoreManager for scale-out has a dependency on the specific class used to represent the performance counters on the DiskOnlyStrategy.  I therefore had to restore the ability to select the DiskOnlyStrategy class (rather than WORMStrategy) using BufferMode.Disk.

Modified Paths:
--------------
    trunk/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java

Modified: trunk/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2010-07-27 18:51:29 UTC (rev 3319)
+++ trunk/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2010-07-27 19:12:15 UTC (rev 3320)
@@ -1027,33 +1027,33 @@
 
         }
 
-//        case Disk: {
-//
-//            /*
-//             * Setup the buffer strategy.
-//             */
-//
-//            fileMetadata = new FileMetadata(file, BufferMode.Disk,
-//                    useDirectBuffers, initialExtent, maximumExtent, create,
-//                    isEmptyFile, deleteOnExit, readOnly, forceWrites,
-//                    offsetBits, //readCacheCapacity, readCacheMaxRecordSize,
-//                    //readOnly ? null : writeCache,
-//                    writeCacheEnabled,
-//                    validateChecksum,
-//                    createTime, checker, alternateRootBlock);
-//
-//            _bufferStrategy = new DiskOnlyStrategy(
-//                    0L/* soft limit for maximumExtent */,
-////                    minimumExtension,
-//                    fileMetadata);
-//
-//            this._rootBlock = fileMetadata.rootBlock;
-//
-//            break;
-//
-//        }
+        case Disk: {
 
-        case Disk:
+            /*
+             * Setup the buffer strategy.
+             */
+
+            fileMetadata = new FileMetadata(file, BufferMode.Disk,
+                    useDirectBuffers, initialExtent, maximumExtent, create,
+                    isEmptyFile, deleteOnExit, readOnly, forceWrites,
+                    offsetBits, //readCacheCapacity, readCacheMaxRecordSize,
+                    //readOnly ? null : writeCache,
+                    writeCacheEnabled,
+                    validateChecksum,
+                    createTime, checker, alternateRootBlock);
+
+            _bufferStrategy = new DiskOnlyStrategy(
+                    0L/* soft limit for maximumExtent */,
+//                    minimumExtension,
+                    fileMetadata);
+
+            this._rootBlock = fileMetadata.rootBlock;
+
+            break;
+
+        }
+
+//        case Disk:
         case DiskWORM: {
 
             /*

Modified: trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java
===================================================================
--- trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java	2010-07-27 18:51:29 UTC (rev 3319)
+++ trunk/bigdata/src/java/com/bigdata/resources/StoreManager.java	2010-07-27 19:12:15 UTC (rev 3320)
@@ -2446,7 +2446,8 @@
              * the "historical" journals managed by this data service.
              * 
              * FIXME Must also roll the counters forward for the other journal
-             * buffer strategies!
+             * buffer strategies! (The implementation class is different for the
+             * WORMStrategy, which is causing complications right now.)
              */
             if (getBufferStrategy() instanceof DiskOnlyStrategy) {
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.