Skip to content

Commit 5de3a64

Browse files
committed
Fixed bug with dates assigned to memberships
1 parent 4a02d03 commit 5de3a64

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,13 @@ private Group generateWall(UserInfo userInfo) {
10111011
membership.setGroupId(group.getGroupId());
10121012
membership.setJoinDate(friends[i].getCreatedTime()+deltaTime);
10131013
membership.setUserId(friends[i].getFriendAcc());
1014-
membership.userCreationDate = userInfo.user.getCreationDate();
1014+
membership.setIP(friends[i].getSourceIp());
1015+
membership.userCreationDate = friends[i].toCreationDate;
1016+
membership.setBrowserIdx(friends[i].getBrowserIdx());
1017+
membership.setAgentIdx(friends[i].getAgentIdx());
1018+
membership.setFrequentChange(friends[i].isFrequentChange());
1019+
membership.setHaveSmartPhone(friends[i].isHaveSmartPhone());
1020+
membership.setLargePoster(friends[i].isLargePoster());
10151021
group.addMember(membership);
10161022
}
10171023
}
@@ -1020,7 +1026,8 @@ private Group generateWall(UserInfo userInfo) {
10201026
}
10211027

10221028
private void generatePosts(PostGenerator postGenerator, ReducedUserProfile user, UserExtraInfo extraInfo, Group group){
1023-
Vector<Post> createdPosts = postGenerator.createPosts( randomFarm, user, extraInfo, postId );
1029+
//Vector<Post> createdPosts = postGenerator.createPosts( randomFarm, user, extraInfo, postId );
1030+
Vector<Post> createdPosts = postGenerator.createPosts(randomFarm,group,postId);
10241031
postId+=createdPosts.size();
10251032
Iterator<Post> it = createdPosts.iterator();
10261033

src/main/java/ldbc/socialnet/dbgen/objects/Friend.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public class Friend implements Serializable{
4747
long to;
4848
public long dependantDate;
4949
public long fromCreationDate;
50+
public long toCreationDate;
5051
long createdTime; //approved Time
5152
long requestTime;
5253
long declinedTime;
@@ -65,7 +66,7 @@ public class Friend implements Serializable{
6566
boolean isLargePoster; // True if friend is a large poster.
6667

6768

68-
public Friend(long from, long to, long _requestedTime, long _declinedTime, long _createdTime, byte passidx, byte initiator, boolean isLargePoster){
69+
/* public Friend(long from, long to, long _requestedTime, long _declinedTime, long _createdTime, byte passidx, byte initiator, boolean isLargePoster){
6970
this.from = from;
7071
this.to = to;
7172
this.requestTime = _requestedTime;
@@ -75,13 +76,15 @@ public Friend(long from, long to, long _requestedTime, long _declinedTime, long
7576
this.initiator = initiator;
7677
this.isLargePoster = isLargePoster;
7778
}
79+
*/
7880
public Friend(){}
7981

8082
public void readFields(DataInput arg0) throws IOException{
8183
from = arg0.readLong();
8284
to = arg0.readLong();
8385
dependantDate = arg0.readLong();
8486
fromCreationDate = arg0.readLong();
87+
toCreationDate = arg0.readLong();
8588
createdTime = arg0.readLong();
8689
requestTime = arg0.readLong();
8790
declinedTime = arg0.readLong();
@@ -102,6 +105,7 @@ public void write(DataOutput arg0) throws IOException {
102105
arg0.writeLong(to);
103106
arg0.writeLong(dependantDate);
104107
arg0.writeLong(fromCreationDate);
108+
arg0.writeLong(toCreationDate);
105109
arg0.writeLong(createdTime);
106110
arg0.writeLong(requestTime);
107111
arg0.writeLong(declinedTime);
@@ -123,6 +127,7 @@ public Friend(ReducedUserProfile from, ReducedUserProfile to, long _requestedTim
123127
this.to = to.getAccountId();
124128
this.dependantDate = Math.max(from.getCreationDate(), to.getCreationDate());
125129
this.fromCreationDate = from.getCreationDate();
130+
this.toCreationDate = to.getCreationDate();
126131
this.requestTime = _requestedTime;
127132
this.declinedTime = _declinedTime;
128133
this.createdTime = _createdTime;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ private void exportLocations() {
178178
Set<Integer> locations = locationDic.getLocations();
179179
Iterator<Integer> it = locations.iterator();
180180
while(it.hasNext()) {
181-
// printLocationHierarchy(it.next());
182181
Location location = locationDic.getLocation(it.next());
183182
staticSerializer.serialize(location);
184183
}

0 commit comments

Comments
 (0)