Changeset 5124

Timestamp:

Oct 9, 2009, 1:20:25 PM (14 years ago)

Author:

Nicklas Nordborg

Message:

References #1374: Caching of experimental factors

Implements our own serialization code. The file sizes shrink considerably and so does the loading time. I hope we can get another factor 2 in loading time :). The important thing now is that we must remember to synchronize everything if the number/types of internal variables change in the future.

Location:

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

Files:

• AnnotationSetSnapshot.java (modified) (4 diffs)
• AnnotationSnapshot.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/core/snapshot/AnnotationSetSnapshot.java

@@ -22 +22 @@
 package net.sf.basedb.core.snapshot;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -53 +54 @@
   when an annotation has been modified. We only have to delete the file
   that is associated with the primary annotation set.
+  <p>
+  <b>IMPORTANT NOTE TO DEVELOPERS!!</b>
+  <p>
+  Do not forget to synchronize all serialization code and to increment
+  the {@link #FILE_VERSION} in case the number of variables that needs
+  serialization in this class or in the {@link AnnotationSnapshot} changes. 
 
   @author Nicklas
@@ -72 +79 @@
   public static final int FILE_VERSION = 1;
   
-  private long created;
-  private int annotationSetId;
-  private int itemId;
-  private Item itemType;
-  private List<AnnotationSnapshot> annotations;
+  private transient long created;
+  private transient int annotationSetId;
+  private transient int itemId;
+  private transient Item itemType;
+  private transient List<AnnotationSnapshot> annotations;
   
   /**
@@ -188 +195 @@
   }
   
+  private void writeObject(java.io.ObjectOutputStream out)
+    throws IOException
+   {
+    out.writeLong(created);
+    out.writeInt(annotationSetId);
+    out.writeInt(itemId);
+    out.writeInt(itemType.getValue());
+    out.writeInt(annotations == null ? 0 : annotations.size());
+    if (annotations != null)
+    {
+      for (AnnotationSnapshot tmp : annotations)
+      {
+        tmp.writeObject(out);
+      }
+    }
+   }
+  private void readObject(java.io.ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    created = in.readLong();
+    annotationSetId = in.readInt();
+    itemId = in.readInt();
+    itemType = Item.fromValue(in.readInt());
+    int numAnnotations = in.readInt();
+    annotations = new ArrayList<AnnotationSnapshot>(numAnnotations);
+    for (int i = 0; i < numAnnotations; ++i)
+    {
+      AnnotationSnapshot tmp = new AnnotationSnapshot();
+      tmp.readObject(in);
+      annotations.add(tmp);
+    }
+  }
+  
 }

trunk/src/core/net/sf/basedb/core/snapshot/AnnotationSnapshot.java

@@ -22 +22 @@
 package net.sf.basedb.core.snapshot;
 
+import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -41 +42 @@
   annotation or an inherited annotation set. Actual 
   annotation values are only stored for primary annotations.
+  <p>
+  <b>IMPORTANT NOTE TO DEVELOPERS!!</b>
+  <p>
+  Do not forget to synchronize all serialization code and to increment
+  the {@link AnnotationSetSnapshot#FILE_VERSION} in case the number of variables 
+  that needs serialization in this class or in the {@link AnnotationSetSnapshot} 
+  changes. 
 
   @author Nicklas
@@ -52 +60 @@
   private static final long serialVersionUID = -4919156087324273194L;
 
-  private boolean inherited;
-  private int annotationId;
-  private int annotationSetId;
-  private int annotationTypeId;
-  private List<? extends Serializable> values;
+  private transient boolean inherited;
+  private transient int annotationId;
+  private transient int annotationSetId;
+  private transient int annotationTypeId;
+  private transient List<? extends Serializable> values;
   private transient int itemId;
   private transient Item itemType;
@@ -259 +267 @@
   }
 
+  void writeObject(java.io.ObjectOutputStream out)
+    throws IOException
+  {
+    out.writeBoolean(inherited);
+    out.writeInt(annotationId);
+    out.writeInt(annotationSetId);
+    out.writeInt(annotationTypeId);
+    out.writeInt(values == null ? 0 : values.size());
+    if (values != null)
+    {
+      for (Serializable tmp : values)
+      {
+        out.writeObject(tmp);
+      }
+    }
+  }
+  void readObject(java.io.ObjectInputStream in)
+    throws IOException, ClassNotFoundException
+  {
+    inherited = in.readBoolean();
+    annotationId = in.readInt();
+    annotationSetId = in.readInt();
+    annotationTypeId = in.readInt();
+    int numValues = in.readInt();
+    if (numValues > 0)
+    {
+      List<Serializable> values = new ArrayList<Serializable>(numValues);
+      for (int i = 0; i < numValues; ++i)
+      {
+        values.add((Serializable)in.readObject());
+      }
+      this.values = values;
+    }
+  }
+  
 }