From 86e2612a44fe128a74719d0c867d20171775ad40 Mon Sep 17 00:00:00 2001 From: Torsten Kilias Date: Tue, 29 Aug 2023 09:38:18 +0200 Subject: [PATCH] Apply review suggestions --- .../peer_communicator/background_listener_thread.py | 6 +++--- .../peer_communicator/background_peer_state.py | 2 +- .../peer_communicator/connection_establisher.py | 2 +- .../peer_communicator/peer_is_ready_sender.py | 6 +++--- .../peer_communicator/register_peer_sender.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_listener_thread.py b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_listener_thread.py index e51f8c60..5476ce43 100644 --- a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_listener_thread.py +++ b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_listener_thread.py @@ -162,7 +162,7 @@ def _check_is_ready_to_stop(self): if self._is_ready_to_stop(): self._out_control_socket.send(serialize_message(IsReadyToStop())) - def _is_ready_to_stop(self): + def _is_ready_to_stop(self) -> bool: peers_status = [peer_state.is_ready_to_stop() for peer_state in self._peer_state.values()] is_ready_to_stop = all(peers_status) and len(peers_status) == self._number_of_peers - 1 @@ -202,7 +202,7 @@ def _handle_control_message(self, message: bytes) -> Status: self._logger.exception("Exception during handling message", message=message) return BackgroundListenerThread.Status.RUNNING - def _is_register_peer_message_allowed_as_control_message(self): + def _is_register_peer_message_allowed_as_control_message(self) -> bool: return ( ( self._config.forward_register_peer_config.is_enabled @@ -263,7 +263,7 @@ def _handle_listener_message(self, message: List[Frame]): except Exception as e: logger.exception("Exception during handling message", message_content=message_content_bytes) - def is_register_peer_message_allowed_as_listener_message(self): + def is_register_peer_message_allowed_as_listener_message(self) -> bool: return not self._config.forward_register_peer_config.is_leader \ and self._config.forward_register_peer_config.is_enabled diff --git a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_peer_state.py b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_peer_state.py index 9c89dc29..f4849098 100644 --- a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_peer_state.py +++ b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/background_peer_state.py @@ -64,5 +64,5 @@ def forward_payload(self, frames: List[Frame]): def stop(self): self._receive_socket.close(linger=0) - def is_ready_to_stop(self): + def is_ready_to_stop(self) -> bool: return self._connection_establisher.is_ready_to_stop() diff --git a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/connection_establisher.py b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/connection_establisher.py index 9290b053..db6a0052 100644 --- a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/connection_establisher.py +++ b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/connection_establisher.py @@ -85,7 +85,7 @@ def try_send(self): self._peer_is_ready_sender.try_send() self._acknowledge_register_peer_sender.try_send() - def is_ready_to_stop(self): + def is_ready_to_stop(self) -> bool: peer_is_ready_sender = self._peer_is_ready_sender.is_ready_to_stop() register_peer_sender = self._register_peer_sender.is_ready_to_stop() self._logger.debug("is_ready_to_stop", diff --git a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/peer_is_ready_sender.py b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/peer_is_ready_sender.py index bc167eab..e4720c2a 100644 --- a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/peer_is_ready_sender.py +++ b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/peer_is_ready_sender.py @@ -72,7 +72,7 @@ def try_send(self): self._states |= _States.FINISHED self._send_peer_is_ready_to_frontend() - def _should_we_send(self): + def _should_we_send(self) -> bool: is_time = self._timer.is_time() is_enabled = self._is_enabled() send_independent_of_time = self._send_independent_of_time() @@ -103,7 +103,7 @@ def _send_independent_of_time(self): and received_register_peer_complete) return send_independent_of_time - def _is_enabled(self): + def _is_enabled(self) -> bool: received_acknowledge_register_peer = (not self._needs_acknowledge_register_peer or _States.REGISTER_PEER_ACKNOWLEDGED in self._states) is_enabled = (_States.CONNECTION_SYNCHRONIZED in self._states @@ -116,7 +116,7 @@ def _send_peer_is_ready_to_frontend(self): serialized_message = serialize_message(message) self._out_control_socket.send(serialized_message) - def is_ready_to_stop(self): + def is_ready_to_stop(self) -> bool: return _States.FINISHED in self._states diff --git a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/register_peer_sender.py b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/register_peer_sender.py index e0f65a7d..e92c7150 100644 --- a/exasol_advanced_analytics_framework/udf_communication/peer_communicator/register_peer_sender.py +++ b/exasol_advanced_analytics_framework/udf_communication/peer_communicator/register_peer_sender.py @@ -51,12 +51,12 @@ def _send(self): self._logger.debug("send", send_attempt_count=self._send_attempt_count) self._register_peer_connection.forward(self._peer) - def _should_we_send(self): + def _should_we_send(self) -> bool: is_time = self._timer.is_time() result = is_time and not self._finished return result - def is_ready_to_stop(self): + def is_ready_to_stop(self) -> bool: return self._finished or not self._needs_to_send_for_peer