From 921111205befc2701d54842fe60b3ddcf41ff56c Mon Sep 17 00:00:00 2001
From: Yoshifumi Nakamura <nakamura@riken.jp>
Date: Sun, 21 Jun 2026 16:22:26 +0900
Subject: [PATCH] Split estimation result query helper

Move fetch_current_fom out of common.sh into scripts/estimation/result_query.sh while preserving the existing public function name and common.sh import path.

Update the GPU kernel ensemble shell fixture so it copies the new helper with the other estimation support files.

Signed-off-by: Yoshifumi Nakamura <nakamura@riken.jp>
---
 scripts/estimation/common.sh                  | 53 +-----------------
 scripts/estimation/result_query.sh            | 54 +++++++++++++++++++
 ..._estimation_gpu_kernel_ensemble_average.sh |  1 +
 3 files changed, 56 insertions(+), 52 deletions(-)
 create mode 100644 scripts/estimation/result_query.sh

diff --git a/scripts/estimation/common.sh b/scripts/estimation/common.sh
index 53f66ad..15d5461 100644
--- a/scripts/estimation/common.sh
+++ b/scripts/estimation/common.sh
@@ -12,6 +12,7 @@ set -euo pipefail
 _bk_estimation_common_dir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 source "${_bk_estimation_common_dir}/../result_server/api.sh"
 source "${_bk_estimation_common_dir}/declarations.sh"
+source "${_bk_estimation_common_dir}/result_query.sh"
 
 # ---------------------------------------------------------------------------
 # Global variables — populated by read_values
@@ -831,58 +832,6 @@ bk_estimation_execute_with_fallback() {
   return 0
 }
 
-# ---------------------------------------------------------------------------
-# fetch_current_fom — Fetch baseline-system FOM from result_server API
-#
-# Arguments:
-#   $1  system (e.g. Fugaku)
-#   $2  code   (e.g. qws)
-#   $3  exp    (optional, e.g. default)
-#
-# Requires: RESULT_SERVER, RESULT_SERVER_KEY environment variables
-# Sets: est_current_fom (FOM value from the selected baseline-system result)
-# Exits with 1 on failure.
-# ---------------------------------------------------------------------------
-fetch_current_fom() {
-  local system="$1"
-  local code="$2"
-  local exp="${3:-}"
-
-  local url="${RESULT_SERVER}/api/query/result?system=${system}&code=${code}"
-  if [[ -n "$exp" ]]; then
-    url="${url}&exp=${exp}"
-  fi
-
-  local response
-  local curl_exit
-  set +e
-  response=$(bk_result_server_get_json "/api/query/result?system=${system}&code=${code}${exp:+&exp=${exp}}")
-  curl_exit=$?
-  set -e
-  if [[ $curl_exit -ne 0 || -z "$response" ]]; then
-    echo "ERROR: Failed to fetch baseline result for system=${system}, code=${code}, exp=${exp} (curl exit=$curl_exit)" >&2
-    echo "ERROR: URL was: ${url}" >&2
-    exit 1
-  fi
-
-  est_current_fom=$(echo "$response" | jq -r '.FOM')
-  if [[ -z "$est_current_fom" || "$est_current_fom" == "null" ]]; then
-    echo "ERROR: FOM not found in baseline result for system=${system}, code=${code}, exp=${exp}" >&2
-    exit 1
-  fi
-
-  # Populate benchmark sub-object variables for current_system
-  est_current_bench_system="$system"
-  est_current_bench_fom="$est_current_fom"
-  est_current_bench_nodes=$(echo "$response" | jq -r '.node_count // empty')
-  est_current_bench_numproc_node=$(echo "$response" | jq -r '.numproc_node // empty')
-  est_current_bench_timestamp=$(echo "$response" | jq -r '._meta.timestamp // empty')
-  est_current_bench_uuid=$(echo "$response" | jq -r '._meta.uuid // empty')
-  est_current_fom_breakdown=$(echo "$response" | jq -c '.fom_breakdown // empty')
-
-  echo "Fetched baseline FOM for ${system}/${code}: ${est_current_fom}"
-}
-
 # ---------------------------------------------------------------------------
 # print_json — Output an Estimate_JSON to stdout
 #
diff --git a/scripts/estimation/result_query.sh b/scripts/estimation/result_query.sh
new file mode 100644
index 0000000..09c8da8
--- /dev/null
+++ b/scripts/estimation/result_query.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+# result_query.sh — Result Server query helpers for estimation.
+
+# ---------------------------------------------------------------------------
+# fetch_current_fom — Fetch baseline-system FOM from result_server API
+#
+# Arguments:
+#   $1  system (e.g. Fugaku)
+#   $2  code   (e.g. qws)
+#   $3  exp    (optional, e.g. default)
+#
+# Requires: RESULT_SERVER, RESULT_SERVER_KEY environment variables
+# Sets: est_current_fom (FOM value from the selected baseline-system result)
+# Exits with 1 on failure.
+# ---------------------------------------------------------------------------
+fetch_current_fom() {
+  local system="$1"
+  local code="$2"
+  local exp="${3:-}"
+
+  local url="${RESULT_SERVER}/api/query/result?system=${system}&code=${code}"
+  if [[ -n "$exp" ]]; then
+    url="${url}&exp=${exp}"
+  fi
+
+  local response
+  local curl_exit
+  set +e
+  response=$(bk_result_server_get_json "/api/query/result?system=${system}&code=${code}${exp:+&exp=${exp}}")
+  curl_exit=$?
+  set -e
+  if [[ $curl_exit -ne 0 || -z "$response" ]]; then
+    echo "ERROR: Failed to fetch baseline result for system=${system}, code=${code}, exp=${exp} (curl exit=$curl_exit)" >&2
+    echo "ERROR: URL was: ${url}" >&2
+    exit 1
+  fi
+
+  est_current_fom=$(echo "$response" | jq -r '.FOM')
+  if [[ -z "$est_current_fom" || "$est_current_fom" == "null" ]]; then
+    echo "ERROR: FOM not found in baseline result for system=${system}, code=${code}, exp=${exp}" >&2
+    exit 1
+  fi
+
+  # Populate benchmark sub-object variables for current_system
+  est_current_bench_system="$system"
+  est_current_bench_fom="$est_current_fom"
+  est_current_bench_nodes=$(echo "$response" | jq -r '.node_count // empty')
+  est_current_bench_numproc_node=$(echo "$response" | jq -r '.numproc_node // empty')
+  est_current_bench_timestamp=$(echo "$response" | jq -r '._meta.timestamp // empty')
+  est_current_bench_uuid=$(echo "$response" | jq -r '._meta.uuid // empty')
+  est_current_fom_breakdown=$(echo "$response" | jq -c '.fom_breakdown // empty')
+
+  echo "Fetched baseline FOM for ${system}/${code}: ${est_current_fom}"
+}
diff --git a/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh b/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh
index 8ce228e..77e9168 100644
--- a/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh
+++ b/scripts/tests/test_estimation_gpu_kernel_ensemble_average.sh
@@ -37,6 +37,7 @@ trap 'rm -rf "${TMP_DIR}"' EXIT
 mkdir -p "${TMP_DIR}/scripts/estimation" "${TMP_DIR}/scripts/result_server"
 cp "${REPO_DIR}/scripts/estimation/common.sh" "${TMP_DIR}/scripts/estimation/common.sh"
 cp "${REPO_DIR}/scripts/estimation/declarations.sh" "${TMP_DIR}/scripts/estimation/declarations.sh"
+cp "${REPO_DIR}/scripts/estimation/result_query.sh" "${TMP_DIR}/scripts/estimation/result_query.sh"
 cp "${REPO_DIR}/scripts/result_server/api.sh" "${TMP_DIR}/scripts/result_server/api.sh"
 cp -R "${REPO_DIR}/scripts/estimation/packages" "${TMP_DIR}/scripts/estimation/packages"
 cp -R "${REPO_DIR}/scripts/estimation/section_packages" "${TMP_DIR}/scripts/estimation/section_packages"