vastdb 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

vastdb/errors.py

@@ -3,6 +3,7 @@ import xml.etree.ElementTree
 from dataclasses import dataclass
 from enum import Enum
 
+import pyarrow as pa
 import requests
 
 
@@ -169,6 +170,11 @@ class NotSupportedCommand(NotSupported):
     table: str
 
 
+@dataclass
+class NotSupportedType(NotSupported):
+    field: pa.Field
+
+
 @dataclass
 class NotSupportedVersion(NotSupported):
     err_msg: str

vastdb/schema.py

@@ -10,7 +10,7 @@ from typing import TYPE_CHECKING, Iterable, List, Optional
 
 import pyarrow as pa
 
-from . import bucket, errors, schema, table
+from . import bucket, errors, schema, table, util
 
 if TYPE_CHECKING:
     from .table import Table
@@ -86,6 +86,7 @@ class Schema:
         if use_external_row_ids_allocation:
             self.tx._rpc.features.check_external_row_ids_allocation()
 
+        util.check_supported_types(columns)
         self.tx._rpc.api.create_table(self.bucket.name, self.name, table_name, columns, txid=self.tx.txid,
                                       use_external_row_ids_allocation=use_external_row_ids_allocation)
         log.info("Created table: %s", table_name)

vastdb/table.py

@@ -486,6 +486,7 @@ class Table:
             raise errors.NotSupportedCommand(self.bucket.name, self.schema.name, self.name)
         try:
             row_ids = []
+            util.check_supported_types(rows.schema)
             serialized_slices = util.iter_serialized_slices(rows, MAX_INSERT_ROWS_PER_PATCH)
             for slice in serialized_slices:
                 res = self.tx._rpc.api.insert_rows(self.bucket.name, self.schema.name, self.name, record_batch=slice,
@@ -528,6 +529,7 @@ class Table:
 
         update_rows_rb = util.sort_record_batch_if_needed(update_rows_rb, INTERNAL_ROW_ID)
 
+        util.check_supported_types(update_rows_rb.schema)
         serialized_slices = util.iter_serialized_slices(update_rows_rb, MAX_ROWS_PER_BATCH)
         for slice in serialized_slices:
             self.tx._rpc.api.update_rows(self.bucket.name, self.schema.name, self.name, record_batch=slice,
@@ -572,6 +574,7 @@ class Table:
         """Add a new column."""
         if self._imports_table:
             raise errors.NotSupportedCommand(self.bucket.name, self.schema.name, self.name)
+        util.check_supported_types(new_column)
         self.tx._rpc.api.add_columns(self.bucket.name, self.schema.name, self.name, new_column, txid=self.tx.txid)
         log.info("Added column(s): %s", new_column)
         self.arrow_schema = self.columns()

vastdb/tests/test_tables.py

@@ -311,6 +311,46 @@ def test_types(session, clean_bucket_name):
             assert select(t['ts9'] == ts_literal) == expected.filter(pc.field('ts9') == ts_literal)
 
 
+TIMESTAMP_UNITS = ['s', 'ms', 'us', 'ns']
+
+
+def test_unsupported_timezone(session, clean_bucket_name):
+    with session.transaction() as tx:
+        s = tx.bucket(clean_bucket_name).create_schema('s1')
+        for unit in TIMESTAMP_UNITS:
+            col_type = pa.timestamp(unit, 'UTC')
+            with pytest.raises(errors.NotSupportedType):
+                s.create_table('t1', pa.schema([('ts', col_type)]))
+            assert s.tables() == []
+
+        cols = [('c', pa.int64())]
+        t1 = s.create_table('t1', pa.schema(cols))
+        for unit in TIMESTAMP_UNITS:
+            col_type = pa.timestamp(unit, 'UTC')
+            with pytest.raises(errors.NotSupportedType):
+                t1.add_column(pa.schema([('ts', col_type)]))
+
+        cols = [(f'c_{unit}', pa.timestamp(unit)) for unit in TIMESTAMP_UNITS]
+        t2 = s.create_table('t2', pa.schema(cols))
+
+        for unit in TIMESTAMP_UNITS:
+            col_type = pa.timestamp(unit, 'UTC')
+
+            rb = pa.record_batch(
+                data=[[None]],
+                schema=pa.schema([(f'c_{unit}', col_type)]))
+            with pytest.raises(errors.NotSupportedType):
+                t2.insert(rb)
+
+            rb = pa.record_batch(
+                data=[[0], [None]],
+                schema=pa.schema([
+                    (INTERNAL_ROW_ID, pa.uint64()),
+                    (f'c_{unit}', col_type)]))
+            with pytest.raises(errors.NotSupportedType):
+                t2.update(rb)
+
+
 def test_filters(session, clean_bucket_name):
     columns = pa.schema([
         ('a', pa.int32()),

vastdb/util.py

@@ -6,7 +6,7 @@ import pyarrow as pa
 import pyarrow.compute as pc
 import pyarrow.parquet as pq
 
-from .errors import InvalidArgument, TooWideRow
+from .errors import InvalidArgument, NotSupportedType, TooWideRow
 
 log = logging.getLogger(__name__)
 
@@ -152,3 +152,10 @@ def sort_record_batch_if_needed(record_batch, sort_column):
         return record_batch.sort_by(sort_column)
     else:
         return record_batch
+
+
+def check_supported_types(fields: pa.Schema):
+    for f in fields:
+        if isinstance(f.type, pa.TimestampType):
+            if f.type.tz:
+                raise NotSupportedType(f)

vastdb/vast_tests/test_ha.py

@@ -10,7 +10,7 @@ logger = logging.getLogger(__name__)
 
 
 @pytest.mark.ha
-def test_ha_query(session, crater_path, test_bucket_name, schema_name, table_name):
+def test_ha_query(session, test_bucket_name, schema_name, table_name):
     # runs in parallel to ha scenario
     times_to_query, records_in_table = 50, 100_000_000
     arrow_array = pa.array(range(0, records_in_table), type=pa.int64())

{vastdb-0.1.8.dist-info → vastdb-0.1.9.dist-info}/METADATA

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

{vastdb-0.1.8.dist-info → vastdb-0.1.9.dist-info}/RECORD

@@ -152,12 +152,12 @@ vastdb/__init__.py,sha256=8PLcZowy_vM0zuiYSQPXuxIEMcwHD7IRFpgcPK-03bk,386
 vastdb/_internal.py,sha256=bENTnMZFAXolkFaWa7op9bsPWMk3wVE6oKKU--0ukXk,89971
 vastdb/bucket.py,sha256=5KuKhPjZOevznZqWHDVVocejvAy7dcwobPuV6BJCfPc,2544
 vastdb/conftest.py,sha256=wnnPXjeLems2zpOBB1UGbZ_YW5S169NhGA5UZu7H5SM,2831
-vastdb/errors.py,sha256=2XR1ko7J5nkfiHSAgwuVAADw0SsyqxOwSeFaGgKZEXM,4186
-vastdb/schema.py,sha256=X7IRrogXH7Z0kes-DsDh1bRqIhvjH6owlFigGBXy7XQ,5913
+vastdb/errors.py,sha256=jER5RQYsBRlQsjym1ItQYRukggMypATOo_sKvsJtMbo,4278
+vastdb/schema.py,sha256=yaueil92MSMYJf6bWseov_8fXTdW5zaKLXNjP5uuyzI,5963
 vastdb/session.py,sha256=3YHhG7IamFOKuy-Fkq_IVtPNriSfI6IN_4z4arBFbDU,3349
-vastdb/table.py,sha256=qnyttTUF4SPCOcwx8HQZmKZFZlasMEfwEa5r_EalRxo,32723
+vastdb/table.py,sha256=TGBiIp0pB7vHd-92q4_sDRDjd4klHDLFOeEgdn1ACQI,32880
 vastdb/transaction.py,sha256=qu2rOlR7AS1ojMOzgWapQMpcorrutelZZLH1mLmTHxk,3186
-vastdb/util.py,sha256=4LTYBBR13na376AmDm5lQILJzLcfelIKdkNPy0IqI0o,5684
+vastdb/util.py,sha256=2W5bBnlihIFvdV4im4HiDLArEhU8zjKMZB3Xw0lzgz0,5888
 vastdb/bench/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vastdb/bench/test_perf.py,sha256=yn5gE7t_nzmJHBl9bCs1hxQOgzhvFphuYElsWGko8ts,1084
 vastdb/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -167,13 +167,13 @@ vastdb/tests/test_nested.py,sha256=22NAxBTm7Aq-Vn6AIYbi5Cb1ET8W0XeLK3pp4D8BYWI,3
 vastdb/tests/test_projections.py,sha256=3y1kubwVrzO-xoR0hyps7zrjOJI8niCYspaFTN16Q9w,4540
 vastdb/tests/test_sanity.py,sha256=V6dO5Y44B6pG8Eet6atTTGGH1yPz75_k0ZybHY-IiF8,3039
 vastdb/tests/test_schemas.py,sha256=l70YQMlx2UL1KRQhApriiG2ZM7GJF-IzWU31H3Yqn1U,3312
-vastdb/tests/test_tables.py,sha256=YhkeeTHq8aW1RgU86GolJl1dG3KGTlVG97Bny9RzyrM,30124
+vastdb/tests/test_tables.py,sha256=RlwVfzs2hjfs2gchiRY0hnWoOAu4MV_9NbQCeHR6_us,31590
 vastdb/tests/test_util.py,sha256=Ok_sAEBJsRGF5Voa_v5eu3eAd52GWu8jMjjQbadwW-s,1260
 vastdb/tests/util.py,sha256=dpRJYbboDnlqL4qIdvScpp8--5fxRUBIcIYitrfcj9o,555
 vastdb/vast_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vastdb/vast_tests/test_ha.py,sha256=icLgf88wR_O_cy0x37zDPfjQLkHxboah1J2xZBjjA7E,988
-vastdb-0.1.8.dist-info/LICENSE,sha256=obffan7LYrq7hLHNrY7vHcn2pKUTBUYXMKu-VOAvDxU,11333
-vastdb-0.1.8.dist-info/METADATA,sha256=uGYK9n-Li00OBDVWsK5qiTYN9yN5FApeLHgvSJ9ksEU,1350
-vastdb-0.1.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-vastdb-0.1.8.dist-info/top_level.txt,sha256=Vsj2MKtlhPg0J4so64slQtnwjhgoPmJgcG-6YcVAwVc,20
-vastdb-0.1.8.dist-info/RECORD,,
+vastdb/vast_tests/test_ha.py,sha256=744P4G6VJ09RIkHhMQL4wlipCBJWQVMhyvUrSc4k1HQ,975
+vastdb-0.1.9.dist-info/LICENSE,sha256=obffan7LYrq7hLHNrY7vHcn2pKUTBUYXMKu-VOAvDxU,11333
+vastdb-0.1.9.dist-info/METADATA,sha256=YRP3W_JzaDywneqZ0cFWJzLbLE_NGf9QYja6-CFwQl4,1350
+vastdb-0.1.9.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+vastdb-0.1.9.dist-info/top_level.txt,sha256=Vsj2MKtlhPg0J4so64slQtnwjhgoPmJgcG-6YcVAwVc,20
+vastdb-0.1.9.dist-info/RECORD,,

{vastdb-0.1.8.dist-info → vastdb-0.1.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any