[Benchmark] Use correct timeout value

Author: Tobias Kopp

benchmark/database_connectors/mutable.py

@@ -137,7 +137,7 @@ def run_configuration(self, experiment, config_name, config, yml):
                 for case, query in cases.items():
                     # Produce code to load data into tables with scale factor
                     path_to_data = os.path.join('benchmark', suite, 'data')
-                    case_imports = create_import_statements(path_to_data, yml['data'], case)   # TODO refactor
+                    case_imports = create_import_statements(path_to_data, yml['data'], case)
                     import_str = '\n'.join(case_imports)
 
                     query_str = import_str + '\n' + query
@@ -147,7 +147,7 @@ def run_configuration(self, experiment, config_name, config, yml):
                         durations = self.benchmark_query(command, query_str, yml['pattern'], timeout, path_to_file)
                     except BenchmarkTimeoutException as ex:
                         tqdm.write(str(ex))
-                        execution_times[case] = TIMEOUT_PER_CASE * 1000
+                        execution_times[case] = timeout * 1000
                     else:
                         execution_times[case] = durations[0]
         except BenchmarkError as ex:

benchmark/database_connectors/postgresql.py

@@ -91,7 +91,7 @@ def execute(self, n_runs, params: dict):
                                 with open(TMP_SQL_FILE) as tmp:
                                     tqdm.write("    " + "    ".join(tmp.readlines()))
 
-                        timeout = DEFAULT_TIMEOUT + TIMEOUT_PER_CASE
+                        timeout = TIMEOUT_PER_CASE
                         benchmark_info = f"{suite}/{benchmark}/{experiment} [PostgreSQL]"
                         try:
                             durations = self.run_command(command, timeout, benchmark_info)