Merge branch 'driver-conversion-script-tracking' into cypher-path-query-opt

Author: GLaDAP

.circleci/config.yml

@@ -57,8 +57,7 @@ jobs:
             git clone https://github.com/ldbc/ldbc_snb_interactive_driver
             cd ldbc_snb_interactive_driver/scripts/
             ./install-dependencies.sh
-            export LDBC_SNB_DATA_ROOT_DIRECTORY=../../social-network-sf0.003-bi-composite-merged-fk/
-            export DATA_INPUT_TYPE=csv
+            export LDBC_SNB_DATA_ROOT_DIRECTORY=../../social-network-sf0.003-bi-composite-merged-fk/graphs/parquet/raw
             ./convert.sh
             mv inserts ../../update-streams/
             mv deletes ../../update-streams/
@@ -69,6 +68,7 @@ jobs:
             export LDBC_SNB_IMPLS_DIR=$(pwd)
             cd ldbc_snb_interactive_driver/paramgen
             scripts/get-sample-factors.sh
+            . scripts/use-sample-factors.sh
             scripts/paramgen.sh
             cd ..
             mv parameters/*.parquet ${LDBC_SNB_IMPLS_DIR}/parameters/

scripts/generate-all.sh

@@ -75,7 +75,7 @@ if ${USE_DATAGEN_DOCKER}; then
     sudo chown -R $(id -u):$(id -g) out-sf${SF}
 fi
 
-export LDBC_SNB_DATA_ROOT_DIRECTORY=${LDBC_SNB_DATAGEN_DIR}/out-sf${SF}/
+export LDBC_SNB_DATA_ROOT_DIRECTORY=${LDBC_SNB_DATAGEN_DIR}/out-sf${SF}/graphs/parquet/raw/
 
 echo "==================== Generate update streams ===================="
 cd ${LDBC_SNB_DRIVER_DIR}
@@ -87,6 +87,7 @@ mv deletes/ ${LDBC_SNB_IMPLS_DIR}/update-streams-sf${SF}/
 
 echo "==================== Generate parameters ===================="
 cd ${LDBC_SNB_DRIVER_DIR}
+export LDBC_SNB_DATA_ROOT_DIRECTORY=${LDBC_SNB_DATAGEN_DIR}/out-sf${SF}/
 paramgen/scripts/get-factors.sh
 paramgen/scripts/paramgen.sh