Changeset 7125

Timestamp:

Apr 20, 2016, 8:28:12 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #2000: Batch API for annotation handling

Added a cache with unit converters so we don't have to create a new converter for every value.

More cleanup when closing the batcher.

Added setValue() method for setting single-valued annotations.

File:

• trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java (modified) (7 diffs)

trunk/src/core/net/sf/basedb/core/AnnotationBatcher.java

@@ -29 +29 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -147 +148 @@
   private final List<Integer> snapshotsToDelete;
   
+  // Cache with unit converters so that we don't need to create
+  // new ones all the time
+  private final Map<String, UnitConverter> unitConvertes;
+  
   /**
     Create a new batcher instance. 
@@ -183 +188 @@
     // Maps AnnotationType.id -> Annotation information
     this.currentInfo = new HashMap<Integer, CurrentAnnotationInfo>();
+    this.unitConvertes = new HashMap<String, UnitConverter>();
     
     this.allUpdateBatchers = new ArrayList<UpdateBatcher>();
@@ -331 +337 @@
       b.close();
     }
+    allUpdateBatchers.clear();
     for (InsertBatcher b : allInsertBatchers)
     {
       b.close();
     }
+    allInsertBatchers.clear();
     for (Integer id : snapshotsToDelete)
     {
       SnapshotManager.removeSnapshot(currentAnnotationSetId);
     }
+    snapshotsToDelete.clear();
+    unitConvertes.clear();
+    currentInfo.clear();
+    currentItem = null;
   }
   // ---------------------------
@@ -360 +372 @@
   }
   
+  /**
+    Get/create a unit converter for converting between two units.
+  */
+  private UnitConverter getUnitConverter(Unit from, Unit to)
+  {
+    String key = from.getId() + ":" + to.getId();
+    UnitConverter converter = unitConvertes.get(key);
+    if (converter == null)
+    {
+      converter = to.getUnitConverter(from);
+      unitConvertes.put(key, converter);
+    }
+    return converter;
+  }
   
   /**
@@ -519 +545 @@
   
   /**
+    Add, update or delete a single-valued annotation. 
+    See {@link #setValues(AnnotationType, List, Unit)} for 
+    more information.
+  */
+  public Change setValue(AnnotationType annotationType, Object value, Unit unit)
+  {
+    return setValues(annotationType, value == null ? null : Collections.singletonList(value), unit);
+  }
+  
+  /**
     Add, update or delete annotation values for the current item.
     If the current item doesn't have any values for the annotation type
@@ -610 +646 @@
         if (unit != null && info.defaultUnit != null && !unit.equals(info.defaultUnit))
         {
-          // Two different unit, convert the values to the default unit
-          converter = info.defaultUnit.getUnitConverter(unit);
+          // Two different units, convert the values to the default unit
+          converter = getUnitConverter(unit, info.defaultUnit);
         }