Skip to content

Commit

Permalink
Address comments: add types, move server start, use Optional
Browse files Browse the repository at this point in the history
  • Loading branch information
Sophie Zhang committed Mar 16, 2024
1 parent 9896dbc commit 5bc48a4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/brad/front_end/flight_sql_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@


class BradFlightSqlServer:
def __init__(self, host, port):
def __init__(self, host: str, port: int) -> None:
self._flight_sql_server = brad_server.BradFlightSqlServer()
self._flight_sql_server.init(host, port)
self._thread = threading.Thread(name="BradFlightSqlServer", target=self._serve)

def start(self):
def start(self) -> None:
self._thread.start()

def stop(self):
def stop(self) -> None:
logger.info("BRAD FlightSQL server stopping...")
self._flight_sql_server.shutdown()
self._thread.join()
logger.info("BRAD FlightSQL server stopped.")

def _serve(self):
def _serve(self) -> None:
self._flight_sql_server.serve()
9 changes: 6 additions & 3 deletions src/brad/front_end/front_end.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import redshift_connector.error as redshift_errors
import psycopg
import struct
from typing import AsyncIterable, Optional, Dict, Any, Union
from typing import AsyncIterable, Optional, Dict, Any
from datetime import timedelta
from ddsketch import DDSketch

Expand Down Expand Up @@ -89,10 +89,9 @@ def __init__(
if BradFrontEnd.native_server_is_supported():
from brad.front_end.flight_sql_server import BradFlightSqlServer

self._flight_sql_server: Union[BradFlightSqlServer, None] = (
self._flight_sql_server: Optional[BradFlightSqlServer] = (
BradFlightSqlServer(host="0.0.0.0", port=31337)
)
self._flight_sql_server.start()
else:
self._flight_sql_server = None

Expand Down Expand Up @@ -193,6 +192,10 @@ def __init__(

async def serve_forever(self):
await self._run_setup()

# Start FlightSQL server
self._flight_sql_server.start()

try:
grpc_server = grpc.aio.server()
brad_grpc.add_BradServicer_to_server(BradGrpc(self), grpc_server)
Expand Down

0 comments on commit 5bc48a4

Please sign in to comment.