From 0c01d07afa81f5cec3a2e9757d9aa3617e245600 Mon Sep 17 00:00:00 2001 From: Patrick Wang Date: Mon, 30 Dec 2024 16:12:42 -0500 Subject: [PATCH] moved everything from env/ into gymlib/ --- env/__init__.py | 0 env/tests/__init__.py | 0 {env => gymlib_package/gymlib}/pg_conn.py | 0 {env => gymlib_package/gymlib}/replay.py | 8 ++++---- .../tests/_set_up_gymlib_integtest_workspace.sh | 0 .../gymlib}/tests/gymlib_integtest_dbgym_config.yaml | 0 .../gymlib}/tests/gymlib_integtest_util.py | 9 +++++---- .../gymlib}/tests/integtest_pg_conn.py | 6 +++--- .../gymlib}/tests/integtest_replay.py | 12 ++++++------ .../gymlib}/tests/integtest_tuning_artifacts.py | 7 +++---- .../gymlib}/tests/integtest_workload.py | 4 ++-- {env => gymlib_package/gymlib}/tuning_artifacts.py | 0 {env => gymlib_package/gymlib}/workload.py | 0 gymlib_package/gymlib/workspace.py | 4 +++- 14 files changed, 26 insertions(+), 24 deletions(-) delete mode 100644 env/__init__.py delete mode 100644 env/tests/__init__.py rename {env => gymlib_package/gymlib}/pg_conn.py (100%) rename {env => gymlib_package/gymlib}/replay.py (92%) rename {env => gymlib_package/gymlib}/tests/_set_up_gymlib_integtest_workspace.sh (100%) rename {env => gymlib_package/gymlib}/tests/gymlib_integtest_dbgym_config.yaml (100%) rename {env => gymlib_package/gymlib}/tests/gymlib_integtest_util.py (93%) rename {env => gymlib_package/gymlib}/tests/integtest_pg_conn.py (97%) rename {env => gymlib_package/gymlib}/tests/integtest_replay.py (93%) rename {env => gymlib_package/gymlib}/tests/integtest_tuning_artifacts.py (96%) rename {env => gymlib_package/gymlib}/tests/integtest_workload.py (91%) rename {env => gymlib_package/gymlib}/tuning_artifacts.py (100%) rename {env => gymlib_package/gymlib}/workload.py (100%) diff --git a/env/__init__.py b/env/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/env/tests/__init__.py b/env/tests/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/env/pg_conn.py b/gymlib_package/gymlib/pg_conn.py similarity index 100% rename from env/pg_conn.py rename to gymlib_package/gymlib/pg_conn.py diff --git a/env/replay.py b/gymlib_package/gymlib/replay.py similarity index 92% rename from env/replay.py rename to gymlib_package/gymlib/replay.py index 0409ff0e..c1463c71 100644 --- a/env/replay.py +++ b/gymlib_package/gymlib/replay.py @@ -1,12 +1,12 @@ from collections import defaultdict from pathlib import Path +from gymlib.pg_conn import PostgresConn +from gymlib.tuning_artifacts import TuningArtifactsReader +from gymlib.workload import Workload from gymlib.workspace import DBGymWorkspace -from env.pg_conn import PostgresConn -from env.tuning_artifacts import TuningArtifactsReader -from env.workload import Workload -from util.pg import DEFAULT_POSTGRES_PORT +from dbms.postgres.cli import DEFAULT_POSTGRES_PORT def replay( diff --git a/env/tests/_set_up_gymlib_integtest_workspace.sh b/gymlib_package/gymlib/tests/_set_up_gymlib_integtest_workspace.sh similarity index 100% rename from env/tests/_set_up_gymlib_integtest_workspace.sh rename to gymlib_package/gymlib/tests/_set_up_gymlib_integtest_workspace.sh diff --git a/env/tests/gymlib_integtest_dbgym_config.yaml b/gymlib_package/gymlib/tests/gymlib_integtest_dbgym_config.yaml similarity index 100% rename from env/tests/gymlib_integtest_dbgym_config.yaml rename to gymlib_package/gymlib/tests/gymlib_integtest_dbgym_config.yaml diff --git a/env/tests/gymlib_integtest_util.py b/gymlib_package/gymlib/tests/gymlib_integtest_util.py similarity index 93% rename from env/tests/gymlib_integtest_util.py rename to gymlib_package/gymlib/tests/gymlib_integtest_util.py index be980021..0342173d 100644 --- a/env/tests/gymlib_integtest_util.py +++ b/gymlib_package/gymlib/tests/gymlib_integtest_util.py @@ -10,15 +10,14 @@ get_workload_suffix, get_workload_symlink_path, ) +from gymlib.tuning_artifacts import TuningMetadata from gymlib.workspace import ( - DBGymWorkspace, fully_resolve_path, get_tmp_path_from_workspace_path, get_workspace_path_from_config, ) from benchmark.tpch.constants import DEFAULT_TPCH_SEED -from env.tuning_artifacts import TuningMetadata class GymlibIntegtestManager: @@ -34,7 +33,9 @@ class GymlibIntegtestManager: # These constants are also used by _set_up_gymlib_integtest_workspace.sh. BENCHMARK = "tpch" SCALE_FACTOR = 0.01 - DBGYM_CONFIG_PATH = Path("env/tests/gymlib_integtest_dbgym_config.yaml") + DBGYM_CONFIG_PATH = Path( + "gymlib_package/gymlib/tests/gymlib_integtest_dbgym_config.yaml" + ) WORKSPACE_PATH: Optional[Path] = None @staticmethod @@ -50,7 +51,7 @@ def set_up_workspace() -> None: # This if statement prevents us from setting up the workspace twice, which saves time. if not GymlibIntegtestManager.WORKSPACE_PATH.exists(): subprocess.run( - ["./env/tests/_set_up_gymlib_integtest_workspace.sh"], + ["./gymlib_package/gymlib/tests/_set_up_gymlib_integtest_workspace.sh"], env={ "BENCHMARK": GymlibIntegtestManager.BENCHMARK, "SCALE_FACTOR": str(GymlibIntegtestManager.SCALE_FACTOR), diff --git a/env/tests/integtest_pg_conn.py b/gymlib_package/gymlib/tests/integtest_pg_conn.py similarity index 97% rename from env/tests/integtest_pg_conn.py rename to gymlib_package/gymlib/tests/integtest_pg_conn.py index 34c78320..5ed97b00 100644 --- a/env/tests/integtest_pg_conn.py +++ b/gymlib_package/gymlib/tests/integtest_pg_conn.py @@ -2,11 +2,11 @@ import unittest import psycopg +from gymlib.pg_conn import PostgresConn +from gymlib.tests.gymlib_integtest_util import GymlibIntegtestManager from gymlib.workspace import DBGymWorkspace -from env.pg_conn import PostgresConn -from env.tests.gymlib_integtest_util import GymlibIntegtestManager -from util.pg import ( +from dbms.postgres.cli import ( DEFAULT_POSTGRES_PORT, get_is_postgres_running, get_running_postgres_ports, diff --git a/env/tests/integtest_replay.py b/gymlib_package/gymlib/tests/integtest_replay.py similarity index 93% rename from env/tests/integtest_replay.py rename to gymlib_package/gymlib/tests/integtest_replay.py index de82308b..3a2a76ef 100644 --- a/env/tests/integtest_replay.py +++ b/gymlib_package/gymlib/tests/integtest_replay.py @@ -1,17 +1,17 @@ import unittest -from gymlib.workspace import DBGymWorkspace - -from benchmark.tpch.constants import DEFAULT_TPCH_SEED -from env.replay import replay -from env.tests.gymlib_integtest_util import GymlibIntegtestManager -from env.tuning_artifacts import ( +from gymlib.replay import replay +from gymlib.tests.gymlib_integtest_util import GymlibIntegtestManager +from gymlib.tuning_artifacts import ( DBMSConfigDelta, IndexesDelta, QueryKnobsDelta, SysKnobsDelta, TuningArtifactsWriter, ) +from gymlib.workspace import DBGymWorkspace + +from benchmark.tpch.constants import DEFAULT_TPCH_SEED class ReplayTests(unittest.TestCase): diff --git a/env/tests/integtest_tuning_artifacts.py b/gymlib_package/gymlib/tests/integtest_tuning_artifacts.py similarity index 96% rename from env/tests/integtest_tuning_artifacts.py rename to gymlib_package/gymlib/tests/integtest_tuning_artifacts.py index e7dad96b..6188ec86 100644 --- a/env/tests/integtest_tuning_artifacts.py +++ b/gymlib_package/gymlib/tests/integtest_tuning_artifacts.py @@ -1,9 +1,7 @@ import unittest -from gymlib.workspace import DBGymWorkspace - -from env.tests.gymlib_integtest_util import GymlibIntegtestManager -from env.tuning_artifacts import ( +from gymlib.tests.gymlib_integtest_util import GymlibIntegtestManager +from gymlib.tuning_artifacts import ( DBMSConfigDelta, IndexesDelta, QueryKnobsDelta, @@ -11,6 +9,7 @@ TuningArtifactsReader, TuningArtifactsWriter, ) +from gymlib.workspace import DBGymWorkspace class PostgresConnTests(unittest.TestCase): diff --git a/env/tests/integtest_workload.py b/gymlib_package/gymlib/tests/integtest_workload.py similarity index 91% rename from env/tests/integtest_workload.py rename to gymlib_package/gymlib/tests/integtest_workload.py index 143fe9ec..2066c39d 100644 --- a/env/tests/integtest_workload.py +++ b/gymlib_package/gymlib/tests/integtest_workload.py @@ -1,10 +1,10 @@ import unittest +from gymlib.tests.gymlib_integtest_util import GymlibIntegtestManager +from gymlib.workload import Workload from gymlib.workspace import DBGymWorkspace from benchmark.tpch.constants import DEFAULT_TPCH_SEED, NUM_TPCH_QUERIES -from env.tests.gymlib_integtest_util import GymlibIntegtestManager -from env.workload import Workload class WorkloadTests(unittest.TestCase): diff --git a/env/tuning_artifacts.py b/gymlib_package/gymlib/tuning_artifacts.py similarity index 100% rename from env/tuning_artifacts.py rename to gymlib_package/gymlib/tuning_artifacts.py diff --git a/env/workload.py b/gymlib_package/gymlib/workload.py similarity index 100% rename from env/workload.py rename to gymlib_package/gymlib/workload.py diff --git a/gymlib_package/gymlib/workspace.py b/gymlib_package/gymlib/workspace.py index 669ee860..2392bc4d 100644 --- a/gymlib_package/gymlib/workspace.py +++ b/gymlib_package/gymlib/workspace.py @@ -284,7 +284,9 @@ def make_standard_dbgym_workspace() -> DBGymWorkspace: default path of dbgym_config.yaml. """ dbgym_config_path = Path(os.getenv("DBGYM_CONFIG_PATH", "dbgym_config.yaml")) - assert dbgym_config_path == Path("env/tests/gymlib_integtest_dbgym_config.yaml") + assert dbgym_config_path == Path( + "gymlib_package/gymlib/tests/gymlib_integtest_dbgym_config.yaml" + ) dbgym_workspace_path = get_workspace_path_from_config(dbgym_config_path) dbgym_workspace = DBGymWorkspace(dbgym_workspace_path) return dbgym_workspace