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
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@
import io.trino.spi.function.ScalarOperator;
import io.trino.spi.function.SqlNullable;
import io.trino.spi.function.SqlType;
import io.trino.spi.type.TrinoNumber;
import io.trino.util.JsonCastException;

import java.io.IOException;
import java.math.BigDecimal;

import static io.airlift.slice.SliceUtf8.countCodePoints;
import static io.trino.spi.StandardErrorCode.INVALID_CAST_ARGUMENT;
Expand All @@ -39,6 +41,7 @@
import static io.trino.spi.type.StandardTypes.DOUBLE;
import static io.trino.spi.type.StandardTypes.INTEGER;
import static io.trino.spi.type.StandardTypes.JSON;
import static io.trino.spi.type.StandardTypes.NUMBER;
import static io.trino.spi.type.StandardTypes.REAL;
import static io.trino.spi.type.StandardTypes.SMALLINT;
import static io.trino.spi.type.StandardTypes.TINYINT;
Expand All @@ -51,6 +54,7 @@
import static io.trino.util.JsonUtil.currentTokenAsBoolean;
import static io.trino.util.JsonUtil.currentTokenAsDouble;
import static io.trino.util.JsonUtil.currentTokenAsInteger;
import static io.trino.util.JsonUtil.currentTokenAsNumber;
import static io.trino.util.JsonUtil.currentTokenAsReal;
import static io.trino.util.JsonUtil.currentTokenAsSmallint;
import static io.trino.util.JsonUtil.currentTokenAsTinyint;
Expand Down Expand Up @@ -198,6 +202,22 @@ public static Long castToReal(@SqlType(JSON) Slice json)
}
}

@ScalarOperator(CAST)
@SqlNullable
@SqlType(NUMBER)
public static TrinoNumber castToNumber(@SqlType(JSON) Slice json)
{
try (JsonParser parser = createJsonParser(JSON_MAPPER, json)) {
parser.nextToken();
TrinoNumber result = currentTokenAsNumber(parser);
checkCondition(parser.nextToken() == null, INVALID_CAST_ARGUMENT, "Cannot cast input json to NUMBER"); // check no trailing token
Comment thread
findepi marked this conversation as resolved.
return result;
}
catch (IOException | JsonCastException e) {
throw new TrinoException(INVALID_CAST_ARGUMENT, format("Cannot cast '%s' to %s", json.toStringUtf8(), NUMBER), e);
}
}

@ScalarOperator(CAST)
@SqlNullable
@SqlType(BOOLEAN)
Expand Down Expand Up @@ -305,6 +325,26 @@ public static Slice castFromReal(@SqlType(REAL) long value)
}
}

@ScalarOperator(CAST)
@SqlType(JSON)
public static Slice castFromNumber(@SqlType(NUMBER) TrinoNumber value)
{
try {
SliceOutput output = new DynamicSliceOutput(32);
try (JsonGenerator jsonGenerator = createJsonGenerator(JSON_MAPPER, output)) {
switch (value.toBigDecimal()) {
case TrinoNumber.NotANumber() -> jsonGenerator.writeString("NaN");
case TrinoNumber.Infinity(boolean negative) -> jsonGenerator.writeString(negative ? "-Infinity" : "+Infinity");
case TrinoNumber.BigDecimalValue(BigDecimal bigDecimal) -> jsonGenerator.writeNumber(bigDecimal);
Comment thread
findepi marked this conversation as resolved.
}
}
return output.slice();
}
catch (IOException e) {
throw new TrinoException(INVALID_CAST_ARGUMENT, format("Cannot cast NUMBER '%s' to %s", value.toBigDecimal(), JSON), e);
}
}

@ScalarOperator(CAST)
@SqlType(JSON)
public static Slice castFromBoolean(@SqlType(BOOLEAN) boolean value)
Expand Down
65 changes: 65 additions & 0 deletions core/trino-main/src/main/java/io/trino/util/JsonUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@
import io.trino.spi.type.IntegerType;
import io.trino.spi.type.LongTimestamp;
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.RowType.Field;
import io.trino.spi.type.SmallintType;
import io.trino.spi.type.StandardTypes;
import io.trino.spi.type.TimestampType;
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 io.trino.type.BigintOperators;
Expand All @@ -57,6 +59,7 @@
import io.trino.type.JsonType;
import io.trino.type.UnknownType;
import io.trino.type.VarcharOperators;
import jakarta.annotation.Nullable;

import java.io.IOException;
import java.io.InputStreamReader;
Expand Down Expand Up @@ -89,6 +92,7 @@
import static io.trino.spi.type.DateType.DATE;
import static io.trino.spi.type.DoubleType.DOUBLE;
import static io.trino.spi.type.IntegerType.INTEGER;
import static io.trino.spi.type.NumberType.NUMBER;
import static io.trino.spi.type.RealType.REAL;
import static io.trino.spi.type.SmallintType.SMALLINT;
import static io.trino.spi.type.TinyintType.TINYINT;
Expand Down Expand Up @@ -180,6 +184,7 @@ public static boolean canCastToJson(Type type)
type instanceof RealType ||
type instanceof DoubleType ||
type instanceof DecimalType ||
type instanceof NumberType ||
type instanceof VarcharType ||
type instanceof JsonType ||
type instanceof TimestampType ||
Expand Down Expand Up @@ -210,6 +215,7 @@ public static boolean canCastFromJson(Type type)
type instanceof RealType ||
type instanceof DoubleType ||
type instanceof DecimalType ||
type instanceof NumberType ||
type instanceof VarcharType ||
type instanceof JsonType) {
return true;
Expand Down Expand Up @@ -316,6 +322,9 @@ static JsonGeneratorWriter createJsonGeneratorWriter(Type type)
}
return new LongDecimalJsonGeneratorWriter(decimalType);
}
if (type instanceof NumberType) {
return new NumberJsonGeneratorWriter();
}
if (type instanceof VarcharType) {
return new VarcharJsonGeneratorWriter(type);
}
Expand Down Expand Up @@ -488,6 +497,27 @@ public void writeJsonValue(JsonGenerator jsonGenerator, Block block, int positio
}
}

private static class NumberJsonGeneratorWriter
implements JsonGeneratorWriter
{
@Override
public void writeJsonValue(JsonGenerator jsonGenerator, Block block, int position)
throws IOException
{
if (block.isNull(position)) {
jsonGenerator.writeNull();
}
else {
TrinoNumber value = (TrinoNumber) NUMBER.getObject(block, position);
switch (value.toBigDecimal()) {
case TrinoNumber.NotANumber() -> jsonGenerator.writeString("NaN");
case TrinoNumber.Infinity(boolean negative) -> jsonGenerator.writeString(negative ? "-Infinity" : "+Infinity");
case TrinoNumber.BigDecimalValue(BigDecimal bigDecimal) -> jsonGenerator.writeNumber(bigDecimal);
}
}
}
}

private static class VarcharJsonGeneratorWriter
implements JsonGeneratorWriter
{
Expand Down Expand Up @@ -796,6 +826,20 @@ public static Long currentTokenAsReal(JsonParser parser)
};
}

@Nullable
public static TrinoNumber currentTokenAsNumber(JsonParser parser)
throws IOException
{
return switch (parser.currentToken()) {
case VALUE_NULL -> null;
case VALUE_STRING, FIELD_NAME -> VarcharOperators.castToNumber(utf8Slice(parser.getText()));
case VALUE_NUMBER_INT, VALUE_NUMBER_FLOAT -> TrinoNumber.from(parser.getDecimalValue());
case VALUE_TRUE -> TrinoNumber.from(BigDecimal.ONE);
case VALUE_FALSE -> TrinoNumber.from(BigDecimal.ZERO);
default -> throw new JsonCastException(format("Unexpected token when cast to %s: %s", StandardTypes.NUMBER, parser.getText()));
};
}

public static Boolean currentTokenAsBoolean(JsonParser parser)
throws IOException
{
Expand Down Expand Up @@ -901,6 +945,9 @@ static BlockBuilderAppender createBlockBuilderAppender(Type type)

return new LongDecimalBlockBuilderAppender(decimalType);
}
if (type instanceof NumberType) {
return new NumberBlockBuilderAppender();
}
if (type instanceof VarcharType) {
return new VarcharBlockBuilderAppender(type);
}
Expand Down Expand Up @@ -1100,6 +1147,24 @@ public void append(JsonParser parser, BlockBuilder blockBuilder)
}
}

private static class NumberBlockBuilderAppender
implements BlockBuilderAppender
{
@Override
public void append(JsonParser parser, BlockBuilder blockBuilder)
throws IOException
{
TrinoNumber result = currentTokenAsNumber(parser);

if (result == null) {
blockBuilder.appendNull();
}
else {
NUMBER.writeObject(blockBuilder, result);
}
}
}

private static class VarcharBlockBuilderAppender
implements BlockBuilderAppender
{
Expand Down
113 changes: 113 additions & 0 deletions core/trino-main/src/test/java/io/trino/type/TestArrayOperators.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,19 @@
*/
package io.trino.type;

import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.primitives.Ints;
import io.airlift.json.JsonMapperProvider;
import io.airlift.slice.DynamicSliceOutput;
import io.airlift.slice.Slice;
import io.airlift.slice.SliceOutput;
import io.trino.metadata.InternalFunctionBundle;
import io.trino.plugin.base.util.JsonTypeUtil;
import io.trino.spi.TrinoException;
import io.trino.spi.block.ArrayBlockBuilder;
import io.trino.spi.block.Block;
import io.trino.spi.function.LiteralParameters;
Expand All @@ -36,8 +42,14 @@
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.parallel.Execution;

import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.util.Collections;

import static com.fasterxml.jackson.databind.DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS;
import static com.fasterxml.jackson.databind.SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS;
import static com.google.common.base.Preconditions.checkState;
import static io.trino.block.BlockSerdeUtil.writeBlock;
import static io.trino.operator.scalar.BlockSet.MAX_FUNCTION_MEMORY;
import static io.trino.spi.StandardErrorCode.AMBIGUOUS_FUNCTION_CALL;
Expand All @@ -55,6 +67,7 @@
import static io.trino.spi.type.DecimalType.createDecimalType;
import static io.trino.spi.type.DoubleType.DOUBLE;
import static io.trino.spi.type.IntegerType.INTEGER;
import static io.trino.spi.type.NumberType.NUMBER;
import static io.trino.spi.type.RealType.REAL;
import static io.trino.spi.type.RowType.anonymousRow;
import static io.trino.spi.type.RowType.field;
Expand All @@ -77,6 +90,7 @@
import static java.lang.Double.POSITIVE_INFINITY;
import static java.lang.Math.toIntExact;
import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand Down Expand Up @@ -115,6 +129,35 @@ public static Slice uncheckedToJson(@SqlType("varchar(x)") Slice slice)
return slice;
}

// TODO (https://github.com/trinodb/trino/issues/28867) remove when json_parse and JSON literals are no longer lossy.
@ScalarFunction("json_literal_fixed")
@LiteralParameters("x")
@SqlType(StandardTypes.JSON)
public static Slice workaroundBrokenJsonLiteralParsing(@SqlType("varchar(x)") Slice slice)
{
// This is copy of JsonTypeUtil.jsonParse with addition of USE_BIG_DECIMAL_FOR_FLOATS to prevent numeric precision loss during JSON parsing.
JsonMapper sortingMapper = new JsonMapperProvider().get()
.rebuild()
.configure(ORDER_MAP_ENTRIES_BY_KEYS, true)
.configure(USE_BIG_DECIMAL_FOR_FLOATS, true)
.build();

Slice json;
try (JsonParser parser = sortingMapper.createParser(new InputStreamReader(slice.getInput(), UTF_8))) {
SliceOutput output = new DynamicSliceOutput(slice.length());
sortingMapper.writeValue((OutputStream) output, sortingMapper.readValue(parser, Object.class));
checkState(parser.nextToken() == null, "Found characters after the expected end of input");
json = output.slice();
}
catch (IOException | RuntimeException e) {
throw new TrinoException(INVALID_FUNCTION_ARGUMENT, format("Cannot convert value to JSON: '%s'", slice.toStringUtf8()), e);
}

Slice lossyJson = JsonTypeUtil.jsonParse(slice);
checkState(!json.equals(lossyJson), "json_literal_fixed is used unnecessarily here, or jsonParse has been fixed");
return json;
}

@Test
public void testStackRepresentation()
{
Expand Down Expand Up @@ -1121,6 +1164,48 @@ public void testCastJsonToArrayDecimal()
.hasErrorCode(INVALID_CAST_ARGUMENT);
}

@Test
public void testCastJsonToArrayNumber()
{
assertThat(assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "CAST(null AS JSON)"))
.isNull(new ArrayType(NUMBER));

assertThat(assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "JSON 'null'"))
.isNull(new ArrayType(NUMBER));

assertThat(assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "JSON '[]'"))
.hasType(new ArrayType(NUMBER))
.matches("CAST(ARRAY[] AS ARRAY(NUMBER))");

assertThat(assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "JSON '[1, 2.5, 3.14159]'"))
.hasType(new ArrayType(NUMBER))
.matches("ARRAY[NUMBER '1', NUMBER '2.5', NUMBER '3.14159']");

assertThat(assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "json_literal_fixed('[12345678901234567890.123456789012345678, 123456789012345678901234567890.123456789012345678901234567890]')"))
.hasType(new ArrayType(NUMBER))
.matches("ARRAY[NUMBER '12345678901234567890.123456789012345678', NUMBER '123456789012345678901234567890.123456789012345678901234567890']");

assertThat(assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "JSON '[\"NaN\", \"Infinity\", \"-Infinity\", null]'"))
.hasType(new ArrayType(NUMBER))
.matches("ARRAY[NUMBER 'NaN', NUMBER '+Infinity', NUMBER '-Infinity', null]");

assertThat(assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "JSON '[true, false, 128, 123.456, \"3.14\", null]'"))
.hasType(new ArrayType(NUMBER))
.matches("ARRAY[NUMBER '1', NUMBER '0', NUMBER '128', NUMBER '123.456', NUMBER '3.14', null]");

assertTrinoExceptionThrownBy(() -> assertions.expression("CAST(a AS ARRAY(NUMBER))")
.binding("a", "JSON '[\"not a number\"]'")
.evaluate())
.hasErrorCode(INVALID_CAST_ARGUMENT);
}

@Test
public void testCastJsonToArrayVarchar()
{
Expand Down Expand Up @@ -1549,6 +1634,34 @@ public void testCastArrayDecimalToJson()
.isEqualTo("[null,null]");
}

@Test
public void testCastArrayNumberToJson()
{
assertThat(assertions.expression("CAST(a AS JSON)")
.binding("a", "CAST(null AS ARRAY(NUMBER))"))
.isNull(JSON);

assertThat(assertions.expression("CAST(a AS JSON)")
.binding("a", "ARRAY[]"))
.hasType(JSON)
.isEqualTo("[]");

assertThat(assertions.expression("CAST(a AS JSON)")
.binding("a", "ARRAY[NUMBER '1', NUMBER '2.5', NUMBER '3.14159', null]"))
.hasType(JSON)
.isEqualTo("[1,2.5,3.14159,null]");

assertThat(assertions.expression("CAST(a AS JSON)")
.binding("a", "ARRAY[NUMBER '12345678901234567890.123456789012345678', null, NUMBER '123456789012345678901234567890.123456789012345678901234567890']"))
.hasType(JSON)
.isEqualTo("[12345678901234567890.123456789012345678,null,123456789012345678901234567890.12345678901234567890123456789]");

assertThat(assertions.expression("CAST(a AS JSON)")
.binding("a", "ARRAY[NUMBER 'NaN', NUMBER '+Infinity', NUMBER '-Infinity', NUMBER '0', null]"))
.hasType(JSON)
.isEqualTo("[\"NaN\",\"+Infinity\",\"-Infinity\",0,null]");
}

@Test
public void testCastArrayVarcharToJson()
{
Expand Down
Loading