Changeset 29484 in osm for applications/editors/josm/plugins/imagerycache/src/org/openstreetmap

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

Location:

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache

Files:

• DBTile.java (added)
• ImageryCachePlugin.java (modified) (2 diffs)
• OsmDBTilesLoader.java (modified) (16 diffs)
• TileDAO.java (added)
• TileDAOMapDB.java (added)

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/ImageryCachePlugin.java

@@ -17 +17 @@
         public OsmTileLoader makeTileLoader(TileLoaderListener listener) {
             String cachePath = TMSLayer.PROP_TILECACHE_DIR.get();
+            try {
+                new File(cachePath).mkdirs();
+            } catch (Exception e) {
+                cachePath=".";
+            }
+            
             if (cachePath != null && !cachePath.isEmpty()) {
                 return new OsmDBTilesLoader(listener, new File(cachePath));
@@ -29 +35 @@
     }
     
+    public static void main(String[] args) {
+        System.out.println("Debugging code for ImageryAdjust plugin");
+    }
 }

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.Serializable;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
-import org.mapdb.DB;
-import org.mapdb.DBMaker;
 import org.openstreetmap.gui.jmapviewer.JobDispatcher;
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
@@ -22 +18 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource.TileUpdate;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 
@@ -35 +32 @@
     
     public static final boolean debug = new BooleanProperty("imagerycache.debug", false).get();
-
-    static class TileDAOMapDB {
-        protected HashMap<String, DB> dbs = new HashMap<String, DB>();
-        protected HashMap<String, Map<Long,DBTile>> storages  = new HashMap<String, Map<Long,DBTile>>();
-        private final File cacheFolder;
-        
-        /**
-         * Lazy creation of DB object associated to * @param source
-         * or returning from cache
-         */
-        private synchronized DB getDB(String source) {
-            DB db = dbs.get(source);
-            if (db==null) {
-                try {
-                db = DBMaker
-                    .newFileDB(new File(cacheFolder, "tiles_"+source.replaceAll("[\\\\/:*?\"<>| ]", "_")))
-                    .randomAccessFileEnableIfNeeded()
-                    .journalDisable()
-                    .closeOnJvmShutdown()
-                    .make();
-                dbs.put(source, db);
-                } catch (Exception e) {
-                    System.out.println("Error: Can not create MapDB file");
-                    e.printStackTrace(System.out);
-                }
-            }
-            return db;
-        }
-
-        private synchronized Map<Long,DBTile> getStorage(String source) {
-            Map<Long, DBTile> m = storages.get(source);
-            if (m == null) {
-                try {
-                    DB d = getDB(source);
-                    m = d.getHashMap("tiles");
-                    storages.put(source, m);
-                    if (debug) System.out.println("Created storage "+source);
-                } catch (Exception e) {
-                    System.out.println("Error: Can not create HashMap in MapDB storage");
-                    e.printStackTrace(System.out);
-                }
-            }
-            return m;
-        }
-        
-        public TileDAOMapDB(File cacheFolder) {
-            this.cacheFolder = cacheFolder;
-        }
-        
-                
-        DBTile getById(String source, long id) {
-            return getStorage(source).get(id);
-        }
-
-        protected void updateModTime(String source, long id, DBTile dbTile) {
-            if (debug) System.out.println("Tile "+id+": Updating modification time");
-            getStorage(source).put(id, dbTile);
-        }
-
-        protected void updateTile(String source, long id, DBTile dbTile) {
-            if (debug) System.out.println("Tile "+id+": Updating tile in base");
-            getStorage(source).put(id, dbTile);
-        }
-
-        protected void deleteTile(String source, long id) {
-            getStorage(source).remove(id);
-        }
-
-
-    }
             
     TileDAOMapDB dao;
-                        
    
     protected long maxCacheFileAge = FILE_AGE_ONE_WEEK;
@@ -115 +41 @@
     public OsmDBTilesLoader(TileLoaderListener smap, File cacheFolder) {
         super(smap);
-        dao = new TileDAOMapDB(cacheFolder);
+        dao = TileDAOMapDB.getInstance();
+        dao.setCacheFolder(cacheFolder);
     }
     
@@ -122 +49 @@
         return new DatabaseLoadJob(tile);
     }
-    
-    static class DBTile implements Serializable {
-        byte data[];
-        Map<String, String> metaData;
-        long lastModified;
-    }
 
     protected class DatabaseLoadJob implements TileJob {
@@ -133 +54 @@
         private final Tile tile;
         File tileCacheDir;
+        
+        /**
+         * Stores the tile loaded from database, null if nothing found. 
+         */
         DBTile dbTile = null;
         long fileAge = 0;
-        boolean fileTilePainted = false;
         
         long id;
@@ -161 +85 @@
                 return;
             }
-            if (fileTilePainted) {
+            if (dbTile != null) {
                 TileJob job = new TileJob() {
-                    public void run() {
-                        loadOrUpdateTile();
-                    }
-                    public Tile getTile() {
+                    @Override public void run() {
+                        loadOrUpdateTileFromServer();
+                    }
+                    @Override public Tile getTile() {
                         return tile;
                     }
@@ -172 +96 @@
                 JobDispatcher.getInstance().addJob(job);
             } else {
-                loadOrUpdateTile();
-            }
-        }
-
+                loadOrUpdateTileFromServer();
+            }
+        }
+
+        /**
+         * Loads tile from database. 
+         * There can be dbTile != null but the tile is outdated and reload is still needed
+         * @return true if no loading from server is needed.
+         */
         private boolean loadTileFromFile() {
             ByteArrayInputStream bin = null;
@@ -182 +111 @@
                 
                 if (dbTile == null) return false;
+                
+                loadMetadata(); 
+                if (debug) System.out.println(id+": found in cache, metadata ="+dbTile.metaData);
 
                 if ("no-tile".equals(tile.getValue("tile-info")))
                 {
                     tile.setError("No tile at this zoom level");
-                    if (dbTile!=null) {
-                        dao.deleteTile(sourceName, id);
-                    }
+                    dao.deleteTile(sourceName, id);
                 } else {
                     bin = new ByteArrayInputStream(dbTile.data);
@@ -202 +132 @@
                     tile.setLoaded(true);
                     listener.tileLoadingFinished(tile, true);
-                    fileTilePainted = true;
-                    return true;
-                }
-                listener.tileLoadingFinished(tile, true);
-                fileTilePainted = true;
+                    return true; // tile loaded
+                } else {
+                    listener.tileLoadingFinished(tile, true);
+                    return false; // Tile is loaded, but too old. Should be reloaded from server
+                }
             } catch (Exception e) {
+                System.out.println("Error: Can not load tile from database: "+sourceName+":"+id);
+                e.printStackTrace(System.out);
                 try {
                     if (bin != null) {
@@ -213 +145 @@
                         dao.deleteTile(sourceName, id);
                     }
-                } catch (Exception e1) {
-                }
+                } catch (Exception e1) {   }
                 dbTile = null;
                 fileAge = 0;
-            }
-            return false;
+                return false; // tile is not because of some error (corrupted database, etc.)
+            } catch (Error e) { // this is bad, bat MapDB throws it
+                System.out.println("Serious database error: Can not load tile from database: "+sourceName+":"+id);
+                e.printStackTrace(System.out);
+                dbTile = null;  fileAge = 0;  return false;                                            
+            }
         }
 
@@ -225 +160 @@
         }
                 
-        private void loadOrUpdateTile() {
+        private void loadOrUpdateTileFromServer() {
             
             try {
@@ -231 +166 @@
                 final TileUpdate tileUpdate = tile.getSource().getTileUpdate();
                 if (dbTile != null) {
+                    // MapDB wants simmutable entities
+                    dbTile = new DBTile(dbTile);
                     switch (tileUpdate) {
                     case IfModifiedSince:   // (1)
@@ -276 +213 @@
                 loadTileMetadata(tile, urlConn);
                 dbTile.metaData = tile.getMetadata();
-
+                
                 if ("no-tile".equals(tile.getValue("tile-info")))
                 {
@@ -305 +242 @@
                 listener.tileLoadingFinished(tile, false);
                 try {
-                    System.out.println("Tile "+id+": Error: Failed loading from "+tile.getUrl());
+                    System.out.println("Error: Tile "+id+" can not be loaded from"+tile.getUrl());
                     e.printStackTrace(System.out);
                 } catch(IOException i) {
@@ -381 +318 @@
         }
 
+        /**
+         * Loads attribute map from dbTile to tile
+         */
+        private void loadMetadata() {
+            Map<String,String> m = dbTile.metaData;
+            if (m==null) return;
+            for (String k: m.keySet()) {
+                tile.putValue(k, m.get(k));
+            }
+        }
     }
-    
 }