From dc67eae0a65bf44b56db0199d0f33a9922e976cf Mon Sep 17 00:00:00 2001 From: Sophie Zhang Date: Fri, 24 May 2024 14:34:58 -0400 Subject: [PATCH] address pr comments: None return type annotation, take stdev of adjusted data --- experiments/13-connect-overhead/measure_compare.py | 5 +++-- .../measure_noop_flight_sql_odbc.py | 2 +- src/brad/flight_sql_client_odbc.py | 10 +++++----- src/brad/sqlite_client.py | 10 +++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/experiments/13-connect-overhead/measure_compare.py b/experiments/13-connect-overhead/measure_compare.py index 7c77027f..5cdedc84 100644 --- a/experiments/13-connect-overhead/measure_compare.py +++ b/experiments/13-connect-overhead/measure_compare.py @@ -37,7 +37,8 @@ def run_client( average_latencies.append(latency) - return np.mean(adjusted_data(average_latencies)), np.std(average_latencies) + adjusted_average_latencies = adjusted_data(average_latencies) + return np.mean(adjusted_average_latencies), np.std(adjusted_average_latencies) def build_dataframe() -> pd.DataFrame: @@ -114,7 +115,7 @@ def plot_from_csv(filename: str) -> None: fig.savefig("measurement_comparisons_plot.png", bbox_inches="tight") -def main(): +def main() -> None: dataframe = build_dataframe() csv_filename = "measurement_comparisons.csv" print_to_csv(dataframe, csv_filename) diff --git a/experiments/13-connect-overhead/measure_noop_flight_sql_odbc.py b/experiments/13-connect-overhead/measure_noop_flight_sql_odbc.py index 664661e2..fa7b88fb 100644 --- a/experiments/13-connect-overhead/measure_noop_flight_sql_odbc.py +++ b/experiments/13-connect-overhead/measure_noop_flight_sql_odbc.py @@ -4,7 +4,7 @@ from brad.flight_sql_client_odbc import BradFlightSqlClientOdbc -def main(): +def main() -> None: parser = argparse.ArgumentParser() parser.add_argument("--repetitions", type=int, default=1000) parser.add_argument("--host", type=str, default="localhost") diff --git a/src/brad/flight_sql_client_odbc.py b/src/brad/flight_sql_client_odbc.py index f7a91c40..55a1dcba 100644 --- a/src/brad/flight_sql_client_odbc.py +++ b/src/brad/flight_sql_client_odbc.py @@ -16,20 +16,20 @@ class BradFlightSqlClientOdbc: RowList = List[Tuple[Any, ...]] - def __init__(self, host="localhost", port=31337): + def __init__(self, host="localhost", port=31337) -> None: self._host = host self._port = port self._connection = None self._cursor = None - def __enter__(self): + def __enter__(self) -> None: self.connect() return self - def __exit__(self, exc_type, exc_value, traceback): + def __exit__(self, exc_type, exc_value, traceback) -> None: self.close() - def connect(self): + def connect(self) -> None: self._connection = pyodbc.connect( "DRIVER={Arrow Flight SQL ODBC Driver};USEENCRYPTION=false;" + f"HOST={self._host};" @@ -38,7 +38,7 @@ def connect(self): ) self._cursor = self._connection.cursor() - def close(self): + def close(self) -> None: self._cursor.close() self._connection.close() diff --git a/src/brad/sqlite_client.py b/src/brad/sqlite_client.py index 19bc0ff2..e75a6784 100644 --- a/src/brad/sqlite_client.py +++ b/src/brad/sqlite_client.py @@ -16,23 +16,23 @@ class BradSqliteClient: RowList = List[Tuple[Any, ...]] - def __init__(self, database: str): + def __init__(self, database: str) -> None: self._database = database self._connection = None self._cursor = None - def __enter__(self): + def __enter__(self) -> None: self.connect() return self - def __exit__(self, exc_type, exc_value, traceback): + def __exit__(self, exc_type, exc_value, traceback) -> None: self.close() - def connect(self): + def connect(self) -> None: self._connection = sqlite3.connect(self._database) self._cursor = self._connection.cursor() - def close(self): + def close(self) -> None: self._cursor.close() self._connection.close()