Changeset 4341

Timestamp:

Jun 17, 2008, 2:06:53 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1056: Disk usage does not seem to report disk usage properly for experiments

Location:

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

Files:

• Experiment.java (modified) (3 diffs)
• Install.java (modified) (1 diff)
• Update.java (modified) (3 diffs)

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

@@ -169 +169 @@
 
   private long addedBytes = 0;
+  private long updatedBytes = 0;
   
   /**
@@ -244 +245 @@
     {
       getData().setBytes(addedBytes);
-      addedBytes = 0;
     }
-    else if (action == Transactional.Action.UPDATE && addedBytes != 0)
+    else if (action == Transactional.Action.UPDATE && addedBytes != updatedBytes)
     {
       /*
@@ -261 +261 @@
         WHERE xpm.id = :experiment
       */
-      query.setLong("addedBytes", addedBytes);
+      query.setLong("addedBytes", addedBytes - updatedBytes);
       query.setInteger("experiment", getId());
       query.executeUpdate();
-      addedBytes = 0;
+      updatedBytes = addedBytes;
     }
   }

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

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

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

@@ -682 +682 @@
     </td>
   </tr>
+  <tr>
+    <td>60</td>
+    <td>
+      Not a schema change as such. We need to update incorrect quota values
+      for experiments. See http://base.thep.lu.se/ticket/1056
+    </td>
+  </tr>
   
   </table>
@@ -957 +964 @@
         if (progress != null) progress.display((int)(58*progress_factor), "--Updating schema version: " + schemaVersion + " -> 59...");
         schemaVersion = setSchemaVersionInTransaction(session, 59);
+      }
+      
+      if (schemaVersion < 60)
+      {
+        if (progress != null) progress.display((int)(59*progress_factor), "--Updating schema version: " + schemaVersion + " -> 60...");
+        schemaVersion = updateToSchemaVersion60(session);
       }
       
@@ -2323 +2336 @@
       if (tx != null) HibernateUtil.rollback(tx); 
       log.error("updateToSchemaVersion57: FAILED", ex);
+      throw ex;
+    }
+    return schemaVersion;
+  }
+  
+  /**
+    Update incorrect quota values for experiments.
+    
+    @return The new schema version (=60)
+  */
+  private static int updateToSchemaVersion60(org.hibernate.Session session)
+    throws BaseException
+  {
+    final int schemaVersion = 60;
+    org.hibernate.Transaction tx = null;
+    try
+    {
+      tx = HibernateUtil.newTransaction(session);
+      
+      org.hibernate.Query query = HibernateUtil.createQuery(session, 
+        "SELECT exp FROM ExperimentData exp");
+      List<ExperimentData> experiments = 
+        HibernateUtil.loadList(ExperimentData.class, query, null);
+      for (ExperimentData exp : experiments)
+      {
+        exp.getDiskUsage().setBytes(exp.getBytes());
+      }
+
+      // Update the schema version number
+      setSchemaVersion(session, schemaVersion);
+  
+      // Commit the changes
+      HibernateUtil.commit(tx);
+      log.info("updateToSchemaVersion60: OK");
+    }
+    catch (BaseException ex)
+    {
+      if (tx != null) HibernateUtil.rollback(tx); 
+      log.error("updateToSchemaVersion60: FAILED", ex);
       throw ex;
     }