From 519e8bfb265026b76100450ce3b559e5384dafcd Mon Sep 17 00:00:00 2001 From: Geoffrey Yu Date: Tue, 28 Nov 2023 15:42:04 -0500 Subject: [PATCH] Update specialized workload experiments --- experiments/15-e2e-scenarios-v2/common.sh | 34 +++++++++++++++++++ .../15-e2e-scenarios-v2/specialized/COND | 4 +-- .../specialized/run_vector_workload.sh | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/experiments/15-e2e-scenarios-v2/common.sh b/experiments/15-e2e-scenarios-v2/common.sh index c778fc77..8cbcbf7c 100644 --- a/experiments/15-e2e-scenarios-v2/common.sh +++ b/experiments/15-e2e-scenarios-v2/common.sh @@ -209,6 +209,36 @@ function start_other_repeating_runner() { runner_pid=$! } +function start_sequence_runner() { + local clients=$1 + local gap_s=$2 + local gap_std_s=$3 + local results_name=$4 + local client_offset=$5 + + local args=( + --num-clients $clients + --num-front-ends $num_front_ends + --query-sequence-file $query_sequence_file + --avg-gap-s $gap_s + --avg-gap-std-s $gap_std_s + ) + + if [[ ! -z $client_offset ]]; then + args+=(--client-offset $client_offset) + fi + + >&2 echo "[Sequence runner] Running with $clients..." + results_dir=$COND_OUT/$results_name + mkdir -p $results_dir + + log_workload_point $results_name + COND_OUT=$results_dir python3.11 ../../../workloads/IMDB_extended/run_query_sequence.py "${args[@]}" & + + # This is a special return value variable that we use. + runner_pid=$! +} + function extract_named_arguments() { # Evaluates any environment variables in this script's arguments. This script # should only be run on trusted input. @@ -279,5 +309,9 @@ function extract_named_arguments() { if [[ $dataset_type =~ --dataset-type=.+ ]]; then dataset_type=${phys_arg:15} fi + + if [[ $dataset_type =~ --query-sequence-file=.+ ]]; then + query_sequence_file=${phys_arg:22} + fi done } diff --git a/experiments/15-e2e-scenarios-v2/specialized/COND b/experiments/15-e2e-scenarios-v2/specialized/COND index 40177908..da0db812 100644 --- a/experiments/15-e2e-scenarios-v2/specialized/COND +++ b/experiments/15-e2e-scenarios-v2/specialized/COND @@ -9,7 +9,7 @@ run_experiment( "planner-config-file": "config/planner.yml", "schema-name": "imdb_specialized_100g", "ra-query-bank-file": IMDB_100GB_REGULAR_QUERY_BANK, - "other-query-bank-file": "vector.sql", + "query-sequence-file": "vector.sql", "num-front-ends": 16, "dataset-type": "100gb", }, @@ -25,7 +25,7 @@ run_command( "planner-config-file": "config/planner.yml", "schema-name": "imdb_specialized_100g", "ra-query-bank-file": IMDB_100GB_REGULAR_QUERY_BANK, - "other-query-bank-file": "vector.sql", + "query-sequence-file": "vector.sql", "num-front-ends": 16, "dataset-type": "100gb", }, diff --git a/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh b/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh index df92f140..7db8095f 100755 --- a/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh +++ b/experiments/15-e2e-scenarios-v2/specialized/run_vector_workload.sh @@ -33,7 +33,7 @@ log_workload_point "clients_starting" start_repeating_olap_runner 8 5 5 $query_indices "ra_8" rana_pid=$runner_pid -start_other_repeating_runner 8 5 5 "ra_vector" 8 +start_sequence_runner 8 5 5 "ra_vector" 8 other_pid=$runner_pid start_txn_runner 4 # Implicit: --dataset-type