Changeset 5864

Timestamp:

Nov 10, 2011, 9:15:24 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

Merged patch release 3.0.1 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• credits.txt (modified) (1 diff)
• doc/src/docbook/overview/resources.xml (modified) (2 diffs)
• src/core/net/sf/basedb/core/Install.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Update.java (modified) (6 diffs)
• src/test/TestFile.java (modified) (2 diffs)
• src/test/data/test.download.base-2.15.0.MD5 (deleted)
• src/test/data/test.download.base-2.17.2.md5 (copied) (copied from tags/3.0.1/src/test/data/test.download.base-2.17.2.md5)

trunk/credits.txt

@@ -1 +1 @@
 $Id$
 
-The current BASE team is (at BASE 3.0-beta release)
+The current BASE team is (at BASE 3.0.1 release)
 {{{
 Jari Häkkinen

trunk/doc/src/docbook/overview/resources.xml

@@ -135 +135 @@
         contains information about the plans for future development, including
         the tickets that should be fixed for each milestone. Usually, only
-        the next upcoming release has a date set. The <guilabel>BASE 2.x</guilabel>
+        the next upcoming release has a date set. The <guilabel>BASE Future Release</guilabel>
         milestone is used to collected tickets that we think should be fixed
         but are less important or require too much work. Contributions are welcome.
@@ -191 +191 @@
       </para>
     </sect2>
-  </sect1>
-  <sect1 id="resources.coreplugins">
-    <title>Core plug-in configurations</title>
-    <para>
-      In the section called <guilabel>Plug-ins</guilabel> on the home page, is a
-      link to
-      <ulink
-        url="http://base.thep.lu.se/chrome/site/doc/historical/admin/plugin_configuration/coreplugins.html">
-        a page that lists the core plug-ins</ulink>.
-      All plug-ins that are included in the installation of
-      BASE are listed on this page, some together with one or several examples of suitable
-      configuration files. These configuration files can be downloaded and imported with the
-      plug-in configuration importer in BASE.
-    </para>
   </sect1>
   <sect1 id="resources.plugins">

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

@@ -118 +118 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(100).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(102).intValue();
   
   public static synchronized int createTables(SchemaGenerator.Mode mode, ProgressReporter progress,

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

@@ -95 +95 @@
     </td>
   </tr>
-  
+  <tr>
+    <td>101 and 102</td>
+    <td>
+      Fixes an issue with duplicate {@link FileSetMemberData} entries
+      due to a bug in the upgrade program. Make sure that the unique
+      constraint that should prevent duplicates exists.
+    </td>
+  </tr>
+
   </table>
 
@@ -122 +130 @@
     throws BaseException
   {
-    final int total_progress_steps = Install.NEW_SCHEMA_VERSION;
-    final float progress_factor = 100F / total_progress_steps;
     if (progress != null) progress.display(0, "Updating database...");
     org.hibernate.Session session = null;
@@ -141 +147 @@
       session = HibernateUtil.newSession();
       int schemaVersion = getSchemaVersion(session);
+      final int total_progress_steps = 1 + Install.NEW_SCHEMA_VERSION - schemaVersion;
+      final float progress_step = 100F / total_progress_steps;
+      float progress_current = progress_step;
       
       if (schemaVersion == 99)
       {
         // Final update to BASE 3
-        if (progress != null) progress.display((int)(1*progress_factor), "--Updating schema version: " + schemaVersion + " -> 100...");
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 100...");
         schemaVersion = updateToSchemaVersion100(session);
-
+        progress_current += progress_step;
+        
+        // Skipping directly to 102 since the updateToBase3() 
+        // has already fixed those issues
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 102...");
+        schemaVersion = setSchemaVersionInTransaction(session, 102);
+        progress_current += 2 * progress_step;
+      }
+
+      // The 101 and 102 updates are only needed when updating from a BASE 3.0.0 installation
+      if (schemaVersion < 101)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 101...");
+        schemaVersion = updateToSchemaVersion101(session);
+        progress_current += progress_step;
+      }
+      
+      if (schemaVersion < 102)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 102...");
+        schemaVersion = updateToSchemaVersion102(session);
+        progress_current += progress_step;
       }
       
@@ -435 +465 @@
   }
 
+  /**
+    Remove duplicate file set members.
+    
+    @return The new schema version (=101)
+  */
+  private static int updateToSchemaVersion101(org.hibernate.Session session)
+    throws BaseException
+  {
+    final int schemaVersion = 101;
+    org.hibernate.Transaction tx = null;
+    try
+    {
+      tx = HibernateUtil.newTransaction(session);
+
+      org.hibernate.Query query = HibernateUtil.createQuery(session, 
+        "SELECT fsm FROM FileSetMemberData fsm");
+      List<FileSetMemberData> members = HibernateUtil.loadList(FileSetMemberData.class, query, null);
+      Set<String> allMembers = new HashSet<String>();
+      for (FileSetMemberData member : members)
+      {
+        int fileSetId = member.getFileSet().getId();
+        int fileTypeId = member.getDataFileType().getId();
+        int fileId = member.getFile().getId();
+        String unique = fileSetId + "." + fileTypeId + "." + fileId;
+        if (!allMembers.add(unique))
+        {
+          // This combination has been seen before
+          session.delete(member);
+        }
+      }
+      
+      // Update the schema version number
+      setSchemaVersion(session, schemaVersion);
+  
+      // Commit the changes
+      HibernateUtil.commit(tx);
+      log.info("updateToSchemaVersion101: OK");
+    }
+    catch (BaseException ex)
+    {
+      if (tx != null) HibernateUtil.rollback(tx); 
+      log.error("updateToSchemaVersion101: FAILED", ex);
+      throw ex;
+    }
+    return schemaVersion;
+  }
+
+  /**
+    Add unique index on FileSetMembers(fileset_id,datafiletype_id,file_id)
+    
+    @return The new schema version (=102)
+  */
+  private static int updateToSchemaVersion102(org.hibernate.Session session)
+    throws BaseException
+  {
+    final int schemaVersion = 102;
+    try
+    {
+  
+      // Try to drop just to make sure that we don't create duplicated indexes
+      dropIndex(session, true, "FileSetMembers", "fileset_id", "datafiletype_id", "file_id");
+      // Create the index
+      createIndex(session, true, "FileSetMembers_uniquefile", "FileSetMembers", "fileset_id", "datafiletype_id", "file_id");
+      
+      // Update the schema version number
+      setSchemaVersionInTransaction(session, schemaVersion);
+  
+      log.info("updateToSchemaVersion102: OK");
+    }
+    catch (SQLException ex)
+    {
+      log.error("updateToSchemaVersion102: FAILED", ex);
+      throw new BaseException(ex);
+    }
+    catch (BaseException ex)
+    {
+      log.error("updateToSchemaVersion102: FAILED", ex);
+      throw ex;
+    }
+    return schemaVersion;
+  }
+  
   // Item type codes for item types that was removed since BASE 2
   private static final int LABELEDEXTRACT = 204;
@@ -491 +603 @@
       progress.display(15, "--Removing unique constraint on FileSetMembers");
       dropIndex(session, true, "FileSetMembers", "fileset_id", "datafiletype_id");
+      createIndex(session, true, "FileSetMembers_uniquefile", "FileSetMembers", "fileset_id", "datafiletype_id", "file_id");
       fixPlatformFileTypes(session);
       
@@ -1166 +1279 @@
         FileSetData fileSet = null;
         
+        // Keep track of duplicate files (since more than one image may reference the same fileId)
+        Set<Integer> files = new HashSet<Integer>();
+        
         while (it2.hasNext())
         {
           Object[] imgRow = (Object[])it2.next();
           Integer fileId = (Integer)imgRow[2];
-          if (fileId != null)
+          if (fileId != null && files.add(fileId))
           {
             if (fileSet == null)

trunk/src/test/TestFile.java

@@ -82 +82 @@
         "data/base2.thep.lu.se.crt", null, null);
     int extId1 = test_create("http://base.thep.lu.se/robots.txt", false, false);
-    int extId2 = test_create("https://base2.thep.lu.se/base/base-2.15.0.tar.gz.MD5", false, false);
+    int extId2 = test_create("https://base2.thep.lu.se/base/base-2.17.2.tar.gz.MD5", false, false);
     int extId3 = test_create("http://base.thep.lu.se/login", false, false);
     test_load(id1);
@@ -96 +96 @@
     test_download(id1, "data/test.upload.txt");
     test_download(extId1, "data/test.download.robots.txt");
-    test_download(extId2, "data/test.download.base-2.15.0.MD5");
+    test_download(extId2, "data/test.download.base-2.17.2.md5");
     test_download(extId3, null);