@@ -595,8 +595,12 @@ object FactorGenerationStage extends DatagenStage with Logging {
595595 val directForums = person.as(" Person" )
596596 .join(hasMember.as(" hasMember" ), $" hasMember.PersonId" === $" Person.id" , " leftouter" )
597597
598- val numForums = frequency(directForums, value = $" ForumId" , by = Seq ($" Person.id" ), agg = count)
599- .select($" Person.id" .as(" Person1Id" ), $" frequency" .as(" numDirectForums" ))
598+ val numForums = frequency(
599+ directForums,
600+ value = $" ForumId" ,
601+ by = Seq ($" Person.id" , $" Person.creationDate" , $" Person.deletionDate" ),
602+ agg = count
603+ ).select($" Person.id" .as(" Person1Id" ), $" Person.creationDate" , $" Person.deletionDate" , $" frequency" .as(" numDirectForums" ))
600604
601605 val friendForums = numForums.as(" numForums1" )
602606 .join(undirectedKnows(personKnowsPerson).as(" knows" ), $" numForums1.Person1Id" === $" knows.Person1Id" , " leftouter" )
@@ -606,9 +610,9 @@ object FactorGenerationStage extends DatagenStage with Logging {
606610 val numFriendForums = frequency(
607611 friendForums,
608612 value = $" numForums2.numDirectForums" ,
609- by = Seq ($" numForums1.Person1Id" , $" numForums1.numDirectForums" ),
613+ by = Seq ($" numForums1.Person1Id" , $" numForums1.creationDate " , $ " numForums1.deletionDate " , $ " numForums1. numDirectForums" ),
610614 agg = sum
611- ).select($" numForums1.Person1Id" .as(" Person1Id" ), $" numForums1.numDirectForums" , $" frequency" .as(" numFriendForums" ))
615+ ).select($" numForums1.Person1Id" .as(" Person1Id" ), $" creationDate " , $ " deletionDate " , $ " numForums1.numDirectForums" , $" frequency" .as(" numFriendForums" ))
612616
613617 // forums of friends of friends
614618 val friendOfFriendForums = numFriendForums.as(" numFriendForums1" )
@@ -618,9 +622,9 @@ object FactorGenerationStage extends DatagenStage with Logging {
618622 val numFriendOfFriendForums = frequency(
619623 friendOfFriendForums,
620624 value = $" numFriendForums2.numFriendForums" ,
621- by = Seq ($" numFriendForums1.Person1Id" , $" numFriendForums1.numDirectForums" , $" numFriendForums1.numFriendForums" ),
625+ by = Seq ($" numFriendForums1.Person1Id" , $" numFriendForums1.creationDate " , $ " numFriendForums1.deletionDate " , $ " numFriendForums1. numDirectForums" , $" numFriendForums1.numFriendForums" ),
622626 agg = sum
623- )
627+ ).select($ " Person1Id " , $ " creationDate " , $ " deletionDate " , $ " numDirectForums " , $ " numFriendForums " , $ " frequency " .as( " numFriendOfFriendForums " ))
624628 numFriendOfFriendForums
625629 },
626630 // companies
0 commit comments