From 43790356eb58275459db2019305236f93403d752 Mon Sep 17 00:00:00 2001 From: Dimitris Christodoulou Date: Wed, 31 Jul 2024 17:13:22 +0100 Subject: [PATCH] Small async API fixes --- acouchbase_columnar/cluster.py | 2 +- .../protocol/core/client_adapter.py | 16 +++++++++++++--- deps/couchbase-cxx-client | 2 +- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/acouchbase_columnar/cluster.py b/acouchbase_columnar/cluster.py index f3cfb4c..22ac438 100644 --- a/acouchbase_columnar/cluster.py +++ b/acouchbase_columnar/cluster.py @@ -41,7 +41,7 @@ def __init__(self, loop: Optional[AbstractEventLoop] = None, **kwargs: object) -> None: from acouchbase_columnar.protocol.cluster import AsyncCluster as _AsyncCluster - self._impl = _AsyncCluster(connstr, credential, options, **kwargs) + self._impl = _AsyncCluster(connstr, credential, options, loop, **kwargs) def database(self, name: str) -> AsyncDatabase: """Creates a database instance. diff --git a/acouchbase_columnar/protocol/core/client_adapter.py b/acouchbase_columnar/protocol/core/client_adapter.py index 44beebf..b304a38 100644 --- a/acouchbase_columnar/protocol/core/client_adapter.py +++ b/acouchbase_columnar/protocol/core/client_adapter.py @@ -157,6 +157,19 @@ def connect(self, req: ConnectRequest) -> None: raise ErrorMapper.build_exception(ret) self._client.connection = ret + def close_connection(self, req: CloseConnectionRequest) -> bool: + """ + **INTERNAL** + """ + return self._client.close_connection(req) + + def reset_client(self) -> None: + """ + **INTERNAL** + """ + if hasattr(self, '_client'): + del self._client + def _get_loop(self, loop: Optional[AbstractEventLoop] = None) -> AbstractEventLoop: """ **INTERNAL** @@ -164,9 +177,6 @@ def _get_loop(self, loop: Optional[AbstractEventLoop] = None) -> AbstractEventLo if loop is None: loop = get_event_loop() - if not loop.is_running(): - raise RuntimeError("Event loop is not running.") - return loop diff --git a/deps/couchbase-cxx-client b/deps/couchbase-cxx-client index 33d2c23..f43220e 160000 --- a/deps/couchbase-cxx-client +++ b/deps/couchbase-cxx-client @@ -1 +1 @@ -Subproject commit 33d2c23c426dfb058620c7820d51e68dfebd2b38 +Subproject commit f43220eafb71362cd4947a7d51e350b205616b07