Merge pull request #25 from ArnauPrat/likes_fix

Likes fix plus version bump to 0.3.8
ldbc · May 15, 2023 · 1079512 · 1079512
2 parents c1fca4d + 3b1d06b
commit 1079512
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/docker_run.sh b/docker_run.sh
@@ -8,7 +8,7 @@ if [ ! -f /opt/ldbc_snb_datagen/params.ini ]; then
 fi
 
 # Running the generator
-/opt/hadoop-3.2.1/bin/hadoop jar /opt/ldbc_snb_datagen/target/ldbc_snb_datagen-0.3.7-SNAPSHOT-jar-with-dependencies.jar /opt/ldbc_snb_datagen/params.ini
+/opt/hadoop-3.2.1/bin/hadoop jar /opt/ldbc_snb_datagen/target/ldbc_snb_datagen-0.3.8-SNAPSHOT-jar-with-dependencies.jar /opt/ldbc_snb_datagen/params.ini
 
 # Cleanup
 rm -f m*personFactors*

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>ldbc.snb.datagen</groupId>
   <artifactId>ldbc_snb_datagen</artifactId>
-  <version>0.3.7-SNAPSHOT</version>
+  <version>0.3.8-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/run.sh b/run.sh
@@ -31,10 +31,10 @@ mvn clean
 mvn -DskipTests assembly:assembly
 
 if [ "$(uname)" == "Darwin" ]; then
-  zip -d $LDBC_SNB_DATAGEN_HOME/target/ldbc_snb_datagen-0.3.7-SNAPSHOT-jar-with-dependencies.jar META-INF/LICENSE
+  zip -d $LDBC_SNB_DATAGEN_HOME/target/ldbc_snb_datagen-0.3.8-SNAPSHOT-jar-with-dependencies.jar META-INF/LICENSE
 fi
 
-$HADOOP_HOME/bin/hadoop jar $LDBC_SNB_DATAGEN_HOME/target/ldbc_snb_datagen-0.3.7-SNAPSHOT-jar-with-dependencies.jar $LDBC_SNB_DATAGEN_HOME/params.ini
+$HADOOP_HOME/bin/hadoop jar $LDBC_SNB_DATAGEN_HOME/target/ldbc_snb_datagen-0.3.8-SNAPSHOT-jar-with-dependencies.jar $LDBC_SNB_DATAGEN_HOME/params.ini
 
 rm -f m*personFactors*
 rm -f .m*personFactors*

diff --git a/src/main/java/ldbc/snb/datagen/generator/generators/LikeGenerator.java b/src/main/java/ldbc/snb/datagen/generator/generators/LikeGenerator.java
@@ -35,11 +35,13 @@ public void generateLikes(Random random, final Forum forum, final Message messag
         }
         for (int i = 0; i < numLikes; i++) {
             ForumMembership membership = memberships.get(startIndex + i);
-            long minDate = message.creationDate() > memberships.get(startIndex + i).creationDate() ? message
-                    .creationDate() : membership.creationDate();
+            long minDate = (message.creationDate() > membership.creationDate() ?
+                    message.creationDate() : membership.creationDate()) +
+                    DatagenParams.deltaTime;
             long date = Dictionaries.dates.randomDate(random, minDate, Dictionaries.dates
                     .randomSevenDays(random) + minDate);
-            assert ((membership.person().creationDate() + DatagenParams.deltaTime) < date);
+            assert ((membership.person().creationDate() + DatagenParams.deltaTime) <= date &&
+                    (message.creationDate() + DatagenParams.deltaTime) <= date);
             like.user = membership.person().accountId();
             like.userCreationDate = membership.person().creationDate();
             like.messageId = message.messageId();