Fokko commented on code in PR #265:
URL: https://github.com/apache/iceberg-python/pull/265#discussion_r1453609341
##########
pyiceberg/catalog/sql.py:
##########
@@ -329,8 +363,66 @@ def _commit_table(self, table_request: CommitTableRequest)
-> CommitTableRespons
Raises:
NoSuchTableError: If a table with the given identifier does not
exist.
+ CommitFailedException: If the commit failed.
"""
- raise NotImplementedError
+ identifier_tuple = self.identifier_to_tuple_without_catalog(
+ tuple(table_request.identifier.namespace.root +
[table_request.identifier.name])
+ )
+ current_table = self.load_table(identifier_tuple)
+ database_name, table_name =
self.identifier_to_database_and_table(identifier_tuple, NoSuchTableError)
+ base_metadata = current_table.metadata
+ for requirement in table_request.requirements:
+ requirement.validate(base_metadata)
+
+ updated_metadata = update_table_metadata(base_metadata,
table_request.updates)
+ if updated_metadata == base_metadata:
+ # no changes, do nothing
+ return CommitTableResponse(metadata=base_metadata,
metadata_location=current_table.metadata_location)
+
+ # write new metadata
+ new_metadata_version =
self._parse_metadata_version(current_table.metadata_location) + 1
+ new_metadata_location =
self._get_metadata_location(current_table.metadata.location,
new_metadata_version)
+ self._write_metadata(updated_metadata, current_table.io,
new_metadata_location)
+
+ with Session(self.engine) as session:
+ if self.engine.dialect.supports_sane_rowcount:
+ stmt = (
+ update(IcebergTables)
+ .where(
+ IcebergTables.catalog_name == self.name,
+ IcebergTables.table_namespace == database_name,
+ IcebergTables.table_name == table_name,
+ IcebergTables.metadata_location ==
current_table.metadata_location,
+ )
+ .values(metadata_location=new_metadata_location,
previous_metadata_location=current_table.metadata_location)
+ )
+ result = session.execute(stmt)
+ if result.rowcount < 1:
+ raise CommitFailedException(
+ "Commit was unsuccessful as a conflicting concurrent
commit was made to the database."
Review Comment:
```suggestion
f"Table has been updated to another process:
{database_name}.{table_name}"
```
##########
pyiceberg/catalog/sql.py:
##########
@@ -329,8 +363,66 @@ def _commit_table(self, table_request: CommitTableRequest)
-> CommitTableRespons
Raises:
NoSuchTableError: If a table with the given identifier does not
exist.
+ CommitFailedException: If the commit failed.
"""
- raise NotImplementedError
+ identifier_tuple = self.identifier_to_tuple_without_catalog(
+ tuple(table_request.identifier.namespace.root +
[table_request.identifier.name])
+ )
+ current_table = self.load_table(identifier_tuple)
+ database_name, table_name =
self.identifier_to_database_and_table(identifier_tuple, NoSuchTableError)
+ base_metadata = current_table.metadata
+ for requirement in table_request.requirements:
+ requirement.validate(base_metadata)
+
+ updated_metadata = update_table_metadata(base_metadata,
table_request.updates)
+ if updated_metadata == base_metadata:
+ # no changes, do nothing
+ return CommitTableResponse(metadata=base_metadata,
metadata_location=current_table.metadata_location)
+
+ # write new metadata
+ new_metadata_version =
self._parse_metadata_version(current_table.metadata_location) + 1
+ new_metadata_location =
self._get_metadata_location(current_table.metadata.location,
new_metadata_version)
+ self._write_metadata(updated_metadata, current_table.io,
new_metadata_location)
+
+ with Session(self.engine) as session:
+ if self.engine.dialect.supports_sane_rowcount:
+ stmt = (
+ update(IcebergTables)
+ .where(
+ IcebergTables.catalog_name == self.name,
+ IcebergTables.table_namespace == database_name,
+ IcebergTables.table_name == table_name,
+ IcebergTables.metadata_location ==
current_table.metadata_location,
+ )
+ .values(metadata_location=new_metadata_location,
previous_metadata_location=current_table.metadata_location)
+ )
+ result = session.execute(stmt)
+ if result.rowcount < 1:
+ raise CommitFailedException(
+ "Commit was unsuccessful as a conflicting concurrent
commit was made to the database."
+ )
+ else:
+ try:
+ tbl = (
+ session.query(IcebergTables)
+ .with_for_update(of=IcebergTables)
+ .filter(
+ IcebergTables.catalog_name == self.name,
+ IcebergTables.table_namespace == database_name,
+ IcebergTables.table_name == table_name,
+ IcebergTables.metadata_location ==
current_table.metadata_location,
+ )
+ .one()
+ )
+ tbl.metadata_location = new_metadata_location
+ tbl.previous_metadata_location =
current_table.metadata_location
+ except NoResultFound as e:
+ raise CommitFailedException(
+ "Commit was unsuccessful as a conflicting concurrent
commit was made to the database."
Review Comment:
```suggestion
f"Table has been updated to another process:
{database_name}.{table_name}"
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
