You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by "Fokko (via GitHub)" <gi...@apache.org> on 2025/05/02 13:16:05 UTC
[PR] Add tests for optimistic concurrency [iceberg-python]
Fokko opened a new pull request, #1962:
URL: https://github.com/apache/iceberg-python/pull/1962
I think it would be great to also have integration tests that make it easy to replicate certain scenarios.
Added some simple ones, but we can extend by having two tables that modify a different partition etc.
<!--
Thanks for opening a pull request!
-->
<!-- In the case this PR will resolve an issue, please replace ${GITHUB_ISSUE_ID} below with the actual Github issue id. -->
<!-- Closes #${GITHUB_ISSUE_ID} -->
# Rationale for this change
# Are these changes tested?
# Are there any user-facing changes?
<!-- In the case of user-facing changes, please add the changelog label. -->
--
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-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] Add tests for optimistic concurrency [iceberg-python]
Posted by "Fokko (via GitHub)" <gi...@apache.org>.
Fokko commented on code in PR #1962:
URL: https://github.com/apache/iceberg-python/pull/1962#discussion_r2072447068
##########
tests/integration/test_writes/test_optimistic_concurrency.py:
##########
@@ -0,0 +1,89 @@
+# 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.
+
+import pyarrow as pa
+import pytest
+from pyspark.sql import SparkSession
+
+from pyiceberg.catalog import Catalog
+from pyiceberg.exceptions import CommitFailedException
+from utils import _create_table
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": "1"}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.delete("string == 'z'")
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_append(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": "1"}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ # This is allowed
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.append(arrow_table_with_null)
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_append_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": "1"}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.delete("string == 'z'")
Review Comment:
Copy-paste, thanks :)
--
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-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] Add tests for optimistic concurrency [iceberg-python]
Posted by "smaheshwar-pltr (via GitHub)" <gi...@apache.org>.
smaheshwar-pltr commented on code in PR #1962:
URL: https://github.com/apache/iceberg-python/pull/1962#discussion_r2072106756
##########
tests/integration/test_writes/test_optimistic_concurrency.py:
##########
@@ -0,0 +1,89 @@
+# 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.
+
+import pyarrow as pa
+import pytest
+from pyspark.sql import SparkSession
+
+from pyiceberg.catalog import Catalog
+from pyiceberg.exceptions import CommitFailedException
+from utils import _create_table
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": "1"}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.delete("string == 'z'")
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_append(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": "1"}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ # This is allowed
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.append(arrow_table_with_null)
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_append_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": "1"}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.delete("string == 'z'")
Review Comment:
From the test's name, should this maybe be:
```suggestion
tbl1.append(arrow_table_with_null)
```
--
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-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] Add tests for optimistic concurrency [iceberg-python]
Posted by "Fokko (via GitHub)" <gi...@apache.org>.
Fokko commented on code in PR #1962:
URL: https://github.com/apache/iceberg-python/pull/1962#discussion_r2075040539
##########
tests/integration/test_writes/test_optimistic_concurrency.py:
##########
@@ -0,0 +1,89 @@
+# 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.
+
+import pyarrow as pa
+import pytest
+from pyspark.sql import SparkSession
+
+from pyiceberg.catalog import Catalog
+from pyiceberg.exceptions import CommitFailedException
+from utils import _create_table
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.delete("string == 'z'")
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_append(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ # This is allowed
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.append(arrow_table_with_null)
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_append_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.append(arrow_table_with_null)
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.delete("string == 'z'")
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_append_append(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.append(arrow_table_with_null)
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.append(arrow_table_with_null)
Review Comment:
Thanks @hussein-awala for jumping in here. And that's correct, once the optimistic concurrency control has been added, they should start passing (for snapshot isolation, not for serializable isolation). I've added a comment, LMKWYT
--
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-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
Re: [PR] Add tests for optimistic concurrency [iceberg-python]
Posted by "hussein-awala (via GitHub)" <gi...@apache.org>.
hussein-awala commented on code in PR #1962:
URL: https://github.com/apache/iceberg-python/pull/1962#discussion_r2072552413
##########
tests/integration/test_writes/test_optimistic_concurrency.py:
##########
@@ -0,0 +1,89 @@
+# 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.
+
+import pyarrow as pa
+import pytest
+from pyspark.sql import SparkSession
+
+from pyiceberg.catalog import Catalog
+from pyiceberg.exceptions import CommitFailedException
+from utils import _create_table
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.delete("string == 'z'")
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_delete_append(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ # This is allowed
+ tbl1.delete("string == 'z'")
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.append(arrow_table_with_null)
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_append_delete(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.append(arrow_table_with_null)
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.delete("string == 'z'")
+
+
+@pytest.mark.integration
+@pytest.mark.parametrize("format_version", [1, 2])
+def test_conflict_append_append(
+ spark: SparkSession, session_catalog: Catalog, arrow_table_with_null: pa.Table, format_version: int
+) -> None:
+ identifier = "default.test_conflict"
+ tbl1 = _create_table(session_catalog, identifier, {"format-version": format_version}, [arrow_table_with_null])
+ tbl2 = session_catalog.load_table(identifier)
+
+ tbl1.append(arrow_table_with_null)
+
+ with pytest.raises(CommitFailedException, match="(branch main has changed: expected id ).*"):
+ # tbl2 isn't aware of the commit by tbl1
+ tbl2.append(arrow_table_with_null)
Review Comment:
Actually, this shouldn't fail, but it does with the current OCC implementation, we may add a todo comment to remove it when https://github.com/apache/iceberg-python/issues/819 is completed, to indicate to the developer working on https://github.com/apache/iceberg-python/issues/1929 that it is safe to remove/update this test.
--
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-unsubscribe@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org