moved shell back to util

cmu-db · Dec 31, 2024 · b74b707 · b74b707
1 parent 2e559a8
commit b74b707
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/benchmark/job/cli.py b/benchmark/job/cli.py
@@ -2,7 +2,6 @@
 from typing import Optional
 
 import click
-from gymlib.shell import subprocess_run
 from gymlib.symlinks_paths import (
     get_tables_dirname,
     get_workload_dirname,
@@ -12,6 +11,7 @@
 from gymlib.workspace import DBGymWorkspace, fully_resolve_path
 
 from benchmark.constants import DEFAULT_SCALE_FACTOR
+from util.shell import subprocess_run
 
 JOB_TABLES_URL = "https://event.cwi.nl/da/job/imdb.tgz"
 JOB_QUERIES_URL = "https://event.cwi.nl/da/job/job.tgz"

diff --git a/benchmark/tpch/cli.py b/benchmark/tpch/cli.py
@@ -1,7 +1,6 @@
 import logging
 
 import click
-from gymlib.shell import subprocess_run
 from gymlib.symlinks_paths import (
     get_scale_factor_string,
     get_tables_dirname,
@@ -15,6 +14,7 @@
 
 from benchmark.constants import DEFAULT_SCALE_FACTOR
 from benchmark.tpch.constants import DEFAULT_TPCH_SEED, NUM_TPCH_QUERIES
+from util.shell import subprocess_run
 
 TPCH_KIT_DIRNAME = "tpch-kit"
 

diff --git a/dbms/postgres/cli.py b/dbms/postgres/cli.py
@@ -11,7 +11,6 @@
 import click
 import sqlalchemy
 from gymlib.pg import create_sqlalchemy_conn, sql_file_execute
-from gymlib.shell import subprocess_run
 from gymlib.symlinks_paths import (
     get_dbdata_tgz_symlink_path,
     get_pgbin_symlink_path,
@@ -32,6 +31,7 @@
 from benchmark.job.load_info import JobLoadInfo
 from benchmark.tpch.load_info import TpchLoadInfo
 from dbms.load_info_base_class import LoadInfoBaseClass
+from util.shell import subprocess_run
 
 DBGYM_POSTGRES_USER = "dbgym_user"
 DBGYM_POSTGRES_PASS = "dbgym_pass"

diff --git a/gymlib_package/gymlib/__init__.py b/gymlib_package/gymlib/__init__.py
@@ -1 +1 @@
-from . import magic, shell, symlinks_paths, workspace
+from . import magic, symlinks_paths, workspace
diff --git a/util/__init__.py b/util/__init__.py
diff --git a/gymlib_package/gymlib/shell.py → util/shell.py b/gymlib_package/gymlib/shell.py → util/shell.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		from . import magic, shell, symlinks_paths, workspace
		from . import magic, symlinks_paths, workspace