Changeset 826:51ec6332c94f

Timestamp:

01/29/12 00:10:58 (4 months ago)

Author:

xeraph

Branch:

default

Message:

lightened heavy changelog (removed collection name duplicates)

Location:

kraken-confdb/src/main/java/org/krakenapps/confdb

Files:

• ConfigChange.java (modified) (2 diffs)
• file/ChangeLog.java (modified) (4 diffs)

kraken-confdb/src/main/java/org/krakenapps/confdb/ConfigChange.java

@@ -16 +16 @@
 package org.krakenapps.confdb;
 
+import org.krakenapps.api.FieldOption;
+
 /**
  * changed config entry for changeset log
@@ -25 +27 @@
         private CommitOp operation;
 
+        @FieldOption(skip = true)
         private String colName;
 

kraken-confdb/src/main/java/org/krakenapps/confdb/file/ChangeLog.java

@@ -19 +19 @@
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -110 +111 @@
                 m.put("msg", message);
                 m.put("manifest_id", manifestId);
+                m.put("col_names", serializeCollectionNames());
                 m.put("changeset", PrimitiveConverter.serialize(changeset));
 
@@ -117 +119 @@
         }
 
+        private List<Object> serializeCollectionNames() {
+                Map<String, Integer> m = new HashMap<String, Integer>();
+                for (ConfigChange c : changeset)
+                        m.put(c.getColName(), c.getColId());
+
+                List<Object> cols = new ArrayList<Object>();
+                for (String name : m.keySet()) {
+                        cols.add(new Object[] { m.get(name), name });
+                }
+                return cols;
+        }
+
+        private static Map<Integer, String> parseCollectionNames(Object[] l) {
+                Map<Integer, String> m = new HashMap<Integer, String>();
+                if (l == null)
+                        return m;
+
+                for (Object o : l) {
+                        Object[] arr = (Object[]) o;
+                        m.put((Integer) arr[0], (String) arr[1]);
+                }
+                return m;
+        }
+
         public static ChangeLog deserialize(byte[] b) {
                 ByteBuffer bb = ByteBuffer.wrap(b);
                 Map<String, Object> m = EncodingRule.decodeMap(bb);
+
+                Map<Integer, String> colNames = parseCollectionNames((Object[]) m.get("col_names"));
 
                 ChangeLog c = new ChangeLog();
@@ -127 +155 @@
                 c.setManifestId((Integer) m.get("manifest_id"));
                 List<Object> list = Arrays.asList((Object[]) m.get("changeset"));
-                c.setChangeSet(new ArrayList<ConfigChange>(PrimitiveConverter.parseCollection(ConfigChange.class, list)));
+                c.setChangeSet(parseConfigChanges(list, colNames));
                 return c;
+        }
+
+        private static List<ConfigChange> parseConfigChanges(List<Object> list, Map<Integer, String> colNames) {
+                Collection<ConfigChange> changes = PrimitiveConverter.parseCollection(ConfigChange.class, list);
+                List<ConfigChange> l = new ArrayList<ConfigChange>(changes);
+                for (ConfigChange c : l)
+                        c.setColName(colNames.get(c.getColId()));
+                return l;
         }