Skip to content
Open
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
15 changes: 11 additions & 4 deletions pyiceberg/expressions/literals.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ def _parse_numeric_string(value: str) -> Decimal:
return number


def _to_integral(value: Decimal, type_var: IcebergType) -> int:
"""Convert a Decimal to an int, rejecting values with a fractional part instead of rounding them."""
if value != value.to_integral_value():
raise ValueError(f"Could not convert {value} into a {type_var}, value has a fractional part")
return int(value)


class Literal(IcebergRootModel[L], Generic[L], ABC): # type: ignore
"""Literal which has a value and can be converted between types."""

Expand Down Expand Up @@ -527,24 +534,24 @@ def _(self, type_var: DecimalType) -> Literal[Decimal]:
raise ValueError(f"Could not convert {self.value} into a {type_var}")

@to.register(IntegerType)
def _(self, _: IntegerType) -> Literal[int]:
def _(self, type_var: IntegerType) -> Literal[int]:
value_int = int(self.value.to_integral_value())
if value_int > IntegerType.max:
return IntAboveMax()
elif value_int < IntegerType.min:
return IntBelowMin()
else:
return LongLiteral(value_int)
return LongLiteral(_to_integral(self.value, type_var))

@to.register(LongType)
def _(self, _: LongType) -> Literal[int]:
def _(self, type_var: LongType) -> Literal[int]:
value_int = int(self.value.to_integral_value())
if value_int > LongType.max:
return LongAboveMax()
elif value_int < LongType.min:
return LongBelowMin()
else:
return LongLiteral(value_int)
return LongLiteral(_to_integral(self.value, type_var))

@to.register(FloatType)
def _(self, _: FloatType) -> Literal[float]:
Expand Down
12 changes: 12 additions & 0 deletions tests/catalog/test_catalog_behaviors.py
Original file line number Diff line number Diff line change
Expand Up @@ -1322,6 +1322,18 @@ def test_append_invalid_input_type_raises(catalog: Catalog) -> None:
tbl.append("not an arrow object")


def test_scan_integer_column_with_decimal_literal(catalog: Catalog) -> None:

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you also add a test for 2.0? That should also pass

catalog.create_namespace("default")
identifier = f"default.scan_integer_decimal_literal_{catalog.name}"
tbl = catalog.create_table(identifier=identifier, schema=pa.schema([pa.field("x", pa.int32())]))
tbl.append(pa.table({"x": pa.array([1, 2, 3, 4], pa.int32())}))

assert sorted(tbl.scan(row_filter="x > 2.0").to_arrow()["x"].to_pylist()) == [3, 4]
# Rounding 2.6 to 3 would turn x > 2.6 into x > 3 and silently drop x = 3
with pytest.raises(ValueError, match="Could not convert 2.6 into a int"):
tbl.scan(row_filter="x > 2.6").to_arrow()


def test_record_batch_reader_consumed_exactly_once(catalog: Catalog) -> None:
"""The streaming path must consume the underlying generator exactly once.
A regression that drained the reader twice (e.g. an extra .schema access
Expand Down
13 changes: 13 additions & 0 deletions tests/expressions/test_literals.py
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,19 @@ def test_decimal_to_long_below_min() -> None:
assert isinstance(DecimalLiteral(Decimal(LongType.min - 1)).to(LongType()), LongBelowMin)


@pytest.mark.parametrize("value", ["2.5", "2.6", "-2.5", "0.1"])
@pytest.mark.parametrize("target_type", [IntegerType(), LongType()])
def test_fractional_decimal_to_integral_type_raises(value: str, target_type: PrimitiveType) -> None:
# Rounding would change the predicate, e.g. x > 2.6 would become x > 3 and drop x = 3
with pytest.raises(ValueError, match=f"Could not convert {value} into a {target_type}"):
_ = DecimalLiteral(Decimal(value)).to(target_type)


@pytest.mark.parametrize("target_type", [IntegerType(), LongType()])
def test_integral_decimal_to_integral_type(target_type: PrimitiveType) -> None:
assert DecimalLiteral(Decimal("2.00")).to(target_type) == LongLiteral(2)


def test_string_to_integer_type_invalid_value() -> None:
with pytest.raises(ValueError) as e:
_ = literal("abc").to(IntegerType())
Expand Down
Loading