Skip to content

Commit ed68863

Browse files
szarnyasgszarnyasg
committed
Rename serializers: Invariant -> Static, Person->DynamicPerson, PersonActivity -> DynamicActivity
1 parent 56517ff commit ed68863

Some content is hidden

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

41 files changed

+167
-167
lines changed

‎graphalytics-generate-old.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ for VERSION in v0.2.1 v0.2.2 v0.2.3 v0.2.4 v0.2.5; do
5151
# vertices
5252
echo > params.ini
5353
echo ldbc.snb.datagen.generator.scaleFactor:graphalytics.$SCALE_FACTOR >> params.ini
54-
echo ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.snb.interactive.CSVPersonSerializer >> params.ini
55-
echo ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.empty.EmptyInvariantSerializer >> params.ini
56-
echo ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyPersonActivitySerializer >> params.ini
54+
echo ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.interactive.CSVDynamicPersonSerializer >> params.ini
55+
echo ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.empty.EmptyStaticSerializer >> params.ini
56+
echo ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyDynamicActivitySerializer >> params.ini
5757

5858
./run.sh
5959
tail -n +2 social_network/person_0_0.csv | wc -l >> ../datagen-graphalytics.log
@@ -63,12 +63,12 @@ for VERSION in v0.2.1 v0.2.2 v0.2.3 v0.2.4 v0.2.5; do
6363
fi
6464

6565
# edges
66-
# from version 0.2.2, it's also possible to use the CSVPersonSerializerWithWeights serializer, which adds edge weights
66+
# from version 0.2.2, it's also possible to use the CSVDynamicPersonSerializerWithWeights serializer, which adds edge weights
6767
echo > params.ini
6868
echo ldbc.snb.datagen.generator.scaleFactor:graphalytics.$SCALE_FACTOR >> params.ini
69-
echo ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.graphalytics.CSVPersonSerializer >> params.ini
70-
echo ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.empty.EmptyInvariantSerializer >> params.ini
71-
echo ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyPersonActivitySerializer >> params.ini
69+
echo ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.graphalytics.CSVDynamicPersonSerializer >> params.ini
70+
echo ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.empty.EmptyStaticSerializer >> params.ini
71+
echo ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyDynamicActivitySerializer >> params.ini
7272

7373
./run.sh
7474
tail -n +2 social_network/person_knows_person_0_0.csv | wc -l >> ../datagen-graphalytics.log
@@ -79,7 +79,7 @@ for VERSION in v0.2.1 v0.2.2 v0.2.3 v0.2.4 v0.2.5; do
7979
done
8080

8181
# For versions 0.2.6-0.2.8, we only need a single run, which produces both the vertices and the edges
82-
# using the CSVPersonSerializerExtended class, which also produces edge weights
82+
# using the CSVDynamicPersonSerializerExtended class, which also produces edge weights
8383
for VERSION in v0.2.6 v0.2.7 v0.2.8; do
8484
echo $VERSION >> ../datagen-graphalytics.log
8585

@@ -90,9 +90,9 @@ for VERSION in v0.2.6 v0.2.7 v0.2.8; do
9090
# vertices and edges
9191
echo > params.ini
9292
echo ldbc.snb.datagen.generator.scaleFactor:graphalytics.$SCALE_FACTOR >> params.ini
93-
echo ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.graphalytics.CSVPersonSerializerExtended >> params.ini
94-
echo ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.empty.EmptyInvariantSerializer >> params.ini
95-
echo ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyPersonActivitySerializer >> params.ini
93+
echo ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.graphalytics.CSVDynamicPersonSerializerExtended >> params.ini
94+
echo ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.empty.EmptyStaticSerializer >> params.ini
95+
echo ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyDynamicActivitySerializer >> params.ini
9696

9797
./run.sh
9898
tail -n +2 social_network/person_0_0.csv | wc -l >> ../datagen-graphalytics.log

‎params-composite-foreign-key.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign.CSVCompositeMergeForeignPersonSerializer
4-
ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign.CSVCompositeMergeForeignInvariantSerializer
5-
ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign.CSVCompositeMergeForeignPersonActivitySerializer
3+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign.CSVCompositeMergeForeignDynamicPersonSerializer
4+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign.CSVCompositeMergeForeignStaticSerializer
5+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.compositemergeforeign.CSVCompositeMergeForeignDynamicActivitySerializer

‎params-composite.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.snb.csv.composite.CSVCompositePersonSerializer
4-
ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.snb.csv.composite.CSVCompositeInvariantSerializer
5-
ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.composite.CSVCompositePersonActivitySerializer
3+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.composite.CSVCompositeDynamicPersonSerializer
4+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.composite.CSVCompositeStaticSerializer
5+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.composite.CSVCompositeDynamicActivitySerializer

‎params-csv.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.0.1
22

3-
ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVPersonSerializer
4-
ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVInvariantSerializer
5-
ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVPersonActivitySerializer
3+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVDynamicPersonSerializer
4+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVStaticSerializer
5+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVDynamicActivitySerializer
66

77
# To generate RFC 3339-compliant timestamps (https://tools.ietf.org/html/rfc3339), uncomment the following line:
88
#ldbc.snb.datagen.serializer.formatter.StringDateFormatter.dateTimeFormat:yyyy-MM-dd'T'HH:mm:ss.SSS+00:00

‎params-foreign-key.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignPersonSerializer
4-
ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignInvariantSerializer
5-
ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignPersonActivitySerializer
3+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignDynamicPersonSerializer
4+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignStaticSerializer
5+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.mergeforeign.CSVMergeForeignDynamicActivitySerializer

‎params-graphalytics.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:graphalytics.1
22

3-
ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.graphalytics.CSVPersonSerializerExtended
4-
ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.empty.EmptyInvariantSerializer
5-
ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyPersonActivitySerializer
3+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.graphalytics.CSVDynamicPersonSerializerExtended
4+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.empty.EmptyStaticSerializer
5+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.empty.EmptyDynamicActivitySerializer

‎params-ttl.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ldbc.snb.datagen.generator.scaleFactor:snb.interactive.1
22

3-
ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.snb.turtle.TurtlePersonSerializer
4-
ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.snb.turtle.TurtleInvariantSerializer
5-
ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.snb.turtle.TurtlePersonActivitySerializer
3+
ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.turtle.TurtleDynamicPersonSerializer
4+
ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.turtle.TurtleStaticSerializer
5+
ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.turtle.TurtleDynamicActivitySerializer

‎snb-generate-old.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ for VERSION in v0.2.1 v0.2.2 v0.2.3 v0.2.4 v0.2.5 v0.2.6 v0.2.7 v0.2.8; do
4949

5050
echo > params.ini
5151
echo ldbc.snb.datagen.generator.scaleFactor:snb.interactive.$SCALE_FACTOR >> params.ini
52-
echo ldbc.snb.datagen.serializer.personSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVPersonSerializer >> params.ini
53-
echo ldbc.snb.datagen.serializer.invariantSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVInvariantSerializer >> params.ini
54-
echo ldbc.snb.datagen.serializer.personActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVPersonActivitySerializer >> params.ini
52+
echo ldbc.snb.datagen.serializer.dynamicPersonSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVDynamicPersonSerializer >> params.ini
53+
echo ldbc.snb.datagen.serializer.staticSerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVStaticSerializer >> params.ini
54+
echo ldbc.snb.datagen.serializer.dynamicActivitySerializer:ldbc.snb.datagen.serializer.snb.csv.basic.CSVDynamicActivitySerializer >> params.ini
5555

5656
./run.sh
5757
tail -n +2 social_network/person_0_0.csv | wc -l >> ../datagen-snb.log

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public int runGenerateJob(Configuration conf) throws Exception {
148148
printProgress("Serializing persons");
149149
long startPersonSerializing = System.currentTimeMillis();
150150
if (!conf.getBoolean("ldbc.snb.datagen.serializer.persons.sort", false)) {
151-
HadoopPersonSerializer serializer = new HadoopPersonSerializer(conf);
151+
HadoopDynamicPersonSerializer serializer = new HadoopDynamicPersonSerializer(conf);
152152
serializer.run(hadoopPrefix + "/mergedPersons");
153153
} else {
154154
HadoopPersonSortAndSerializer serializer = new HadoopPersonSortAndSerializer(conf);
@@ -254,8 +254,8 @@ public int runGenerateJob(Configuration conf) throws Exception {
254254

255255
printProgress("Serializing invariant schema ");
256256
long startInvariantSerializing = System.currentTimeMillis();
257-
HadoopInvariantSerializer invariantSerializer = new HadoopInvariantSerializer(conf);
258-
invariantSerializer.run();
257+
HadoopStaticSerializer staticSerializer = new HadoopStaticSerializer(conf);
258+
staticSerializer.run();
259259
long endInvariantSerializing = System.currentTimeMillis();
260260

261261
long end = System.currentTimeMillis();

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Linked Data Benchmark Council (http://www.ldbcouncil.org)
4141
import ldbc.snb.datagen.objects.ForumMembership;
4242
import ldbc.snb.datagen.objects.Person;
4343
import ldbc.snb.datagen.serializer.PersonActivityExporter;
44-
import ldbc.snb.datagen.serializer.PersonActivitySerializer;
44+
import ldbc.snb.datagen.serializer.DynamicActivitySerializer;
4545
import ldbc.snb.datagen.serializer.UpdateEventSerializer;
4646
import ldbc.snb.datagen.util.FactorTable;
4747
import ldbc.snb.datagen.util.RandomGeneratorFarm;
@@ -60,16 +60,16 @@ public class PersonActivityGenerator {
6060
private UniformPostGenerator uniformPostGenerator_ = null;
6161
private FlashmobPostGenerator flashmobPostGenerator_ = null;
6262
private PhotoGenerator photoGenerator_ = null;
63-
private PersonActivitySerializer personActivitySerializer_ = null;
63+
private DynamicActivitySerializer dynamicActivitySerializer_ = null;
6464
private UpdateEventSerializer updateSerializer_ = null;
6565
private long forumId = 0;
6666
private long messageId = 0;
6767
private FactorTable factorTable_;
6868
private PersonActivityExporter exporter_;
6969

70-
public PersonActivityGenerator(PersonActivitySerializer serializer, UpdateEventSerializer updateSerializer) {
70+
public PersonActivityGenerator(DynamicActivitySerializer serializer, UpdateEventSerializer updateSerializer) {
7171
randomFarm_ = new RandomGeneratorFarm();
72-
personActivitySerializer_ = serializer;
72+
dynamicActivitySerializer_ = serializer;
7373
updateSerializer_ = updateSerializer;
7474
forumGenerator_ = new ForumGenerator();
7575
TextGenerator generator = new LdbcSnbTextGenerator(randomFarm_
@@ -80,7 +80,7 @@ public PersonActivityGenerator(PersonActivitySerializer serializer, UpdateEventS
8080
flashmobPostGenerator_ = new FlashmobPostGenerator(generator, commentGenerator, likeGenerator_);
8181
photoGenerator_ = new PhotoGenerator(likeGenerator_);
8282
factorTable_ = new FactorTable();
83-
exporter_ = new PersonActivityExporter(personActivitySerializer_, updateSerializer_, factorTable_);
83+
exporter_ = new PersonActivityExporter(dynamicActivitySerializer_, updateSerializer_, factorTable_);
8484
}
8585

8686
private void generateActivity(Person person, ArrayList<Person> block) throws AssertionError, IOException {
@@ -98,7 +98,7 @@ private void generateActivity(Person person, ArrayList<Person> block) throws Ass
9898
}
9999

100100
public void reset() {
101-
personActivitySerializer_.reset();
101+
dynamicActivitySerializer_.reset();
102102
}
103103

104104
private void generateWall(Person person, ArrayList<Person> block) throws IOException {
@@ -189,7 +189,7 @@ public void generateActivityForBlock(int seed, ArrayList<Person> block, Context
189189
forumId = 0;
190190
messageId = 0;
191191
SN.machineId = seed;
192-
personActivitySerializer_.reset();
192+
dynamicActivitySerializer_.reset();
193193
int counter = 0;
194194
float personGenerationTime = 0.0f;
195195
for (Person p : block) {

0 commit comments

Comments
 (0)