Fokko commented on code in PR #1935: URL: https://github.com/apache/iceberg-python/pull/1935#discussion_r2053926676
########## pyiceberg/table/update/validate.py: ########## @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from typing import Optional + +from pyiceberg.manifest import ManifestContent, ManifestFile +from pyiceberg.table import Table +from pyiceberg.table.snapshots import Operation, Snapshot, ancestors_between + + +class ValidationException(Exception): + """Raised when validation fails.""" + + +def validation_history( + table: Table, + from_snapshot: Snapshot, + to_snapshot: Optional[Snapshot], + matching_operations: set[Operation], + manifest_content_filter: ManifestContent, +) -> tuple[list[ManifestFile], set[Snapshot]]: + """Return newly added manifests and snapshot IDs between the starting snapshot and parent snapshot. + + Args: + table: Table to get the history from + from_snapshot: Parent snapshot to get the history from + to_snapshot: Starting snapshot + matching_operations: Operations to match on + manifest_content_filter: Manifest content type to filter + + Raises: + ValidationException: If no matching snapshot is found or only one snapshot is found + + Returns: + List of manifest files and set of snapshots matching conditions + """ + manifests_files: list[ManifestFile] = [] + snapshots: set[Snapshot] = set() Review Comment: Java just returns `ints`, we can return `Snapshot`'s as well, but with the `set` we lose the order. ########## pyiceberg/table/update/validate.py: ########## @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from typing import Optional + +from pyiceberg.manifest import ManifestContent, ManifestFile +from pyiceberg.table import Table +from pyiceberg.table.snapshots import Operation, Snapshot, ancestors_between + + +class ValidationException(Exception): Review Comment: We keep the exceptions in `exceptions.py` ########## pyiceberg/table/update/validate.py: ########## @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from typing import Optional + +from pyiceberg.manifest import ManifestContent, ManifestFile +from pyiceberg.table import Table +from pyiceberg.table.snapshots import Operation, Snapshot, ancestors_between + + +class ValidationException(Exception): + """Raised when validation fails.""" + + +def validation_history( + table: Table, + from_snapshot: Snapshot, + to_snapshot: Optional[Snapshot], + matching_operations: set[Operation], + manifest_content_filter: ManifestContent, +) -> tuple[list[ManifestFile], set[Snapshot]]: + """Return newly added manifests and snapshot IDs between the starting snapshot and parent snapshot. + + Args: + table: Table to get the history from + from_snapshot: Parent snapshot to get the history from + to_snapshot: Starting snapshot + matching_operations: Operations to match on + manifest_content_filter: Manifest content type to filter + + Raises: + ValidationException: If no matching snapshot is found or only one snapshot is found + + Returns: + List of manifest files and set of snapshots matching conditions + """ + manifests_files: list[ManifestFile] = [] + snapshots: set[Snapshot] = set() + + last_snapshot = None + for snapshot in ancestors_between(from_snapshot, to_snapshot, table.metadata): + last_snapshot = snapshot + summary = snapshot.summary + if summary is None or summary.operation not in matching_operations: Review Comment: This looks dangerous to me, I don't think we want to skip over this if the summary is `None` ########## pyiceberg/table/update/validate.py: ########## @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from typing import Optional + +from pyiceberg.manifest import ManifestContent, ManifestFile +from pyiceberg.table import Table +from pyiceberg.table.snapshots import Operation, Snapshot, ancestors_between + + +class ValidationException(Exception): + """Raised when validation fails.""" + + +def validation_history( + table: Table, + from_snapshot: Snapshot, + to_snapshot: Optional[Snapshot], + matching_operations: set[Operation], + manifest_content_filter: ManifestContent, +) -> tuple[list[ManifestFile], set[Snapshot]]: + """Return newly added manifests and snapshot IDs between the starting snapshot and parent snapshot. + + Args: + table: Table to get the history from + from_snapshot: Parent snapshot to get the history from + to_snapshot: Starting snapshot + matching_operations: Operations to match on + manifest_content_filter: Manifest content type to filter + + Raises: + ValidationException: If no matching snapshot is found or only one snapshot is found + + Returns: + List of manifest files and set of snapshots matching conditions + """ + manifests_files: list[ManifestFile] = [] + snapshots: set[Snapshot] = set() + + last_snapshot = None + for snapshot in ancestors_between(from_snapshot, to_snapshot, table.metadata): + last_snapshot = snapshot + summary = snapshot.summary + if summary is None or summary.operation not in matching_operations: Review Comment: I think the right thing here is to assume that it is an `Overwrite` operation ########## pyiceberg/table/update/validate.py: ########## @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +from typing import Optional + +from pyiceberg.manifest import ManifestContent, ManifestFile +from pyiceberg.table import Table +from pyiceberg.table.snapshots import Operation, Snapshot, ancestors_between + + +class ValidationException(Exception): + """Raised when validation fails.""" + + +def validation_history( + table: Table, + from_snapshot: Snapshot, + to_snapshot: Optional[Snapshot], Review Comment: What do you think of making the API a bit more strict and simplify code along the way. I don't think this needs to be `Optional`: ```suggestion to_snapshot: Snapshot, ``` -- 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
