Changeset 6567

Timestamp:

Oct 21, 2014, 10:00:30 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1843: Use snapshot manager to load annotations on list pages

Updated the table exporter to also use the snapshot manager. Initial export time with no cached snapshot for 23753 samples was little over 5 minutes. With snapshots in place the export time dropped to less than a minute.

File:

• trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java (modified) (6 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -23 +23 @@
 
 import net.sf.basedb.core.Annotatable;
-import net.sf.basedb.core.Annotation;
-import net.sf.basedb.core.AnnotationSet;
 import net.sf.basedb.core.BasicItem;
 import net.sf.basedb.core.BooleanParameterType;
@@ -44 +42 @@
 import net.sf.basedb.core.Type;
 import net.sf.basedb.core.Unit;
-
 import net.sf.basedb.core.Job.ExecutionTime;
 import net.sf.basedb.core.data.BasicData;
@@ -66 +63 @@
 import net.sf.basedb.core.signal.SignalTarget;
 import net.sf.basedb.core.signal.ThreadSignalHandler;
+import net.sf.basedb.core.snapshot.AnnotationSetSnapshot;
+import net.sf.basedb.core.snapshot.AnnotationSnapshot;
+import net.sf.basedb.core.snapshot.AnnotationTypeFilter;
+import net.sf.basedb.core.snapshot.SnapshotManager;
 import net.sf.basedb.util.Enumeration;
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.formatter.Formatter;
+import net.sf.basedb.util.units.UnitConverter;
 
 import java.io.IOException;
@@ -514 +516 @@
     boolean hasAnnotations = false;
     long totalItems = query.getMaxResults() == 0 ? query.count(dc) : query.getMaxResults();
+    SnapshotManager manager = new SnapshotManager();
+    AnnotationTypeFilter filter = new AnnotationTypeFilter();
     
     for (ExportedProperty ep : exportedProperties)
@@ -566 +570 @@
         
         int id = queryWrapper.getId(item);
-        AnnotationSet as = null;
+        AnnotationSetSnapshot snapshot = null;
         if (hasAnnotations)
         {
           Annotatable a = (Annotatable)item;
-          if (a.isAnnotated()) as = a.getAnnotationSet();
+          if (a.isAnnotated()) snapshot = manager.getSnapshot(dc, a.getAnnotationSet().getId());
         }
         
@@ -582 +586 @@
             if (ep.dataloader == null)
             {
-              Annotation a = as != null && as.hasAnnotation(ep.annotationType) ?
-                  as.getAnnotation(ep.annotationType) : null;
-              if (a != null)
+              if (snapshot != null)
               {
-                values = a.getValues(ep.unit);
-                if (ep.unit == null) unitSymbol = a.getUnitSymbol(null);
+                filter.setAnnotationType(ep.annotationType);
+                List<AnnotationSnapshot> s = manager.findAnnotations(dc, snapshot, filter, false);
+                if (s.size() == 1)
+                {
+                  Unit defaultUnit = ep.annotationType.getDefaultUnit();
+                  UnitConverter unitConverter = null;
+                  if (defaultUnit != null)
+                  {
+                    if (ep.unit != null) unitConverter = ep.unit.getUnitConverter(defaultUnit);
+                    if (ep.unit == null) unitSymbol = defaultUnit.getDisplaySymbol();
+                  }
+                  values = s.get(0).getValues(unitConverter, ep.annotationType.getValueType());
+                }
               }
             }