Merge branch 'main' of github.com:apache/iceberg-python into fd-add-ability-to-delete-full-data-files

Author: Fokko

mkdocs/requirements.txt

@@ -23,6 +23,6 @@ mkdocstrings-python==1.10.3
 mkdocs-literate-nav==0.6.1
 mkdocs-autorefs==1.0.1
 mkdocs-gen-files==0.5.0
-mkdocs-material==9.5.24
+mkdocs-material==9.5.25
 mkdocs-material-extensions==1.3.1
 mkdocs-section-index==0.3.9

poetry.lock

@@ -588,7 +588,7 @@ def identifier_to_tuple(identifier: Union[str, Identifier]) -> Identifier:
         If the identifier is a string, it is split into a tuple on '.'. If it is a tuple, it is used as-is.
 
         Args:
-            identifier (str | Identifier: an identifier, either a string or tuple of strings.
+            identifier (str | Identifier): an identifier, either a string or tuple of strings.
 
         Returns:
             Identifier: a tuple of strings.
@@ -619,6 +619,29 @@ def namespace_from(identifier: Union[str, Identifier]) -> Identifier:
         """
         return Catalog.identifier_to_tuple(identifier)[:-1]
 
+    @staticmethod
+    def namespace_to_string(
+        identifier: Union[str, Identifier], err: Union[Type[ValueError], Type[NoSuchNamespaceError]] = ValueError
+    ) -> str:
+        """Transform a namespace identifier into a string.
+
+        Args:
+            identifier (Union[str, Identifier]): a namespace identifier.
+            err (Union[Type[ValueError], Type[NoSuchNamespaceError]]): the error type to raise when identifier is empty.
+
+        Returns:
+            Identifier: Namespace identifier.
+        """
+        tuple_identifier = Catalog.identifier_to_tuple(identifier)
+        if len(tuple_identifier) < 1:
+            raise err("Empty namespace identifier")
+
+        # Check if any segment of the tuple is an empty string
+        if any(segment.strip() == "" for segment in tuple_identifier):
+            raise err("Namespace identifier contains an empty segment or a segment with only whitespace")
+
+        return ".".join(segment.strip() for segment in tuple_identifier)
+
     @staticmethod
     def identifier_to_database(
         identifier: Union[str, Identifier], err: Union[Type[ValueError], Type[NoSuchNamespaceError]] = ValueError

pyiceberg/catalog/__init__.py

@@ -112,9 +112,13 @@ def list(ctx: Context, parent: Optional[str]) -> None:  # pylint: disable=redefi
     """List tables or namespaces."""
     catalog, output = _catalog_and_output(ctx)
 
-    identifiers = catalog.list_namespaces(parent or ())
-    if not identifiers and parent:
+    identifiers = []
+    if parent:
+        # Do we have tables under parent namespace?
         identifiers = catalog.list_tables(parent)
+    if not identifiers:
+        # List hierarchical namespaces if parent, root namespaces otherwise.
+        identifiers = catalog.list_namespaces(parent or ())
     output.identifiers(identifiers)
 
 

pyiceberg/catalog/sql.py

@@ -57,6 +57,13 @@
 HDFS_PORT = "hdfs.port"
 HDFS_USER = "hdfs.user"
 HDFS_KERB_TICKET = "hdfs.kerberos_ticket"
+ADLFS_CONNECTION_STRING = "adlfs.connection-string"
+ADLFS_ACCOUNT_NAME = "adlfs.account-name"
+ADLFS_ACCOUNT_KEY = "adlfs.account-key"
+ADLFS_SAS_TOKEN = "adlfs.sas-token"
+ADLFS_TENANT_ID = "adlfs.tenant-id"
+ADLFS_CLIENT_ID = "adlfs.client-id"
+ADLFS_ClIENT_SECRET = "adlfs.client-secret"
 GCS_TOKEN = "gcs.oauth2.token"
 GCS_TOKEN_EXPIRES_AT_MS = "gcs.oauth2.token-expires-at"
 GCS_PROJECT_ID = "gcs.project-id"

pyiceberg/cli/console.py

@@ -40,6 +40,12 @@
 from pyiceberg.catalog import TOKEN
 from pyiceberg.exceptions import SignError
 from pyiceberg.io import (
+    ADLFS_ACCOUNT_KEY,
+    ADLFS_ACCOUNT_NAME,
+    ADLFS_CLIENT_ID,
+    ADLFS_CONNECTION_STRING,
+    ADLFS_SAS_TOKEN,
+    ADLFS_TENANT_ID,
     GCS_ACCESS,
     GCS_CACHE_TIMEOUT,
     GCS_CONSISTENCY,
@@ -57,6 +63,7 @@
     S3_REGION,
     S3_SECRET_ACCESS_KEY,
     S3_SESSION_TOKEN,
+    ADLFS_ClIENT_SECRET,
     FileIO,
     InputFile,
     InputStream,
@@ -163,13 +170,13 @@ def _adlfs(properties: Properties) -> AbstractFileSystem:
     from adlfs import AzureBlobFileSystem
 
     return AzureBlobFileSystem(
-        connection_string=properties.get("adlfs.connection-string"),
-        account_name=properties.get("adlfs.account-name"),
-        account_key=properties.get("adlfs.account-key"),
-        sas_token=properties.get("adlfs.sas-token"),
-        tenant_id=properties.get("adlfs.tenant-id"),
-        client_id=properties.get("adlfs.client-id"),
-        client_secret=properties.get("adlfs.client-secret"),
+        connection_string=properties.get(ADLFS_CONNECTION_STRING),
+        account_name=properties.get(ADLFS_ACCOUNT_NAME),
+        account_key=properties.get(ADLFS_ACCOUNT_KEY),
+        sas_token=properties.get(ADLFS_SAS_TOKEN),
+        tenant_id=properties.get(ADLFS_TENANT_ID),
+        client_id=properties.get(ADLFS_CLIENT_ID),
+        client_secret=properties.get(ADLFS_ClIENT_SECRET),
     )