Changeset 5118

Timestamp:

Oct 8, 2009, 9:12:17 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #1400: Store the item id together with annotation sets

Location:

trunk/src/core/net/sf/basedb/core

Files:

• AnnotationSet.java (modified) (6 diffs)
• Install.java (modified) (1 diff)
• Update.java (modified) (4 diffs)
• data/AnnotationSetData.java (modified) (1 diff)

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

@@ -118 +118 @@
 
   /**
+    @since 2.14
+  */
+  static int loadItemId(org.hibernate.Session session, Item itemType, int annotationSetId)
+  {
+    String hql = "SELECT item.id"+
+      " FROM "+itemType.getDataClass().getName()+" item"+
+      " WHERE item.annotationSet = :annotationSet";
+    org.hibernate.Query query = HibernateUtil.createQuery(session, hql);
+    query.setInteger("annotationSet", annotationSetId);
+    return HibernateUtil.loadData(Integer.class, query);
+  }
+  
+  /**
     The item this annotation set belongs to.
   */
@@ -138 +151 @@
   {
     super(annotationSetData);
-    this.item = item;   
+    setItem(item);
   }
 
@@ -175 +188 @@
   {
     Set<ItemProxy> using = super.getUsingItems();
-    Annotatable item = getItem();
-    using.add(new ItemProxy(item.getId(), item.getType()));
+    using.add(new ItemProxy(getItemId(), getItemType()));
     return using;
   }
@@ -242 +254 @@
     if (item == null)
     { 
-      if (dc == null) dc = getDbControl();
-      Item type = getItemType();
-      String hql = "SELECT item"+
-        " FROM "+type.getDataClass().getName()+" item"+
-        " WHERE item.annotationSet = :annotationSet";
-      org.hibernate.Query query = HibernateUtil.createQuery(dc.getHibernateSession(), hql);
-      query.setEntity("annotationSet", this.getData());
-      item = (Annotatable)dc.getItem(type.getItemClass(), HibernateUtil.loadData(type.getDataClass(), query));
+      Integer itemId = getData().getItemId();
+      if (itemId == null) 
+      {
+        if (dc == null) dc = getDbControl();
+        itemId = loadItemId(dc.getHibernateSession(), getItemType(), getId());
+        getData().setItemId(itemId);
+      }
+      item = (Annotatable)getItemType().getById(dc, itemId);      
     }
     else if (dc != null)
@@ -259 +271 @@
   
   /**
+    Get the ID of the item this annotation set belongs to. This may
+    need to hit the database unless the id is already known.
+    @since 2.14
+  */
+  public int getItemId()
+  {
+    Integer itemId = getData().getItemId();
+    if (itemId == null)
+    {
+      itemId = loadItemId(getDbControl().getHibernateSession(), getItemType(), getId());
+      getData().setItemId(itemId);
+    }
+    return itemId;
+  }
+  
+  /**
     Set the item this annotation set belongs to.
   */
@@ -264 +292 @@
   {
     this.item = item;
+    if (item.getId() != 0) getData().setItemId(item.getId());
   }
   

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

@@ -114 +114 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(75).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(76).intValue();
   
   public static synchronized void createTables(boolean update, final ProgressReporter progress)

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

@@ -36 +36 @@
 
 import net.sf.basedb.core.data.AnnotationData;
+import net.sf.basedb.core.data.AnnotationSetData;
 import net.sf.basedb.core.data.ArrayDesignData;
 import net.sf.basedb.core.data.ChangeHistoryData;
@@ -839 +840 @@
     </td>
   </tr>
+  <tr>
+    <td>76</td>
+    <td>
+      Added {@link AnnotationSetData#getItemId()}.
+      The update sets the value for all existing annotation
+      sets.
+    </td>
+  </tr>
   </table>
 
@@ -1128 +1137 @@
       }
       
+      if (schemaVersion < 76)
+      {
+        if (progress != null) progress.display((int)(75*progress_factor), "--Updating schema version: " + schemaVersion + " -> 76...");
+        schemaVersion = updateToSchemaVersion76(session);
+      }
+
       sc.logout();
       if (progress != null) progress.display(100, "Database updated successfully.");
@@ -2519 +2534 @@
     return schemaVersion;
   }
+  
+  /**
+    Sets the {@link AnnotationSetData#getItemId()} for
+    all annotation sets with a null value.
+    @return The new schema version (=76)
+  */
+  private static int updateToSchemaVersion76(org.hibernate.Session session)
+    throws BaseException
+  {
+    final int schemaVersion = 76;
+    org.hibernate.Transaction tx = null;
+    try
+    {
+      tx = HibernateUtil.newTransaction(session);
+      
+      // Load all annotation sets with a null id
+      org.hibernate.Query query = HibernateUtil.createQuery(session, 
+        "SELECT a FROM AnnotationSetData a WHERE a.itemId IS NULL");
+      List<AnnotationSetData> annotationSets = 
+        HibernateUtil.loadList(AnnotationSetData.class, query, null);
+      Map<Item, org.hibernate.Query> itemQueries = new HashMap<Item, org.hibernate.Query>();
+      for (AnnotationSetData a : annotationSets)
+      {
+        Item itemType = Item.fromValue(a.getItemType());
+        org.hibernate.Query findItem = itemQueries.get(itemType);
+        if (findItem == null)
+        {
+          String hql = "SELECT item.id"+
+            " FROM "+itemType.getDataClass().getName()+" item"+
+            " WHERE item.annotationSet = :annotationSet";
+          findItem = HibernateUtil.createQuery(session, hql);
+          itemQueries.put(itemType, findItem);
+        }
+        findItem.setInteger("annotationSet", a.getId());
+        a.setItemId(HibernateUtil.loadData(Integer.class, findItem));
+      }
+  
+      // Update the schema version number
+      setSchemaVersion(session, schemaVersion);
+  
+      // Commit the changes
+      HibernateUtil.commit(tx);
+      log.info("updateToSchemaVersion76: OK");
+    }
+    catch (BaseException ex)
+    {
+      if (tx != null) HibernateUtil.rollback(tx); 
+      log.error("updateToSchemaVersion76: FAILED", ex);
+      throw ex;
+    }
+    return schemaVersion;
+  }
+
   
   /**

trunk/src/core/net/sf/basedb/core/data/AnnotationSetData.java

@@ -58 +58 @@
   }
 
+  private Integer itemId;
+  /**
+    The ID if the item this annotation set is associated with. Can be null
+    if this is not know. Use a query based on the itemType and annotation set 
+    ID to find the item in this case.
+    @since 2.14
+    @hibernate.property column="`item_id`" type="int" not-null="false"
+  */
+  public Integer getItemId()
+  {
+    return itemId;
+  }
+  public void setItemId(Integer itemId)
+  {
+    this.itemId = itemId;
+  }
+  
   private Map<AnnotationTypeData, AnnotationData> annotations;
   /**