Merge pull request #224 merge main into v3

Author: rekby

.github/scripts/increment_version.py

@@ -6,6 +6,7 @@
 
 SETUP_PY_PATH = "setup.py"
 DEFAULT_CHANGELOG_PATH = "CHANGELOG.md"
+DEFAULT_YDB_VERSION_FILE = "ydb/ydb_version.py"
 MARKER = "# AUTOVERSION"
 
 
@@ -125,6 +126,10 @@ def add_changelog_version(changelog_path, version: str):
         f.write(content)
 
 
+def set_version_in_ydb_version_file(file_path: str, version: str):
+    with open(file_path, "w") as f:
+        f.write('VERSION = "%s"\n' % version)
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument(
@@ -147,6 +152,7 @@ def main():
 
     new_version = increment_version_at_setup_py(args.setup_py_path, args.inc_type, is_beta)
     add_changelog_version(args.changelog_path, new_version)
+    set_version_in_ydb_version_file(DEFAULT_YDB_VERSION_FILE, new_version)
     print(new_version)
 
 

.github/workflows/python-publish.yml

@@ -69,9 +69,6 @@ jobs:
         echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_OUTPUT
         echo "New version: $NEW_VERSION" >> $GITHUB_STEP_SUMMARY
 
-        git add $SETUP_PY_PATH
-        git add $CHANGELOG_FILE
-
     - name: Build package
       run: python -m build
 
@@ -93,7 +90,7 @@ jobs:
         
         git config --global user.email "robot@umbrella";
         git config --global user.name "robot";
-        git commit -m "Release: $TAG";
+        git commit -am "Release: $TAG";
 
         git tag "$TAG"
         git push && git push --tags

CHANGELOG.md

@@ -35,6 +35,30 @@
 ## 3.0.1b1 ##
 * start 3.0 beta branch
 
+## 2.13.3 ##
+* fixed use transaction object when commit with flag
+
+## 2.13.2 ##
+* fix snapshot attribute in class _ResultSet
+
+## 2.13.1 ##
+* fixed set version in ydb_version file
+
+## 2.13.0 ##
+* fixed in to make compressed backups possible
+* Add snapshot to read table responses
+
+## 2.12.4 ##
+* Added functions for global change behaviour for compatible with future sdk version: ydb.global_allow_truncated_result and global_allow_split_transactions
+
+## 2.12.3 ##
+* Flag for deny split transaction
+* Add six package to requirements
+* Fixed error while passing date parameter in execute
+
+## 2.12.2 ##
+* Fix error of check retriable error for idempotent operations (error exist since 2.12.1)
+
 ## 2.12.1 ##
 * Supported `TYPE_UNSPECIFIED` item type to scheme ls
 * Fixed error while request iam token with bad content type in metadata

requirements.txt

@@ -1,6 +1,5 @@
-aiohttp>=3.7.4,<4.0.0
-enum-compat>=0.0.1
 grpcio>=1.42.0
 packaging
 protobuf>=3.13.0,<5.0.0
-six<2
+pytest==6.2.4
+aiohttp==3.7.4

tests/aio/test_tx.py

@@ -98,7 +98,7 @@ async def test_tx_snapshot_ro(driver, database):
 
 
 @pytest.mark.asyncio
-async def test_split_transactions_deny_split(driver, table_name):
+async def test_split_transactions_deny_split_explicit_commit(driver, table_name):
     async with ydb.aio.SessionPool(driver, 1) as pool:
 
         async def check_transaction(s: ydb.aio.table.Session):
@@ -118,6 +118,28 @@ async def check_transaction(s: ydb.aio.table.Session):
         await pool.retry_operation(check_transaction)
 
 
+@pytest.mark.asyncio
+async def test_split_transactions_deny_split_flag_commit(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(allow_split_transactions=False) as tx:
+                await tx.execute(
+                    "INSERT INTO %s (id) VALUES (1)" % table_name, commit_tx=True
+                )
+
+                with pytest.raises(RuntimeError):
+                    await tx.execute("INSERT INTO %s (id) VALUES (2)" % table_name)
+
+                await tx.commit()
+
+            async with s.transaction() as tx:
+                rs = await tx.execute("SELECT COUNT(*) as cnt FROM %s" % table_name)
+                assert rs[0].rows[0].cnt == 1
+
+        await pool.retry_operation(check_transaction)
+
+
 @pytest.mark.asyncio
 async def test_split_transactions_allow_split(driver, table_name):
     async with ydb.aio.SessionPool(driver, 1) as pool:

tests/aio/test_types.py

@@ -62,9 +62,9 @@ async def test_types(driver, database, value, ydb_type):
 @pytest.mark.parametrize(
     "value,ydb_type,result_value",
     [
-        # FIXME: TypeError: 'datetime.date'/'datetime.datetime' object cannot be interpreted as an integer
-        # (test_today, 'Date', test_today),
+        # FIXME: TypeError: 'datetime.datetime' object cannot be interpreted as an integer
         # (test_dt_today, "Datetime", test_dt_today),
+        (test_today, "Date", test_today),
         (365, "Date", date(1971, 1, 1)),
         (3600 * 24 * 365, "Datetime", datetime(1971, 1, 1, 0, 0)),
         (test_td, "Interval", test_td),

tests/table/table_test.py

@@ -0,0 +1,29 @@
+import ydb
+
+
+class TestTable:
+    def test_create_table_with_not_null_primary_key_by_api(self, driver_sync, database):
+        table_path = database + "/test_table"
+
+        def create_table(session: ydb.Session):
+            try:
+                session.drop_table(table_path)
+            except ydb.issues.SchemeError:
+                pass
+
+            description = (
+                ydb.TableDescription()
+                .with_primary_keys("key1")
+                .with_columns(
+                    ydb.Column("key1", ydb.PrimitiveType.Uint64),
+                    ydb.Column("value", ydb.OptionalType(ydb.PrimitiveType.Utf8)),
+                )
+            )
+
+            session.create_table(table_path, description)
+
+        with ydb.SessionPool(driver_sync) as pool:
+            pool.retry_operation_sync(create_table)
+
+        res = driver_sync.scheme_client.describe_path(table_path)
+        assert res.type == ydb.scheme.SchemeEntryType.TABLE

tests/table/test_tx.py

@@ -112,6 +112,27 @@ def check_transaction(s: ydb.table.Session):
         pool.retry_operation_sync(check_transaction)
 
 
+def test_split_transactions_deny_split_flag_commit(driver_sync, table_name):
+    with ydb.SessionPool(driver_sync, 1) as pool:
+
+        def check_transaction(s: ydb.table.Session):
+            with s.transaction(allow_split_transactions=False) as tx:
+                tx.execute(
+                    "INSERT INTO %s (id) VALUES (1)" % table_name, commit_tx=True
+                )
+
+                with pytest.raises(RuntimeError):
+                    tx.execute("INSERT INTO %s (id) VALUES (2)" % table_name)
+
+                tx.commit()
+
+            with s.transaction() as tx:
+                rs = tx.execute("SELECT COUNT(*) as cnt FROM %s" % table_name)
+                assert rs[0].rows[0].cnt == 1
+
+        pool.retry_operation_sync(check_transaction)
+
+
 def test_split_transactions_allow_split(driver_sync, table_name):
     with ydb.SessionPool(driver_sync, 1) as pool:
 

ydb/_session_impl.py

@@ -407,7 +407,8 @@ def bulk_upsert_request_factory(table, rows, column_types):
 
 def wrap_read_table_response(response):
     issues._process_response(response)
-    return convert.ResultSet.from_message(response.result.result_set)
+    snapshot = response.snapshot if response.HasField("snapshot") else None
+    return convert.ResultSet.from_message(response.result.result_set, snapshot=snapshot)
 
 
 class SessionState(object):

ydb/aio/table.py

@@ -194,8 +194,6 @@ async def execute(
         self, query, parameters=None, commit_tx=False, settings=None
     ):  # pylint: disable=W0236
 
-        self._check_split()
-
         return await super().execute(query, parameters, commit_tx, settings)
 
     async def commit(self, settings=None):  # pylint: disable=W0236

ydb/convert.py

@@ -308,15 +308,16 @@ def _unwrap_optionality(column):
 
 
 class _ResultSet(object):
-    __slots__ = ("columns", "rows", "truncated")
+    __slots__ = ("columns", "rows", "truncated", "snapshot")
 
-    def __init__(self, columns, rows, truncated):
+    def __init__(self, columns, rows, truncated, snapshot=None):
         self.columns = columns
         self.rows = rows
         self.truncated = truncated
+        self.snapshot = snapshot
 
     @classmethod
-    def from_message(cls, message, table_client_settings=None):
+    def from_message(cls, message, table_client_settings=None, snapshot=None):
         rows = []
         # prepare columnn parsers before actuall parsing
         column_parsers = []
@@ -343,12 +344,12 @@ def from_message(cls, message, table_client_settings=None):
                     unwrapped_type, value, table_client_settings
                 )
             rows.append(row)
-        return cls(message.columns, rows, message.truncated)
+        return cls(message.columns, rows, message.truncated, snapshot)
 
     @classmethod
-    def lazy_from_message(cls, message, table_client_settings=None):
+    def lazy_from_message(cls, message, table_client_settings=None, snapshot=None):
         rows = _LazyRows(message.rows, table_client_settings, message.columns)
-        return cls(message.columns, rows, message.truncated)
+        return cls(message.columns, rows, message.truncated, snapshot)
 
 
 ResultSet = _ResultSet

ydb/export.py

@@ -131,7 +131,7 @@ def __init__(self):
         self.secret_key = None
         self.number_of_retries = 0
         self.storage_class = None
-        self.compression = None
+        self.export_compression = None
 
     def with_scheme(self, scheme):
         self.scheme = scheme
@@ -141,8 +141,8 @@ def with_storage_class(self, storage_class):
         self.storage_class = storage_class
         return self
 
-    def with_compression(self, compression):
-        self.compression = compression
+    def with_export_compression(self, compression):
+        self.export_compression = compression
         return self
 
     def with_bucket(self, bucket):
@@ -225,8 +225,8 @@ def _export_to_s3_request_factory(settings):
     if settings.number_of_retries > 0:
         request.settings.number_of_retries = settings.number_of_retries
 
-    if settings.compression is not None:
-        request.settings.compression = settings.compression
+    if settings.export_compression is not None:
+        request.settings.compression = settings.export_compression
 
     for source_path, destination_prefix in settings.items:
         request.settings.items.add(

ydb/table.py

@@ -2311,6 +2311,8 @@ def execute(self, query, parameters=None, commit_tx=False, settings=None):
         """
 
         self._check_split()
+        if commit_tx:
+            self._set_finish(self._COMMIT)
 
         return self._driver(
             _tx_ctx_impl.execute_request_factory(

ydb/types.py

@@ -13,13 +13,20 @@
 _EPOCH = datetime(1970, 1, 1)
 
 
-def _from_date_number(x, table_client_settings):
+def _from_date(x, table_client_settings):
     if (
         table_client_settings is not None
         and table_client_settings._native_date_in_result_sets
     ):
-        return date.fromordinal(x + date(1970, 1, 1).toordinal())
-    return x
+        return _EPOCH.date() + timedelta(days=x.uint32_value)
+    return x.uint32_value
+
+
+def _to_date(pb, value):
+    if isinstance(value, date):
+        pb.uint32_value = (value - _EPOCH.date()).days
+    else:
+        pb.uint32_value = value
 
 
 def _from_datetime_number(x, table_client_settings):
@@ -113,8 +120,9 @@ class PrimitiveType(enum.Enum):
     UUID = (_apis.primitive_types.UUID, None, _to_uuid, _from_uuid)
     Date = (
         _apis.primitive_types.DATE,
-        "uint32_value",
-        _from_date_number,
+        None,
+        _from_date,
+        _to_date,
     )
     Datetime = (
         _apis.primitive_types.DATETIME,

ydb/ydb_version.py

@@ -1 +1 @@
-VERSION = "2.10.0"
+VERSION = "2.13.3"