Changeset 2574

Timestamp:

07/01/08 20:02:11 (5 months ago)

Author:

jmoore

Message:

ticket:1002 - Working implementation of pagination for getImage(Dataset|Project)

• Fixes tricky mistake in PojoOptions
  
• Uses two queries to handle pagination
  

Location:

trunk/components

Files:

• model/src/ome/util/builders/PojoOptions.java (modified) (1 diff)
• server/src/ome/logic/PojosImpl.java (modified) (4 diffs)
• server/src/ome/services/query/PojosGetImagesQueryDefinition.java (modified) (3 diffs)
• server/test/ome/server/itests/scalability (added)
• server/test/ome/server/itests/scalability/PaginationTest.java (added)

trunk/components/model/src/ome/util/builders/PojoOptions.java

@@ -66 +66 @@
     protected void copy(Map map) {
         String[] s = new String[] { LEAF, EXPERIMENTER, GROUP, START_TIME,
-                END_TIME };
+                END_TIME, OFFSET, LIMIT };
         for (int i = 0; i < s.length; i++) {
             if (map.containsKey(s[i])) {

trunk/components/server/src/ome/logic/PojosImpl.java

@@ -16 +16 @@
 
 // Java imports
+import java.sql.SQLException;
 import java.util.Collection;
 import java.util.HashMap;
@@ -60 +61 @@
 import ome.util.builders.PojoOptions;
 
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 import org.jboss.annotation.ejb.LocalBinding;
 import org.jboss.annotation.ejb.RemoteBinding;
 import org.jboss.annotation.ejb.RemoteBindings;
+import org.springframework.orm.hibernate3.HibernateCallback;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -346 +350 @@
     }
 
-    @RolesAllowed("user")
-    @Transactional(readOnly = true)
-    public Set getImages(Class rootNodeType, Set rootNodeIds, Map options) {
+    static final Map<Class, String> paginationQueries = new HashMap();
+    static {
+        paginationQueries.put(Dataset.class,
+                "select link.child.id from DatasetImageLink "
+                        + " link where link.parent.id in (:ids)"
+                        + "order by link.child.id");
+        paginationQueries
+                .put(
+                        Project.class,
+                        "select distinct dil.child.id from ProjectDatasetLink pdl "
+                                + "join pdl.child ds join ds.imageLinks as dil "
+                                + "where pdl.parent.id in (:ids) order by dil.child.id");
+    }
+
+    @RolesAllowed("user")
+    @Transactional(readOnly = true)
+    @SuppressWarnings("unchecked")
+    public Set getImages(final Class rootNodeType, final Set rootNodeIds,
+            final Map options) {
 
         if (rootNodeIds.size() == 0) {
@@ -354 +374 @@
         }
 
-        PojoOptions po = new PojoOptions(options);
+        final PojoOptions po = new PojoOptions(options);
+
+        // Effective values
+        Class effType = rootNodeType;
+        Set<Long> effIds = rootNodeIds;
+
+        if (po.isPagination()) {
+            final String query = paginationQueries.get(rootNodeType);
+            if (query == null) {
+                throw new ApiUsageException(rootNodeType.getName()
+                        + " does not support pagination yet.");
+            }
+            effType = Image.class;
+            effIds = new HashSet<Long>((List<Long>) iQuery
+                    .execute(new HibernateCallback() {
+                        public Object doInHibernate(Session s)
+                                throws HibernateException, SQLException {
+                            return s.createQuery(query).setParameterList("ids",
+                                    rootNodeIds).setMaxResults(po.getLimit())
+                                    .setFirstResult(po.getOffset()).list();
+                        }
+                    }));
+            if (effIds == null || effIds.size() == 0) {
+                return new HashSet();
+            }
+        }
 
         Query<List<IObject>> q = getQueryFactory().lookup(
                 PojosGetImagesQueryDefinition.class.getName(),
-                new Parameters().addIds(rootNodeIds).addClass(rootNodeType)
-                        .addOptions(po.map()));
+                new Parameters().addIds(effIds).addClass(effType).addOptions(
+                        po.map()));
 
         List<IObject> l = iQuery.execute(q);

trunk/components/server/src/ome/services/query/PojosGetImagesQueryDefinition.java

@@ -41 +41 @@
         Class klass = (Class) value(CLASS);
         Collection ids = (Collection) value(IDS);
+        PojoOptions po = new PojoOptions((Map) value(OPTIONS));
 
         StringBuilder sb = new StringBuilder();
@@ -87 +88 @@
 
         // if PojoOptions sets START_TIME and/or END_TIME
-        if (check(OPTIONS)) {
-            PojoOptions po = new PojoOptions((Map) value(OPTIONS));
-            if (po.getStartTime() != null) {
-                sb.append("img.details.creationEvent.time > :starttime and ");
-                params.put("starttime", po.getStartTime());
-            }
-            if (po.getEndTime() != null) {
-                sb.append("img.details.creationEvent.time < :endtime and ");
-                params.put("endtime", po.getEndTime());
-            }
+        if (po.getStartTime() != null) {
+            sb.append("img.details.creationEvent.time > :starttime and ");
+            params.put("starttime", po.getStartTime());
+        }
+        if (po.getEndTime() != null) {
+            sb.append("img.details.creationEvent.time < :endtime and ");
+            params.put("endtime", po.getEndTime());
         }
 
@@ -118 +116 @@
             q.setParameter(param, params.get(param));
         }
+
         q.setParameterList("ids", ids);
         setQuery(q);