Merge 'tpc-h: fix 'time' output in Ubuntu CI' from Jussi Saurio

Closes #1509
This commit is contained in:
Jussi Saurio
2025-05-17 17:12:25 +03:00

View File

@@ -66,15 +66,15 @@ for query_file in $(ls "$QUERIES_DIR"/*.sql | sort -V); do
# Clear caches before Limbo run
clear_caches
# Run Limbo
limbo_output=$(/usr/bin/time "$LIMBO_BIN" "$DB_FILE" --quiet --output-mode list "$(cat "$query_file")" 2>&1)
limbo_non_time_lines=$(echo "$limbo_output" | grep -v -e "real" -e "user" -e "sys")
limbo_real_time=$(echo "$limbo_output" | grep "real" | awk '{print $1}')
limbo_output=$( { time -p "$LIMBO_BIN" "$DB_FILE" --quiet --output-mode list "$(cat $query_file)" 2>&1; } 2>&1)
limbo_non_time_lines=$(echo "$limbo_output" | grep -v -e "^real" -e "^user" -e "^sys")
limbo_real_time=$(echo "$limbo_output" | grep "^real" | awk '{print $2}')
echo "Running $query_name with SQLite3..." >&2
# Clear caches before SQLite execution
clear_caches
sqlite_output=$(/usr/bin/time $SQLITE_BIN "$DB_FILE" "$(cat "$query_file")" 2>&1)
sqlite_non_time_lines=$(echo "$sqlite_output" | grep -v -e "real" -e "user" -e "sys")
sqlite_real_time=$(echo "$sqlite_output" | grep "real" | awk '{print $1}')
sqlite_output=$( { time -p "$SQLITE_BIN" "$DB_FILE" "$(cat $query_file)" 2>&1; } 2>&1)
sqlite_non_time_lines=$(echo "$sqlite_output" | grep -v -e "^real" -e "^user" -e "^sys")
sqlite_real_time=$(echo "$sqlite_output" | grep "^real" | awk '{print $2}')
echo "Limbo real time: $limbo_real_time"
echo "SQLite3 real time: $sqlite_real_time"
echo "Limbo output:"