Merge pull request #302 from ldbc/use-more-specific-endpoint-labels

Use more specific endpoint labels

Author: szarnyasg

src/main/java/ldbc/snb/datagen/serializer/DynamicActivitySerializer.java

@@ -65,10 +65,10 @@ public void writeFileHeaders() {
         writers.get(FORUM_HASTAG_TAG)         .writeHeader(dates2, ImmutableList.of("Forum.id", "Tag.id"));
         writers.get(FORUM_HASMEMBER_PERSON)   .writeHeader(dates1, ImmutableList.of("Forum.id", "Person.id"));
 
-        writers.get(POST)                     .writeHeader(dates1, ImmutableList.of("id", "imageFile", "locationIP", "browserUsed", "language", "content", "length", "creator", "Forum.id", "place"));
+        writers.get(POST)                     .writeHeader(dates1, ImmutableList.of("id", "imageFile", "locationIP", "browserUsed", "language", "content", "length", "creator", "Forum.id", "Country.id"));
         writers.get(POST_HASTAG_TAG)          .writeHeader(dates2, ImmutableList.of("Post.id", "Tag.id"));
 
-        writers.get(COMMENT)                  .writeHeader(dates1, ImmutableList.of("id", "locationIP", "browserUsed", "content", "length", "creator", "place", "replyOfPost", "replyOfComment"));
+        writers.get(COMMENT)                  .writeHeader(dates1, ImmutableList.of("id", "locationIP", "browserUsed", "content", "length", "creator", "Country.id", "replyOfPost", "replyOfComment"));
         writers.get(COMMENT_HASTAG_TAG)       .writeHeader(dates2, ImmutableList.of("Comment.id", "Tag.id"));
 
         writers.get(PERSON_LIKES_POST)        .writeHeader(dates1, ImmutableList.of("Person.id", "Post.id"));

src/main/java/ldbc/snb/datagen/serializer/DynamicPersonSerializer.java

@@ -60,15 +60,15 @@ public void writeFileHeaders() {
         List<String> dates1 = ImmutableList.of("creationDate", "deletionDate", "explicitlyDeleted");
 
         // one-to-many edges, single- and multi-valued attributes
-        writers.get(PERSON)                     .writeHeader(dates1, ImmutableList.of("id", "firstName", "lastName", "gender", "birthday", "locationIP", "browserUsed", "place", "language", "email"));
+        writers.get(PERSON)                     .writeHeader(dates1, ImmutableList.of("id", "firstName", "lastName", "gender", "birthday", "locationIP", "browserUsed", "city", "language", "email"));
 
         // many-to-many edges
         writers.get(PERSON_KNOWS_PERSON)        .writeHeader(dates1, ImmutableList.of("Person1.id", "Person2.id"));
 
         List<String> dates2 = ImmutableList.of("creationDate", "deletionDate");
         writers.get(PERSON_HASINTEREST_TAG)     .writeHeader(dates2, ImmutableList.of("Person.id", "Tag.id"));
-        writers.get(PERSON_STUDYAT_UNIVERSITY)  .writeHeader(dates2, ImmutableList.of("Person.id", "Organisation.id", "classYear"));
-        writers.get(PERSON_WORKAT_COMPANY)      .writeHeader(dates2, ImmutableList.of("Person.id", "Organisation.id", "workFrom"));
+        writers.get(PERSON_STUDYAT_UNIVERSITY)  .writeHeader(dates2, ImmutableList.of("Person.id", "University.id", "classYear"));
+        writers.get(PERSON_WORKAT_COMPANY)      .writeHeader(dates2, ImmutableList.of("Person.id", "Company.id", "workFrom"));
     }
 
     public void serialize(final Person person) {

src/main/scala/ldbc/snb/datagen/transformation/TransformationStage.scala

@@ -43,7 +43,7 @@ object TransformationStage extends SparkApp with Logging {
         "`id` INT, `name` STRING, `url` STRING, `isSubclassOf` INT"
       ),
       Node("Comment") -> Some(
-        "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `explicitlyDeleted` BOOLEAN, `id` BIGINT, `locationIP` STRING, `browserUsed` STRING, `content` STRING, `length` INT, `creator` BIGINT, `place` INT, `replyOfPost` BIGINT, `replyOfComment` BIGINT"
+        "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `explicitlyDeleted` BOOLEAN, `id` BIGINT, `locationIP` STRING, `browserUsed` STRING, `content` STRING, `length` INT, `Person.id` BIGINT, `Country.id` INT, `replyOfPost` BIGINT, `replyOfComment` BIGINT"
       ),
       Edge("HasTag", "Comment", "Tag", NN) -> Some(
         "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `Comment.id` BIGINT, `Tag.id` INT"
@@ -58,7 +58,7 @@ object TransformationStage extends SparkApp with Logging {
         "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `Forum.id` BIGINT, `Tag.id` INT"
       ),
       Node("Person") -> Some(
-        "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `explicitlyDeleted` BOOLEAN, `id` BIGINT, `firstName` STRING, `lastName` STRING, `gender` STRING, `birthday` DATE, `locationIP` STRING, `browserUsed` STRING, `place` INT, `language` STRING, `email` STRING"
+        "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `explicitlyDeleted` BOOLEAN, `id` BIGINT, `firstName` STRING, `lastName` STRING, `gender` STRING, `birthday` DATE, `locationIP` STRING, `browserUsed` STRING, `City.id` INT, `language` STRING, `email` STRING"
       ),
       Edge("HasInterest", "Person", "Tag", NN) -> Some(
         "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `Person.id` BIGINT, `Tag.id` INT"
@@ -79,7 +79,7 @@ object TransformationStage extends SparkApp with Logging {
         "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `Person.id` BIGINT, `Company.id` INT, `workFrom` INT"
       ),
       Node("Post") -> Some(
-        "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `explicitlyDeleted` BOOLEAN, `id` BIGINT, `imageFile` STRING, `locationIP` STRING, `browserUsed` STRING, `language` STRING, `content` STRING, `length` INT, `creator` BIGINT, `Forum.id` BIGINT, `place` INT"
+        "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `explicitlyDeleted` BOOLEAN, `id` BIGINT, `imageFile` STRING, `locationIP` STRING, `browserUsed` STRING, `language` STRING, `content` STRING, `length` INT, `Person.id` BIGINT, `Forum.id` BIGINT, `Country.id` INT"
       ),
       Edge("HasTag", "Post", "Tag", NN) -> Some(
         "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `Post.id` BIGINT, `Tag.id` INT"

src/main/scala/ldbc/snb/datagen/transformation/transform/ExplodeEdges.scala

@@ -41,27 +41,27 @@ object ExplodeEdges extends Transform[Mode.Raw.type, Mode.Raw.type]{
         k -> v.drop("isSubclassOf")
       )
       case (k@Node("Comment", false), v) => Map(
-        explodedEdge(Edge("HasCreator", "Comment", "Person", OneN), v, $"creator"),
-        explodedEdge(Edge("IsLocatedIn", "Comment", "Place", OneN), v, $"place"),
+        explodedEdge(Edge("HasCreator", "Comment", "Person", OneN), v, $"`Person.id`"),
+        explodedEdge(Edge("IsLocatedIn", "Comment", "Country", OneN), v, $"`Country.id`"),
         explodedEdge(Edge("ReplyOf", "Comment", "Comment", OneN), v, $"replyOfComment"),
         explodedEdge(Edge("ReplyOf", "Comment", "Post", OneN), v, $"replyOfPost"),
-        k -> v.drop("creator", "place", "replyOfPost", "replyOfComment")
+        k -> v.drop("Person.id", "Country.id", "replyOfPost", "replyOfComment")
       )
       case (k@Node("Forum", false), v) => Map(
         explodedEdge(Edge("HasModerator", "Forum", "Person", OneN), v, $"moderator"),
         k -> v.drop("moderator")
       )
 
       case (k@Node("Person", false), v) => Map(
-        explodedEdge(Edge("IsLocatedIn", "Person", "Place", OneN), v, $"place"),
-        k -> v.drop("place")
+        explodedEdge(Edge("IsLocatedIn", "Person", "City", OneN), v, $"`City.id`"),
+        k -> v.drop("City.id")
       )
 
       case (k@Node("Post", false), v) => Map(
-        explodedEdge(Edge("HasCreator", "Post", "Person", OneN), v, $"creator"),
-        explodedEdge(Edge("IsLocatedIn", "Post", "Place", OneN), v, $"place"),
+        explodedEdge(Edge("HasCreator", "Post", "Person", OneN), v, $"`Person.id`"),
+        explodedEdge(Edge("IsLocatedIn", "Post", "Country", OneN), v, $"`Country.id`"),
         explodedEdge(Edge("ContainerOf", "Forum", "Post", NOne), v, $"`Forum.id`"),
-        k -> v.drop("creator", "place", "`Forum.id`")
+        k -> v.drop("Person.id", "Country.id", "Forum.id")
       )
     }.foldLeft(entities)(_ ++ _)