Merge pull request #217 Sync from arcadia

Author: rekby

CHANGELOG.md

@@ -1,3 +1,6 @@
+* 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
 

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/convert.py

@@ -313,15 +313,15 @@ 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
 
     @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 = []
@@ -348,12 +348,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(