vastdb 1.3.3__py3-none-any.whl → 1.3.5__py3-none-any.whl

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
@@ -115,6 +119,8 @@ TABULAR_INVALID_ROW_ID = 0xFFFFFFFFFFFF  # (1<<48)-1
 ESTORE_INVALID_EHANDLE = UINT64_MAX
 IMPORTED_OBJECTS_TABLE_NAME = "vastdb-imported-objects"
 
+KAFKA_TOPICS_SCHEMA_NAME = 'kafka_topics'
+
 """
 S3 Tabular API
 """
@@ -341,50 +347,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)
@@ -776,15 +789,14 @@ def _decode_table_props(s):
 TableInfo = namedtuple('TableInfo', 'name properties handle num_rows size_in_bytes num_partitions')
 
 
-def _parse_table_info(obj):
+def _parse_table_info(obj, parse_properties):
     name = obj.Name().decode()
     properties = obj.Properties().decode()
     handle = obj.Handle().decode()
     num_rows = obj.NumRows()
     used_bytes = obj.SizeInBytes()
     num_partitions = obj.NumPartitions()
-    if num_partitions != 0:
-        properties = _decode_table_props(properties)
+    properties = parse_properties(properties)
     return TableInfo(name, properties, handle, num_rows, used_bytes, num_partitions)
 
 
@@ -1098,9 +1110,29 @@ class VastdbApi:
 
         return snapshots, is_truncated, marker
 
-    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):
+    def create_table(self, bucket, schema, name, arrow_schema=None,
+                     txid=0, client_tags=[], expected_retvals=[],
+                     create_imports_table=False, use_external_row_ids_allocation=False, table_props=None):
+        self._create_table_internal(bucket=bucket, schema=schema, name=name, arrow_schema=arrow_schema,
+                                    txid=txid, client_tags=client_tags, expected_retvals=expected_retvals,
+                                    create_imports_table=create_imports_table, use_external_row_ids_allocation=use_external_row_ids_allocation,
+                                    table_props=table_props)
+
+    def create_topic(self, bucket, name, topic_partitions, expected_retvals=[],
+                     message_timestamp_type=None, retention_ms=None, message_timestamp_after_max_ms=None,
+                     message_timestamp_before_max_ms=None):
+        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)
+
+        self._create_table_internal(bucket=bucket, schema=KAFKA_TOPICS_SCHEMA_NAME, name=name, arrow_schema=None,
+                                    expected_retvals=expected_retvals, topic_partitions=topic_partitions,
+                                    table_props=table_props)
+
+    def _create_table_internal(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, table_props=None):
         """
         Create a table, use the following request
         POST /bucket/schema/table?table HTTP/1.1
@@ -1131,10 +1163,8 @@ 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
+        if table_props is not None:
+            url_params['table-props'] = table_props
 
         self._request(
             method="POST",
@@ -1163,9 +1193,22 @@ class VastdbApi:
         endpoints = [self.url]  # we cannot replace the host by a VIP address in HTTPS-based URLs
         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="",
+    def alter_topic(self, bucket, name,
                     new_name="", expected_retvals=[],
-                    message_timestamp_type=None, retention_ms=None, message_timestamp_after_max_ms=None, message_timestamp_before_max_ms=None):
+                    message_timestamp_type=None, retention_ms=None, message_timestamp_after_max_ms=None,
+                    message_timestamp_before_max_ms=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 = ""
+
+        self.alter_table(bucket=bucket, schema=KAFKA_TOPICS_SCHEMA_NAME, name=name,
+                         table_properties=table_properties, expected_retvals=expected_retvals)
+
+    def alter_table(self, bucket, schema, name, txid=0, client_tags=[], table_properties="",
+                    new_name="", expected_retvals=[]):
         """
         PUT /mybucket/myschema/mytable?table HTTP/1.1
         Content-Length: ContentLength
@@ -1177,10 +1220,8 @@ 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 = ""
+        if table_properties is None:
+            table_properties = ""
 
         properties = builder.CreateString(table_properties)
         tabular_alter_table.Start(builder)
@@ -1200,6 +1241,10 @@ class VastdbApi:
             url=self._url(bucket=bucket, schema=schema, table=name, command="table", url_params=url_params),
             data=alter_table_req, headers=headers)
 
+    def drop_topic(self, bucket, name, expected_retvals=[]):
+        self.drop_table(bucket=bucket, schema=KAFKA_TOPICS_SCHEMA_NAME, name=name,
+                        expected_retvals=expected_retvals)
+
     def drop_table(self, bucket, schema, name, txid=0, client_tags=[], expected_retvals=[], remove_imports_table=False):
         """
         DELETE /mybucket/schema_path/mytable?table HTTP/1.1
@@ -1216,8 +1261,26 @@ class VastdbApi:
             url=self._url(bucket=bucket, schema=schema, table=name, command="table", url_params=url_params),
             headers=headers)
 
+    def list_topics(self, bucket, max_keys=1000, next_key=0, name_prefix="",
+                    exact_match=False, expected_retvals=[], include_list_stats=False, count_only=False):
+        return self._list_tables_internal(bucket=bucket, schema=KAFKA_TOPICS_SCHEMA_NAME,
+                                          parse_properties=_decode_table_props, max_keys=max_keys,
+                                          next_key=next_key, name_prefix=name_prefix, exact_match=exact_match,
+                                          expected_retvals=expected_retvals,
+                                          include_list_stats=include_list_stats, count_only=count_only)
+
     def list_tables(self, bucket, schema, txid=0, client_tags=[], max_keys=1000, next_key=0, name_prefix="",
                     exact_match=False, expected_retvals=[], include_list_stats=False, count_only=False):
+        def parse_properties(x):
+            return x
+        return self._list_tables_internal(bucket=bucket, schema=schema, txid=txid, client_tags=client_tags,
+                                          parse_properties=parse_properties, max_keys=max_keys, next_key=next_key,
+                                          name_prefix=name_prefix, exact_match=exact_match,
+                                          expected_retvals=expected_retvals,
+                                          include_list_stats=include_list_stats, count_only=count_only)
+
+    def _list_tables_internal(self, bucket, schema, parse_properties, txid=0, client_tags=[], max_keys=1000, next_key=0, name_prefix="",
+                              exact_match=False, expected_retvals=[], include_list_stats=False, count_only=False):
         """
         GET /mybucket/schema_path?table HTTP/1.1
         tabular-txid: TransactionId
@@ -1254,7 +1317,7 @@ class VastdbApi:
         tables_length = lists.TablesLength()
         count = int(res_headers['tabular-list-count']) if 'tabular-list-count' in res_headers else tables_length
         for i in range(tables_length):
-            tables.append(_parse_table_info(lists.Tables(i)))
+            tables.append(_parse_table_info(lists.Tables(i), parse_properties))
 
         return bucket_name, schema_name, tables, next_key, is_truncated, count
 
@@ -1826,7 +1889,7 @@ class VastdbApi:
             raise ValueError(f'bucket: {bucket} did not start from {bucket_name}')
         projections_length = lists.ProjectionsLength()
         for i in range(projections_length):
-            projections.append(_parse_table_info(lists.Projections(i)))
+            projections.append(_parse_table_info(lists.Projections(i), lambda x: x))
 
         return bucket_name, schema_name, table_name, projections, next_key, is_truncated, count
 

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/tests/test_tables.py

@@ -388,6 +388,33 @@ def test_types(session, clean_bucket_name):
             assert select(t['ts9'] == ts_literal) == expected.filter(pc.field('ts9') == ts_literal)
 
 
+def test_unsigned_filters(session, clean_bucket_name):
+    columns = pa.schema([
+        ('a', pa.uint8()),
+        ('b', pa.uint16()),
+        ('c', pa.uint32()),
+        ('d', pa.uint64()),
+    ])
+
+    expected = pa.table(schema=columns, data=[
+        [1, 2, 3],
+        [11, 22, 33],
+        [111, 222, 333],
+        [1111, 2222, 3333],
+    ])
+
+    with prepare_data(session, clean_bucket_name, 's', 't', expected) as table:
+        def select(predicate):
+            return table.select(predicate=predicate).read_all()
+
+        assert select(True) == expected
+        for t in [table, ibis._]:
+            assert select(t['a'] > 2) == expected.filter(pc.field('a') > 2)
+            assert select(t['b'] > 22) == expected.filter(pc.field('b') > 22)
+            assert select(t['c'] > 222) == expected.filter(pc.field('c') > 222)
+            assert select(t['d'] > 2222) == expected.filter(pc.field('d') > 2222)
+
+
 def test_filters(session, clean_bucket_name):
     columns = pa.schema([
         ('a', pa.int32()),

{vastdb-1.3.3.dist-info → vastdb-1.3.5.dist-info}/METADATA

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

{vastdb-1.3.3.dist-info → vastdb-1.3.5.dist-info}/RECORD

@@ -151,7 +151,7 @@ vast_flatbuf/tabular/S3File.py,sha256=KC9c2oS5-JXwTTriUVFdjOvRG0B54Cq9kviSDZY3NI
 vast_flatbuf/tabular/VipRange.py,sha256=_BJd1RRZAcK76T9vlsHzXKYVsPVaz6WTEAqStMQCAUQ,2069
 vast_flatbuf/tabular/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vastdb/__init__.py,sha256=J1JjKiFkKC95BHowfh9kJfQFTjRce-QMsc6zF_FfxC0,432
-vastdb/_internal.py,sha256=nLa2G6FwjPiirjXo4HBc3Cs6P2XH8ub1yBsy1Zxu0R8,95257
+vastdb/_internal.py,sha256=N3Z5uQ9aYj-UlzJTtBBXpht2JV685emtiVhawm1zlKQ,99787
 vastdb/bucket.py,sha256=5KuKhPjZOevznZqWHDVVocejvAy7dcwobPuV6BJCfPc,2544
 vastdb/config.py,sha256=1tMYtzKXerGcIUjH4tIGEvZNWvO4fviCEdcNCnELJZo,2269
 vastdb/conftest.py,sha256=X2kVveySPQYZlVBXUMoo7Oea5IsvmJzjdqq3fpH2kVw,3469
@@ -191,21 +191,21 @@ vastdb/bench/perf_bench/query/query.py,sha256=h98Ui6vUTw16LHMY0ufkLnyVO3QCR8f1cX
 vastdb/bench/perf_bench/query/query_pyarrow.py,sha256=Dj5YPUvb4dAj7RskHfJcPijJnM-rdYIAItEF2dp4jfo,2305
 vastdb/bench/perf_bench/query/query_vastdb.py,sha256=SZYem_EmsaynEftAa_VFobjSJZDAcli9BckyRS3SFvg,2810
 vastdb/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vastdb/tests/metrics.py,sha256=N6ELJUmZubhAMmUtDbisXr6TFhSDgVCTTU05gBVxHRA,1010
+vastdb/tests/metrics.py,sha256=ZCSeBYFSPMG3yI0JrAHs2CrY6wFjx_5GwRTYHVAwLKA,1026
 vastdb/tests/test_duckdb.py,sha256=STw_1PwTQR8Naz6s0p6lQTV1ZTKKhe3LPBUbhqzTCu0,1880
 vastdb/tests/test_imports.py,sha256=xKub3-bisFjH0BsZM8COfiUWuMrtoOoQKprF6VQT9RI,5669
 vastdb/tests/test_nested.py,sha256=LPU6uV3Ri23dBzAEMFQqRPbqapV5LfmiHSHkhILPIY0,6332
 vastdb/tests/test_projections.py,sha256=3y1kubwVrzO-xoR0hyps7zrjOJI8niCYspaFTN16Q9w,4540
 vastdb/tests/test_sanity.py,sha256=bv1ypGDzvOgmMvGbucDYiLQu8krQLlE6NB3M__q87x8,3303
 vastdb/tests/test_schemas.py,sha256=l70YQMlx2UL1KRQhApriiG2ZM7GJF-IzWU31H3Yqn1U,3312
-vastdb/tests/test_tables.py,sha256=711oTcdw431zs5LAyDxvTaJqF86xYwVCo5iZxSpH58o,39184
+vastdb/tests/test_tables.py,sha256=PwtUTmQdm4HDZJVq981h7RKcFDma2Loxz6FeQhQSu2Y,40101
 vastdb/tests/test_util.py,sha256=n7gvT5Wg6b6bxgqkFXkYqvFd_W1GlUdVfmPv66XYXyA,1956
 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=744P4G6VJ09RIkHhMQL4wlipCBJWQVMhyvUrSc4k1HQ,975
 vastdb/vast_tests/test_scale.py,sha256=5jGwOdZH6Tv5tPdZYPWoqcxOceI2jA5i2D1zNKZHER4,3958
-vastdb-1.3.3.dist-info/LICENSE,sha256=obffan7LYrq7hLHNrY7vHcn2pKUTBUYXMKu-VOAvDxU,11333
-vastdb-1.3.3.dist-info/METADATA,sha256=xqBDm4Puvz348pzEDM7b_IIs-nZDSha7Sgg0RHHh94w,1340
-vastdb-1.3.3.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-vastdb-1.3.3.dist-info/top_level.txt,sha256=Vsj2MKtlhPg0J4so64slQtnwjhgoPmJgcG-6YcVAwVc,20
-vastdb-1.3.3.dist-info/RECORD,,
+vastdb-1.3.5.dist-info/LICENSE,sha256=obffan7LYrq7hLHNrY7vHcn2pKUTBUYXMKu-VOAvDxU,11333
+vastdb-1.3.5.dist-info/METADATA,sha256=Vsfa6X_4snlbZNOVzNZ5x_HKEDzZozAn1Q3i9rCpRv4,1340
+vastdb-1.3.5.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+vastdb-1.3.5.dist-info/top_level.txt,sha256=Vsj2MKtlhPg0J4so64slQtnwjhgoPmJgcG-6YcVAwVc,20
+vastdb-1.3.5.dist-info/RECORD,,