Skip to content

Commit 3a23968

Browse files
committed
docker set-up chages 2
1 parent 88e3350 commit 3a23968

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

‎src/compression.sh‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ LOGDIR=${LOGDIR:-run_metrics}
1212

1313
# rdf2hdt binary
1414
HDT=${RDF2HDT:-/opt/hdt-java/hdt-java-cli/bin/rdf2hdt.sh}
15+
HDT_PROJECT_DIR=${HDT_PROJECT_DIR:-}
16+
if [[ -z "$HDT_PROJECT_DIR" ]]; then
17+
HDT_PROJECT_DIR="$(cd "$(dirname "$HDT")/.." 2>/dev/null && pwd || true)"
18+
fi
1519

1620
# Base URI for rdf2hdt (reserved for future use)
1721
BASE_URI=${BASE_URI:-http://example.org/base}
@@ -403,10 +407,15 @@ for OUT in "${OUTPUT_DIRS[@]}"; do
403407
HDT_PATH="$HDT_ROOT/$BASENAME.hdt"
404408
EXIT_CODE_HDT=0
405409

410+
HDT_CMD="bash \"$HDT\" \"$SOURCE_RDF\" \"$HDT_PATH\""
411+
if [[ -n "$HDT_PROJECT_DIR" && -f "$HDT_PROJECT_DIR/pom.xml" ]]; then
412+
HDT_CMD="cd \"$HDT_PROJECT_DIR\" && $HDT_CMD"
413+
fi
414+
406415
if have_gnu_time; then
407-
/usr/bin/time -v -o "$TIME_LOG_HDT" -- bash "$HDT" "$SOURCE_RDF" "$HDT_PATH" || EXIT_CODE_HDT=$?
416+
/usr/bin/time -v -o "$TIME_LOG_HDT" -- bash -lc "$HDT_CMD" || EXIT_CODE_HDT=$?
408417
else
409-
{ time -p bash "$HDT" "$SOURCE_RDF" "$HDT_PATH"; } >"$TIME_LOG_HDT" 2>&1 || EXIT_CODE_HDT=$?
418+
{ time -p bash -lc "$HDT_CMD"; } >"$TIME_LOG_HDT" 2>&1 || EXIT_CODE_HDT=$?
410419
fi
411420

412421
HDT_SIZE=$(stat_size "$HDT_PATH")

‎vcf_rdfizer.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,8 +565,10 @@ def run_compress_mode(
565565
command = (
566566
"set -euo pipefail; "
567567
"HDT_BIN=/opt/hdt-java/hdt-java-cli/bin/rdf2hdt.sh; "
568+
"HDT_PROJECT_DIR=/opt/hdt-java/hdt-java-cli; "
568569
'if [[ ! -x "$HDT_BIN" ]]; then echo "Missing rdf2hdt.sh at $HDT_BIN" >&2; exit 127; fi; '
569570
'if ! command -v java >/dev/null 2>&1; then echo "Java runtime not found on PATH" >&2; exit 127; fi; '
571+
'if [[ -f "$HDT_PROJECT_DIR/pom.xml" ]]; then cd "$HDT_PROJECT_DIR"; fi; '
570572
'bash "$HDT_BIN" '
571573
f"{shlex.quote(input_container)} {shlex.quote(out_container)}"
572574
)
@@ -642,8 +644,10 @@ def run_decompress_mode(
642644
command = (
643645
"set -euo pipefail; "
644646
"HDT2RDF_BIN=/opt/hdt-java/hdt-java-cli/bin/hdt2rdf.sh; "
647+
"HDT_PROJECT_DIR=/opt/hdt-java/hdt-java-cli; "
645648
'if [[ ! -x "$HDT2RDF_BIN" ]]; then echo "Missing hdt2rdf.sh at $HDT2RDF_BIN" >&2; exit 127; fi; '
646649
'if ! command -v java >/dev/null 2>&1; then echo "Java runtime not found on PATH" >&2; exit 127; fi; '
650+
'if [[ -f "$HDT_PROJECT_DIR/pom.xml" ]]; then cd "$HDT_PROJECT_DIR"; fi; '
647651
'bash "$HDT2RDF_BIN" '
648652
f"{shlex.quote(source_container)} {shlex.quote(output_container)}"
649653
)

0 commit comments

Comments
 (0)