#1394 : clean up

Author: pratt4

e2e-tests/lib/parquet_utils.sh

@@ -4,25 +4,23 @@
 
 set -euo pipefail
 
-# retry_rowcount <path> <expected> <label> <parquet_jar>
+# retry_rowcount <path> <expected>  <parquet_jar>
 #   path         – shell glob pointing to a Parquet folder (wildcards allowed).
 #                  The glob is passed verbatim to parquet-tools, which understands
 #                  Hadoop-style wild-cards (e.g. "…/*/Patient/").
 #   expected     – integer row count we expect to see.
-#   label        – short metric name for log messages.
 #   parquet_jar  – full path to the parquet-tools JAR file.
 #
 # Prints the final count on stdout.
 
 retry_rowcount() {
   local parquet_glob="$1"
   local expected="$2"
-  local label="$3"
-  local parquet_tools_jar="$4"
+  local parquet_tools_jar="$3"
 
   # CI can override cadence through env vars
-  local max_retries="${ROWCOUNT_MAX_RETRIES:-12}"
-  local sleep_secs="${ROWCOUNT_SLEEP_SECS:-5}"
+  local max_retries="${ROWCOUNT_MAX_RETRIES:-15}"
+  local sleep_secs="${ROWCOUNT_SLEEP_SECS:-20}"
 
   local retries=0
   local raw_count=0
@@ -42,7 +40,7 @@ retry_rowcount() {
 
     # ── 2. Normalise raw_count
     if [[ -z "${raw_count}" || ! "${raw_count}" =~ ^[0-9]+$ ]]; then
-      echo "E2E TEST ERROR: [${label}] parquet-tools returned '${raw_count}' " \
+      echo "E2E TEST ERROR: [${parquet_glob}] parquet-tools returned '${raw_count}' " \
            "(treating as 0)" >&2
       final_count=0
     else
@@ -66,7 +64,7 @@ retry_rowcount() {
 
     # ── 6. Sleep & retry
     retries=$((retries + 1))
-    echo "E2E TEST: [${label}] raw=${raw_count}, expected=${expected} — retry ${retries}/${max_retries} in ${sleep_secs}s" >&2
+    echo "E2E TEST: [${parquet_glob}] raw=${raw_count}, expected=${expected} — retry ${retries}/${max_retries} in ${sleep_secs}s" >&2
     sleep "${sleep_secs}"
   done
 }