now getting queries from data instead of build

Author: wangpatrick57

benchmark/job/cli.py

@@ -129,6 +129,7 @@
     "33b",
     "33c",
 ]
+JOB_QUERIES_DNAME = "job-queries"
 
 
 @click.group(name="job")
@@ -174,7 +175,7 @@ def _download_job_data(dbgym_cfg: DBGymConfig) -> None:
 
 
 def _download_job_queries(dbgym_cfg: DBGymConfig) -> None:
-    _download_and_untar_dir(dbgym_cfg, JOB_QUERIES_URL, "job.tgz", "job-queries")
+    _download_and_untar_dir(dbgym_cfg, JOB_QUERIES_URL, "job.tgz", JOB_QUERIES_DNAME)
 
 
 def _download_and_untar_dir(
@@ -230,7 +231,8 @@ def _generate_job_workload(
     with open(real_dpath / "order.txt", "w") as f:
         for qname in query_names:
             sql_fpath = (
-                dbgym_cfg.cur_symlinks_build_path(mkdir=True) / ("job-queries.link")
+                dbgym_cfg.cur_symlinks_data_path(mkdir=True)
+                / (f"{JOB_QUERIES_DNAME}.link")
             ).resolve() / f"{qname}.sql"
             assert (
                 sql_fpath.exists()

scripts/run_protox_e2e_test.py

@@ -200,5 +200,5 @@ def run_e2e_for_benchmark(benchmark_name: str, intended_dbdata_hardware: str) ->
     # Set the config file so that we use resources that don't conflict with normal usage (e.g. a different workspace, different ports, etc.).
     os.environ["DBGYM_CONFIG_PATH"] = str(E2ETEST_DBGYM_CONFIG_FPATH)
 
-    # run_e2e_for_benchmark("tpch", intended_dbdata_hardware)
+    run_e2e_for_benchmark("tpch", intended_dbdata_hardware)
     run_e2e_for_benchmark("job", intended_dbdata_hardware)