[Benchmark] Fix type hints considering dict.get()

Author: Tobias Kopp

benchmark/Benchmark.py

@@ -296,8 +296,9 @@ def perform_experiment(
                 if name in config_name:
                     if 'args' in conf:
                         config = conf['args']
-                    else:
-                        config = conf
+                    elif 'variables' in conf:
+                        config = ' '.join([f'{key}={value}' for key, value in conf['variables'].items()])
+                    break
 
         measurements_list: list[list[str | int | float]] = list()
         for case, times in config_result.items():
@@ -420,10 +421,9 @@ def run_benchmarks(args: argparse.Namespace) -> None:
             if info.experiment_data:
                 table_access_error: bool = False
                 for table_name, table in info.experiment_data.items():
-                    p: str = table.get('file')  # Path to file
-                    if not p:
+                    if 'file' not in table:
                         continue  # Skip counting files when table does not have a file with data
-                    p = os.path.join(p)
+                    p: str = os.path.join(table['file'])  # Path to file
                     if not os.path.isfile(p):
                         tqdm.write(f'Table file \'{p}\' not found.  Skipping benchmark.\n', file=sys.stderr)
                         table_access_error = True

benchmark/database_connectors/duckdb.py

@@ -188,22 +188,18 @@ def generate_create_table_stmts(self, data: dict[str, dict[str, Any]], with_scal
         for table_name, table in data.items():
             columns: str = self.parse_attributes(table['attributes'])
 
-            delimiter: str = table.get('delimiter')
-            header: int = table.get('header')
-            format: str = table.get('format')
-
             if with_scale_factors:
                 table_name += "_tmp"
 
             create: str = f'CREATE TABLE "{table_name}" {columns};'
             copy: str = f'COPY "{table_name}" FROM \'{table["file"]}\' ( '
-            if delimiter:
-                delim = delimiter.replace("'", "")
+            if 'delimiter' in table:
+                delim = table['delimiter'].replace("'", "")
                 copy += f" DELIMITER \'{delim}\',"
-            if format:
-                copy += f" FORMAT {format.upper()},"
-            if header:
-                copy += f" HEADER," if (header==1) else ""
+            if 'format' in table:
+                copy += f" FORMAT {table['format'].upper()},"
+            if 'header' in table:
+                copy += f" HEADER," if table['header'] == 1 else ""
 
             copy = copy[:-1] + " );"
 

benchmark/database_connectors/mutable.py

@@ -356,9 +356,9 @@ def get_setup_statements(suite: str, path_to_data: str, data: dict[str, dict[str
             statements.append(create)
 
             # Create an IMPORT statement for current table
-            lines: int = table.get('lines_in_file')
-            if not lines:
+            if 'lines_in_file' not in table:
                 continue    # Only import data when lines are given
+            lines: int = table['lines_in_file']
 
             path: str = table.get('file', os.path.join(path_to_data, f'{table_name}.csv'))
             sf: float | int

benchmark/database_connectors/postgresql.py

@@ -233,24 +233,20 @@ def create_tables(self, cursor: psycopg2.extensions.cursor, data: dict[str, dict
         for table_name, table in data.items():
             columns: str = self.parse_attributes(table['attributes'])
 
-            delimiter: str = table.get('delimiter')
-            header: int = table.get('header')
-            format: str = table.get('format')
-
             # Use an additional table with the *complete* data set to quickly recreate the table with the benchmark
             # data, in case of varying scale factor.
             complete_table_name: str = table_name + COMPLETE_TABLE_SUFFIX if with_scale_factors else table_name
             quoted_table_name: str = f'"{complete_table_name}"'
 
             create: str = f"CREATE UNLOGGED TABLE {quoted_table_name} {columns};"
             copy: str = f"COPY {quoted_table_name} FROM STDIN"
-            if delimiter:
-                delim: str = delimiter.replace("'", "")
+            if 'delimiter' in table:
+                delim: str = table['delimiter'].replace("'", "")
                 copy += f" WITH DELIMITER \'{delim}\'"
-            if format:
-                copy += f" {format.upper()}"
-            if header:
-                copy += ' HEADER' if header == 1 else ''
+            if 'format' in table:
+                copy += f" {table['format'].upper()}"
+            if 'header' in table:
+                copy += ' HEADER' if table['header'] == 1 else ''
 
             copy += ";"