Skip to content

Revert Python UDF changes #28920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wendigo merged 2 commits into from
Mar 30, 2026
+5 −80
Merged

Revert Python UDF changes #28920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5936e8
Revert "Improve DynamicSliceOutput usage"
wendigo Mar 30, 2026
d8cef8f
Revert "Add support to NUMBER to Python UDFs"
wendigo Mar 30, 2026
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
52 changes: 5 additions & 47 deletions plugin/trino-functions-python/src/main/java/io/trino/plugin/functions/python/TrinoTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import io.airlift.slice.Slice;
import io.airlift.slice.SliceInput;
import io.airlift.slice.SliceOutput;
import io.airlift.slice.Slices;
import io.trino.spi.TrinoException;
import io.trino.spi.block.Block;
import io.trino.spi.block.SqlMap;
Expand All @@ -36,24 +35,19 @@
import io.trino.spi.type.LongTimestamp;
import io.trino.spi.type.LongTimestampWithTimeZone;
import io.trino.spi.type.MapType;
import io.trino.spi.type.NumberType;
import io.trino.spi.type.RealType;
import io.trino.spi.type.RowType;
import io.trino.spi.type.SmallintType;
import io.trino.spi.type.SqlNumber;
import io.trino.spi.type.StandardTypes;
import io.trino.spi.type.TimeType;
import io.trino.spi.type.TimeWithTimeZoneType;
import io.trino.spi.type.TimeZoneKey;
import io.trino.spi.type.TimestampType;
import io.trino.spi.type.TimestampWithTimeZoneType;
import io.trino.spi.type.TinyintType;
import io.trino.spi.type.TrinoNumber;
import io.trino.spi.type.Type;
import io.trino.spi.type.VarcharType;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.math.BigDecimal;
import java.util.List;

Expand Down Expand Up @@ -113,7 +107,7 @@ public static void validateReturnType(Type type)
public static Slice toRowTypeDescriptor(List<Type> types)
{
if (types.isEmpty()) {
SliceOutput output = Slices.allocate(8).getOutput();
SliceOutput output = new DynamicSliceOutput(8);
output.writeInt(TrinoType.ROW.id());
output.writeInt(0);
return output.slice();
Expand All @@ -124,13 +118,9 @@ public static Slice toRowTypeDescriptor(List<Type> types)

public static Slice toTypeDescriptor(Type type)
{
try (SliceOutput output = new DynamicSliceOutput(64)) {
toTypeDescriptor(type, output);
return output.slice();
}
catch (IOException e) {
throw new UncheckedIOException(e);
}
SliceOutput output = new DynamicSliceOutput(64);
toTypeDescriptor(type, output);
return output.slice();
}

private static void toTypeDescriptor(Type type, SliceOutput output)
Expand Down Expand Up @@ -166,7 +156,7 @@ private static TrinoType singletonType(Type type)
case StandardTypes.TINYINT -> TrinoType.TINYINT;
case StandardTypes.DOUBLE -> TrinoType.DOUBLE;
case StandardTypes.REAL -> TrinoType.REAL;
case StandardTypes.DECIMAL, StandardTypes.NUMBER -> TrinoType.DECIMAL;
case StandardTypes.DECIMAL -> TrinoType.DECIMAL;
case StandardTypes.VARCHAR -> TrinoType.VARCHAR;
case StandardTypes.VARBINARY -> TrinoType.VARBINARY;
case StandardTypes.DATE -> TrinoType.DATE;
Expand Down Expand Up @@ -211,17 +201,6 @@ private static void javaToBinary(Type type, Object value, SliceOutput output)
: Decimals.toString((Int128) value, decimalType.getScale());
writeVariableSlice(utf8Slice(decimalString), output);
}
case NumberType _ -> {
TrinoNumber number = (TrinoNumber) value;

Slice slice = switch (number.toBigDecimal()) {
case TrinoNumber.BigDecimalValue(BigDecimal bigDecimal) -> utf8Slice(bigDecimal.toString());
case TrinoNumber.Infinity(boolean negative) -> negative ? utf8Slice("-Infinity") : utf8Slice("Infinity");
case TrinoNumber.NotANumber() -> utf8Slice("NaN");
};

writeVariableSlice(slice, output);
}
case TimeWithTimeZoneType timeType -> {
if (timeType.isShort()) {
long time = (long) value;
Expand Down Expand Up @@ -304,15 +283,6 @@ private static void blockToBinary(Type type, Block block, int position, SliceOut
: Decimals.toString((Int128) decimalType.getObject(block, position), decimalType.getScale());
writeVariableSlice(utf8Slice(decimalString), output);
}
case NumberType numberType -> {
SqlNumber value = (SqlNumber) numberType.getObjectValue(block, position);
Slice slice = switch (value.value()) {
case TrinoNumber.BigDecimalValue(BigDecimal bigDecimal) -> utf8Slice(bigDecimal.toString());
case TrinoNumber.Infinity(boolean negative) -> negative ? utf8Slice("-Infinity") : utf8Slice("Infinity");
case TrinoNumber.NotANumber _ -> utf8Slice("NaN");
};
writeVariableSlice(slice, output);
}
case DateType dateType -> output.writeInt(dateType.getInt(block, position));
case TimeType timeType -> output.writeLong(picosToMicros(timeType.getLong(block, position)));
case TimeWithTimeZoneType timeType -> {
Expand Down Expand Up @@ -415,18 +385,6 @@ public static Object binaryToJava(Type type, SliceInput input)
? encodeShortScaledValue(decimal, decimalType.getScale(), HALF_UP)
: encodeScaledValue(decimal, decimalType.getScale(), HALF_UP);
}
case NumberType _ -> {
String stringUtf8 = input.readSlice(input.readInt()).toStringUtf8();

TrinoNumber.AsBigDecimal number = switch (stringUtf8) {
case "NaN" -> new TrinoNumber.NotANumber();
case "Infinity" -> new TrinoNumber.Infinity(false);
case "-Infinity" -> new TrinoNumber.Infinity(true);
default -> new TrinoNumber.BigDecimalValue(new BigDecimal(stringUtf8));
};

yield TrinoNumber.from(number);
}
case TimeType timeType -> {
long micros = roundMicros(input.readLong(), timeType.getPrecision()) % MICROSECONDS_PER_DAY;
yield micros * PICOSECONDS_PER_MICROSECOND;
Expand Down
33 changes: 0 additions & 33 deletions ...-functions-python/src/test/java/io/trino/plugin/functions/python/TestPythonFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
import static io.trino.testing.TestingSession.testSessionBuilder;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
import static org.junit.jupiter.api.parallel.ExecutionMode.CONCURRENT;

Expand Down Expand Up @@ -752,38 +751,6 @@ SELECT bad_bigint_return()
"TypeError: 'str' object cannot be interpreted as an integer");
}

@Test
public void testTypeNumber()
{
String query =
"""
WITH FUNCTION multiply(x number, y number)
RETURNS number
LANGUAGE PYTHON
WITH (handler = 'multiply')
AS $$
from decimal import Decimal
def multiply(x, y):
return x * y * Decimal("100000000000000000000.000000000000000000000000000000000000001")
$$
""";

assertThat(assertions.query(
query + "SELECT multiply(NUMBER '1.12345', NUMBER '2.54321')"))
.matches("VALUES NUMBER '2.8571692745E+20'");

// TODO: https://github.com/trinodb/trino-wasm-python/pull/11
assertThatThrownBy(() -> assertThat(assertions.query(
query + "SELECT multiply(NUMBER 'NaN', NUMBER '2.54321')"))
.matches("VALUES NUMBER 'NaN'"))
.hasMessageContaining("ValueError: Decimal is not finite: NaN");

assertThatThrownBy(() -> assertThat(assertions.query(
query + "SELECT multiply(NUMBER '-Infinity', NUMBER '2.54321')"))
.matches("VALUES NUMBER 'NaN'"))
.hasMessageContaining("ValueError: Decimal is not finite: -Infinity");
}

@Test
public void testTypeInteger()
{
Expand Down
Loading