Skip to content

Commit 7587594

Browse files
committed
Merge branch 'main' into file-uri-fixes
2 parents c626934 + dc5211e commit 7587594

File tree

20 files changed

+27
-1813
lines changed

20 files changed

+27
-1813
lines changed

.circleci/config.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,18 @@ jobs:
5252
paths:
5353
- ~/.m2/repository # maven deps
5454
- run: mkdir social-network-sf0.003
55+
# BI
5556
- run: tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges --explode-attrs && mv out social-network-sf0.003-bi-singular-projected-fk
5657
- run: tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-attrs && mv out social-network-sf0.003-bi-singular-merged-fk
5758
- run: tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges && mv out social-network-sf0.003-bi-composite-projected-fk
5859
- run: tools/docker-run.sh --mode bi --scale-factor 0.003 && mv out social-network-sf0.003-bi-composite-merged-fk
5960
- run: tools/docker-run.sh --mode bi --scale-factor 0.003 --format-options header=true && mv out social-network-sf0.003-bi-composite-merged-fk-postgres
6061
- run: tools/docker-run.sh --mode bi --scale-factor 0.003 --explode-edges --format-options header=false,quoteAll=true && mv out social-network-sf0.003-bi-composite-projected-fk-neo4j
62+
# Interactive
63+
- run: tools/docker-run.sh --mode interactive --scale-factor 0.003 --explode-edges --explode-attrs && mv out social-network-sf0.003-interactive-singular-projected-fk
64+
- run: tools/docker-run.sh --mode interactive --scale-factor 0.003 --explode-attrs && mv out social-network-sf0.003-interactive-singular-merged-fk
65+
- run: tools/docker-run.sh --mode interactive --scale-factor 0.003 --explode-edges && mv out social-network-sf0.003-interactive-composite-projected-fk
66+
- run: tools/docker-run.sh --mode interactive --scale-factor 0.003 && mv out social-network-sf0.003-interactive-composite-merged-fk
6167
- run: |
6268
# deploy CircleCI configuration to provide the 'filters' instructions (and prevent failed builds on the gh-pages branch)
6369
mv .circleci dist/

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ Datagen is part of the [LDBC project](https://ldbcouncil.org/).
1111
:warning: There are two different versions of the Datagen:
1212

1313
* The [Hadoop-based Datagen](https://github.com/ldbc/ldbc_snb_datagen_hadoop/) generates the Interactive SF1-1000 data sets
14-
* For the Interactive workload's larger data sets (up to SF30k) and for the BI workload, use the Spark-based Datagen (in this repository). This is an experimental repository and breaking changes (e.g. changes in the directory layout and CSV schema) are expected
14+
* For the BI workload, use the Spark-based Datagen (in this repository).
15+
* For the Interactive workloads's larger data sets, there is no out-of-the-box solution (see [this issue](https://github.com/ldbc/ldbc_snb_interactive/issues/173)).
1516

1617
The LDBC SNB Data Generator (Datagen) is the responsible for providing the datasets used by all the LDBC benchmarks. This data generator is designed to produce directed labelled graphs that mimic the characteristics of those graphs of real data. A detailed description of the schema produced by Datagen, as well as the format of the output files, can be found in the latest version of official [LDBC SNB specification document](https://github.com/ldbc/ldbc_snb_docs).
1718

@@ -127,19 +128,19 @@ To get a complete list of the arguments, pass `--help` to the JAR file:
127128
./tools/run.py ./target/ldbc_snb_datagen_${PLATFORM_VERSION}-${DATAGEN_VERSION}.jar -- --format csv --param-file params.ini
128129
```
129130

130-
* Generating `CsvBasic` files in Interactive mode:
131+
* Generating `CsvBasic` files in **Interactive mode**:
131132

132133
```bash
133134
./tools/run.py ./target/ldbc_snb_datagen_${PLATFORM_VERSION}-${DATAGEN_VERSION}.jar -- --format csv --scale-factor 0.003 --explode-edges --explode-attrs --mode interactive
134135
```
135136

136-
* Generating `CsvCompositeMergeForeign` files in BI mode resulting in compressed `.csv.gz` files:
137+
* Generating `CsvCompositeMergeForeign` files in **BI mode** resulting in compressed `.csv.gz` files:
137138

138139
```bash
139140
./tools/run.py ./target/ldbc_snb_datagen_${PLATFORM_VERSION}-${DATAGEN_VERSION}.jar -- --format csv --scale-factor 0.003 --mode bi --format-options compression=gzip
140141
```
141142

142-
* Generating CSVs in `Raw` mode:
143+
* Generating CSVs in **raw mode**:
143144

144145
```bash
145146
./tools/run.py ./target/ldbc_snb_datagen_${PLATFORM_VERSION}-${DATAGEN_VERSION}.jar -- --format csv --scale-factor 0.003 --mode raw --output-dir sf0.003-raw

paramgenerator/Manifest.toml

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

paramgenerator/Project.toml

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

paramgenerator/README.md

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

paramgenerator/compare.sh

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

0 commit comments

Comments
 (0)