From ac12baa9f46477df28be4672e2ef444ff1248fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Zim=C3=A1nyi?= Date: Tue, 1 Sep 2026 02:23:04 +0200 Subject: [PATCH] Drop the per-query Dockerfile lookup nothing selects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `run_query.sh` chose the image per query through a `QUERY_DOCKERFILE` map, which existed for the one query that needed its own image. That image is gone — `Dockerfile_q8_meos_kalman` collapsed into the base one when the MEOS entry it patched turned out to be upstream — so all nine entries are empty, `CUSTOM_DF` is always the empty string, and `BASE_DOCKERFILE` always resolves to `Dockerfile`. The map, the lookup and the fallback go; `BASE_DOCKERFILE` names the one image directly. Every query builds it and differs only in the entrypoint class, which the `sed` patch below already supplies. --- benchmark/run_query.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/benchmark/run_query.sh b/benchmark/run_query.sh index 8f4120d..cf496ba 100644 --- a/benchmark/run_query.sh +++ b/benchmark/run_query.sh @@ -37,10 +37,6 @@ declare -A QUERY_DESC=( [9]="Windowed Per-Device kNN Join" ) -declare -A QUERY_DOCKERFILE=( - [1]="" [2]="" [3]="" [4]="" [5]="" [6]="" [7]="" [8]="" [9]="" -) - QUERY_NUM="${1:-}" if [[ -z "$QUERY_NUM" || ! "$QUERY_NUM" =~ ^[1-9]$ ]]; then error "Usage : $(basename "$0") <1-9>" @@ -54,7 +50,6 @@ fi CLASS="${QUERY_CLASS[$QUERY_NUM]}" DESC="${QUERY_DESC[$QUERY_NUM]}" -CUSTOM_DF="${QUERY_DOCKERFILE[$QUERY_NUM]}" banner "Query $QUERY_NUM — $DESC" @@ -90,8 +85,9 @@ if [[ ! -f "pom.xml" ]]; then exit 1 fi -# Dockerfile source -BASE_DOCKERFILE="${CUSTOM_DF:-Dockerfile}" +# Dockerfile source. Every query builds the same image; only the entrypoint +# class differs, and the patch below supplies it. +BASE_DOCKERFILE="Dockerfile" if [[ ! -f "$BASE_DOCKERFILE" ]]; then error "Dockerfile source '$BASE_DOCKERFILE' missing." exit 1