Skip to content

Commit d6d7d8d

Browse files
authored
Merge pull request #336 from ldbc/serializer-scala
2 parents c9d21ef + 777d049 commit d6d7d8d

File tree

108 files changed

+1725
-2156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1725
-2156
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ENV DRIVER_MEMORY "5G"
1818
# the SPARK_* variables are used by submit.sh to configure the Spark job
1919
ENV SPARK_LOCAL_DIRS ${TEMP_DIR}
2020
ENV SPARK_SUBMIT_ARGS --executor-memory ${EXECUTOR_MEMORY} --driver-memory ${DRIVER_MEMORY}
21-
ENV SPARK_APPLICATION_MAIN_CLASS ldbc.snb.datagen.spark.LdbcDatagen
21+
ENV SPARK_APPLICATION_MAIN_CLASS ldbc.snb.datagen.LdbcDatagen
2222
ENV SPARK_MASTER_URL local[*]
2323
ENV SPARK_APPLICATION_JAR_LOCATION /mnt/datagen.jar
2424

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.4.3
1+
sbt.version=1.5.2

src/main/java/ldbc/snb/datagen/entities/dynamic/Forum.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.entities.dynamic;
3737

38-
import ldbc.snb.datagen.DatagenParams;
38+
import ldbc.snb.datagen.generator.DatagenParams;
3939
import ldbc.snb.datagen.entities.dynamic.person.PersonSummary;
4040
import ldbc.snb.datagen.entities.dynamic.relations.ForumMembership;
4141

src/main/java/ldbc/snb/datagen/entities/dynamic/messages/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.entities.dynamic.messages;
3737

38-
import ldbc.snb.datagen.DatagenParams;
38+
import ldbc.snb.datagen.generator.DatagenParams;
3939
import ldbc.snb.datagen.entities.dynamic.DynamicActivity;
4040
import ldbc.snb.datagen.entities.dynamic.person.IP;
4141
import ldbc.snb.datagen.entities.dynamic.person.PersonSummary;

src/main/java/ldbc/snb/datagen/entities/dynamic/person/similarity/GeoDistanceSimilarity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.entities.dynamic.person.similarity;
3737

38-
import ldbc.snb.datagen.dictionary.Dictionaries;
38+
import ldbc.snb.datagen.generator.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.entities.dynamic.person.Person;
4040

4141
public class GeoDistanceSimilarity implements Person.PersonSimilarity {

src/main/java/ldbc/snb/datagen/entities/dynamic/relations/ForumMembership.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.entities.dynamic.relations;
3737

38-
import ldbc.snb.datagen.DatagenParams;
38+
import ldbc.snb.datagen.generator.DatagenParams;
3939
import ldbc.snb.datagen.entities.dynamic.DynamicActivity;
4040
import ldbc.snb.datagen.entities.dynamic.Forum;
4141
import ldbc.snb.datagen.entities.dynamic.person.PersonSummary;

src/main/java/ldbc/snb/datagen/entities/dynamic/relations/Knows.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.entities.dynamic.relations;
3737

38-
import ldbc.snb.datagen.DatagenParams;
39-
import ldbc.snb.datagen.dictionary.Dictionaries;
38+
import ldbc.snb.datagen.generator.DatagenParams;
39+
import ldbc.snb.datagen.generator.dictionary.Dictionaries;
4040
import ldbc.snb.datagen.entities.dynamic.person.Person;
4141
import ldbc.snb.datagen.entities.dynamic.person.PersonSummary;
4242
import org.apache.hadoop.io.Writable;

src/main/java/ldbc/snb/datagen/entities/statictype/TagClass.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/main/java/ldbc/snb/datagen/entities/statictype/tag/FlashMobTag.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3535
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.*/
3636
package ldbc.snb.datagen.entities.statictype.tag;
3737

38-
import ldbc.snb.datagen.dictionary.Dictionaries;
38+
import ldbc.snb.datagen.generator.dictionary.Dictionaries;
3939

4040
public class FlashMobTag implements Comparable<FlashMobTag> {
4141
public int level;

src/main/java/ldbc/snb/datagen/entities/statictype/tag/Tag.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)