Skip to content

Commit eab8358

Browse files
committed
fixed error with update stream consistency
1 parent 3ce5950 commit eab8358

File tree

4 files changed

+25
-21
lines changed

4 files changed

+25
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ public Comment createComment(RandomGeneratorFarm randomFarm, long commentId, Pos
234234
textSize,
235235
creationDate,
236236
friend.getFriendAcc(),
237-
friend.fromCreationDate,
237+
friend.toCreationDate,
238238
post.getGroupId(),
239239
tags,
240240
ipAddDic.getIP(randomFarm.get(RandomGeneratorFarm.Aspect.IP), randomFarm.get(RandomGeneratorFarm.Aspect.DIFF_IP), randomFarm.get(RandomGeneratorFarm.Aspect.DIFF_IP_FOR_TRAVELER),friend.getSourceIp(), friend.isFrequentChange(), creationDate),

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public Group createAlbum(RandomGeneratorFarm randomFarm, long groupId, ReducedUs
115115
group.getCreatedDate(), friends[i]);
116116
if( memberShip != null ) {
117117
memberShip.setGroupId(group.getGroupId());
118+
memberShip.userCreationDate = friends[i].toCreationDate;
118119
group.addMember(memberShip);
119120
}
120121
}
@@ -134,6 +135,7 @@ public GroupMemberShip createGroupMember(Random random, long userId, long groupC
134135
memberShip.setFrequentChange(friend.isFrequentChange());
135136
memberShip.setHaveSmartPhone(friend.isHaveSmartPhone());
136137
memberShip.setLargePoster(friend.isLargePoster());
138+
memberShip.userCreationDate = friend.toCreationDate;
137139
return memberShip;
138140
}
139141

@@ -150,6 +152,7 @@ public GroupMemberShip createGroupMember(Random random, long userId, long groupC
150152
memberShip.setFrequentChange(user.isFrequentChange());
151153
memberShip.setHaveSmartPhone(user.isHaveSmartPhone());
152154
memberShip.setLargePoster(user.isLargePoster());
155+
memberShip.userCreationDate = user.getCreationDate();
153156
return memberShip;
154157
}
155158
}

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

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,14 +1515,16 @@ private void createFriendShip(ReducedUserProfile user1, ReducedUserProfile user2
15151515
createdTime = dateTimeGenerator.randomFriendReapprovedDate(randomFarm.get(RandomGeneratorFarm.Aspect.DATE),declinedTime);
15161516
}
15171517
}
1518-
createdTime = createdTime - user1.getCreationDate() >= deltaTime ? createdTime : createdTime + (deltaTime - (createdTime - user1.getCreationDate() ));
1519-
createdTime = createdTime - user2.getCreationDate() >= deltaTime ? createdTime : createdTime + (deltaTime - (createdTime - user2.getCreationDate() ));
1520-
if( createdTime <= dateTimeGenerator.getEndDateTime() ) {
1521-
user2.addNewFriend(new Friend(user2, user1, requestedTime, declinedTime,
1522-
createdTime, pass, initiator));
1523-
user1.addNewFriend(new Friend(user1, user2, requestedTime, declinedTime,
1524-
createdTime, pass, initiator));
1525-
friendshipNum++;
1518+
if(createdTime != -1) {
1519+
createdTime = createdTime - user1.getCreationDate() >= deltaTime ? createdTime : createdTime + deltaTime;
1520+
createdTime = createdTime - user2.getCreationDate() >= deltaTime ? createdTime : createdTime + deltaTime;
1521+
if (createdTime <= dateTimeGenerator.getEndDateTime()) {
1522+
user2.addNewFriend(new Friend(user2, user1, requestedTime, declinedTime,
1523+
createdTime, pass, initiator));
1524+
user1.addNewFriend(new Friend(user1, user2, requestedTime, declinedTime,
1525+
createdTime, pass, initiator));
1526+
friendshipNum++;
1527+
}
15261528
}
15271529
}
15281530

@@ -1580,17 +1582,17 @@ private void writeFactorTable(){
15801582
ReducedUserProfile.Counts count = c.getValue();
15811583
// correct the group counts
15821584
//count.numberOfGroups += count.numberOfFriends;
1583-
StringBuffer strbuf = new StringBuffer();
1584-
strbuf.append(c.getKey()); strbuf.append(",");
1585-
String name = medianFirstName.get(c.getKey());
1586-
strbuf.append(name); strbuf.append(",");
1587-
strbuf.append(count.numberOfFriends); strbuf.append(",");
1588-
strbuf.append(count.numberOfPosts); strbuf.append(",");
1589-
strbuf.append(count.numberOfLikes); strbuf.append(",");
1590-
strbuf.append(count.numberOfTagsOfPosts); strbuf.append(",");
1591-
strbuf.append(count.numberOfGroups); strbuf.append(",");
1592-
strbuf.append(count.numberOfWorkPlaces); strbuf.append(",");
1593-
strbuf.append(count.numberOfPostReplies); strbuf.append(",");
1585+
StringBuffer strbuf = new StringBuffer();
1586+
strbuf.append(c.getKey()); strbuf.append(",");
1587+
String name = medianFirstName.get(c.getKey());
1588+
strbuf.append(name); strbuf.append(",");
1589+
strbuf.append(count.numberOfFriends); strbuf.append(",");
1590+
strbuf.append(count.numberOfPosts); strbuf.append(",");
1591+
strbuf.append(count.numberOfLikes); strbuf.append(",");
1592+
strbuf.append(count.numberOfTagsOfPosts); strbuf.append(",");
1593+
strbuf.append(count.numberOfGroups); strbuf.append(",");
1594+
strbuf.append(count.numberOfWorkPlaces); strbuf.append(",");
1595+
strbuf.append(count.numberOfPostReplies); strbuf.append(",");
15941596

15951597
int numBuckets = count.numberOfPostsPerMonth.length;
15961598
for (int i = 0; i < numBuckets; i++){

src/main/java/ldbc/socialnet/dbgen/serializer/DataExporter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ public void export(Group group, long dependantDate) {
400400
if (bucket < factorTable.get(memberships[i].getUserId()).numberOfGroupsPerMonth.length){
401401
factorTable.get(memberships[i].getUserId()).numberOfGroupsPerMonth[bucket]++;
402402
}
403-
404403
staticSerializer.serialize(memberships[i]);
405404
} else {
406405
updateStreamSerializer.setCurrentDependantDate(memberships[i].userCreationDate);

0 commit comments

Comments
 (0)