deltacat 1.1.38__py3-none-any.whl → 2.0.0__py3-none-any.whl

deltacat/storage/model/table.py

@@ -1,25 +1,46 @@
 # Allow classes to use self-referencing Type hints in Python 3.7.
 from __future__ import annotations
 
-from typing import Any, Dict, Optional
+import posixpath
+from typing import Any, Dict, Optional, List
 
-from deltacat.storage.model.locator import Locator
-from deltacat.storage.model.namespace import NamespaceLocator
+import pyarrow
 
+from deltacat.storage.model.locator import Locator, LocatorName
+from deltacat.storage.model.namespace import (
+    NamespaceLocator,
+    Namespace,
+)
+from deltacat.storage.model.metafile import Metafile, MetafileRevisionInfo
+from deltacat.constants import TXN_DIR_NAME
+from deltacat.types.tables import TableProperty
+
+TableProperties = Dict[str, Any]
+
+
+class Table(Metafile):
+    """
+    Tables store properties common to every table version including the
+    table's name, a high-level description of all table versions, and
+    properties shared by all table versions.
+    """
 
-class Table(dict):
     @staticmethod
     def of(
         locator: Optional[TableLocator],
-        permissions: Optional[Dict[str, Any]] = None,
         description: Optional[str] = None,
-        properties: Optional[Dict[str, str]] = None,
+        properties: Optional[TableProperties] = None,
+        latest_active_table_version: Optional[str] = None,
+        latest_table_version: Optional[str] = None,
+        native_object: Optional[Any] = None,
     ) -> Table:
         table = Table()
         table.locator = locator
-        table.permissions = permissions
         table.description = description
         table.properties = properties
+        table.latest_active_table_version = latest_active_table_version
+        table.latest_table_version = latest_table_version
+        table.native_object = native_object
         return table
 
     @property
@@ -33,14 +54,6 @@ class Table(dict):
     def locator(self, table_locator: Optional[TableLocator]) -> None:
         self["tableLocator"] = table_locator
 
-    @property
-    def permissions(self) -> Optional[Dict[str, Any]]:
-        return self.get("permissions")
-
-    @permissions.setter
-    def permissions(self, permissions: Optional[Dict[str, Any]]) -> None:
-        self["permissions"] = permissions
-
     @property
     def description(self) -> Optional[str]:
         return self.get("description")
@@ -50,13 +63,43 @@ class Table(dict):
         self["description"] = description
 
     @property
-    def properties(self) -> Optional[Dict[str, str]]:
+    def properties(self) -> Optional[TableProperties]:
         return self.get("properties")
 
     @properties.setter
-    def properties(self, properties: Optional[Dict[str, str]]) -> None:
+    def properties(self, properties: Optional[TableProperties]) -> None:
         self["properties"] = properties
 
+    @property
+    def latest_active_table_version(self) -> Optional[str]:
+        return self.get("latest_active_table_version")
+
+    @latest_active_table_version.setter
+    def latest_active_table_version(
+        self,
+        latest_active_table_version: Optional[str],
+    ) -> None:
+        self["latest_active_table_version"] = latest_active_table_version
+
+    @property
+    def latest_table_version(self) -> Optional[str]:
+        return self.get("latest_table_version")
+
+    @latest_table_version.setter
+    def latest_table_version(
+        self,
+        latest_table_version: Optional[str],
+    ) -> None:
+        self["latest_table_version"] = latest_table_version
+
+    @property
+    def native_object(self) -> Optional[Any]:
+        return self.get("nativeObject")
+
+    @native_object.setter
+    def native_object(self, native_object: Optional[Any]) -> None:
+        self["nativeObject"] = native_object
+
     @property
     def namespace_locator(self) -> Optional[NamespaceLocator]:
         table_locator = self.locator
@@ -78,6 +121,70 @@ class Table(dict):
             return table_locator.table_name
         return None
 
+    @table_name.setter
+    def table_name(self, table_name: Optional[str]) -> None:
+        table_locator = self.locator
+        if table_locator:
+            table_locator.table_name = table_name
+
+    def url(self, catalog_name: Optional[str] = None) -> str:
+        return (
+            f"dc://{catalog_name}/{self.namespace}/{self.table_name}/"
+            if catalog_name
+            else f"table://{self.namespace}/{self.table_name}/"
+        )
+
+    def read_table_property(self, property: TableProperty) -> Any:
+        return TableProperty.read_table_property(self, property)
+
+    def to_serializable(self) -> Table:
+        serializable = self
+        if serializable.namespace_locator:
+            serializable: Table = Table.update_for(self)
+            # remove the mutable namespace locator
+            serializable.locator.namespace_locator = NamespaceLocator.of(self.id)
+        return serializable
+
+    def from_serializable(
+        self,
+        path: str,
+        filesystem: Optional[pyarrow.fs.FileSystem] = None,
+    ) -> Table:
+        # restore the namespace locator from its mapped immutable metafile ID
+        if self.namespace_locator and self.namespace_locator.namespace == self.id:
+            parent_rev_dir_path = Metafile._parent_metafile_rev_dir_path(
+                base_metafile_path=path,
+                parent_number=1,
+            )
+            txn_log_dir = posixpath.join(
+                posixpath.dirname(
+                    posixpath.dirname(parent_rev_dir_path),
+                ),
+                TXN_DIR_NAME,
+            )
+            namespace = Namespace.read(
+                MetafileRevisionInfo.latest_revision(
+                    revision_dir_path=parent_rev_dir_path,
+                    filesystem=filesystem,
+                    success_txn_log_dir=txn_log_dir,
+                ).path,
+                filesystem,
+            )
+            self.locator.namespace_locator = namespace.locator
+        return self
+
+
+class TableLocatorName(LocatorName):
+    def __init__(self, locator: TableLocator):
+        self.locator = locator
+
+    @property
+    def immutable_id(self) -> Optional[str]:
+        return None
+
+    def parts(self) -> List[str]:
+        return [self.locator.table_name]
+
 
 class TableLocator(Locator, dict):
     @staticmethod
@@ -91,11 +198,19 @@ class TableLocator(Locator, dict):
 
     @staticmethod
     def at(namespace: Optional[str], table_name: Optional[str]) -> TableLocator:
-        namespace_locator = NamespaceLocator.of(namespace)
+        namespace_locator = NamespaceLocator.of(namespace) if namespace else None
         return TableLocator.of(namespace_locator, table_name)
 
     @property
-    def namespace_locator(self) -> NamespaceLocator:
+    def name(self) -> TableLocatorName:
+        return TableLocatorName(self)
+
+    @property
+    def parent(self) -> Optional[NamespaceLocator]:
+        return self.namespace_locator
+
+    @property
+    def namespace_locator(self) -> Optional[NamespaceLocator]:
         val: Dict[str, Any] = self.get("namespaceLocator")
         if val is not None and not isinstance(val, NamespaceLocator):
             self.namespace_locator = val = NamespaceLocator(val)
@@ -119,13 +234,3 @@ class TableLocator(Locator, dict):
         if namespace_locator:
             return namespace_locator.namespace
         return None
-
-    def canonical_string(self) -> str:
-        """
-        Returns a unique string for the given locator that can be used
-        for equality checks (i.e. two locators are equal if they have
-        the same canonical string).
-        """
-        nl_hexdigest = self.namespace_locator.hexdigest()
-        table_name = self.table_name
-        return f"{nl_hexdigest}|{table_name}"

deltacat/storage/model/table_version.py

@@ -1,38 +1,77 @@
 # Allow classes to use self-referencing Type hints in Python 3.7.
 from __future__ import annotations
 
-from typing import Any, Dict, List, Optional, Union
+import base64
+import re
+import posixpath
+from typing import Any, Dict, List, Optional, Tuple
 
+import pyarrow
 import pyarrow as pa
 
-from deltacat.storage.model.locator import Locator
+import deltacat.storage.model.partition as partition
+
+from deltacat.storage.model.metafile import Metafile, MetafileRevisionInfo
+from deltacat.constants import (
+    METAFILE_FORMAT,
+    METAFILE_FORMAT_JSON,
+    TXN_DIR_NAME,
+    BYTES_PER_KIBIBYTE,
+)
+from deltacat.storage.model.schema import (
+    Schema,
+    SchemaList,
+)
+from deltacat.storage.model.locator import (
+    Locator,
+    LocatorName,
+)
 from deltacat.storage.model.namespace import NamespaceLocator
-from deltacat.storage.model.table import TableLocator
+from deltacat.storage.model.table import (
+    TableLocator,
+    Table,
+)
 from deltacat.types.media import ContentType
-from deltacat.storage.model.sort_key import SortKey
+from deltacat.storage.model.sort_key import SortScheme, SortSchemeList
+from deltacat.storage.model.types import LifecycleState
+from deltacat.types.tables import TableProperty
 
+TableVersionProperties = Dict[str, Any]
 
-class TableVersion(dict):
+
+class TableVersion(Metafile):
     @staticmethod
     def of(
         locator: Optional[TableVersionLocator],
-        schema: Optional[Union[pa.Schema, str, bytes]],
-        partition_keys: Optional[List[Dict[str, Any]]] = None,
-        primary_key_columns: Optional[List[str]] = None,
+        schema: Optional[Schema],
+        partition_scheme: Optional[partition.PartitionScheme] = None,
         description: Optional[str] = None,
-        properties: Optional[Dict[str, str]] = None,
+        properties: Optional[TableVersionProperties] = None,
         content_types: Optional[List[ContentType]] = None,
-        sort_keys: Optional[List[SortKey]] = None,
+        sort_scheme: Optional[SortScheme] = None,
+        watermark: Optional[int] = None,
+        lifecycle_state: Optional[LifecycleState] = None,
+        schemas: Optional[SchemaList] = None,
+        partition_schemes: Optional[partition.PartitionSchemeList] = None,
+        sort_schemes: Optional[SortSchemeList] = None,
+        previous_table_version: Optional[str] = None,
+        native_object: Optional[Any] = None,
     ) -> TableVersion:
         table_version = TableVersion()
         table_version.locator = locator
         table_version.schema = schema
-        table_version.partition_keys = partition_keys
-        table_version.primary_keys = primary_key_columns
+        table_version.partition_scheme = partition_scheme
         table_version.description = description
         table_version.properties = properties
         table_version.content_types = content_types
-        table_version.sort_keys = sort_keys
+        table_version.sort_scheme = sort_scheme
+        table_version.watermark = watermark
+        table_version.state = lifecycle_state
+        table_version.schemas = schemas
+        table_version.partition_schemes = partition_schemes
+        table_version.sort_schemes = sort_schemes
+        table_version.previous_table_version = previous_table_version
+        table_version.native_object = native_object
         return table_version
 
     @property
@@ -47,36 +86,91 @@ class TableVersion(dict):
         self["tableVersionLocator"] = table_version_locator
 
     @property
-    def schema(self) -> Optional[Union[pa.Schema, str, bytes]]:
-        return self.get("schema")
+    def schema(self) -> Optional[Schema]:
+        val: Dict[str, Any] = self.get("schema")
+        if val is not None and not isinstance(val, Schema):
+            self.schema = val = Schema(val)
+        return val
 
     @schema.setter
-    def schema(self, schema: Optional[Union[pa.Schema, str, bytes]]) -> None:
+    def schema(self, schema: Optional[Schema]) -> None:
         self["schema"] = schema
 
     @property
-    def sort_keys(self) -> Optional[List[SortKey]]:
-        return self.get("sortKeys")
+    def schemas(self) -> Optional[SchemaList]:
+        val: Optional[SchemaList] = self.get("schemas")
+        if val is not None and not isinstance(val, SchemaList):
+            self["schemas"] = val = SchemaList.of(val)
+        return val
+
+    @schemas.setter
+    def schemas(self, schemas: Optional[SchemaList]) -> None:
+        self["schemas"] = schemas
+
+    @property
+    def sort_scheme(self) -> Optional[SortScheme]:
+        val: Dict[str, Any] = self.get("sortScheme")
+        if val is not None and not isinstance(val, SortScheme):
+            self["sortScheme"] = val = SortScheme(val)
+        return val
+
+    @sort_scheme.setter
+    def sort_scheme(self, sort_scheme: Optional[SortScheme]) -> None:
+        self["sortScheme"] = sort_scheme
+
+    @property
+    def sort_schemes(self) -> Optional[SortSchemeList]:
+        val: Dict[str, Any] = self.get("sortSchemes")
+        if val is not None and not isinstance(val, SortSchemeList):
+            self["sortSchemes"] = val = SortSchemeList.of(val)
+        return val
+
+    @sort_schemes.setter
+    def sort_schemes(self, sort_schemes: Optional[SortSchemeList]) -> None:
+        self["sortSchemes"] = sort_schemes
+
+    @property
+    def watermark(self) -> Optional[int]:
+        return self.get("watermark")
 
-    @sort_keys.setter
-    def sort_keys(self, sort_keys: Optional[List[SortKey]]) -> None:
-        self["sortKeys"] = sort_keys
+    @watermark.setter
+    def watermark(self, watermark: Optional[int]) -> None:
+        self["watermark"] = watermark
 
     @property
-    def partition_keys(self) -> Optional[List[Dict[str, Any]]]:
-        return self.get("partitionKeys")
+    def state(self) -> Optional[LifecycleState]:
+        state = self.get("state")
+        return None if state is None else LifecycleState(state)
 
-    @partition_keys.setter
-    def partition_keys(self, partition_keys: Optional[List[Dict[str, Any]]]) -> None:
-        self["partitionKeys"] = partition_keys
+    @state.setter
+    def state(self, state: Optional[LifecycleState]) -> None:
+        self["state"] = state
 
     @property
-    def primary_keys(self) -> Optional[List[str]]:
-        return self.get("primaryKeys")
+    def partition_scheme(self) -> Optional[partition.PartitionScheme]:
+        val: Dict[str, Any] = self.get("partitionScheme")
+        if val is not None and not isinstance(val, partition.PartitionScheme):
+            self["partitionScheme"] = val = partition.PartitionScheme(val)
+        return val
 
-    @primary_keys.setter
-    def primary_keys(self, primary_keys: Optional[List[str]]) -> None:
-        self["primaryKeys"] = primary_keys
+    @partition_scheme.setter
+    def partition_scheme(
+        self, partition_scheme: Optional[partition.PartitionScheme]
+    ) -> None:
+        self["partitionScheme"] = partition_scheme
+
+    @property
+    def partition_schemes(self) -> Optional[partition.PartitionSchemeList]:
+        val: Dict[str, Any] = self.get("partitionSchemes")
+        if val is not None and not isinstance(val, partition.PartitionSchemeList):
+            self["partitionSchemes"] = val = partition.PartitionSchemeList.of(val)
+        return val
+
+    @partition_schemes.setter
+    def partition_schemes(
+        self, partition_schemes: Optional[partition.PartitionSchemeList]
+    ) -> None:
+        self["partitionSchemes"] = partition_schemes
 
     @property
     def description(self) -> Optional[str]:
@@ -87,11 +181,19 @@ class TableVersion(dict):
         self["description"] = description
 
     @property
-    def properties(self) -> Optional[Dict[str, str]]:
+    def previous_table_version(self) -> Optional[str]:
+        return self.get("previous_table_version")
+
+    @previous_table_version.setter
+    def previous_table_version(self, previous_table_version: Optional[str]) -> None:
+        self["previous_table_version"] = previous_table_version
+
+    @property
+    def properties(self) -> Optional[TableVersionProperties]:
         return self.get("properties")
 
     @properties.setter
-    def properties(self, properties: Optional[Dict[str, str]]) -> None:
+    def properties(self, properties: Optional[TableVersionProperties]) -> None:
         self["properties"] = properties
 
     @property
@@ -107,6 +209,14 @@ class TableVersion(dict):
     def content_types(self, content_types: Optional[List[ContentType]]) -> None:
         self["contentTypes"] = content_types
 
+    @property
+    def native_object(self) -> Optional[Any]:
+        return self.get("nativeObject")
+
+    @native_object.setter
+    def native_object(self, native_object: Optional[Any]) -> None:
+        self["nativeObject"] = native_object
+
     @property
     def namespace_locator(self) -> Optional[NamespaceLocator]:
         table_version_locator = self.locator
@@ -142,17 +252,190 @@ class TableVersion(dict):
             return table_version_locator.table_version
         return None
 
+    def url(self, catalog_name: Optional[str] = None) -> str:
+        return (
+            f"dc://{catalog_name}/{self.namespace}/{self.table_name}/{self.table_version}/"
+            if catalog_name
+            else f"table://{self.namespace}/{self.table_name}/{self.table_version}/"
+        )
+
     def is_supported_content_type(self, content_type: ContentType):
         supported_content_types = self.content_types
         return (not supported_content_types) or (
             content_type in supported_content_types
         )
 
+    def to_serializable(self) -> TableVersion:
+        serializable: TableVersion = TableVersion.update_for(self)
+        if serializable.schema:
+            schema_bytes = serializable.schema.serialize().to_pybytes()
+            serializable.schema = (
+                base64.b64encode(schema_bytes).decode("utf-8")
+                if METAFILE_FORMAT == METAFILE_FORMAT_JSON
+                else schema_bytes
+            )
+
+        if serializable.schemas:
+            serializable.schemas = [
+                base64.b64encode(schema.serialize().to_pybytes()).decode("utf-8")
+                if METAFILE_FORMAT == METAFILE_FORMAT_JSON
+                else schema.serialize().to_pybytes()
+                for schema in serializable.schemas
+            ]
+        if serializable.table_locator:
+            # remove the mutable table locator
+            serializable.locator.table_locator = TableLocator.at(
+                namespace=self.id,
+                table_name=self.id,
+            )
+        return serializable
+
+    def from_serializable(
+        self,
+        path: str,
+        filesystem: Optional[pyarrow.fs.FileSystem] = None,
+    ) -> TableVersion:
+        if self.get("schema"):
+            schema_data = self["schema"]
+            schema_bytes = (
+                base64.b64decode(schema_data)
+                if METAFILE_FORMAT == "json"
+                else schema_data
+            )
+            self["schema"] = Schema.deserialize(pa.py_buffer(schema_bytes))
+        else:
+            self["schema"] = None
+
+        if self.get("schemas"):
+            self.schemas = [
+                Schema.deserialize(
+                    pa.py_buffer(
+                        base64.b64decode(schema)
+                        if METAFILE_FORMAT == METAFILE_FORMAT_JSON
+                        else schema
+                    )
+                )
+                for schema in self["schemas"]
+            ]
+        else:
+            self.schemas = None
+
+        if self.sort_scheme:
+            # force list-to-tuple conversion of sort keys via property invocation
+            self.sort_scheme.keys
+            [sort_scheme.keys for sort_scheme in self.sort_schemes]
+        # restore the table locator from its mapped immutable metafile ID
+        if self.table_locator and self.table_locator.table_name == self.id:
+            parent_rev_dir_path = Metafile._parent_metafile_rev_dir_path(
+                base_metafile_path=path,
+                parent_number=1,
+            )
+            txn_log_dir = posixpath.join(
+                posixpath.dirname(
+                    posixpath.dirname(
+                        posixpath.dirname(parent_rev_dir_path),
+                    )
+                ),
+                TXN_DIR_NAME,
+            )
+            table = Table.read(
+                MetafileRevisionInfo.latest_revision(
+                    revision_dir_path=parent_rev_dir_path,
+                    filesystem=filesystem,
+                    success_txn_log_dir=txn_log_dir,
+                ).path,
+                filesystem,
+            )
+            self.locator.table_locator = table.locator
+        return self
+
+    def current_version_number(self) -> Optional[int]:
+        """
+        Returns the current table version number as an integer, or None if
+        a table version has not yet been assigned.
+        """
+        prefix, version_number = (
+            TableVersion.parse_table_version(
+                self.table_version,
+            )
+            if self.table_version is not None
+            else (None, None)
+        )
+        return int(version_number) if version_number is not None else None
+
+    def read_table_property(self, property: TableProperty) -> Any:
+        return TableProperty.read_table_property(self, property)
+
+    @staticmethod
+    def next_version(previous_version: Optional[str] = None) -> str:
+        """
+        Assigns the next table version string given the previous table version
+        by incrementing the version number of the given previous table version
+        identifier. Returns "1" if the previous version is undefined.
+        """
+        prefix, previous_version_number = (
+            TableVersion.parse_table_version(
+                previous_version,
+            )
+            if previous_version is not None
+            else (None, None)
+        )
+        new_version_number = (
+            int(previous_version_number) + 1
+            if previous_version_number is not None
+            else 1
+        )
+        new_prefix = prefix if prefix is not None else ""
+        return f"{new_prefix}{new_version_number}"
+
+    @staticmethod
+    def parse_table_version(table_version: str) -> Tuple[Optional[str], int]:
+        """
+        Parses a table version string into its prefix and version number.
+        Returns a tuple of the prefix and version number.
+        """
+        if not table_version:
+            raise ValueError(f"Table version to parse is undefined.")
+        if len(table_version) > BYTES_PER_KIBIBYTE:
+            raise ValueError(
+                f"Invalid table version {table_version}. Table version "
+                f"identifier cannot be greater than {BYTES_PER_KIBIBYTE} "
+                f"characters."
+            )
+        version_match = re.match(
+            rf"^(\w*\.)?(\d+)$",
+            table_version,
+        )
+        if version_match:
+            prefix, version_number = version_match.groups()
+            return prefix, int(version_number)
+        raise ValueError(
+            f"Invalid table version {table_version}. Valid table versions "
+            f"are of the form `TableVersionName.1` or simply `1`.",
+        )
+
+
+class TableVersionLocatorName(LocatorName):
+    def __init__(self, locator: TableVersionLocator):
+        self.locator = locator
+
+    @property
+    def immutable_id(self) -> Optional[str]:
+        return self.locator.table_version
+
+    @immutable_id.setter
+    def immutable_id(self, immutable_id: Optional[str]):
+        self.locator.table_version = immutable_id
+
+    def parts(self) -> List[str]:
+        return [self.locator.table_version]
+
 
 class TableVersionLocator(Locator, dict):
     @staticmethod
     def of(
-        table_locator: Optional[TableLocator], table_version: Optional[str]
+        table_locator: Optional[TableLocator],
+        table_version: Optional[str],
     ) -> TableVersionLocator:
         table_version_locator = TableVersionLocator()
         table_version_locator.table_locator = table_locator
@@ -165,9 +448,17 @@ class TableVersionLocator(Locator, dict):
         table_name: Optional[str],
         table_version: Optional[str],
     ) -> TableVersionLocator:
-        table_locator = TableLocator.at(namespace, table_name)
+        table_locator = TableLocator.at(namespace, table_name) if table_name else None
         return TableVersionLocator.of(table_locator, table_version)
 
+    @property
+    def name(self):
+        return TableVersionLocatorName(self)
+
+    @property
+    def parent(self) -> Optional[TableLocator]:
+        return self.table_locator
+
     @property
     def table_locator(self) -> Optional[TableLocator]:
         val: Dict[str, Any] = self.get("tableLocator")
@@ -185,7 +476,13 @@ class TableVersionLocator(Locator, dict):
 
     @table_version.setter
     def table_version(self, table_version: Optional[str]) -> None:
-        self["tableVersion"] = table_version
+        # ensure that the table version is valid
+        prefix, version_number = TableVersion.parse_table_version(table_version)
+        # restate the table version number in its canonical form
+        # (e.g., ensure that "MyVersion.0001" is saved as "MyVersion.1")
+        self["tableVersion"] = (
+            f"{prefix}{version_number}" if prefix else str(version_number)
+        )
 
     @property
     def namespace_locator(self) -> Optional[NamespaceLocator]:
@@ -207,13 +504,3 @@ class TableVersionLocator(Locator, dict):
         if table_locator:
             return table_locator.table_name
         return None
-
-    def canonical_string(self) -> str:
-        """
-        Returns a unique string for the given locator that can be used
-        for equality checks (i.e. two locators are equal if they have
-        the same canonical string).
-        """
-        tl_hexdigest = self.table_locator.hexdigest()
-        table_version = self.table_version
-        return f"{tl_hexdigest}|{table_version}"