Merge pull request #58 from ldbc/fix_merge_foreign

Fixed merge foreign to properly merge tag's class foreign key

Author: szarnyasg

src/main/java/ldbc/snb/datagen/serializer/snb/interactive/CSVMergeForeignInvariantSerializer.java

@@ -60,7 +60,6 @@ private enum FileNames {
         TAG("tag"),
         TAG_HAS_TYPE_TAGCLASS("tag_hasType_tagclass"),
         TAGCLASS("tagclass"),
-        TAGCLASS_IS_SUBCLASS_OF_TAGCLASS("tagclass_isSubclassOf_tagclass"),
         PLACE("place"),
         ORGANIZATION("organisation");
 
@@ -101,13 +100,9 @@ public void initialize(Configuration conf, int reducerId) throws IOException {
         arguments.add("id");
         arguments.add("name");
         arguments.add("url");
+        arguments.add("isSubclassOf");
         writers[FileNames.TAGCLASS.ordinal()].writeHeader(arguments);
 
-        arguments.clear();
-        arguments.add("TagClass.id");
-        arguments.add("TagClass.id");
-        writers[FileNames.TAGCLASS_IS_SUBCLASS_OF_TAGCLASS.ordinal()].writeHeader(arguments);
-
         arguments.clear();
         arguments.add("id");
         arguments.add("name");
@@ -171,14 +166,13 @@ protected void serialize(final TagClass tagClass) {
         } else {
             arguments.add(DBPOWL.getUrl(tagClass.name));
         }
-        writers[FileNames.TAGCLASS.ordinal()].writeEntry(arguments);
-
         if (tagClass.parent != -1) {
-            arguments.clear();
-            arguments.add(Integer.toString(tagClass.id));
             arguments.add(Integer.toString(tagClass.parent));
-            writers[FileNames.TAGCLASS_IS_SUBCLASS_OF_TAGCLASS.ordinal()].writeEntry(arguments);
+        } else {
+            arguments.add("");
         }
+        writers[FileNames.TAGCLASS.ordinal()].writeEntry(arguments);
+
     }
 
     protected void serialize(final Tag tag) {