Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pyiceberg/io/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -379,14 +379,14 @@ def load_file_io(properties: Properties = EMPTY_DICT, location: str | None = Non
raise ValueError(f"Could not initialize FileIO: {io_impl}")

# Check the table location
if location:
if file_io := _infer_file_io_from_scheme(location, properties):
return file_io
if location and (file_io := _infer_file_io_from_scheme(location, properties)):
return file_io

# Look at the schema of the warehouse
if warehouse_location := properties.get(WAREHOUSE):
if file_io := _infer_file_io_from_scheme(warehouse_location, properties):
return file_io
if (warehouse_location := properties.get(WAREHOUSE)) and (
file_io := _infer_file_io_from_scheme(warehouse_location, properties)
):
return file_io

try:
# Default to PyArrow
Expand Down
21 changes: 10 additions & 11 deletions pyiceberg/partitioning.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,16 @@ def __init__(
@model_validator(mode="before")
@classmethod
def map_source_ids_onto_source_id(cls, data: Any) -> Any:
if isinstance(data, dict):
if "source-ids" in data:
if "source-id" in data:
raise ValueError("source-id and source-ids are mutually exclusive")
source_ids = data["source-ids"]
if isinstance(source_ids, list):
if len(source_ids) == 0:
raise ValueError("Empty source-ids is not allowed")
if len(source_ids) > 1:
raise ValueError("Multi argument transforms are not yet supported")
data["source-id"] = source_ids[0]
if isinstance(data, dict) and "source-ids" in data:
if "source-id" in data:
raise ValueError("source-id and source-ids are mutually exclusive")
source_ids = data["source-ids"]
if isinstance(source_ids, list):
if len(source_ids) == 0:
raise ValueError("Empty source-ids is not allowed")
if len(source_ids) > 1:
raise ValueError("Multi argument transforms are not yet supported")
data["source-id"] = source_ids[0]
return data

def __str__(self) -> str:
Expand Down
5 changes: 2 additions & 3 deletions pyiceberg/table/metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,8 @@ def set_v2_compatible_defaults(cls, data: dict[str, Any]) -> dict[str, Any]:
"""
# When the schema doesn't have an ID
schema = data.get("schema")
if isinstance(schema, dict):
if "schema_id" not in schema and "schema-id" not in schema:
schema["schema_id"] = DEFAULT_SCHEMA_ID
if isinstance(schema, dict) and "schema_id" not in schema and "schema-id" not in schema:
schema["schema_id"] = DEFAULT_SCHEMA_ID

return data

Expand Down
21 changes: 10 additions & 11 deletions pyiceberg/table/sorting.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,16 @@ def set_null_order(cls, values: dict[str, Any]) -> dict[str, Any]:
@model_validator(mode="before")
@classmethod
def map_source_ids_onto_source_id(cls, data: Any) -> Any:
if isinstance(data, dict):
if "source-ids" in data:
if "source-id" in data:
raise ValueError("source-id and source-ids are mutually exclusive")
source_ids = data["source-ids"]
if isinstance(source_ids, list):
if len(source_ids) == 0:
raise ValueError("Empty source-ids is not allowed")
if len(source_ids) > 1:
raise ValueError("Multi argument transforms are not yet supported")
data["source-id"] = source_ids[0]
if isinstance(data, dict) and "source-ids" in data:
if "source-id" in data:
raise ValueError("source-id and source-ids are mutually exclusive")
source_ids = data["source-ids"]
if isinstance(source_ids, list):
if len(source_ids) == 0:
raise ValueError("Empty source-ids is not allowed")
if len(source_ids) > 1:
raise ValueError("Multi argument transforms are not yet supported")
data["source-id"] = source_ids[0]
return data

source_id: int = Field(alias="source-id")
Expand Down
Loading