Rework column names for better names in MergedFK output

Author: szarnyasg

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

@@ -57,10 +57,10 @@ public List<FileName> getFileNames() {
 
     @Override
     public void writeFileHeaders() {
-        writers.get(TAG).writeHeader(ImmutableList.of("id", "name", "url", "hasType"));
-        writers.get(TAGCLASS).writeHeader(ImmutableList.of("id", "name", "url", "isSubclassOf"));
-        writers.get(PLACE).writeHeader(ImmutableList.of("id", "name", "url", "type", "isPartOf"));
-        writers.get(ORGANISATION).writeHeader(ImmutableList.of("id", "type", "name", "url", "place"));
+        writers.get(ORGANISATION).writeHeader(ImmutableList.of("id", "type", "name", "url", "LocationPlaceId"));
+        writers.get(PLACE).writeHeader(ImmutableList.of("id", "name", "url", "type", "PartOfPlaceId"));
+        writers.get(TAG).writeHeader(ImmutableList.of("id", "name", "url", "TypeTagClassId"));
+        writers.get(TAGCLASS).writeHeader(ImmutableList.of("id", "name", "url", "SubclassOfTagClassId"));
     }
 
     public void serialize(final Place place) {

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

@@ -31,16 +31,16 @@ object TransformationStage extends SparkApp with Logging {
     Mode.Raw,
     Map(
       Node("Organisation", isStatic = true) -> Some(
-        "`id` INT, `type` STRING, `name` STRING, `url` STRING, `place` INT"
+        "`id` INT, `type` STRING, `name` STRING, `url` STRING, `LocationPlaceId` INT"
       ),
       Node("Place", isStatic = true) -> Some(
-        "`id` INT, `name` STRING, `url` STRING, `type` STRING, `isPartOf` INT"
+        "`id` INT, `name` STRING, `url` STRING, `type` STRING, `PartOfPlaceId` INT"
       ),
       Node("Tag", isStatic = true) -> Some(
-        "`id` INT, `name` STRING, `url` STRING, `hasType` INT"
+        "`id` INT, `name` STRING, `url` STRING, `TypeTagClassId` INT"
       ),
       Node("TagClass", isStatic = true) -> Some(
-        "`id` INT, `name` STRING, `url` STRING, `isSubclassOf` INT"
+        "`id` INT, `name` STRING, `url` STRING, `SubclassOfTagClassId` INT"
       ),
       Node("Comment") -> Some(
         "`creationDate` TIMESTAMP, `deletionDate` TIMESTAMP, `explicitlyDeleted` BOOLEAN, `id` BIGINT, `locationIP` STRING, `browserUsed` STRING, `content` STRING, `length` INT, `CreatorPersonId` BIGINT, `LocationCountryId` INT, `ParentPostId` BIGINT, `ParentCommentId` BIGINT"

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

@@ -25,20 +25,20 @@ object ExplodeEdges extends Transform[Mode.Raw.type, Mode.Raw.type]{
 
     val updatedEntities = entities.collect {
       case (k@Node("Organisation", true), v) => Map(
-        explodedEdge(Edge("IsLocatedIn", "Organisation", "Place", OneN, isStatic = true), v, $"place"),
-        k -> v.drop("place")
+        explodedEdge(Edge("IsLocatedIn", "Organisation", "Place", OneN, isStatic = true), v, $"LocationPlaceId"),
+        k -> v.drop("LocationPlaceId")
       )
       case (k@Node("Place", true), v) => Map(
-        explodedEdge(Edge("IsPartOf", "Place", "Place", OneN, isStatic = true), v, $"isPartOf"),
-        k -> v.drop("isPartOf")
+        explodedEdge(Edge("IsPartOf", "Place", "Place", OneN, isStatic = true), v, $"PartOfPlaceId"),
+        k -> v.drop("PartOfPlaceId")
       )
       case (k@Node("Tag", true), v) => Map(
-        explodedEdge(Edge("HasType", "Tag", "TagClass", OneN, isStatic = true), v, $"hasType"),
-        k -> v.drop("hasType")
+        explodedEdge(Edge("HasType", "Tag", "TagClass", OneN, isStatic = true), v, $"TypeTagClassId"),
+        k -> v.drop("TypeTagClassId")
       )
       case (k@Node("TagClass", true), v) => Map(
-        explodedEdge(Edge("IsSubclassOf", "TagClass", "TagClass", OneN, isStatic = true), v, $"isSubclassOf"),
-        k -> v.drop("isSubclassOf")
+        explodedEdge(Edge("IsSubclassOf", "TagClass", "TagClass", OneN, isStatic = true), v, $"SubclassOfTagClassId"),
+        k -> v.drop("SubclassOfTagClassId")
       )
       case (k@Node("Comment", false), v) => Map(
         explodedEdge(Edge("HasCreator", "Comment", "Person", OneN), v, $"CreatorPersonId"),
@@ -59,8 +59,8 @@ object ExplodeEdges extends Transform[Mode.Raw.type, Mode.Raw.type]{
 
       case (k@Node("Post", false), v) => Map(
         explodedEdge(Edge("HasCreator", "Post", "Person", OneN), v, $"CreatorPersonId"),
-        explodedEdge(Edge("IsLocatedIn", "Post", "Country", OneN), v, $"LocationCountryId"),
         explodedEdge(Edge("ContainerOf", "Forum", "Post", NOne), v, $"ContainerForumId"),
+        explodedEdge(Edge("IsLocatedIn", "Post", "Country", OneN), v, $"LocationCountryId"),
         k -> v.drop("CreatorPersonId", "LocationCountryId", "ContainerForumId")
       )
     }.foldLeft(entities)(_ ++ _)