Changeset 29484 in osm for applications/editors/josm/plugins/imagerycache/src/org/mapdb/DBMaker.java

Timestamp:

2013-04-07T17:07:27+02:00 (12 years ago)

Author:

akks

Message:

JOSM/ImageryCache: updated MapDB (no more deadlocks, Java 1.6 compatible), less crashes, multiple-JOSM support

File:

• applications/editors/josm/plugins/imagerycache/src/org/mapdb/DBMaker.java (modified) (12 diffs)

applications/editors/josm/plugins/imagerycache/src/org/mapdb/DBMaker.java

@@ -60 +60 @@
     protected byte[] _xteaEncryptionKey = null;
 
-    protected boolean _freeSpaceReclaimDisabled = false;
+    protected int _freeSpaceReclaimQ = 5;
 
     protected boolean _checksumEnabled = false;
@@ -124 +124 @@
                 .deleteFilesAfterClose()
                 .closeOnJvmShutdown()
-                .journalDisable()
+                .writeAheadLogDisable()
                 .make()
                 .getTreeMap("temp");
@@ -139 +139 @@
                 .deleteFilesAfterClose()
                 .closeOnJvmShutdown()
-                .journalDisable()
+                .writeAheadLogDisable()
                 .make()
                 .getHashMap("temp");
@@ -154 +154 @@
                 .deleteFilesAfterClose()
                 .closeOnJvmShutdown()
-                .journalDisable()
+                .writeAheadLogDisable()
                 .make()
                 .getTreeSet("temp");
@@ -169 +169 @@
                 .deleteFilesAfterClose()
                 .closeOnJvmShutdown()
-                .journalDisable()
+                .writeAheadLogDisable()
                 .make()
                 .getHashSet("temp");
@@ -210 +210 @@
      * @return this builder
      */
-    public DBMaker journalDisable(){
+    public DBMaker writeAheadLogDisable(){
         this._journalEnabled = false;
         return this;
@@ -485 +485 @@
 
     /**
-     * In this mode existing free space is not reused,
-     * but records are added to the end of the store.
-     * <p/>
-     * This slightly improves write performance as store does not have
-     * to traverse list of free records to find and reuse existing position.
-     * <p/>
-     * It also decreases chance for store corruption, as existing data
-     * are not overwritten with new record.
-     * <p/>
-     * When this mode is used for longer time, store becomes fragmented.
-     * It is necessary to run defragmentation then.
-     * <p/>
-     * NOTE: this mode is not append-only, just small setting for update-in-place storage.
-     *
-     *
-     * @return this builder
-     */
-    public DBMaker freeSpaceReclaimDisable(){
-        this._freeSpaceReclaimDisabled = true;
+     * Set free space reclaim Q.  It is value from 0 to 10, indicating how eagerly MapDB
+     * searchs for free space inside store to reuse, before expanding store file.
+     * 0 means that no free space will be reused and store file will just grow (effectively append only).
+     * 10 means that MapDB tries really hard to reuse free space, even if it may hurt performance.
+     * Default value is 5;
+     *
+     *
+     * @return this builder
+     */
+    public DBMaker freeSpaceReclaimQ(int q){
+        if(q<0||q>10) throw new IllegalArgumentException("wrong Q");
+        this._freeSpaceReclaimQ = q;
         return this;
     }
@@ -536 +529 @@
      * @return this builder
      */
-    public DBMaker powerSavingModeEnable(){
-        this._powerSavingMode = true;
-        return this;
-    }
+//    public DBMaker powerSavingModeEnable(){
+//        this._powerSavingMode = true;
+//        return this;
+//    }
 
 
@@ -559 +552 @@
             throw new UnsupportedOperationException("Can not open in-memory DB in read-only mode.");
 
-        if(_readOnly && !_file.exists()){
+        if(_readOnly && !_file.exists() && !_appendStorage){
             throw new UnsupportedOperationException("Can not open non-existing file in read-only mode.");
         }
@@ -571 +564 @@
 
             engine = _journalEnabled ?
-                new StorageJournaled(folFac, _freeSpaceReclaimDisabled, _deleteFilesAfterClose, _failOnWrongHeader, _readOnly):
-                new StorageDirect(folFac, _freeSpaceReclaimDisabled, _deleteFilesAfterClose , _failOnWrongHeader, _readOnly);
+                    //TODO add extra params
+                //new StoreWAL(folFac, _freeSpaceReclaimDisabled, _deleteFilesAfterClose, _failOnWrongHeader, _readOnly):
+                //new StoreDirect(folFac, _freeSpaceReclaimDisabled, _deleteFilesAfterClose , _failOnWrongHeader, _readOnly);
+                new StoreWAL(folFac,  _readOnly,_deleteFilesAfterClose):
+                new StoreDirect(folFac,  _readOnly,_deleteFilesAfterClose);
         }else{
             if(_file==null) throw new UnsupportedOperationException("Append Storage format is not supported with in-memory dbs");
-            engine = new StorageAppend(_file, _RAF, _readOnly, !_journalEnabled);
-        }
+            engine = new StoreAppend(_file, _RAF, _readOnly, !_journalEnabled);
+        }
+
+        if(_checksumEnabled){
+            engine = new ByteTransformEngine(engine, Serializer.CRC32_CHECKSUM);
+        }
+
+        if(_xteaEncryptionKey!=null){
+            engine = new ByteTransformEngine(engine, new EncryptionXTEA(_xteaEncryptionKey));
+        }
+
+
+        if(_compressionEnabled){
+            engine = new ByteTransformEngine(engine, CompressLZF.SERIALIZER);
+        }
+
 
         AsyncWriteEngine engineAsync = null;
@@ -584 +594 @@
         }
 
-        if(_checksumEnabled){
-            engine = new ByteTransformEngine(engine, Serializer.CRC32_CHECKSUM);
-        }
-
-        if(_xteaEncryptionKey!=null){
-            engine = new ByteTransformEngine(engine, new EncryptionXTEA(_xteaEncryptionKey));
-        }
-
-
-        if(_compressionEnabled){
-            engine = new ByteTransformEngine(engine, CompressLZF.SERIALIZER);
-        }
 
         engine = new SnapshotEngine(engine);
@@ -625 +623 @@
                 @Override
                                 public void run() {
+                    
+                    // for JOSM plugin ImageryCache
+                    org.openstreetmap.josm.plugins.imagerycache.TileDAOMapDB.dbNotAvailable = true;
                     if(!engine2.isClosed())
                         engine2.close();