Merge branch 'master' into dev_partitions

Conflicts:
	src/main/java/ldbc/socialnet/dbgen/generator/MRGenerateUsers.java

Author: ArnauPrat

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

@@ -106,7 +106,9 @@ protected void setup(Context context){
                     Path outFile = new Path(context.getConfiguration().get("outputDir")+"/social_network/updateStream_"+attempTaskId+"_"+partitionId+"_"+streamType+".csv");
                     out = fs.create(outFile);
                 }
-                properties = fs.create(new Path(context.getConfiguration().get("outputDir")+"/social_network/updateStream_"+attempTaskId+"_"+partitionId+"_"+streamType+".properties"));
+                if (conf.getBoolean("updateStreams",false)) {
+                    properties = fs.create(new Path(context.getConfiguration().get("outputDir")+"/social_network/updateStream_"+attempTaskId+"_"+partitionId+"_"+streamType+".properties"));
+                }
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -127,10 +129,13 @@ public void reduce(LongWritable key, Iterable<Text> valueSet,
         protected void cleanup(Context context){
             try {
                 System.out.println("Number of events reduced "+numEvents);
-                String propertiesStr = new String("gctdeltaduration:"+context.getConfiguration().get("deltaTime")+"\nmin_write_event_start_time:"+min+"\nmax_write_event_start_time:"+max+"\nupdate_interleave:"+(max-min)/numEvents);
-                properties.write(propertiesStr.getBytes("UTF8"));
-                properties.flush();
-                properties.close();
+                if (numEvents > 0) {
+                    long updateDistance = (max-min)/numEvents;
+                    String propertiesStr = new String("gctdeltaduration:"+context.getConfiguration().get("deltaTime")+"\nmin_write_event_start_time:"+min+"\nmax_write_event_start_time:"+max+"\nupdate_interleave:"+updateDistance);
+                    properties.write(propertiesStr.getBytes("UTF8"));
+                    properties.flush();
+                    properties.close();
+                }
                 out.flush();
                 out.close();
             } catch (IOException e) {