Fixed serializers

Author: ArnauPrat

src/main/java/ldbc/socialnet/dbgen/generator/MRWriter.java

@@ -65,8 +65,7 @@ public void writeReducedUserProfiles(int from, int to, int pass,
         try {
             to = to % windowSize;
             for (int i = from; i != to; i = (i+1)%windowSize) {
-                //int key = userProfiles[i].getDicElementId(pass);
-                int key[] = userProfiles[i].getDicElementIds();
+                int key = userProfiles[i].getDicElementId(pass);
                 int block = 0;
                 long id = userProfiles[i].getAccountId();
                 MapReduceKey mpk = new MapReduceKey(block,key,id);

src/main/java/ldbc/socialnet/dbgen/generator/ScalableGenerator.java

@@ -901,7 +901,11 @@ public void mrGenerateUserInfo(int pass, Context context){
                 ReducedUserProfile reduceUserProf = generateGeneralInformation(j);
                 ++numUsersToGenerate;
                 try {
-                    context.write(generateKey(pass,reduceUserProf), reduceUserProf);
+                    int block =  0;                                                                  // The mapreduce group this university will be assigned.
+                    int key = reduceUserProf.getDicElementId(pass);                                  // The key used to sort within the block.
+                    long id = reduceUserProf.getAccountId();                                         // The id used to sort within the key, to guarantee determinism.
+                    MapReduceKey mpk = new MapReduceKey( block, key, id );
+                    context.write(mpk, reduceUserProf);
                 } catch (IOException e) {
                     e.printStackTrace();
                 } catch (InterruptedException e) {
@@ -911,17 +915,6 @@ public void mrGenerateUserInfo(int pass, Context context){
         }
         System.out.println("Number of generated users: "+numUsersToGenerate);
     }
-    private MapReduceKey generateKey( int pass, ReducedUserProfile user ) {
-        int block =  0;                                                                  // The mapreduce group this university will be assigned.
-        int key[] = new int[3];
-         = reduceUserProf.getDicElementIds();                                  // The key used to sort within the block.
-        for( int i = 0; i < NUM_FRIENDSHIP_HADOOP_JOBS;++i) {
-            key[]
-        }
-        long id = reduceUserProf.getAccountId();                                         // The id used to sort within the key, to guarantee determinism.
-        MapReduceKey mpk = new MapReduceKey( block, key, id );
-        return mpk;
-    }
 
     private void generateCellOfUsers2(int newStartIndex, ReducedUserProfile[] _cellReduceUserProfiles){
         int curIdxInWindow;

src/main/java/ldbc/socialnet/dbgen/util/MapReduceKey.java

@@ -49,37 +49,29 @@
 
 public class MapReduceKey implements WritableComparable<MapReduceKey> {
     public int block;       
-    public int key[];
+    public int key;
     public long id;
 
     public MapReduceKey( ) {
-        this.key = new int[3];
     }
 
-    public MapReduceKey( int block, int key[], long id) {
+    public MapReduceKey( int block, int key, long id) {
         this.block = block;
-        this.key = new int[3];
-        this.key[0] = key[0];
-        this.key[1] = key[1];
-        this.key[2] = key[2];
+        this.key = key;
         this.id = id;
     }
 
     @Override
     public void write(DataOutput out) throws IOException {
         out.writeInt(block);
-        out.writeInt(key[0]);
-        out.writeInt(key[1]);
-        out.writeInt(key[2]);
+        out.writeInt(key);
         out.writeLong(id);
     }
 
     @Override
     public void readFields(DataInput in) throws IOException {
         block = in.readInt();
-        key[0] = in.readInt();
-        key[1] = in.readInt();
-        key[2] = in.readInt();
+        key = in.readInt();
         id = in.readLong();
     }