aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2025-01-14 11:23:02 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2025-01-14 11:41:03 +0300
commit8e2a62c296736bedbbabeeb8152488d17d6452a1 (patch)
tree8c1e08954e9762ca56d7245382e854703f63cf19 /contrib
parentfe3fe1ab0397fa0c86868bfb20305b7e65b9c831 (diff)
downloadydb-8e2a62c296736bedbbabeeb8152488d17d6452a1.tar.gz
Intermediate changes
commit_hash:15d56dd66952b13618965762cefcdb4484050ee4
Diffstat (limited to 'contrib')
-rw-r--r--contrib/python/ydb/py3/.dist-info/METADATA2
-rw-r--r--contrib/python/ydb/py3/ya.make2
-rw-r--r--contrib/python/ydb/py3/ydb/aio/table.py9
-rw-r--r--contrib/python/ydb/py3/ydb/query/transaction.py2
-rw-r--r--contrib/python/ydb/py3/ydb/ydb_version.py2
5 files changed, 12 insertions, 5 deletions
diff --git a/contrib/python/ydb/py3/.dist-info/METADATA b/contrib/python/ydb/py3/.dist-info/METADATA
index f20c4f4245..391e0b3f96 100644
--- a/contrib/python/ydb/py3/.dist-info/METADATA
+++ b/contrib/python/ydb/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: ydb
-Version: 3.18.12
+Version: 3.18.14
Summary: YDB Python SDK
Home-page: http://github.com/ydb-platform/ydb-python-sdk
Author: Yandex LLC
diff --git a/contrib/python/ydb/py3/ya.make b/contrib/python/ydb/py3/ya.make
index 3407713a34..e0f0e9ce8a 100644
--- a/contrib/python/ydb/py3/ya.make
+++ b/contrib/python/ydb/py3/ya.make
@@ -2,7 +2,7 @@
PY3_LIBRARY()
-VERSION(3.18.12)
+VERSION(3.18.14)
LICENSE(Apache-2.0)
diff --git a/contrib/python/ydb/py3/ydb/aio/table.py b/contrib/python/ydb/py3/ydb/aio/table.py
index aec32e1a26..538f498ba1 100644
--- a/contrib/python/ydb/py3/ydb/aio/table.py
+++ b/contrib/python/ydb/py3/ydb/aio/table.py
@@ -563,7 +563,14 @@ class SessionPool:
async def _get_session_from_queue(self, timeout: float):
task_wait = asyncio.ensure_future(asyncio.wait_for(self._active_queue.get(), timeout=timeout))
task_should_stop = asyncio.ensure_future(self._should_stop.wait())
- done, _ = await asyncio.wait((task_wait, task_should_stop), return_when=asyncio.FIRST_COMPLETED)
+ try:
+ done, _ = await asyncio.wait((task_wait, task_should_stop), return_when=asyncio.FIRST_COMPLETED)
+ except asyncio.CancelledError:
+ cancelled = task_wait.cancel()
+ if not cancelled:
+ priority, session = task_wait.result()
+ self._active_queue.put_nowait((priority, session))
+ raise
if task_should_stop in done:
task_wait.cancel()
return self._create()
diff --git a/contrib/python/ydb/py3/ydb/query/transaction.py b/contrib/python/ydb/py3/ydb/query/transaction.py
index d9c0dfcb3b..414401da4d 100644
--- a/contrib/python/ydb/py3/ydb/query/transaction.py
+++ b/contrib/python/ydb/py3/ydb/query/transaction.py
@@ -283,7 +283,7 @@ class BaseQueryTxContext:
)
def _move_to_beginned(self, tx_id: str) -> None:
- if self._tx_state._already_in(QueryTxStateEnum.BEGINED):
+ if self._tx_state._already_in(QueryTxStateEnum.BEGINED) or not tx_id:
return
self._tx_state._change_state(QueryTxStateEnum.BEGINED)
self._tx_state.tx_id = tx_id
diff --git a/contrib/python/ydb/py3/ydb/ydb_version.py b/contrib/python/ydb/py3/ydb/ydb_version.py
index 9d48446b09..b40f83ba95 100644
--- a/contrib/python/ydb/py3/ydb/ydb_version.py
+++ b/contrib/python/ydb/py3/ydb/ydb_version.py
@@ -1 +1 @@
-VERSION = "3.18.12"
+VERSION = "3.18.14"