Skip to content

Commit 4f64f7b

Browse files
committed
Refactored object package into dynamic and static
1 parent 60ab151 commit 4f64f7b

File tree

88 files changed

+247
-172
lines changed

Some content is hidden

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

88 files changed

+247
-172
lines changed

src/main/java/ldbc/snb/datagen/LDBCDatagen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
4444
import ldbc.snb.datagen.hadoop.serializer.HadoopStaticSerializer;
4545
import ldbc.snb.datagen.hadoop.serializer.HadoopUpdateStreamSorterAndSerializer;
4646
import ldbc.snb.datagen.hadoop.miscjob.HadoopMergeFriendshipFiles;
47-
import ldbc.snb.datagen.objects.Person;
47+
import ldbc.snb.datagen.objects.dynamic.person.Person;
4848
import ldbc.snb.datagen.util.ConfigParser;
4949
import ldbc.snb.datagen.vocabulary.SN;
5050
import org.apache.commons.io.FileUtils;

src/main/java/ldbc/snb/datagen/dictionary/FlashmobTagDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3737

3838
import ldbc.snb.datagen.util.DateUtils;
3939
import ldbc.snb.datagen.generator.tools.PowerDistribution;
40-
import ldbc.snb.datagen.objects.FlashmobTag;
40+
import ldbc.snb.datagen.objects.statictype.tag.FlashmobTag;
4141

4242
import java.util.*;
4343

src/main/java/ldbc/snb/datagen/dictionary/IPAddressDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3636
package ldbc.snb.datagen.dictionary;
3737

3838
import ldbc.snb.datagen.DatagenParams;
39-
import ldbc.snb.datagen.objects.IP;
39+
import ldbc.snb.datagen.objects.dynamic.person.IP;
4040

4141
import java.io.BufferedReader;
4242
import java.io.IOException;

src/main/java/ldbc/snb/datagen/dictionary/PlaceDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3636
package ldbc.snb.datagen.dictionary;
3737

3838
import ldbc.snb.datagen.DatagenParams;
39-
import ldbc.snb.datagen.objects.Place;
39+
import ldbc.snb.datagen.objects.statictype.place.Place;
4040
import ldbc.snb.datagen.util.ZOrder;
4141

4242
import java.io.BufferedReader;

src/main/java/ldbc/snb/datagen/dictionary/PopularPlacesDictionary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3636
package ldbc.snb.datagen.dictionary;
3737

3838
import ldbc.snb.datagen.DatagenParams;
39-
import ldbc.snb.datagen.objects.PopularPlace;
39+
import ldbc.snb.datagen.objects.statictype.place.PopularPlace;
4040

4141
import java.io.BufferedReader;
4242
import java.io.IOException;

src/main/java/ldbc/snb/datagen/generator/generators/CommentGenerator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,13 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3838
import ldbc.snb.datagen.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.DatagenParams;
4040
import ldbc.snb.datagen.generator.generators.textgenerators.TextGenerator;
41-
import ldbc.snb.datagen.objects.*;
41+
import ldbc.snb.datagen.objects.dynamic.messages.Comment;
42+
import ldbc.snb.datagen.objects.dynamic.messages.Message;
43+
import ldbc.snb.datagen.objects.dynamic.messages.Post;
44+
import ldbc.snb.datagen.objects.dynamic.person.IP;
45+
import ldbc.snb.datagen.objects.dynamic.relations.ForumMembership;
46+
import ldbc.snb.datagen.objects.dynamic.relations.Like;
47+
import ldbc.snb.datagen.objects.dynamic.Forum;
4248
import ldbc.snb.datagen.serializer.PersonActivityExporter;
4349
import ldbc.snb.datagen.util.PersonBehavior;
4450
import ldbc.snb.datagen.util.RandomGeneratorFarm;

src/main/java/ldbc/snb/datagen/generator/generators/ForumGenerator.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3838

3939
import ldbc.snb.datagen.dictionary.Dictionaries;
4040
import ldbc.snb.datagen.DatagenParams;
41-
import ldbc.snb.datagen.objects.Forum;
42-
import ldbc.snb.datagen.objects.ForumMembership;
43-
import ldbc.snb.datagen.objects.Knows;
44-
import ldbc.snb.datagen.objects.Person;
41+
import ldbc.snb.datagen.objects.dynamic.Forum;
42+
import ldbc.snb.datagen.objects.dynamic.relations.ForumMembership;
43+
import ldbc.snb.datagen.objects.dynamic.relations.Knows;
44+
import ldbc.snb.datagen.objects.dynamic.person.Person;
4545
import ldbc.snb.datagen.util.RandomGeneratorFarm;
4646
import ldbc.snb.datagen.util.StringUtils;
4747
import ldbc.snb.datagen.vocabulary.SN;

src/main/java/ldbc/snb/datagen/generator/generators/LikeGenerator.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3838
import ldbc.snb.datagen.dictionary.Dictionaries;
3939
import ldbc.snb.datagen.DatagenParams;
4040
import ldbc.snb.datagen.generator.tools.PowerDistribution;
41-
import ldbc.snb.datagen.objects.Forum;
42-
import ldbc.snb.datagen.objects.ForumMembership;
43-
import ldbc.snb.datagen.objects.Like;
44-
import ldbc.snb.datagen.objects.Like.LikeType;
45-
import ldbc.snb.datagen.objects.Message;
41+
import ldbc.snb.datagen.objects.dynamic.Forum;
42+
import ldbc.snb.datagen.objects.dynamic.relations.ForumMembership;
43+
import ldbc.snb.datagen.objects.dynamic.relations.Like;
44+
import ldbc.snb.datagen.objects.dynamic.relations.Like.LikeType;
45+
import ldbc.snb.datagen.objects.dynamic.messages.Message;
4646
import ldbc.snb.datagen.serializer.PersonActivityExporter;
4747

4848
import java.io.IOException;

src/main/java/ldbc/snb/datagen/generator/generators/PersonActivityGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
4242
import ldbc.snb.datagen.generator.generators.postgenerators.UniformPostGenerator;
4343
import ldbc.snb.datagen.generator.generators.textgenerators.LdbcSnbTextGenerator;
4444
import ldbc.snb.datagen.generator.generators.textgenerators.TextGenerator;
45-
import ldbc.snb.datagen.objects.Forum;
46-
import ldbc.snb.datagen.objects.ForumMembership;
47-
import ldbc.snb.datagen.objects.Person;
45+
import ldbc.snb.datagen.objects.dynamic.Forum;
46+
import ldbc.snb.datagen.objects.dynamic.relations.ForumMembership;
47+
import ldbc.snb.datagen.objects.dynamic.person.Person;
4848
import ldbc.snb.datagen.serializer.PersonActivityExporter;
4949
import ldbc.snb.datagen.serializer.DynamicActivitySerializer;
5050
import ldbc.snb.datagen.serializer.UpdateEventSerializer;

src/main/java/ldbc/snb/datagen/generator/generators/PersonGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
3939
import ldbc.snb.datagen.DatagenParams;
4040
import ldbc.snb.datagen.generator.distribution.DegreeDistribution;
4141
import ldbc.snb.datagen.generator.tools.PowerDistribution;
42-
import ldbc.snb.datagen.objects.Person;
42+
import ldbc.snb.datagen.objects.dynamic.person.Person;
4343
import ldbc.snb.datagen.util.RandomGeneratorFarm;
4444
import ldbc.snb.datagen.vocabulary.SN;
4545
import org.apache.hadoop.conf.Configuration;

0 commit comments

Comments
 (0)