fully_resolve_path no longer takes in dbgym_workspace

Author: wangpatrick57

dbms/postgres/cli.py

@@ -106,8 +106,8 @@ def postgres_dbdata(
         )
 
     # Fully resolve all input paths.
-    pgbin_path = fully_resolve_path(dbgym_workspace, pgbin_path)
-    dbdata_parent_dpath = fully_resolve_path(dbgym_workspace, dbdata_parent_dpath)
+    pgbin_path = fully_resolve_path(pgbin_path)
+    dbdata_parent_dpath = fully_resolve_path(dbdata_parent_dpath)
 
     # Check assertions on args
     if intended_dbdata_hardware == "hdd":

env/integtest_util.py

@@ -69,7 +69,6 @@ def get_default_metadata() -> TuningMetadata:
         dbgym_workspace = GymlibIntegtestManager.get_dbgym_workspace()
         return TuningMetadata(
             workload_path=fully_resolve_path(
-                dbgym_workspace,
                 get_default_workload_path(
                     dbgym_workspace.dbgym_workspace_path,
                     GymlibIntegtestManager.BENCHMARK,
@@ -82,19 +81,16 @@ def get_default_metadata() -> TuningMetadata:
                 ),
             ),
             pristine_dbdata_snapshot_path=fully_resolve_path(
-                dbgym_workspace,
                 get_default_pristine_dbdata_snapshot_path(
                     dbgym_workspace.dbgym_workspace_path,
                     GymlibIntegtestManager.BENCHMARK,
                     GymlibIntegtestManager.SCALE_FACTOR,
                 ),
             ),
             dbdata_parent_path=fully_resolve_path(
-                dbgym_workspace,
                 get_default_dbdata_parent_dpath(dbgym_workspace.dbgym_workspace_path),
             ),
             pgbin_path=fully_resolve_path(
-                dbgym_workspace,
                 get_default_pgbin_path(dbgym_workspace.dbgym_workspace_path),
             ),
         )

env/integtest_workload.py

@@ -18,7 +18,6 @@ def setUpClass() -> None:
 
     def test_workload(self) -> None:
         workload_dpath = fully_resolve_path(
-            GymlibIntegtestManager.get_dbgym_workspace(),
             get_default_workload_path(
                 GymlibIntegtestManager.get_dbgym_workspace().dbgym_workspace_path,
                 GymlibIntegtestManager.BENCHMARK,

util/workspace.py

@@ -281,8 +281,7 @@ def get_workspace_path_from_config(dbgym_config_path: Path) -> Path:
     Returns the workspace path (as a fully resolved path) from the config file.
     """
     with open(dbgym_config_path) as f:
-        # TODO: use fully_resolve_path()
-        return Path(yaml.safe_load(f)["dbgym_workspace_path"]).resolve().absolute()
+        return fully_resolve_path(Path(yaml.safe_load(f)["dbgym_workspace_path"]))
 
 
 def make_standard_dbgym_workspace() -> DBGymWorkspace:
@@ -296,9 +295,7 @@ def make_standard_dbgym_workspace() -> DBGymWorkspace:
     return dbgym_workspace
 
 
-def fully_resolve_path(
-    dbgym_workspace: DBGymWorkspace, inputpath: os.PathLike[str]
-) -> Path:
+def fully_resolve_path(inputpath: os.PathLike[str]) -> Path:
     """
     Fully resolve any path to a real, absolute path.
 
@@ -600,7 +597,7 @@ def link_result(
     assert is_fully_resolved(
         result_fordpath
     ), f"result_fordpath ({result_fordpath}) should be a fully resolved path"
-    result_fordpath = fully_resolve_path(dbgym_workspace, result_fordpath)
+    result_fordpath = fully_resolve_path(result_fordpath)
     assert is_child_path(result_fordpath, dbgym_workspace.dbgym_this_run_path)
     assert not os.path.islink(result_fordpath)