full renaming

Author: slampy97

examples/coordination/example.py

@@ -29,7 +29,7 @@ async def main():
 async def some_workload(driver, text):
     client = CoordinationClient(driver)
     await client.create_node("/local/node1")
-    session = client.node("/local/node1")
+    session = client.session("/local/node1")
     semaphore = session.lock("semaphore")
     for i in range(10):
         # print(f"{text} starting iteration {i}")
@@ -48,4 +48,4 @@ async def some_workload(driver, text):
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    asyncio.run(main())

tests/coordination/test_coordination_client.py

@@ -119,7 +119,7 @@ async def test_coordination_node_lifecycle_async(self, async_coordination_node):
     async def test_coordination_lock_describe_full_async(self, async_coordination_node):
         client, node_path, _ = async_coordination_node
 
-        async with client.node(node_path) as node:
+        async with client.session(node_path) as node:
             lock = node.lock("test_lock")
 
             desc = await lock.describe()
@@ -139,7 +139,7 @@ async def test_coordination_lock_describe_full_async(self, async_coordination_no
     def test_coordination_lock_describe_full(self, sync_coordination_node):
         client, node_path, _ = sync_coordination_node
 
-        with client.node(node_path) as node:
+        with client.session(node_path) as node:
             lock = node.lock("test_lock")
 
             desc = lock.describe()
@@ -160,7 +160,7 @@ async def test_coordination_lock_racing_async(self, async_coordination_node):
         client, node_path, _ = async_coordination_node
         timeout = 5
 
-        async with client.node(node_path) as node:
+        async with client.session(node_path) as node:
             lock2_started = asyncio.Event()
             lock2_acquired = asyncio.Event()
             lock2_release = asyncio.Event()
@@ -183,7 +183,7 @@ def test_coordination_lock_racing(self, sync_coordination_node):
         client, node_path, _ = sync_coordination_node
         timeout = 5
 
-        with client.node(node_path) as node:
+        with client.session(node_path) as node:
             lock2_started = threading.Event()
             lock2_acquired = threading.Event()
             lock2_release = threading.Event()
@@ -207,7 +207,7 @@ def second_lock_task():
     async def test_coordination_reconnect_async(self, async_coordination_node):
         client, node_path, _ = async_coordination_node
 
-        async with client.node(node_path) as node:
+        async with client.session(node_path) as node:
             lock = node.lock("test_lock")
 
             async with lock:
@@ -221,7 +221,7 @@ async def test_coordination_reconnect_async(self, async_coordination_node):
     async def test_same_lock_cannot_be_acquired_twice(self, async_coordination_node):
         client, node_path, _ = async_coordination_node
 
-        async with client.node(node_path) as node:
+        async with client.session(node_path) as node:
             lock1 = node.lock("lock1")
             lock1_1 = node.lock("lock1")
 

ydb/aio/coordination/client.py

@@ -40,5 +40,5 @@ async def delete_node(self, path: str, settings=None):
             settings=settings,
         )
 
-    def node(self, path: str) -> CoordinationNode:
+    def session(self, path: str) -> CoordinationNode:
         return CoordinationNode(self._driver, path)

ydb/aio/coordination/node.py

@@ -1,7 +1,7 @@
 import asyncio
 
 from .reconnector import CoordinationReconnector
-from .lock import CoordinationLock
+from .semaphore import CoordinationSemaphore
 
 
 class CoordinationNode:
@@ -25,10 +25,10 @@ async def next_req_id(self) -> int:
             self._req_id += 1
             return self._req_id
 
-    def lock(self, name: str) -> CoordinationLock:
+    def lock(self, name: str) -> CoordinationSemaphore:
         if self._closed:
             raise RuntimeError("CoordinationNode is closed")
-        return CoordinationLock(self, name)
+        return CoordinationSemaphore(self, name)
 
     async def close(self):
         if self._closed:

ydb/aio/coordination/lock.py ydb/aio/coordination/semaphore.pyydb/aio/coordination/lock.py renamed to ydb/aio/coordination/semaphore.py

@@ -12,7 +12,7 @@
 )
 
 
-class CoordinationLock:
+class CoordinationSemaphore:
     def __init__(self, node, name: str):
         self._node = node
         self._name = name

ydb/coordination/client.py

@@ -36,5 +36,5 @@ def delete_node(self, path: str, settings=None):
             settings=settings,
         )
 
-    def node(self, path: str) -> CoordinationNodeSync:
+    def session(self, path: str) -> CoordinationNodeSync:
         return CoordinationNodeSync(self, path)

ydb/coordination/node_sync.py

@@ -1,6 +1,6 @@
 from .._topic_common.common import _get_shared_event_loop, CallFromSyncToAsync
 from ..aio.coordination.node import CoordinationNode
-from .lock_sync import CoordinationLockSync
+from .semaphore_sync import CoordinationSemaphoreSync
 
 
 class CoordinationNodeSync:
@@ -24,7 +24,7 @@ async def _make_node() -> CoordinationNode:
         )
 
     def lock(self, name: str):
-        return CoordinationLockSync(self, name)
+        return CoordinationSemaphoreSync(self, name)
 
     def close(self):
         if self._closed:

ydb/coordination/lock_sync.py ydb/coordination/semaphore_sync.pyydb/coordination/lock_sync.py renamed to ydb/coordination/semaphore_sync.py

@@ -2,17 +2,17 @@
 
 from .. import issues
 from .._topic_common.common import _get_shared_event_loop, CallFromSyncToAsync
-from ..aio.coordination.lock import CoordinationLock
+from ..aio.coordination.semaphore import CoordinationSemaphore
 
 
-class CoordinationLockSync:
+class CoordinationSemaphoreSync:
     def __init__(self, node_sync, name: str, timeout_sec: float = 5):
         self._node_sync = node_sync
         self._name = name
         self._timeout_sec = timeout_sec
         self._closed = False
         self._caller = CallFromSyncToAsync(_get_shared_event_loop())
-        self._async_lock: CoordinationLock = self._node_sync._async_node.lock(name)
+        self._async_lock: CoordinationSemaphore = self._node_sync._async_node.lock(name)
 
     def _check_closed(self):
         if self._closed: