Merge branch 'v3' into black-up-line-length

Author: rekby

CHANGELOG.md

@@ -1,3 +1,6 @@
+* Add function for global revert broken behaviour: ydb.global_allow_truncated_result, ydb.global_allow_split_transactions
+* Change argument names from deny_split_transactions to allow_split_transactions (with reverse value
+
 ## 3.0.1b8 ##
 * Fixed exception while create ResultSet with None table_settings
 

tests/aio/test_tx.py

@@ -102,7 +102,7 @@ async def test_split_transactions_deny_split(driver, table_name):
     async with ydb.aio.SessionPool(driver, 1) as pool:
 
         async def check_transaction(s: ydb.aio.table.Session):
-            async with s.transaction(deny_split_transactions=True) as tx:
+            async with s.transaction(allow_split_transactions=False) as tx:
                 await tx.execute("INSERT INTO %s (id) VALUES (1)" % table_name)
                 await tx.commit()
 
@@ -123,7 +123,7 @@ async def test_split_transactions_allow_split(driver, table_name):
     async with ydb.aio.SessionPool(driver, 1) as pool:
 
         async def check_transaction(s: ydb.aio.table.Session):
-            async with s.transaction(deny_split_transactions=False) as tx:
+            async with s.transaction(allow_split_transactions=True) as tx:
                 await tx.execute("INSERT INTO %s (id) VALUES (1)" % table_name)
                 await tx.commit()
 

tests/table/test_tx.py

@@ -94,7 +94,7 @@ def test_split_transactions_deny_split(driver_sync, table_name):
     with ydb.SessionPool(driver_sync, 1) as pool:
 
         def check_transaction(s: ydb.table.Session):
-            with s.transaction(deny_split_transactions=True) as tx:
+            with s.transaction(allow_split_transactions=False) as tx:
                 tx.execute("INSERT INTO %s (id) VALUES (1)" % table_name)
                 tx.commit()
 
@@ -114,7 +114,7 @@ def test_split_transactions_allow_split(driver_sync, table_name):
     with ydb.SessionPool(driver_sync, 1) as pool:
 
         def check_transaction(s: ydb.table.Session):
-            with s.transaction(deny_split_transactions=False) as tx:
+            with s.transaction(allow_split_transactions=True) as tx:
                 tx.execute("INSERT INTO %s (id) VALUES (1)" % table_name)
                 tx.commit()
 

ydb/__init__.py

@@ -1,5 +1,6 @@
 from .credentials import *  # noqa
 from .driver import *  # noqa
+from .global_settings import *  # noqa
 from .table import *  # noqa
 from .issues import *  # noqa
 from .types import *  # noqa

ydb/aio/table.py

@@ -13,6 +13,7 @@
     _scan_query_request_factory,
     _wrap_scan_query_response,
     BaseTxContext,
+    _allow_split_transaction,
 )
 from . import _utilities
 from ydb import _apis, _session_impl
@@ -116,13 +117,15 @@ async def alter_table(
             set_read_replicas_settings,
         )
 
-    def transaction(self, tx_mode=None, *, deny_split_transactions=True):
+    def transaction(
+        self, tx_mode=None, *, allow_split_transactions=_allow_split_transaction
+    ):
         return TxContext(
             self._driver,
             self._state,
             self,
             tx_mode,
-            deny_split_transactions=deny_split_transactions,
+            allow_split_transactions=allow_split_transactions,
         )
 
     async def describe_table(self, path, settings=None):  # pylint: disable=W0236

ydb/global_settings.py

@@ -0,0 +1,26 @@
+import warnings
+
+from . import convert
+from . import table
+
+
+def global_allow_truncated_result(enabled: bool = True):
+    if enabled:
+        warnings.warn("Global allow truncated response is deprecated behaviour.")
+    else:
+        warnings.warn(
+            "Global deny truncated response is default behaviour. You don't need call the function."
+        )
+
+    convert._default_allow_truncated_result = enabled
+
+
+def global_allow_split_transactions(enabled: bool):
+    if enabled:
+        warnings.warn("Global allow truncated response is deprecated behaviour.")
+    else:
+        warnings.warn(
+            "Global deby truncated response is default behaviour. You don't need call the function."
+        )
+
+    table._allow_split_transaction = enabled

ydb/table.py

@@ -27,6 +27,8 @@
 except ImportError:
     interceptor = None
 
+_allow_split_transaction = False
+
 logger = logging.getLogger(__name__)
 
 ##################################################################
@@ -1153,7 +1155,9 @@ def execute_scheme(self, yql_text, settings=None):
         pass
 
     @abstractmethod
-    def transaction(self, tx_mode=None, deny_split_transactions=True):
+    def transaction(
+        self, tx_mode=None, allow_split_transactions=_allow_split_transaction
+    ):
         pass
 
     @abstractmethod
@@ -1621,13 +1625,15 @@ def execute_scheme(self, yql_text, settings=None):
             self._state.endpoint,
         )
 
-    def transaction(self, tx_mode=None, deny_split_transactions=True):
+    def transaction(
+        self, tx_mode=None, allow_split_transactions=_allow_split_transaction
+    ):
         return TxContext(
             self._driver,
             self._state,
             self,
             tx_mode,
-            deny_split_transactions=deny_split_transactions,
+            allow_split_transactions=allow_split_transactions,
         )
 
     def has_prepared(self, query):
@@ -2131,13 +2137,13 @@ class BaseTxContext(ITxContext):
         "_driver",
         "session",
         "_finished",
-        "_deny_split_transactions",
+        "_allow_split_transactions",
     )
 
     _COMMIT = "commit"
     _ROLLBACK = "rollback"
 
-    def __init__(self, driver, session_state, session, tx_mode=None, *, deny_split_transactions=True):
+    def __init__(self, driver, session_state, session, tx_mode=None, *, allow_split_transactions=_allow_split_transaction):
         """
         An object that provides a simple transaction context manager that allows statements execution
         in a transaction. You don't have to open transaction explicitly, because context manager encapsulates
@@ -2161,7 +2167,7 @@ def __init__(self, driver, session_state, session, tx_mode=None, *, deny_split_t
         self._session_state = session_state
         self.session = session
         self._finished = ""
-        self._deny_split_transactions = deny_split_transactions
+        self._allow_split_transactions = allow_split_transactions
 
     def __enter__(self):
         """
@@ -2321,7 +2327,7 @@ def _check_split(self, allow=""):
         Deny all operaions with transaction after commit/rollback.
         Exception: double commit and double rollbacks, because it is safe
         """
-        if not self._deny_split_transactions:
+        if self._allow_split_transactions:
             return
 
         if self._finished != "" and self._finished != allow: