From eeb4fa36e345bcaea8ac3e2cdaf1c550f0fdd22b Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Wed, 25 Jun 2025 15:09:07 -0700 Subject: [PATCH 1/4] just need to add abstract methods --- pyiceberg/catalog/__init__.py | 15 +++++++ pyiceberg/catalog/rest/__init__.py | 14 +++++++ pyiceberg/exceptions.py | 4 ++ tests/catalog/test_rest.py | 63 ++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/pyiceberg/catalog/__init__.py b/pyiceberg/catalog/__init__.py index a434193573..ad213089d1 100644 --- a/pyiceberg/catalog/__init__.py +++ b/pyiceberg/catalog/__init__.py @@ -670,6 +670,21 @@ def drop_view(self, identifier: Union[str, Identifier]) -> None: NoSuchViewError: If a view with the given name does not exist. """ + @abstractmethod + def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Union[str, Identifier]) -> None: + """Rename a fully classified view name. + + Args: + from_identifier (str | Identifier): Existing view identifier. + to_identifier (str | Identifier): New view identifier. + + Returns: + Table: the updated table instance with its metadata. + + Raises: + NoSuchViewError: If a table with the name does not exist. + """ + @staticmethod def identifier_to_tuple(identifier: Union[str, Identifier]) -> Identifier: """Parse an identifier to a tuple. diff --git a/pyiceberg/catalog/rest/__init__.py b/pyiceberg/catalog/rest/__init__.py index f7d8eec960..5ba5e3285a 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -53,6 +53,7 @@ NoSuchViewError, TableAlreadyExistsError, UnauthorizedError, + ViewAlreadyExistsError, ) from pyiceberg.io import AWS_ACCESS_KEY_ID, AWS_REGION, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN from pyiceberg.partitioning import UNPARTITIONED_PARTITION_SPEC, PartitionSpec, assign_fresh_partition_spec_ids @@ -101,6 +102,7 @@ class Endpoints: list_views: str = "namespaces/{namespace}/views" drop_view: str = "namespaces/{namespace}/views/{view}" view_exists: str = "namespaces/{namespace}/views/{view}" + rename_view: str = "views/rename" class IdentifierKind(Enum): @@ -877,6 +879,18 @@ def drop_view(self, identifier: Union[str]) -> None: except HTTPError as exc: _handle_non_200_response(exc, {404: NoSuchViewError}) + @retry(**_RETRY_ARGS) + def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Union[str, Identifier]) -> None: + payload = { + "source": self._split_identifier_for_json(from_identifier), + "destination": self._split_identifier_for_json(to_identifier), + } + response = self._session.post(self.url(Endpoints.rename_view), json=payload) + try: + response.raise_for_status() + except HTTPError as exc: + _handle_non_200_response(exc, {404: NoSuchViewError, 409: ViewAlreadyExistsError}) + def close(self) -> None: """Close the catalog and release Session connection adapters. diff --git a/pyiceberg/exceptions.py b/pyiceberg/exceptions.py index c80f104e46..c87bd108e0 100644 --- a/pyiceberg/exceptions.py +++ b/pyiceberg/exceptions.py @@ -44,6 +44,10 @@ class NoSuchViewError(Exception): """Raises when the view can't be found in the REST catalog.""" +class ViewAlreadyExistsError(Exception): + """Raises when the view being created already exists in the REST catalog.""" + + class NoSuchIdentifierError(Exception): """Raises when the identifier can't be found in the REST catalog.""" diff --git a/tests/catalog/test_rest.py b/tests/catalog/test_rest.py index 223c6d2f9e..f294565229 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -38,6 +38,7 @@ OAuthError, ServerError, TableAlreadyExistsError, + ViewAlreadyExistsError, ) from pyiceberg.io import load_file_io from pyiceberg.partitioning import PartitionField, PartitionSpec @@ -1918,3 +1919,65 @@ def test_rest_catalog_context_manager_with_exception_sigv4(self, rest_mock: Mock assert catalog is not None and hasattr(catalog, "_session") assert len(catalog._session.adapters) == self.EXPECTED_ADAPTERS_SIGV4 + + +def test_rename_view_204(rest_mock: Mocker) -> None: + from_identifier = ("some_namespace", "old_view") + to_identifier = ("some_namespace", "new_view") + rest_mock.post( + f"{TEST_URI}v1/views/rename", + json={ + "source": {"namespace": ["some_namespace"], "name": "old_view"}, + "destination": {"namespace": ["some_namespace"], "name": "new_view"}, + }, + status_code=204, + request_headers=TEST_HEADERS, + ) + catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN) + catalog.rename_view(from_identifier, to_identifier) + assert ( + rest_mock.last_request.text + == """{"source": {"namespace": ["some_namespace"], "name": "old_view"}, "destination": {"namespace": ["some_namespace"], "name": "new_view"}}""" + ) + + +def test_rename_view_404(rest_mock: Mocker) -> None: + from_identifier = ("some_namespace", "non_existent_view") + to_identifier = ("some_namespace", "new_view") + rest_mock.post( + f"{TEST_URI}v1/views/rename", + json={ + "error": { + "message": "View does not exist: some_namespace.non_existent_view", + "type": "NoSuchViewException", + "code": 404, + } + }, + status_code=404, + request_headers=TEST_HEADERS, + ) + catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN) + with pytest.raises(NoSuchViewError) as exc_info: + catalog.rename_view(from_identifier, to_identifier) + assert "View does not exist: some_namespace.non_existent_view" in str(exc_info.value) + + +def test_rename_view_409(rest_mock: Mocker) -> None: + from_identifier = ("some_namespace", "old_view") + to_identifier = ("some_namespace", "existing_view") + rest_mock.post( + f"{TEST_URI}v1/views/rename", + json={ + "error": { + "message": "View already exists: some_namespace.existing_view", + "type": "ViewAlreadyExistsException", + "code": 409, + } + }, + status_code=409, + request_headers=TEST_HEADERS, + ) + catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN) + with pytest.raises(ViewAlreadyExistsError) as exc_info: + catalog.rename_view(from_identifier, to_identifier) + assert "View already exists: some_namespace.existing_view" in str(exc_info.value) From 7b4a4f5d7e7594510d9ea9fcdae6005c934bf9f7 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Wed, 25 Jun 2025 15:11:59 -0700 Subject: [PATCH 2/4] add abstract methods to additional classes --- pyiceberg/catalog/dynamodb.py | 3 +++ pyiceberg/catalog/glue.py | 3 +++ pyiceberg/catalog/hive.py | 3 +++ pyiceberg/catalog/noop.py | 3 +++ pyiceberg/catalog/sql.py | 3 +++ 5 files changed, 15 insertions(+) diff --git a/pyiceberg/catalog/dynamodb.py b/pyiceberg/catalog/dynamodb.py index 420fa5b523..063659e96a 100644 --- a/pyiceberg/catalog/dynamodb.py +++ b/pyiceberg/catalog/dynamodb.py @@ -550,6 +550,9 @@ def drop_view(self, identifier: Union[str, Identifier]) -> None: def view_exists(self, identifier: Union[str, Identifier]) -> bool: raise NotImplementedError + def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Union[str, Identifier]) -> None: + raise NotImplementedError + def _get_iceberg_table_item(self, database_name: str, table_name: str) -> Dict[str, Any]: try: return self._get_dynamo_item(identifier=f"{database_name}.{table_name}", namespace=database_name) diff --git a/pyiceberg/catalog/glue.py b/pyiceberg/catalog/glue.py index 50c4d74ad3..ecc174ed07 100644 --- a/pyiceberg/catalog/glue.py +++ b/pyiceberg/catalog/glue.py @@ -826,6 +826,9 @@ def drop_view(self, identifier: Union[str, Identifier]) -> None: def view_exists(self, identifier: Union[str, Identifier]) -> bool: raise NotImplementedError + def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Union[str, Identifier]) -> None: + raise NotImplementedError + @staticmethod def __is_iceberg_table(table: "TableTypeDef") -> bool: return table.get("Parameters", {}).get(TABLE_TYPE, "").lower() == ICEBERG diff --git a/pyiceberg/catalog/hive.py b/pyiceberg/catalog/hive.py index 93ece35cbb..8bf0ee14e4 100644 --- a/pyiceberg/catalog/hive.py +++ b/pyiceberg/catalog/hive.py @@ -480,6 +480,9 @@ def list_views(self, namespace: Union[str, Identifier]) -> List[Identifier]: def view_exists(self, identifier: Union[str, Identifier]) -> bool: raise NotImplementedError + def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Union[str, Identifier]) -> None: + raise NotImplementedError + def _create_lock_request(self, database_name: str, table_name: str) -> LockRequest: lock_component: LockComponent = LockComponent( level=LockLevel.TABLE, type=LockType.EXCLUSIVE, dbname=database_name, tablename=table_name, isTransactional=True diff --git a/pyiceberg/catalog/noop.py b/pyiceberg/catalog/noop.py index eb3132a9ac..2d73876a6f 100644 --- a/pyiceberg/catalog/noop.py +++ b/pyiceberg/catalog/noop.py @@ -128,3 +128,6 @@ def view_exists(self, identifier: Union[str, Identifier]) -> bool: def drop_view(self, identifier: Union[str, Identifier]) -> None: raise NotImplementedError + + def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Union[str, Identifier]) -> None: + raise NotImplementedError diff --git a/pyiceberg/catalog/sql.py b/pyiceberg/catalog/sql.py index dfa573bc13..c0fb04a5b3 100644 --- a/pyiceberg/catalog/sql.py +++ b/pyiceberg/catalog/sql.py @@ -744,3 +744,6 @@ def close(self) -> None: """ if hasattr(self, "engine"): self.engine.dispose() + + def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Union[str, Identifier]) -> None: + raise NotImplementedError From a634beabf9352626b6b9111f42ca60817e816f52 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Tue, 7 Oct 2025 11:28:47 -0700 Subject: [PATCH 3/4] Add namespace check on rename_view --- pyiceberg/catalog/rest/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pyiceberg/catalog/rest/__init__.py b/pyiceberg/catalog/rest/__init__.py index 5ba5e3285a..f00298bd8f 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -885,6 +885,16 @@ def rename_view(self, from_identifier: Union[str, Identifier], to_identifier: Un "source": self._split_identifier_for_json(from_identifier), "destination": self._split_identifier_for_json(to_identifier), } + + # Ensure source and destination namespaces exist before rename. + source_namespace = self._split_identifier_for_json(from_identifier)["namespace"] + dest_namespace = self._split_identifier_for_path(to_identifier)["namespace"] + + if not self.namespace_exists(source_namespace): + raise NoSuchNamespaceError(f"Source namespace does not exist: {source_namespace}") + if not self.namespace_exists(dest_namespace): + raise NoSuchNamespaceError(f"Destination namespace does not exist: {dest_namespace}") + response = self._session.post(self.url(Endpoints.rename_view), json=payload) try: response.raise_for_status() From 8ad2e553cc1c4f2ce62225849699861830e8d95b Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Tue, 7 Oct 2025 11:31:53 -0700 Subject: [PATCH 4/4] Added test for namespace exists --- tests/catalog/test_rest.py | 59 +++++++++++++++++++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-) diff --git a/tests/catalog/test_rest.py b/tests/catalog/test_rest.py index f294565229..450b321c09 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -1924,6 +1924,11 @@ def test_rest_catalog_context_manager_with_exception_sigv4(self, rest_mock: Mock def test_rename_view_204(rest_mock: Mocker) -> None: from_identifier = ("some_namespace", "old_view") to_identifier = ("some_namespace", "new_view") + rest_mock.head( + f"{TEST_URI}v1/namespaces/some_namespace", + status_code=200, + request_headers=TEST_HEADERS, + ) rest_mock.post( f"{TEST_URI}v1/views/rename", json={ @@ -1937,13 +1942,18 @@ def test_rename_view_204(rest_mock: Mocker) -> None: catalog.rename_view(from_identifier, to_identifier) assert ( rest_mock.last_request.text - == """{"source": {"namespace": ["some_namespace"], "name": "old_view"}, "destination": {"namespace": ["some_namespace"], "name": "new_view"}}""" + == '''{"source": {"namespace": ["some_namespace"], "name": "old_view"}, "destination": {"namespace": ["some_namespace"], "name": "new_view"}}''' ) def test_rename_view_404(rest_mock: Mocker) -> None: from_identifier = ("some_namespace", "non_existent_view") to_identifier = ("some_namespace", "new_view") + rest_mock.head( + f"{TEST_URI}v1/namespaces/some_namespace", + status_code=200, + request_headers=TEST_HEADERS, + ) rest_mock.post( f"{TEST_URI}v1/views/rename", json={ @@ -1965,6 +1975,11 @@ def test_rename_view_404(rest_mock: Mocker) -> None: def test_rename_view_409(rest_mock: Mocker) -> None: from_identifier = ("some_namespace", "old_view") to_identifier = ("some_namespace", "existing_view") + rest_mock.head( + f"{TEST_URI}v1/namespaces/some_namespace", + status_code=200, + request_headers=TEST_HEADERS, + ) rest_mock.post( f"{TEST_URI}v1/views/rename", json={ @@ -1981,3 +1996,45 @@ def test_rename_view_409(rest_mock: Mocker) -> None: with pytest.raises(ViewAlreadyExistsError) as exc_info: catalog.rename_view(from_identifier, to_identifier) assert "View already exists: some_namespace.existing_view" in str(exc_info.value) + + +def test_rename_view_source_namespace_does_not_exist(rest_mock: Mocker) -> None: + from_identifier = ("non_existent_namespace", "old_view") + to_identifier = ("some_namespace", "new_view") + + rest_mock.head( + f"{TEST_URI}v1/namespaces/non_existent_namespace", + status_code=404, + request_headers=TEST_HEADERS, + ) + rest_mock.head( + f"{TEST_URI}v1/namespaces/some_namespace", + status_code=200, + request_headers=TEST_HEADERS, + ) + + catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN) + with pytest.raises(NoSuchNamespaceError) as exc_info: + catalog.rename_view(from_identifier, to_identifier) + assert "Source namespace does not exist: ('non_existent_namespace',)" in str(exc_info.value) + + +def test_rename_view_destination_namespace_does_not_exist(rest_mock: Mocker) -> None: + from_identifier = ("some_namespace", "old_view") + to_identifier = ("non_existent_namespace", "new_view") + + rest_mock.head( + f"{TEST_URI}v1/namespaces/some_namespace", + status_code=200, + request_headers=TEST_HEADERS, + ) + rest_mock.head( + f"{TEST_URI}v1/namespaces/non_existent_namespace", + status_code=404, + request_headers=TEST_HEADERS, + ) + + catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN) + with pytest.raises(NoSuchNamespaceError) as exc_info: + catalog.rename_view(from_identifier, to_identifier) + assert "Destination namespace does not exist: non_existent_namespace" in str(exc_info.value)