vastdb 1.3.2__tar.gz → 1.3.4__tar.gz

{vastdb-1.3.2 → vastdb-1.3.4}/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [1.3.4] (2024-12-11)
+[1.3.4]: https://github.com/vast-data/vastdb_sdk/compare/v1.3.3...v1.3.4
+
+### Added
+ - Support predicate pushdown on unsigned integers
+
+
+## [1.3.3] (2024-11-18)
+[1.3.3]: https://github.com/vast-data/vastdb_sdk/compare/v1.3.2...v1.3.3
+
+### Added
+ - Detect non-VAST DB server responses
+
+### Fixed
+ - Fetch table statistics when constructing a `Table` objects and accessing `Table.stats`
+
+
 ## [1.3.2] (2024-10-07)
 [1.3.2]: https://github.com/vast-data/vastdb_sdk/compare/v1.3.1...v1.3.2
 

{vastdb-1.3.2 → vastdb-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vastdb
-Version: 1.3.2
+Version: 1.3.4
 Summary: VAST Data SDK
 Home-page: https://github.com/vast-data/vastdb_sdk
 Author: VAST DATA

{vastdb-1.3.2 → vastdb-1.3.4}/README.md

@@ -14,7 +14,7 @@ For more details about the VAST Database, see [this whitepaper](https://vastdata
 
 ### Requirements
 
-- Linux client with Python 3.9 or later, and network access to the VAST Cluster
+- Linux client with Python 3.9 - 3.12, and network access to the VAST Cluster
 - [Virtual IP pool configured with DNS service](https://support.vastdata.com/s/topic/0TOV40000000FThOAM/configuring-network-access-v50)
 - [S3 access & secret keys on the VAST cluster](https://support.vastdata.com/s/article/UUID-4d2e7e23-b2fb-7900-d98f-96c31a499626)
 - [Tabular identity policy with the proper permissions](https://support.vastdata.com/s/article/UUID-14322b60-d6a2-89ac-3df0-3dfbb6974182)

{vastdb-1.3.2 → vastdb-1.3.4}/setup.py

@@ -29,7 +29,7 @@ setup(
     name='vastdb',
     python_requires='>=3.9.0',
     description='VAST Data SDK',
-    version='1.3.2' + suffix,
+    version='1.3.4' + suffix,
     url='https://github.com/vast-data/vastdb_sdk',
     author='VAST DATA',
     author_email='hello@vastdata.com',

vastdb-1.3.4/vast_flatbuf/tabular/CreateViewRequest.py

@@ -0,0 +1,104 @@
+# automatically generated by the FlatBuffers compiler, do not modify
+
+# namespace: tabular
+
+import flatbuffers
+from flatbuffers.compat import import_numpy
+np = import_numpy()
+
+class CreateViewRequest(object):
+    __slots__ = ['_tab']
+
+    @classmethod
+    def GetRootAs(cls, buf, offset=0):
+        n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset)
+        x = CreateViewRequest()
+        x.Init(buf, n + offset)
+        return x
+
+    @classmethod
+    def GetRootAsCreateViewRequest(cls, buf, offset=0):
+        """This method is deprecated. Please switch to GetRootAs."""
+        return cls.GetRootAs(buf, offset)
+    # CreateViewRequest
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # CreateViewRequest
+    def ViewMetadataArrowBuffer(self, j):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            a = self._tab.Vector(o)
+            return self._tab.Get(flatbuffers.number_types.Uint8Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 1))
+        return 0
+
+    # CreateViewRequest
+    def ViewMetadataArrowBufferAsNumpy(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Uint8Flags, o)
+        return 0
+
+    # CreateViewRequest
+    def ViewMetadataArrowBufferLength(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            return self._tab.VectorLen(o)
+        return 0
+
+    # CreateViewRequest
+    def ViewMetadataArrowBufferIsNone(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        return o == 0
+
+    # CreateViewRequest
+    def ViewDataArrowSchema(self, j):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        if o != 0:
+            a = self._tab.Vector(o)
+            return self._tab.Get(flatbuffers.number_types.Uint8Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 1))
+        return 0
+
+    # CreateViewRequest
+    def ViewDataArrowSchemaAsNumpy(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        if o != 0:
+            return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Uint8Flags, o)
+        return 0
+
+    # CreateViewRequest
+    def ViewDataArrowSchemaLength(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        if o != 0:
+            return self._tab.VectorLen(o)
+        return 0
+
+    # CreateViewRequest
+    def ViewDataArrowSchemaIsNone(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        return o == 0
+
+def Start(builder): builder.StartObject(2)
+def CreateViewRequestStart(builder):
+    """This method is deprecated. Please switch to Start."""
+    return Start(builder)
+def AddViewMetadataArrowBuffer(builder, viewMetadataArrowBuffer): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(viewMetadataArrowBuffer), 0)
+def CreateViewRequestAddViewMetadataArrowBuffer(builder, viewMetadataArrowBuffer):
+    """This method is deprecated. Please switch to AddViewMetadataArrowBuffer."""
+    return AddViewMetadataArrowBuffer(builder, viewMetadataArrowBuffer)
+def StartViewMetadataArrowBufferVector(builder, numElems): return builder.StartVector(1, numElems, 1)
+def CreateViewRequestStartViewMetadataArrowBufferVector(builder, numElems):
+    """This method is deprecated. Please switch to Start."""
+    return StartViewMetadataArrowBufferVector(builder, numElems)
+def AddViewDataArrowSchema(builder, viewDataArrowSchema): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(viewDataArrowSchema), 0)
+def CreateViewRequestAddViewDataArrowSchema(builder, viewDataArrowSchema):
+    """This method is deprecated. Please switch to AddViewDataArrowSchema."""
+    return AddViewDataArrowSchema(builder, viewDataArrowSchema)
+def StartViewDataArrowSchemaVector(builder, numElems): return builder.StartVector(1, numElems, 1)
+def CreateViewRequestStartViewDataArrowSchemaVector(builder, numElems):
+    """This method is deprecated. Please switch to Start."""
+    return StartViewDataArrowSchemaVector(builder, numElems)
+def End(builder): return builder.EndObject()
+def CreateViewRequestEnd(builder):
+    """This method is deprecated. Please switch to End."""
+    return End(builder)

vastdb-1.3.4/vast_flatbuf/tabular/ListViewsResponse.py

@@ -0,0 +1,89 @@
+# automatically generated by the FlatBuffers compiler, do not modify
+
+# namespace: tabular
+
+import flatbuffers
+from flatbuffers.compat import import_numpy
+np = import_numpy()
+
+class ListViewsResponse(object):
+    __slots__ = ['_tab']
+
+    @classmethod
+    def GetRootAs(cls, buf, offset=0):
+        n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset)
+        x = ListViewsResponse()
+        x.Init(buf, n + offset)
+        return x
+
+    @classmethod
+    def GetRootAsListViewsResponse(cls, buf, offset=0):
+        """This method is deprecated. Please switch to GetRootAs."""
+        return cls.GetRootAs(buf, offset)
+    # ListViewsResponse
+    def Init(self, buf, pos):
+        self._tab = flatbuffers.table.Table(buf, pos)
+
+    # ListViewsResponse
+    def BucketName(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
+        if o != 0:
+            return self._tab.String(o + self._tab.Pos)
+        return None
+
+    # ListViewsResponse
+    def SchemaName(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
+        if o != 0:
+            return self._tab.String(o + self._tab.Pos)
+        return None
+
+    # ListViewsResponse
+    def Views(self, j):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
+        if o != 0:
+            x = self._tab.Vector(o)
+            x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4
+            x = self._tab.Indirect(x)
+            from vast_flatbuf.tabular.ObjectDetails import ObjectDetails
+            obj = ObjectDetails()
+            obj.Init(self._tab.Bytes, x)
+            return obj
+        return None
+
+    # ListViewsResponse
+    def ViewsLength(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
+        if o != 0:
+            return self._tab.VectorLen(o)
+        return 0
+
+    # ListViewsResponse
+    def ViewsIsNone(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
+        return o == 0
+
+def Start(builder): builder.StartObject(3)
+def ListViewsResponseStart(builder):
+    """This method is deprecated. Please switch to Start."""
+    return Start(builder)
+def AddBucketName(builder, bucketName): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(bucketName), 0)
+def ListViewsResponseAddBucketName(builder, bucketName):
+    """This method is deprecated. Please switch to AddBucketName."""
+    return AddBucketName(builder, bucketName)
+def AddSchemaName(builder, schemaName): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(schemaName), 0)
+def ListViewsResponseAddSchemaName(builder, schemaName):
+    """This method is deprecated. Please switch to AddSchemaName."""
+    return AddSchemaName(builder, schemaName)
+def AddViews(builder, views): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(views), 0)
+def ListViewsResponseAddViews(builder, views):
+    """This method is deprecated. Please switch to AddViews."""
+    return AddViews(builder, views)
+def StartViewsVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ListViewsResponseStartViewsVector(builder, numElems):
+    """This method is deprecated. Please switch to Start."""
+    return StartViewsVector(builder, numElems)
+def End(builder): return builder.EndObject()
+def ListViewsResponseEnd(builder):
+    """This method is deprecated. Please switch to End."""
+    return End(builder)

{vastdb-1.3.2 → vastdb-1.3.4}/vast_flatbuf/tabular/ObjectDetails.py

@@ -60,7 +60,21 @@ class ObjectDetails(object):
             return self._tab.Get(flatbuffers.number_types.Uint64Flags, o + self._tab.Pos)
         return 0
 
-def Start(builder): builder.StartObject(5)
+    # ObjectDetails
+    def NumPartitions(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(14))
+        if o != 0:
+            return self._tab.Get(flatbuffers.number_types.Uint64Flags, o + self._tab.Pos)
+        return 0
+
+    # ObjectDetails
+    def SortingKeyEnabled(self):
+        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(16))
+        if o != 0:
+            return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos))
+        return False
+
+def Start(builder): builder.StartObject(7)
 def ObjectDetailsStart(builder):
     """This method is deprecated. Please switch to Start."""
     return Start(builder)
@@ -84,6 +98,14 @@ def AddSizeInBytes(builder, sizeInBytes): builder.PrependUint64Slot(4, sizeInByt
 def ObjectDetailsAddSizeInBytes(builder, sizeInBytes):
     """This method is deprecated. Please switch to AddSizeInBytes."""
     return AddSizeInBytes(builder, sizeInBytes)
+def AddNumPartitions(builder, numPartitions): builder.PrependUint64Slot(5, numPartitions, 0)
+def ObjectDetailsAddNumPartitions(builder, numPartitions):
+    """This method is deprecated. Please switch to AddNumPartitions."""
+    return AddNumPartitions(builder, numPartitions)
+def AddSortingKeyEnabled(builder, sortingKeyEnabled): builder.PrependBoolSlot(6, sortingKeyEnabled, 0)
+def ObjectDetailsAddSortingKeyEnabled(builder, sortingKeyEnabled):
+    """This method is deprecated. Please switch to AddSortingKeyEnabled."""
+    return AddSortingKeyEnabled(builder, sortingKeyEnabled)
 def End(builder): return builder.EndObject()
 def ObjectDetailsEnd(builder):
     """This method is deprecated. Please switch to End."""

{vastdb-1.3.2 → vastdb-1.3.4}/vastdb/_internal.py

@@ -58,6 +58,10 @@ import vast_flatbuf.org.apache.arrow.computeir.flatbuf.Source as fb_source
 import vast_flatbuf.org.apache.arrow.computeir.flatbuf.StringLiteral as fb_string_lit
 import vast_flatbuf.org.apache.arrow.computeir.flatbuf.TimeLiteral as fb_time_lit
 import vast_flatbuf.org.apache.arrow.computeir.flatbuf.TimestampLiteral as fb_timestamp_lit
+import vast_flatbuf.org.apache.arrow.computeir.flatbuf.UInt8Literal as fb_uint8_lit
+import vast_flatbuf.org.apache.arrow.computeir.flatbuf.UInt16Literal as fb_uint16_lit
+import vast_flatbuf.org.apache.arrow.computeir.flatbuf.UInt32Literal as fb_uint32_lit
+import vast_flatbuf.org.apache.arrow.computeir.flatbuf.UInt64Literal as fb_uint64_lit
 import vast_flatbuf.org.apache.arrow.flatbuf.Binary as fb_binary
 import vast_flatbuf.org.apache.arrow.flatbuf.Bool as fb_bool
 import vast_flatbuf.org.apache.arrow.flatbuf.Date as fb_date
@@ -341,50 +345,57 @@ class Predicate:
         fb_expression.AddImpl(self.builder, offset_call)
         return fb_expression.End(self.builder)
 
+    # see https://github.com/apache/arrow/blob/main/format/Schema.fbs
+    # https://github.com/apache/arrow/blob/apache-arrow-7.0.0/experimental/computeir/Expression.fbs
+    # https://github.com/apache/arrow/blob/apache-arrow-7.0.0/experimental/computeir/Literal.fbs
     def build_literal(self, field: pa.Field, value):
         literal_type: Any
 
-        if field.type.equals(pa.int64()):
-            literal_type = fb_int64_lit
-            literal_impl = LiteralImpl.Int64Literal
+        if field.type.equals(pa.int64()) or field.type.equals(pa.uint64()):
+            is_signed = field.type.equals(pa.int64())
+            literal_type = fb_int64_lit if is_signed else fb_uint64_lit
+            literal_impl = LiteralImpl.Int64Literal if is_signed else LiteralImpl.UInt64Literal
 
             field_type_type = Type.Int
             fb_int.Start(self.builder)
             fb_int.AddBitWidth(self.builder, field.type.bit_width)
-            fb_int.AddIsSigned(self.builder, True)
+            fb_int.AddIsSigned(self.builder, is_signed)
             field_type = fb_int.End(self.builder)
 
             value = int(value)
-        elif field.type.equals(pa.int32()):
-            literal_type = fb_int32_lit
-            literal_impl = LiteralImpl.Int32Literal
+        elif field.type.equals(pa.int32()) or field.type.equals(pa.uint32()):
+            is_signed = field.type.equals(pa.int32())
+            literal_type = fb_int32_lit if is_signed else fb_uint32_lit
+            literal_impl = LiteralImpl.Int32Literal if is_signed else LiteralImpl.UInt32Literal
 
             field_type_type = Type.Int
             fb_int.Start(self.builder)
             fb_int.AddBitWidth(self.builder, field.type.bit_width)
-            fb_int.AddIsSigned(self.builder, True)
+            fb_int.AddIsSigned(self.builder, is_signed)
             field_type = fb_int.End(self.builder)
 
             value = int(value)
-        elif field.type.equals(pa.int16()):
-            literal_type = fb_int16_lit
-            literal_impl = LiteralImpl.Int16Literal
+        elif field.type.equals(pa.int16()) or field.type.equals(pa.uint16()):
+            is_signed = field.type.equals(pa.int16())
+            literal_type = fb_int16_lit if is_signed else fb_uint16_lit
+            literal_impl = LiteralImpl.Int16Literal if is_signed else LiteralImpl.UInt16Literal
 
             field_type_type = Type.Int
             fb_int.Start(self.builder)
             fb_int.AddBitWidth(self.builder, field.type.bit_width)
-            fb_int.AddIsSigned(self.builder, True)
+            fb_int.AddIsSigned(self.builder, is_signed)
             field_type = fb_int.End(self.builder)
 
             value = int(value)
-        elif field.type.equals(pa.int8()):
-            literal_type = fb_int8_lit
-            literal_impl = LiteralImpl.Int8Literal
+        elif field.type.equals(pa.int8()) or field.type.equals(pa.uint8()):
+            is_signed = field.type.equals(pa.int8())
+            literal_type = fb_int8_lit if is_signed else fb_uint8_lit
+            literal_impl = LiteralImpl.Int8Literal if is_signed else LiteralImpl.UInt8Literal
 
             field_type_type = Type.Int
             fb_int.Start(self.builder)
             fb_int.AddBitWidth(self.builder, field.type.bit_width)
-            fb_int.AddIsSigned(self.builder, True)
+            fb_int.AddIsSigned(self.builder, is_signed)
             field_type = fb_int.End(self.builder)
 
             value = int(value)
@@ -735,17 +746,57 @@ def _iter_nested_arrays(column: pa.Array) -> Iterator[pa.Array]:
         yield from _iter_nested_arrays(column.values)  # Note: Map is serialized in VAST as a List<Struct<K, V>>
 
 
-TableInfo = namedtuple('TableInfo', 'name properties handle num_rows size_in_bytes')
+class ValidateInList:
+    def __init__(self, *args):
+        self.candidates = [x.strip() for x in args]
 
+    def __call__(self, x):
+        x = x.strip()
+        if x not in self.candidates:
+            raise Exception(f'{x} is not in {self.candidates}')
+        return x
+
+    def __getitem__(self, x):
+        return self
+
+
+_int_coding = (lambda x: str(int(x)), lambda x: int(x))
+_prop_coding = {
+        "message.timestamp.type": ValidateInList('CreateTime', 'LogAppendTime'),
+        "retention.ms": _int_coding,
+        "message.timestamp.after.max.ms": _int_coding,
+        "message.timestamp.before.max.ms": _int_coding
+        }
+
+
+def _encode_table_props(**kwargs):
+    if all([v is None for v in kwargs.values()]):
+        return None
+    else:
+        pairs = [(k.replace("_", ".").strip(), v) for k, v in kwargs.items() if v is not None]
+        return "$".join([f"{k}={_prop_coding[k][0](v)}" for k, v in pairs])
+
+
+def _decode_table_props(s):
+    if s.strip() == '':
+        return {}
+    triplets = [(x.strip(), x.strip().replace(".", "_"), y.strip()) for x, y in [z.split('=') for z in s.strip().split("$")]]
+    return {y: _prop_coding[x][1](z) for x, y, z in triplets if z != ''}
 
-def _parse_table_info(obj):
 
+TableInfo = namedtuple('TableInfo', 'name properties handle num_rows size_in_bytes num_partitions')
+
+
+def _parse_table_info(obj):
     name = obj.Name().decode()
     properties = obj.Properties().decode()
     handle = obj.Handle().decode()
     num_rows = obj.NumRows()
     used_bytes = obj.SizeInBytes()
-    return TableInfo(name, properties, handle, num_rows, used_bytes)
+    num_partitions = obj.NumPartitions()
+    if num_partitions != 0:
+        properties = _decode_table_props(properties)
+    return TableInfo(name, properties, handle, num_rows, used_bytes, num_partitions)
 
 
 # Results that returns from tablestats
@@ -774,7 +825,13 @@ def _backoff_giveup(exc: Exception) -> bool:
     return True  # give up in case of other exceptions
 
 
+class UnsupportedServer(NotImplementedError):
+    """Raised when the response comes back from non-VAST DB server."""
+    pass
+
+
 class VastdbApi:
+    VAST_SERVER_PREFIX = 'vast'
     # we expect the vast version to be <major>.<minor>.<patch>.<protocol>
     VAST_VERSION_REGEX = re.compile(r'^vast (\d+\.\d+\.\d+\.\d+)$')
 
@@ -829,6 +886,9 @@ class VastdbApi:
         if server_header is None:
             _logger.error("Response doesn't contain 'Server' header")
         else:
+            if not server_header.startswith(self.VAST_SERVER_PREFIX):
+                raise UnsupportedServer(f'{self.url} is not a VAST DB server endpoint ("{server_header}")')
+
             if m := self.VAST_VERSION_REGEX.match(server_header):
                 self.vast_version: Tuple[int, ...] = tuple(int(v) for v in m.group(1).split("."))
                 return
@@ -1049,8 +1109,9 @@ class VastdbApi:
 
         return snapshots, is_truncated, marker
 
-    def create_table(self, bucket, schema, name, arrow_schema, txid=0, client_tags=[], expected_retvals=[],
-                     topic_partitions=0, create_imports_table=False, use_external_row_ids_allocation=False):
+    def create_table(self, bucket, schema, name, arrow_schema=None, txid=0, client_tags=[], expected_retvals=[],
+                     topic_partitions=0, create_imports_table=False, use_external_row_ids_allocation=False,
+                     message_timestamp_type=None, retention_ms=None, message_timestamp_after_max_ms=None, message_timestamp_before_max_ms=None):
         """
         Create a table, use the following request
         POST /bucket/schema/table?table HTTP/1.1
@@ -1069,6 +1130,9 @@ class VastdbApi:
         """
         headers = self._fill_common_headers(txid=txid, client_tags=client_tags)
 
+        if arrow_schema is None:
+            arrow_schema = pa.schema([])
+
         serialized_schema = arrow_schema.serialize()
         headers['Content-Length'] = str(len(serialized_schema))
         if use_external_row_ids_allocation:
@@ -1078,6 +1142,11 @@ class VastdbApi:
         if create_imports_table:
             url_params['sub-table'] = IMPORTED_OBJECTS_TABLE_NAME
 
+        if topic_partitions > 0:
+            table_props = _encode_table_props(message_timestamp_type=message_timestamp_type, retention_ms=retention_ms, message_timestamp_after_max_ms=message_timestamp_after_max_ms, message_timestamp_before_max_ms=message_timestamp_before_max_ms)
+            if table_props is not None:
+                url_params['table-props'] = table_props
+
         self._request(
             method="POST",
             url=self._url(bucket=bucket, schema=schema, table=name, command="table", url_params=url_params),
@@ -1106,7 +1175,8 @@ class VastdbApi:
         return TableStatsResult(num_rows, size_in_bytes, is_external_rowid_alloc, tuple(endpoints))
 
     def alter_table(self, bucket, schema, name, txid=0, client_tags=[], table_properties="",
-                    new_name="", expected_retvals=[]):
+                    new_name="", expected_retvals=[],
+                    message_timestamp_type=None, retention_ms=None, message_timestamp_after_max_ms=None, message_timestamp_before_max_ms=None):
         """
         PUT /mybucket/myschema/mytable?table HTTP/1.1
         Content-Length: ContentLength
@@ -1118,6 +1188,11 @@ class VastdbApi:
         """
         builder = flatbuffers.Builder(1024)
 
+        if message_timestamp_type is not None or retention_ms is not None or message_timestamp_after_max_ms is not None or message_timestamp_before_max_ms is not None:
+            table_properties = _encode_table_props(message_timestamp_type=message_timestamp_type, retention_ms=retention_ms, message_timestamp_after_max_ms=message_timestamp_after_max_ms, message_timestamp_before_max_ms=message_timestamp_before_max_ms)
+            if table_properties is None:
+                table_properties = ""
+
         properties = builder.CreateString(table_properties)
         tabular_alter_table.Start(builder)
         if len(table_properties):

{vastdb-1.3.2 → vastdb-1.3.4}/vastdb/schema.py

@@ -146,5 +146,4 @@ class Schema:
 
 
 def _parse_table_info(table_info, schema: "schema.Schema"):
-    stats = table.TableStats(num_rows=table_info.num_rows, size_in_bytes=table_info.size_in_bytes)
-    return table.Table(name=table_info.name, schema=schema, handle=int(table_info.handle), stats=stats, _imports_table=False)
+    return table.Table(name=table_info.name, schema=schema, handle=int(table_info.handle), _imports_table=False)

{vastdb-1.3.2 → vastdb-1.3.4}/vastdb/table.py

@@ -112,7 +112,6 @@ class Table:
     name: str
     schema: "schema.Schema"
     handle: int
-    stats: TableStats
     arrow_schema: pa.Schema = field(init=False, compare=False, repr=False)
     _ibis_table: ibis.Schema = field(init=False, compare=False, repr=False)
     _imports_table: bool
@@ -139,6 +138,11 @@ class Table:
         """Return bucket."""
         return self.schema.bucket
 
+    @property
+    def stats(self):
+        """Fetch table's statistics from server."""
+        return self.get_stats()
+
     def columns(self) -> pa.Schema:
         """Return columns' metadata."""
         fields = []
@@ -576,7 +580,7 @@ class Table:
     def imports_table(self) -> Optional["Table"]:
         """Get the imports table of this table."""
         self.tx._rpc.features.check_imports_table()
-        return Table(name=self.name, schema=self.schema, handle=int(self.handle), stats=self.stats, _imports_table=True)
+        return Table(name=self.name, schema=self.schema, handle=int(self.handle), _imports_table=True)
 
     def __getitem__(self, col_name):
         """Allow constructing ibis-like column expressions from this table.

{vastdb-1.3.2 → vastdb-1.3.4}/vastdb/tests/metrics.py

@@ -29,7 +29,7 @@ class Table:
         self.conn = conn
         self.name = name
         columns = ", ".join(
-            f"{f.name} {_MAP_SQLITE_TYPES[f.type]}"
+            f"{f.name} {_MAP_SQLITE_TYPES[f.type]}"  # type: ignore
             for f in self.fields
         )
         cmd = f"CREATE TABLE {self.name} ({columns})"

{vastdb-1.3.2 → vastdb-1.3.4}/vastdb/tests/test_sanity.py

@@ -7,6 +7,7 @@ from itertools import cycle
 import pytest
 
 import vastdb.errors
+from vastdb._internal import UnsupportedServer
 
 log = logging.getLogger(__name__)
 
@@ -32,13 +33,14 @@ def test_bad_endpoint(session):
 def test_version_extraction():
     # A list of version and expected version parsed by API
     TEST_CASES = [
-            (None, None),                                   # vast server without version in header
-            ("5", None),                                    # major
-            ("5.2", None),                                  # major.minor
-            ("5.2.0", None),                                # major.minor.patch
-            ("5.2.0.10", (5, 2, 0, 10)),                    # major.minor.patch.protocol
-            ("5.2.0.10 some other things", None),           # suffix
-            ("5.2.0.10.20", None),                          # extra version
+            ("nginx", UnsupportedServer),                               # non-vast server
+            ("vast", NotImplementedError),                              # vast server without version in header
+            ("vast 5", NotImplementedError),                            # major
+            ("vast 5.2", NotImplementedError),                          # major.minor
+            ("vast 5.2.0", NotImplementedError),                        # major.minor.patch
+            ("vast 5.2.0.10", (5, 2, 0, 10)),                           # major.minor.patch.protocol
+            ("vast 5.2.0.10 some other things", NotImplementedError),   # suffix
+            ("vast 5.2.0.10.20", NotImplementedError),                  # extra version
     ]
 
     # Mock OPTIONS handle that cycles through the test cases response
@@ -53,8 +55,7 @@ def test_version_extraction():
             self.end_headers()
 
         def version_string(self):
-            version = next(self.versions_iterator)[0]
-            return f"vast {version}" if version else "vast"
+            return next(self.versions_iterator)[0]
 
         def log_message(self, format, *args):
             log.debug(format, *args)
@@ -74,7 +75,10 @@ def test_version_extraction():
 
     try:
         for _, expected in TEST_CASES:
-            with (pytest.raises(NotImplementedError) if expected is None else contextlib.nullcontext()):
+            manager = contextlib.nullcontext()
+            if isinstance(expected, type) and issubclass(expected, NotImplementedError):
+                manager = pytest.raises(expected)
+            with manager:
                 s = vastdb.connect(endpoint=f"http://localhost:{httpd.server_port}", access="abc", secret="abc")
                 assert s.api.vast_version == expected
     finally: