Changeset 7597

Timestamp:

Feb 22, 2019, 9:06:54 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2135: Remove support for secondary storage

Removed QuotaType.hasSecondaryLocation() property.

Location:

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

Files:

• Install.java (modified) (3 diffs)
• QuotaType.java (modified) (1 diff)
• Update.java (modified) (3 diffs)
• data/QuotaTypeData.java (modified) (1 diff)

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

@@ -188 +188 @@
       progressStep++;
       if (progress != null) progress.display((int)(progressStep*progress_factor), "--Creating quota types...");
-      createQuotaType(QuotaType.TOTAL, "Total", "Total quota", true);
-      createQuotaType(QuotaType.FILE, "Files", "Quota for files", true);
-      createQuotaType(QuotaType.RAW_DATA, "Raw data", "Quota for raw data", false);
-      createQuotaType(QuotaType.EXPERIMENT, "Experiment", "Quota for experiment", false);
+      createQuotaType(QuotaType.TOTAL, "Total", "Total quota");
+      createQuotaType(QuotaType.FILE, "Files", "Quota for files");
+      createQuotaType(QuotaType.RAW_DATA, "Raw data", "Quota for raw data");
+      createQuotaType(QuotaType.EXPERIMENT, "Experiment", "Quota for experiment");
   
       // Quota
@@ -1150 +1150 @@
     Create a {@link QuotaType}.
   */
-  @SuppressWarnings("deprecation")
-  private static QuotaTypeData createQuotaType(String systemId, String name, String description, boolean secondaryLocation)
+  private static QuotaTypeData createQuotaType(String systemId, String name, String description)
     throws BaseException
   {
@@ -1184 +1183 @@
         quotaType.setName(name);
         quotaType.setDescription(description);
-        quotaType.setSecondaryLocation(secondaryLocation);
         HibernateUtil.saveData(session, quotaType);
         HibernateUtil.commit(tx);

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

@@ -219 +219 @@
   // -------------------------------------------
 
-  /**
-    Check if items using quota from this quota type can be stored
-    in the secondary location or not.
-    @return <code>true</code> if the secondary location can be used, <code>false</code> otherwise
-    @deprecated In 3.14, no replacement
-  */
-  @Deprecated
-  public boolean hasSecondaryLocation()
-  {
-    return getData().getSecondaryLocation();
-  }
 }

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

@@ -673 +673 @@
       }
       
-      if (schemaVersion < 143)
+      if (schemaVersion < 144)
       {
         // Note! 143 and 144 is a two-step update due to DROP COLUMN
@@ -2080 +2080 @@
     column and all stored contexts using the 'action' column.
     Update the QuotaValues table by removing all entries with
-    location=2
+    location=2. Remove the 'secondary_location' column from the
+    QuotaTypes table.
     @return The new schema version (=144)
   */
@@ -2123 +2124 @@
       }
       
-      // Drop the 'Files.action' column
+      // Drop the 'Files.action' and 'QuotaTypes.secondary_location' columns
       dropColumn(session, "Files", "action", null);
-        
+      dropColumn(session, "QuotaTypes", "secondary_location", null);
+      
       // Update the schema version number
       setSchemaVersionInTransaction(session, schemaVersion);

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

@@ -102 +102 @@
   // -------------------------------------------
 
-  private boolean secondaryLocation;
-  /**
-    If this quota type can use disk quota in the secondary location or not.
-    
-    @hibernate.property column="`secondary_location`" type="boolean" not-null="true" update="false"
-    @deprecated In 3.14, no replacement
-  */
-  @Deprecated
-  public boolean getSecondaryLocation()
-  {
-    return secondaryLocation;
-  }
-  @Deprecated
-  public void setSecondaryLocation(boolean secondaryLocation)
-  {
-    this.secondaryLocation = secondaryLocation;
-  }
-  
 }