fixed some paths in gymlib integtests

Author: wangpatrick57

env/tests/_set_up_gymlib_integtest_workspace.sh

@@ -16,7 +16,7 @@ set -euo pipefail
 # INTENDED_DBDATA_HARDWARE can be set elsewhere (e.g. by tests_ci.yaml) but we use hdd by default.
 INTENDED_DBDATA_HARDWARE="${INTENDED_DBDATA_HARDWARE:-hdd}"
 
-python3 task.py benchmark $BENCHMARK data $SCALE_FACTOR
+python3 task.py benchmark $BENCHMARK tables $SCALE_FACTOR
 python3 task.py benchmark $BENCHMARK workload --scale-factor $SCALE_FACTOR
 
 python3 task.py dbms postgres build

env/tests/gymlib_integtest_util.py

@@ -4,7 +4,7 @@
 from typing import Optional
 
 # TODO: remove symlinks_paths from the import
-from gymlib.symlinks_paths import get_workload_dirname, get_workload_suffix
+from gymlib.symlinks_paths import get_workload_suffix, get_workload_symlink_path
 
 from benchmark.tpch.constants import DEFAULT_TPCH_SEED
 from env.tuning_artifacts import TuningMetadata
@@ -14,7 +14,6 @@
     get_default_dbdata_parent_dpath,
     get_default_pgbin_path,
     get_default_pristine_dbdata_snapshot_path,
-    get_default_workload_path,
     get_workspace_path_from_config,
 )
 
@@ -88,14 +87,11 @@ def get_default_metadata() -> TuningMetadata:
         )
         return TuningMetadata(
             workload_path=fully_resolve_path(
-                get_default_workload_path(
+                get_workload_symlink_path(
                     dbgym_workspace.dbgym_workspace_path,
                     GymlibIntegtestManager.BENCHMARK,
-                    get_workload_dirname(
-                        GymlibIntegtestManager.BENCHMARK,
-                        GymlibIntegtestManager.SCALE_FACTOR,
-                        suffix,
-                    ),
+                    GymlibIntegtestManager.SCALE_FACTOR,
+                    suffix
                 ),
             ),
             pristine_dbdata_snapshot_path=fully_resolve_path(