Skip to content

Commit e61b876

Browse files
psychlone77psychlone77
committed
Cleanup of unused files and move files to proper folders
1 parent bdc3267 commit e61b876

24 files changed

Lines changed: 80 additions & 14701 deletions

‎classes/Cost_Model.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from classes.Workload_Runner import BenchmarkTask
2-
from classes.Workload_Runner import WorkloadRunner
1+
from classes.base_classes.Workload_Runner import BenchmarkTask
2+
from classes.base_classes.Workload_Runner import WorkloadRunner
33

44

55
class CostModel(WorkloadRunner):

‎classes/HEBO_Tuner.py‎

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import json
22
import os
33

4-
from classes.Knob_Config import KnobConfig
4+
from classes.base_classes.Knob_Config import KnobConfig
55
from classes.Tuner import Tuner
6-
from classes.Script_Config import TuningConfig
7-
from classes.Workload_Runner import BenchmarkTask, WorkloadRunner
8-
from classes.Knob_Settings import KnobSettingsSet
6+
from classes.base_classes.Script_Config import TuningConfig
7+
from classes.base_classes.Workload_Runner import BenchmarkTask, WorkloadRunner
8+
from classes.base_classes.Knob_Settings import KnobSettingsSet
99
from typing import List, Optional, Literal
1010
from pathlib import Path
1111
import utils
@@ -66,7 +66,9 @@ def tune(self) -> KnobConfig:
6666

6767
default_config = self.knob_settings.get_default_knob_settings()
6868
self.workload_task.knob_config = default_config
69-
default_performance = self.workload_runner.run_workload(self.workload_task)[self.tuning_parameter]
69+
default_performance = self.workload_runner.run_workload(self.workload_task)[
70+
self.tuning_parameter
71+
]
7072
default_config_df = self._get_tunable_knobs(default_config, params)
7173
default_performance_array = self._get_perf_ndarray(default_performance)
7274

@@ -77,30 +79,34 @@ def tune(self) -> KnobConfig:
7779

7880
best_config: KnobConfig = default_config
7981
best_objective: float = default_performance
80-
with open(history_file, 'w') as f:
81-
json.dump({
82-
'config': default_config.to_dict(),
83-
'cost': default_performance,
84-
}, f)
85-
f.write('\n')
82+
with open(history_file, "w") as f:
83+
json.dump(
84+
{
85+
"config": default_config.to_dict(),
86+
"cost": default_performance,
87+
},
88+
f,
89+
)
90+
f.write("\n")
8691

8792
try:
8893
for iteration in range(self.tuning_config.suggest_num):
8994
suggestion = hebo.suggest(n_suggestions=1)
9095
config_dict = suggestion.iloc[0].to_dict()
9196
self.workload_task.knob_config = KnobConfig.from_dict(config_dict)
92-
cur_objective = self.workload_runner.run_workload(self.workload_task)[self.tuning_parameter]
97+
cur_objective = self.workload_runner.run_workload(self.workload_task)[
98+
self.tuning_parameter
99+
]
93100

94-
config_df = self._get_tunable_knobs(self.workload_task.knob_config, params)
101+
config_df = self._get_tunable_knobs(
102+
self.workload_task.knob_config, params
103+
)
95104
performance_array = self._get_perf_ndarray(cur_objective)
96105
hebo.observe(config_df, performance_array)
97106

98-
with open(history_file, 'a') as f:
99-
json.dump({
100-
'config': config_dict,
101-
'cost': cur_objective
102-
}, f)
103-
f.write('\n')
107+
with open(history_file, "a") as f:
108+
json.dump({"config": config_dict, "cost": cur_objective}, f)
109+
f.write("\n")
104110
if cur_objective < best_objective:
105111
best_config = self.workload_task.knob_config
106112
best_objective = cur_objective
@@ -112,12 +118,16 @@ def tune(self) -> KnobConfig:
112118

113119
best_config_file = f"{self.output_dir}/best_config.json"
114120
with open(best_config_file, "w") as f:
115-
json.dump({
116-
"workload": self.workload_task.workload_path,
117-
"best_cost": best_objective,
118-
"best_performance": -best_objective,
119-
"configuration": best_config.to_dict()
120-
}, f, indent=4)
121+
json.dump(
122+
{
123+
"workload": self.workload_task.workload_path,
124+
"best_cost": best_objective,
125+
"best_performance": -best_objective,
126+
"configuration": best_config.to_dict(),
127+
},
128+
f,
129+
indent=4,
130+
)
121131

122132
return best_config
123133

‎classes/PostgreSQL_Database.py‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from classes.Database import Database
2-
from classes.Knob_Config import KnobConfig
3-
from classes.Workload_Runner import BenchmarkTask
4-
from classes.Script_Config import DatabaseConfig
5-
from classes.Internal_Metrics import InternalMetrics
1+
from classes.base_classes.Database import Database
2+
from classes.base_classes.Knob_Config import KnobConfig
3+
from classes.base_classes.Workload_Runner import BenchmarkTask
4+
from classes.base_classes.Script_Config import DatabaseConfig
5+
from classes.base_classes.Internal_Metrics import InternalMetrics
66
from typing import Optional
77
import utils
88
import psycopg2
@@ -77,21 +77,21 @@ def fetch_internal_metrics(self) -> InternalMetrics:
7777
)
7878
d = cursor.fetchone()
7979
metrics = {
80-
"xact_commit": float(d[0]),
81-
"xact_rollback": float(d[1]),
82-
"blks_read": float(d[2]),
83-
"blks_hit": float(d[3]),
84-
"tup_returned": float(d[4]),
85-
"tup_fetched": float(d[5]),
86-
"tup_inserted": float(d[6]),
87-
"conflicts": float(d[7]),
88-
"tup_updated": float(d[8]),
89-
"tup_deleted": float(d[9]),
90-
"disk_read_count": 0,
91-
"disk_write_count": 0,
92-
"disk_read_bytes": 0,
93-
"disk_write_bytes": 0,
94-
}
80+
"xact_commit": float(d[0]),
81+
"xact_rollback": float(d[1]),
82+
"blks_read": float(d[2]),
83+
"blks_hit": float(d[3]),
84+
"tup_returned": float(d[4]),
85+
"tup_fetched": float(d[5]),
86+
"tup_inserted": float(d[6]),
87+
"conflicts": float(d[7]),
88+
"tup_updated": float(d[8]),
89+
"tup_deleted": float(d[9]),
90+
"disk_read_count": 0,
91+
"disk_write_count": 0,
92+
"disk_read_bytes": 0,
93+
"disk_write_bytes": 0,
94+
}
9595

9696
cursor.execute(
9797
"""
@@ -124,23 +124,22 @@ def fetch_internal_metrics(self) -> InternalMetrics:
124124
except Exception as e:
125125
print(f"Error fetching internal metrics: {e}")
126126
metrics: InternalMetrics = {
127-
"xact_commit": 0.0,
128-
"xact_rollback": 0.0,
129-
"blks_read": 0.0,
130-
"blks_hit": 0.0,
131-
"tup_returned": 0.0,
132-
"tup_fetched": 0.0,
133-
"tup_inserted": 0.0,
134-
"conflicts": 0.0,
135-
"tup_updated": 0.0,
136-
"tup_deleted": 0.0,
137-
"disk_read_count": 0.0,
138-
"disk_write_count": 0.0,
139-
"disk_read_bytes": 0.0,
140-
"disk_write_bytes": 0.0,
127+
"xact_commit": 0.0,
128+
"xact_rollback": 0.0,
129+
"blks_read": 0.0,
130+
"blks_hit": 0.0,
131+
"tup_returned": 0.0,
132+
"tup_fetched": 0.0,
133+
"tup_inserted": 0.0,
134+
"conflicts": 0.0,
135+
"tup_updated": 0.0,
136+
"tup_deleted": 0.0,
137+
"disk_read_count": 0.0,
138+
"disk_write_count": 0.0,
139+
"disk_read_bytes": 0.0,
140+
"disk_write_bytes": 0.0,
141141
}
142142

143-
144143
return metrics
145144

146145
def reset_internal_metrics(self):

classes/Database.py renamed to classes/base_classes/Database.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from abc import abstractmethod
2-
from classes.Workload_Runner import BenchmarkTask
3-
from classes.Workload_Runner import WorkloadRunner
4-
from classes.Internal_Metrics import InternalMetrics
2+
from classes.base_classes.Workload_Runner import BenchmarkTask
3+
from classes.base_classes.Workload_Runner import WorkloadRunner
4+
from classes.base_classes.Internal_Metrics import InternalMetrics
55

66

77
class Database(WorkloadRunner):

classes/Internal_Metrics.py renamed to classes/base_classes/Internal_Metrics.py

File renamed without changes.

classes/Knob_Config.py renamed to classes/base_classes/Knob_Config.py

File renamed without changes.

classes/Knob_Settings.py renamed to classes/base_classes/Knob_Settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from typing import Dict, Any, List, Union, Literal
33
import json
44

5-
from classes.Knob_Config import KnobConfig
5+
from classes.base_classes.Knob_Config import KnobConfig
66

77

88
@dataclass

classes/Script_Config.py renamed to classes/base_classes/Script_Config.py

File renamed without changes.

classes/Tuner.py renamed to classes/base_classes/Tuner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from abc import ABC, abstractmethod
2-
from classes.Knob_Config import KnobConfig
2+
from classes.base_classes.Knob_Config import KnobConfig
33

44

55
class Tuner(ABC):

classes/Workload_Runner.py renamed to classes/base_classes/Workload_Runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from dataclasses import dataclass
33
from pathlib import Path
44
from typing import Any, Dict, Optional
5-
from classes.Knob_Config import KnobConfig
5+
from classes.base_classes.Knob_Config import KnobConfig
66

77

88
@dataclass

0 commit comments

Comments
 (0)