From 698877af1dd7a9d5739f7a0a10c3961eb06fa1f3 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Wed, 25 Jun 2025 15:09:07 -0700 Subject: [PATCH 1/7] just need to add abstract methods --- pyiceberg/catalog/__init__.py | 14 +++++++ pyiceberg/catalog/rest/__init__.py | 15 +++++++ tests/catalog/test_rest.py | 63 ++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) diff --git a/pyiceberg/catalog/__init__.py b/pyiceberg/catalog/__init__.py index 0842f51cc8..a74eec566f 100644 --- a/pyiceberg/catalog/__init__.py +++ b/pyiceberg/catalog/__init__.py @@ -37,8 +37,10 @@ NamespaceAlreadyExistsError, NoSuchNamespaceError, NoSuchTableError, + NoSuchViewError, NotInstalledError, TableAlreadyExistsError, + ViewAlreadyExistsError, ) from pyiceberg.io import FileIO, load_file_io from pyiceberg.manifest import ManifestFile @@ -744,6 +746,18 @@ def create_view( ViewAlreadyExistsError: If a view with the name already exists. """ + @abstractmethod + def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: + """Rename a fully classified view name. + + Args: + from_identifier (str | Identifier): Existing view identifier. + to_identifier (str | Identifier): New view identifier. + + Raises: + NoSuchViewError: If a view with the name does not exist. + """ + @staticmethod def identifier_to_tuple(identifier: str | Identifier) -> Identifier: """Parse an identifier to a tuple. diff --git a/pyiceberg/catalog/rest/__init__.py b/pyiceberg/catalog/rest/__init__.py index 88bbd29bef..715feae2cc 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -176,6 +176,7 @@ class Endpoints: register_view: str = "namespaces/{namespace}/register-view" drop_view: str = "namespaces/{namespace}/views/{view}" view_exists: str = "namespaces/{namespace}/views/{view}" + rename_view: str = "views/rename" plan_table_scan: str = "namespaces/{namespace}/tables/{table}/plan" # Use plan_id (underscore) for str.format; Capability paths use {plan-id} to match the REST spec. fetch_planning_result: str = "namespaces/{namespace}/tables/{table}/plan/{plan_id}" @@ -211,6 +212,7 @@ class Capability: V1_CREATE_VIEW = Endpoint(http_method=HttpMethod.POST, path=f"{API_PREFIX}/{Endpoints.create_view}") V1_REGISTER_VIEW = Endpoint(http_method=HttpMethod.POST, path=f"{API_PREFIX}/{Endpoints.register_view}") V1_DELETE_VIEW = Endpoint(http_method=HttpMethod.DELETE, path=f"{API_PREFIX}/{Endpoints.drop_view}") + V1_RENAME_VIEW = Endpoint(http_method=HttpMethod.POST, path=f"{API_PREFIX}/{Endpoints.rename_view}") V1_SUBMIT_TABLE_SCAN_PLAN = Endpoint(http_method=HttpMethod.POST, path=f"{API_PREFIX}/{Endpoints.plan_table_scan}") # Spec advertises {plan-id}; must match ConfigResponse endpoint strings from servers. V1_FETCH_TABLE_SCAN_PLAN = Endpoint( @@ -248,6 +250,7 @@ class Capability: Capability.V1_LOAD_VIEW, Capability.V1_CREATE_VIEW, Capability.V1_DELETE_VIEW, + Capability.V1_RENAME_VIEW, ) ) @@ -1855,6 +1858,18 @@ def drop_view(self, identifier: str | Identifier) -> 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/tests/catalog/test_rest.py b/tests/catalog/test_rest.py index b06281bcef..ff9e070bf8 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -3022,6 +3022,7 @@ 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 +<<<<<<< HEAD def test_server_side_planning_disabled_by_default(self, rest_mock: Mocker) -> None: catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN) @@ -3496,3 +3497,65 @@ def test_load_table_without_storage_credentials( ) assert actual.metadata.model_dump() == expected.metadata.model_dump() assert actual == expected + + +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 290f59ea0bf579d7e03c5ba8a4a2bd6254ee0b12 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Wed, 25 Jun 2025 15:11:59 -0700 Subject: [PATCH 2/7] add abstract methods to additional classes --- pyiceberg/catalog/dynamodb.py | 4 ++++ pyiceberg/catalog/glue.py | 4 ++++ pyiceberg/catalog/hive.py | 4 ++++ pyiceberg/catalog/noop.py | 4 ++++ pyiceberg/catalog/sql.py | 3 +++ tests/catalog/test_rest.py | 1 - 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pyiceberg/catalog/dynamodb.py b/pyiceberg/catalog/dynamodb.py index b4111a6fbb..d20c0268b7 100644 --- a/pyiceberg/catalog/dynamodb.py +++ b/pyiceberg/catalog/dynamodb.py @@ -584,6 +584,10 @@ def view_exists(self, identifier: str | Identifier) -> bool: def load_view(self, identifier: str | Identifier) -> View: raise NotImplementedError + @override + def rename_view(self, from_identifier: str | Identifier, to_identifier: 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 977876918c..15545ee683 100644 --- a/pyiceberg/catalog/glue.py +++ b/pyiceberg/catalog/glue.py @@ -1001,6 +1001,10 @@ def view_exists(self, identifier: str | Identifier) -> bool: def load_view(self, identifier: str | Identifier) -> View: raise NotImplementedError + @override + def rename_view(self, from_identifier: str | Identifier, to_identifier: 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 a44da81b6c..2c48b48462 100644 --- a/pyiceberg/catalog/hive.py +++ b/pyiceberg/catalog/hive.py @@ -506,6 +506,10 @@ def view_exists(self, identifier: str | Identifier) -> bool: def load_view(self, identifier: str | Identifier) -> View: raise NotImplementedError + @override + def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: + raise NotImplementedError + def _create_lock_request(self, database_name: str, table_name: str) -> LockRequest: # Iceberg commits are not executed within a Hive transaction, so the lock component uses operationType=NO_TXN. # Setting it explicitly also matters for Hive 2.1.0, which rejects a lock component left at the default UNSET diff --git a/pyiceberg/catalog/noop.py b/pyiceberg/catalog/noop.py index df18c85f73..90b0f398e0 100644 --- a/pyiceberg/catalog/noop.py +++ b/pyiceberg/catalog/noop.py @@ -175,3 +175,7 @@ def create_view( @override def load_view(self, identifier: str | Identifier) -> View: raise NotImplementedError + + @override + def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: + raise NotImplementedError diff --git a/pyiceberg/catalog/sql.py b/pyiceberg/catalog/sql.py index 13e67997d8..07c867b75e 100644 --- a/pyiceberg/catalog/sql.py +++ b/pyiceberg/catalog/sql.py @@ -847,3 +847,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 diff --git a/tests/catalog/test_rest.py b/tests/catalog/test_rest.py index ff9e070bf8..9e2154a6f0 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -3022,7 +3022,6 @@ 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 -<<<<<<< HEAD def test_server_side_planning_disabled_by_default(self, rest_mock: Mocker) -> None: catalog = RestCatalog("rest", uri=TEST_URI, token=TEST_TOKEN) From de21f9c1f03ec2e28d33e0332d6171c42da929c2 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Tue, 7 Oct 2025 11:28:47 -0700 Subject: [PATCH 3/7] 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 715feae2cc..343a08b89f 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -1864,6 +1864,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 b1aacfc8d0e8634bc863e04600ee662aa2777bfc Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Tue, 7 Oct 2025 11:31:53 -0700 Subject: [PATCH 4/7] 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 9e2154a6f0..3cc3e5991d 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -3501,6 +3501,11 @@ def test_load_table_without_storage_credentials( 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={ @@ -3514,13 +3519,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={ @@ -3542,6 +3552,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={ @@ -3558,3 +3573,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) From bdac24395f91d060334e8d55b9c5e18151e84ab3 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Tue, 17 Mar 2026 13:41:31 -0700 Subject: [PATCH 5/7] rebase --- pyiceberg/catalog/__init__.py | 2 -- pyiceberg/catalog/bigquery_metastore.py | 3 +++ pyiceberg/catalog/rest/__init__.py | 2 +- pyiceberg/catalog/sql.py | 2 +- tests/catalog/test_rest.py | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pyiceberg/catalog/__init__.py b/pyiceberg/catalog/__init__.py index a74eec566f..27441690cf 100644 --- a/pyiceberg/catalog/__init__.py +++ b/pyiceberg/catalog/__init__.py @@ -37,10 +37,8 @@ NamespaceAlreadyExistsError, NoSuchNamespaceError, NoSuchTableError, - NoSuchViewError, NotInstalledError, TableAlreadyExistsError, - ViewAlreadyExistsError, ) from pyiceberg.io import FileIO, load_file_io from pyiceberg.manifest import ManifestFile diff --git a/pyiceberg/catalog/bigquery_metastore.py b/pyiceberg/catalog/bigquery_metastore.py index 1267233e94..31c102dfe8 100644 --- a/pyiceberg/catalog/bigquery_metastore.py +++ b/pyiceberg/catalog/bigquery_metastore.py @@ -334,6 +334,9 @@ def load_view(self, identifier: str | Identifier) -> View: raise NotImplementedError @override + def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: + raise NotImplementedError + def load_namespace_properties(self, namespace: str | Identifier) -> Properties: dataset_name = self.identifier_to_database(namespace, NoSuchNamespaceError) diff --git a/pyiceberg/catalog/rest/__init__.py b/pyiceberg/catalog/rest/__init__.py index 343a08b89f..9b8b0b95ee 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -1859,7 +1859,7 @@ def drop_view(self, identifier: str | Identifier) -> None: _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: + def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: payload = { "source": self._split_identifier_for_json(from_identifier), "destination": self._split_identifier_for_json(to_identifier), diff --git a/pyiceberg/catalog/sql.py b/pyiceberg/catalog/sql.py index 07c867b75e..db80249166 100644 --- a/pyiceberg/catalog/sql.py +++ b/pyiceberg/catalog/sql.py @@ -848,5 +848,5 @@ 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: + def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: raise NotImplementedError diff --git a/tests/catalog/test_rest.py b/tests/catalog/test_rest.py index 3cc3e5991d..a2da06af8b 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -3518,8 +3518,8 @@ def test_rename_view_204(rest_mock: Mocker) -> None: 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"}}''' + rest_mock.last_request.text == """{"source": {"namespace": ["some_namespace"], "name": "old_view"}, """ + """"destination": {"namespace": ["some_namespace"], "name": "new_view"}}""" ) From 34a874c2ddf0f9cf975185a349231085dd403410 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Wed, 27 May 2026 20:50:46 +0000 Subject: [PATCH 6/7] PR comments --- pyiceberg/catalog/__init__.py | 1 + pyiceberg/catalog/rest/__init__.py | 3 ++- tests/catalog/test_rest.py | 3 ++- tests/integration/test_catalog.py | 20 ++++++++++++++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/pyiceberg/catalog/__init__.py b/pyiceberg/catalog/__init__.py index 27441690cf..83eb5eb9b7 100644 --- a/pyiceberg/catalog/__init__.py +++ b/pyiceberg/catalog/__init__.py @@ -754,6 +754,7 @@ def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Id Raises: NoSuchViewError: If a view with the name does not exist. + ViewAlreadyExistsError: If the target view already exists. """ @staticmethod diff --git a/pyiceberg/catalog/rest/__init__.py b/pyiceberg/catalog/rest/__init__.py index 9b8b0b95ee..ca45f970f2 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -1860,6 +1860,7 @@ def drop_view(self, identifier: str | Identifier) -> None: @retry(**_RETRY_ARGS) def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: + self._check_endpoint(Capability.V1_RENAME_VIEW) payload = { "source": self._split_identifier_for_json(from_identifier), "destination": self._split_identifier_for_json(to_identifier), @@ -1867,7 +1868,7 @@ def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Id # 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"] + dest_namespace = self._split_identifier_for_json(to_identifier)["namespace"] if not self.namespace_exists(source_namespace): raise NoSuchNamespaceError(f"Source namespace does not exist: {source_namespace}") diff --git a/tests/catalog/test_rest.py b/tests/catalog/test_rest.py index a2da06af8b..b589f2213f 100644 --- a/tests/catalog/test_rest.py +++ b/tests/catalog/test_rest.py @@ -119,6 +119,7 @@ Capability.V1_CREATE_VIEW, Capability.V1_REGISTER_VIEW, Capability.V1_DELETE_VIEW, + Capability.V1_RENAME_VIEW, Capability.V1_SUBMIT_TABLE_SCAN_PLAN, Capability.V1_TABLE_SCAN_PLAN_TASKS, ] @@ -3614,4 +3615,4 @@ def test_rename_view_destination_namespace_does_not_exist(rest_mock: Mocker) -> 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) + assert "Destination namespace does not exist: ('non_existent_namespace',)" in str(exc_info.value) diff --git a/tests/integration/test_catalog.py b/tests/integration/test_catalog.py index 3765b296e0..1f2ca61bd2 100644 --- a/tests/integration/test_catalog.py +++ b/tests/integration/test_catalog.py @@ -720,6 +720,26 @@ def test_rest_drop_view( @pytest.mark.integration +def test_rest_rename_view( + rest_catalog: RestCatalog, example_view_metadata_v1: dict[str, Any], database_name: str, view_name: str +) -> None: + from_identifier = (database_name, view_name) + to_identifier = (database_name, f"{view_name}_renamed") + + rest_catalog.create_namespace_if_not_exists(database_name) + view = View(from_identifier, ViewMetadata.model_validate(example_view_metadata_v1)) + + rest_catalog.create_view(from_identifier, view.schema(), view.current_version()) + assert rest_catalog.view_exists(from_identifier) + + rest_catalog.rename_view(from_identifier, to_identifier) + + assert not rest_catalog.view_exists(from_identifier) + assert rest_catalog.view_exists(to_identifier) + + +@pytest.mark.integration +@pytest.mark.skip(reason="Requires Iceberg REST Fixtures 1.11.x") def test_rest_custom_namespace_separator(rest_catalog: RestCatalog, table_schema_simple: Schema) -> None: """ Tests that the REST catalog correctly picks up the namespace-separator from the config endpoint. From 3d8dc7db8f5ce70b477692645e3ace531ef336b3 Mon Sep 17 00:00:00 2001 From: Alex Stephen Date: Mon, 5 Oct 2026 19:08:46 +0000 Subject: [PATCH 7/7] Address review comments on rename_view - Add @override to RestCatalog/SqlCatalog rename_view and restore it on BigQueryMetastoreCatalog.load_namespace_properties - Split identifiers once in RestCatalog.rename_view - Fix "fully classified" typo in the Catalog.rename_view docstring - Add a cross-namespace rename integration test - Drop a stale skip on test_rest_custom_namespace_separator reintroduced by rebase Co-Authored-By: Claude Opus 5.5 --- pyiceberg/catalog/__init__.py | 2 +- pyiceberg/catalog/bigquery_metastore.py | 1 + pyiceberg/catalog/rest/__init__.py | 20 ++++++++++---------- pyiceberg/catalog/sql.py | 1 + tests/integration/test_catalog.py | 22 +++++++++++++++++++++- 5 files changed, 34 insertions(+), 12 deletions(-) diff --git a/pyiceberg/catalog/__init__.py b/pyiceberg/catalog/__init__.py index 83eb5eb9b7..45d9c9fe35 100644 --- a/pyiceberg/catalog/__init__.py +++ b/pyiceberg/catalog/__init__.py @@ -746,7 +746,7 @@ def create_view( @abstractmethod def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: - """Rename a fully classified view name. + """Rename a fully qualified view name. Args: from_identifier (str | Identifier): Existing view identifier. diff --git a/pyiceberg/catalog/bigquery_metastore.py b/pyiceberg/catalog/bigquery_metastore.py index 31c102dfe8..74d1c952bc 100644 --- a/pyiceberg/catalog/bigquery_metastore.py +++ b/pyiceberg/catalog/bigquery_metastore.py @@ -337,6 +337,7 @@ def load_view(self, identifier: str | Identifier) -> View: def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: raise NotImplementedError + @override def load_namespace_properties(self, namespace: str | Identifier) -> Properties: dataset_name = self.identifier_to_database(namespace, NoSuchNamespaceError) diff --git a/pyiceberg/catalog/rest/__init__.py b/pyiceberg/catalog/rest/__init__.py index ca45f970f2..e893dd4b34 100644 --- a/pyiceberg/catalog/rest/__init__.py +++ b/pyiceberg/catalog/rest/__init__.py @@ -1858,23 +1858,23 @@ def drop_view(self, identifier: str | Identifier) -> None: except HTTPError as exc: _handle_non_200_response(exc, {404: NoSuchViewError}) + @override @retry(**_RETRY_ARGS) def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: self._check_endpoint(Capability.V1_RENAME_VIEW) - payload = { - "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_json(to_identifier)["namespace"] + source = self._split_identifier_for_json(from_identifier) + destination = self._split_identifier_for_json(to_identifier) + # Ensure that namespaces exist on source and destination. + source_namespace = source["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}") + destination_namespace = destination["namespace"] + if not self.namespace_exists(destination_namespace): + raise NoSuchNamespaceError(f"Destination namespace does not exist: {destination_namespace}") + + payload = {"source": source, "destination": destination} response = self._session.post(self.url(Endpoints.rename_view), json=payload) try: response.raise_for_status() diff --git a/pyiceberg/catalog/sql.py b/pyiceberg/catalog/sql.py index db80249166..e600f4a3ac 100644 --- a/pyiceberg/catalog/sql.py +++ b/pyiceberg/catalog/sql.py @@ -848,5 +848,6 @@ def close(self) -> None: if hasattr(self, "engine"): self.engine.dispose() + @override def rename_view(self, from_identifier: str | Identifier, to_identifier: str | Identifier) -> None: raise NotImplementedError diff --git a/tests/integration/test_catalog.py b/tests/integration/test_catalog.py index 1f2ca61bd2..50af7964a6 100644 --- a/tests/integration/test_catalog.py +++ b/tests/integration/test_catalog.py @@ -739,7 +739,27 @@ def test_rest_rename_view( @pytest.mark.integration -@pytest.mark.skip(reason="Requires Iceberg REST Fixtures 1.11.x") +def test_rest_rename_view_across_namespaces( + rest_catalog: RestCatalog, example_view_metadata_v1: dict[str, Any], database_name: str, view_name: str +) -> None: + to_database_name = f"{database_name}_renamed" + from_identifier = (database_name, view_name) + to_identifier = (to_database_name, view_name) + + rest_catalog.create_namespace_if_not_exists(database_name) + rest_catalog.create_namespace_if_not_exists(to_database_name) + view = View(from_identifier, ViewMetadata.model_validate(example_view_metadata_v1)) + + rest_catalog.create_view(from_identifier, view.schema(), view.current_version()) + assert rest_catalog.view_exists(from_identifier) + + rest_catalog.rename_view(from_identifier, to_identifier) + + assert not rest_catalog.view_exists(from_identifier) + assert rest_catalog.view_exists(to_identifier) + + +@pytest.mark.integration def test_rest_custom_namespace_separator(rest_catalog: RestCatalog, table_schema_simple: Schema) -> None: """ Tests that the REST catalog correctly picks up the namespace-separator from the config endpoint.