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

Timestamp:

2013-04-07T17:07:27+02:00 (11 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/HTreeMap.java (modified) (8 diffs)

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

@@ -52 +52 @@
     protected final int hashSalt;
 
+    protected final Atomic.Long counter;
 
     protected final Serializer<K> keySerializer;
@@ -86 +87 @@
             out.writeBoolean(value.hasValues);
             out.writeInt(value.hashSalt);
+            out.writeLong(value.counterRecid);
             for(int i=0;i<16;i++){
                 Utils.packLong(out, value.segmentRecids[i]);
@@ -100 +102 @@
             r.hasValues = in.readBoolean();
             r.hashSalt = in.readInt();
+            r.counterRecid = in.readLong();
             r.segmentRecids = new long[16];
             for(int i=0;i<16;i++){
@@ -116 +119 @@
         boolean hasValues;
         int hashSalt;
+        long counterRecid;
         Serializer keySerializer;
         Serializer valueSerializer;
+
     }
 
@@ -212 +217 @@
      * @param valueSerializer Serializer used for values. May be null for default value
      */
-    public HTreeMap(Engine engine, boolean hasValues, int hashSalt, Serializer defaultSerializer, Serializer<K> keySerializer, Serializer<V> valueSerializer) {
+    public HTreeMap(Engine engine, boolean hasValues, boolean keepCounter, int hashSalt, Serializer defaultSerializer, Serializer<K> keySerializer, Serializer<V> valueSerializer) {
         this.engine = engine;
         this.hasValues = hasValues;
         this.hashSalt = hashSalt;
+
+
         SerializerBase.assertSerializable(keySerializer);
         SerializerBase.assertSerializable(valueSerializer);
+
 
         if(defaultSerializer == null) defaultSerializer = Serializer.BASIC_SERIALIZER;
@@ -229 +237 @@
         for(int i=0;i<16;i++)
             segmentRecids[i] = engine.put(new long[16][], DIR_SERIALIZER);
+
+        long counterRecid = 0;
+        if(keepCounter){
+            counterRecid = engine.put(0L, Serializer.LONG_SERIALIZER);
+            this.counter = new Atomic.Long(engine,counterRecid);
+            Bind.size(this,counter);
+        }else{
+            this.counter = null;
+        }
+
         HashRoot r = new HashRoot();
         r.hasValues = hasValues;
         r.hashSalt = hashSalt;
+        r.counterRecid = counterRecid;
         r.segmentRecids = segmentRecids;
         r.keySerializer = this.keySerializer;
         r.valueSerializer = this.valueSerializer;
         this.rootRecid = engine.put(r, new HashRootSerializer(defaultSerializer));
+
     }
 
@@ -259 +279 @@
         this.keySerializer = r.keySerializer;
         this.valueSerializer = r.valueSerializer;
+
+        if(r.counterRecid!=0){
+            counter = new Atomic.Long(engine,r.counterRecid);
+            Bind.size(this,counter);
+        }else{
+            this.counter = null;
+        }
     }
 
@@ -294 +321 @@
     @Override
     public int size() {
+        if(counter!=null)
+            return (int) counter.get(); //TODO larger then MAX_INT
+
+
         long counter = 0;