Added Optimized Serialization for UUID

joval · Sep 3, 2012 · 2a4fc6b · 2a4fc6b
1 parent cd825e2
commit 2a4fc6b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 2 deletions.
diff --git a/src/main/java/org/apache/jdbm/Serialization.java b/src/main/java/org/apache/jdbm/Serialization.java
@@ -263,6 +263,10 @@ else if (val == 1)
             out.write(DATE);
             out.writeLong(((Date) obj).getTime());
             return;
+        } else if (clazz == UUID.class) {
+            out.write(UUID);
+            serializeUUID(out,(UUID) obj);
+            return;
         } else if (clazz == BTree.class) {
             out.write(BTREE);
             ((BTree) obj).writeExternal(out);
@@ -406,7 +410,13 @@ static void serializeString(DataOutput out, String obj) throws IOException {
         }
 
     }
-
+
+    private void serializeUUID(DataOutput out, UUID uuid) throws IOException
+    {
+    	out.writeLong(uuid.getMostSignificantBits());
+    	out.writeLong(uuid.getLeastSignificantBits());
+    }
+
     private void serializeMap(int header, DataOutput out, Object obj, FastArrayList objectStack) throws IOException {
         Map l = (Map) obj;
         out.write(header);
@@ -432,7 +442,6 @@ private void serializeByteArrayInt(DataOutput out, byte[] b) throws IOException
         out.write(b);
     }
 
-
     private void writeLongArray(DataOutput da, long[] obj) throws IOException {
         long max = Long.MIN_VALUE;
         long min = Long.MAX_VALUE;
@@ -824,6 +833,9 @@ public Object deserialize(DataInput is, FastArrayList objectStack) throws IOExce
             case DATE:
                 ret = new Date(is.readLong());
                 break;
+            case UUID:
+            	ret = deserializeUUID(is);
+            	break;
             case ARRAY_INT_B_255:
                 ret = deserializeArrayIntB255(is);
                 break;
@@ -1067,6 +1079,11 @@ private long[] deserializeArrayLongPack(DataInput is) throws IOException {
         }
         return ret;
     }
+
+    private UUID deserializeUUID(DataInput is) throws IOException
+    {
+    	return new UUID(is.readLong(), is.readLong());
+    }
 
     private int[] deserializeArrayIntB255(DataInput is) throws IOException {
         int size = is.readUnsignedByte();

diff --git a/src/main/java/org/apache/jdbm/SerializationHeader.java b/src/main/java/org/apache/jdbm/SerializationHeader.java
@@ -120,6 +120,7 @@ final class SerializationHeader {
 
     final static int CLASS = 126;
     final static int DATE = 127;
+    final static int UUID = 128;
 
 
     static final int JDBMLINKEDLIST = 159;

diff --git a/src/test/java/org/apache/jdbm/SerializationTest.java b/src/test/java/org/apache/jdbm/SerializationTest.java
@@ -398,6 +398,18 @@ public void testBigInteger() throws IOException, ClassNotFoundException {
         d = new BigInteger("-535345345345344456567889889895165654423236");
         assertEquals(d, ser.deserialize(ser.serialize(d)));
     }
+
+    public void testUUID() throws IOException, ClassNotFoundException {
+    	//try a bunch of UUIDs.
+    	for(int i = 0; i < 1000;i++)
+    	{
+    		UUID uuid = UUID.randomUUID();
+    		SimpleEntry a = new SimpleEntry(uuid, "11");
+    		byte[] buf = ser.serialize(a);
+    		SimpleEntry b = (SimpleEntry) ser.deserialize(buf);
+    		assertEquals(b, a);
+    	}
+    }
 
 
     public void testLocale() throws Exception{