Skip to content

VARIANT code cleanups and improvements #28939

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 11 commits into from
Apr 1, 2026
Merged

VARIANT code cleanups and improvements #28939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
de261fa
Move ESCAPE_NON_ASCII to a mapper configuration
wendigo Mar 31, 2026
5dc5ddc
Move SliceOutput to try block
wendigo Mar 31, 2026
60c5777
Use non-deprecated method on RowType
wendigo Mar 31, 2026
f53c608
Use static imports
wendigo Mar 31, 2026
162dbb9
Use integer modulo arithmetics
wendigo Mar 31, 2026
b3ee7e2
Simplify check in Variant constructor
wendigo Mar 31, 2026
f65b9e6
Convert Variant to a record class
wendigo Mar 31, 2026
fa3e0d4
Rename unused variable
wendigo Mar 31, 2026
78846ad
Rename variable for consistency
wendigo Mar 31, 2026
c3c4e96
Remove redundant parentheses
wendigo Mar 31, 2026
1efa7cb
Do not create jsonFactory per encoder
wendigo Mar 31, 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
4 changes: 3 additions & 1 deletion client/trino-client/src/main/java/io/trino/client/JsonDecodingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@

public final class JsonDecodingUtils
{
static final JsonMapper JSON_MAPPER = new JsonMapper(createJsonFactory());

private JsonDecodingUtils() {}

private static final BigIntegerDecoder BIG_INTEGER_DECODER = new BigIntegerDecoder();
Expand Down Expand Up @@ -302,7 +304,7 @@ public Object decode(JsonParser parser)
throws IOException
{
StringWriter writer = new StringWriter();
try (JsonGenerator generator = createJsonFactory().createGenerator(writer)) {
try (JsonGenerator generator = JSON_MAPPER.createGenerator(writer)) {
generator.copyCurrentStructure(parser);
}
return writer.toString();
Expand Down
143 changes: 73 additions & 70 deletions core/trino-main/src/main/java/io/trino/util/variant/VariantUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
import io.trino.type.BigintOperators;
import io.trino.type.BooleanOperators;
import io.trino.type.DateOperators;
import io.trino.type.DateTimes;
import io.trino.type.DoubleOperators;
import io.trino.type.IntegerOperators;
import io.trino.type.JsonType;
Expand Down Expand Up @@ -106,14 +105,18 @@
import static io.trino.spi.type.VariantType.VARIANT;
import static io.trino.spi.variant.Header.BasicType.PRIMITIVE;
import static io.trino.spi.variant.Header.PrimitiveType.BINARY;
import static io.trino.type.BooleanOperators.castToVarchar;
import static io.trino.type.DateTimes.MICROSECONDS_PER_DAY;
import static io.trino.type.DateTimes.NANOSECONDS_PER_DAY;
import static io.trino.type.DateTimes.PICOSECONDS_PER_DAY;
import static io.trino.type.DateTimes.formatTimestamp;
import static io.trino.type.DateTimes.formatTimestampWithTimeZone;
import static io.trino.type.DateTimes.round;
import static io.trino.type.JsonType.JSON;
import static io.trino.util.JsonUtil.createJsonGenerator;
import static java.lang.Float.floatToRawIntBits;
import static java.lang.Math.toIntExact;
import static java.lang.Math.floorDiv;
import static java.lang.Math.floorMod;
import static java.lang.String.format;
import static java.math.RoundingMode.HALF_UP;
import static java.time.ZoneOffset.UTC;
Expand All @@ -124,6 +127,7 @@ public final class VariantUtil
.disable(CANONICALIZE_FIELD_NAMES)
// prevents characters outside BMP (e.g., emoji) from being escaped as surrogate pairs
.enable(COMBINE_UNICODE_SURROGATES_IN_UTF8)
.disable(ESCAPE_NON_ASCII)
.build());

private VariantUtil() {}
Expand Down Expand Up @@ -157,8 +161,8 @@ public static boolean canCastToVariant(Type type)
return mapType.getKeyType() instanceof VarcharType &&
canCastToVariant(mapType.getValueType());
}
if (type instanceof RowType) {
return type.getTypeParameters().stream().allMatch(VariantUtil::canCastToVariant);
if (type instanceof RowType rowType) {
return rowType.getTypeParameters().stream().allMatch(VariantUtil::canCastToVariant);
}
return false;
}
Expand Down Expand Up @@ -191,8 +195,8 @@ public static boolean canCastFromVariant(Type type)
if (type instanceof MapType mapType) {
return mapType.getKeyType() instanceof VarcharType && canCastFromVariant(mapType.getValueType());
}
if (type instanceof RowType) {
return type.getTypeParameters().stream().allMatch(VariantUtil::canCastFromVariant);
if (type instanceof RowType rowType) {
return rowType.getTypeParameters().stream().allMatch(VariantUtil::canCastFromVariant);
}
return false;
}
Expand All @@ -204,8 +208,8 @@ public static Slice asVarchar(Variant variant)
case PRIMITIVE -> switch (variant.primitiveType()) {
case NULL -> null;
case STRING -> variant.getString();
case BOOLEAN_TRUE -> BooleanOperators.castToVarchar(UNBOUNDED_LENGTH, true);
case BOOLEAN_FALSE -> BooleanOperators.castToVarchar(UNBOUNDED_LENGTH, false);
case BOOLEAN_TRUE -> castToVarchar(UNBOUNDED_LENGTH, true);
case BOOLEAN_FALSE -> castToVarchar(UNBOUNDED_LENGTH, false);
case INT8 -> utf8Slice(String.valueOf(variant.getByte()));
case INT16 -> utf8Slice(String.valueOf(variant.getShort()));
case INT32 -> utf8Slice(String.valueOf(variant.getInt()));
Expand All @@ -217,22 +221,22 @@ public static Slice asVarchar(Variant variant)
case TIME_NTZ_MICROS -> TimeOperators.castToVarchar(UNBOUNDED_LENGTH, 6, variant.getTimeMicros() * 1_000_000L);
case TIMESTAMP_UTC_MICROS -> {
long micros = variant.getTimestampMicros();
long epochMillis = Math.floorDiv(micros, 1_000L);
int picosOfMilli = toIntExact(Math.floorMod(micros, 1_000L) * 1_000_000L);
yield utf8Slice(DateTimes.formatTimestampWithTimeZone(6, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
long epochMillis = floorDiv(micros, 1_000L);
int picosOfMilli = floorMod(micros, 1_000) * 1_000_000;
yield utf8Slice(formatTimestampWithTimeZone(6, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
}
case TIMESTAMP_NTZ_MICROS -> utf8Slice(DateTimes.formatTimestamp(6, variant.getTimestampMicros(), 0, UTC));
case TIMESTAMP_NTZ_MICROS -> utf8Slice(formatTimestamp(6, variant.getTimestampMicros(), 0, UTC));
case TIMESTAMP_UTC_NANOS -> {
long nanos = variant.getTimestampNanos();
long epochMillis = Math.floorDiv(nanos, 1_000_000L);
int picosOfMilli = toIntExact(Math.floorMod(nanos, 1_000_000L) * 1_000L);
yield utf8Slice(DateTimes.formatTimestampWithTimeZone(9, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
long epochMillis = floorDiv(nanos, 1_000_000L);
int picosOfMilli = floorMod(nanos, 1_000_000) * 1_000;
yield utf8Slice(formatTimestampWithTimeZone(9, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
}
case TIMESTAMP_NTZ_NANOS -> {
long nanos = variant.getTimestampNanos();
long epochMicros = Math.floorDiv(nanos, 1_000L);
int picosOfMicros = toIntExact(Math.floorMod(nanos, 1_000L) * 1_000L);
yield utf8Slice(DateTimes.formatTimestamp(9, epochMicros, picosOfMicros, UTC));
long epochMicros = floorDiv(nanos, 1_000L);
int picosOfMicros = floorMod(nanos, 1_000) * 1_000;
yield utf8Slice(formatTimestamp(9, epochMicros, picosOfMicros, UTC));
}
case UUID -> utf8Slice(variant.getUuid().toString());
default -> throw new VariantCastException("Unsupported VARIANT primitive type for cast to VARCHAR: " + variant.primitiveType());
Expand Down Expand Up @@ -490,17 +494,17 @@ public static Long asDate(Variant variant)
case DATE -> (long) variant.getDate();
case TIMESTAMP_UTC_MICROS, TIMESTAMP_NTZ_MICROS -> {
long micros = variant.getTimestampMicros();
long epochSeconds = Math.floorDiv(micros, 1_000_000L);
int nanoAdjustment = (int) Math.floorMod(micros, 1_000_000L) * 1_000;
long epochSeconds = floorDiv(micros, 1_000_000L);
int nanoAdjustment = floorMod(micros, 1_000_000) * 1_000;
yield Instant.ofEpochSecond(epochSeconds, nanoAdjustment)
.atZone(UTC)
.toLocalDate()
.toEpochDay();
}
case TIMESTAMP_UTC_NANOS, TIMESTAMP_NTZ_NANOS -> {
long nanos = variant.getTimestampNanos();
long epochSeconds = Math.floorDiv(nanos, 1_000_000_000L);
int nanoAdjustment = (int) Math.floorMod(nanos, 1_000_000_000L);
long epochSeconds = floorDiv(nanos, 1_000_000_000L);
int nanoAdjustment = floorMod(nanos, 1_000_000_000);
yield Instant.ofEpochSecond(epochSeconds, nanoAdjustment)
.atZone(UTC)
.toLocalDate()
Expand All @@ -525,13 +529,13 @@ public static Long asTime(Variant variant, int precision)
yield round(timePicos, MAX_PRECISION - precision) % PICOSECONDS_PER_DAY;
}
case TIMESTAMP_UTC_MICROS, TIMESTAMP_NTZ_MICROS -> {
long micros = Math.floorMod(variant.getTimestampMicros(), MICROSECONDS_PER_DAY);
long micros = floorMod(variant.getTimestampMicros(), MICROSECONDS_PER_DAY);
long timePicos = micros * 1_000_000L;
// round can round up to a value equal to 24h, so we need to compute module 24h
yield round(timePicos, MAX_PRECISION - precision) % PICOSECONDS_PER_DAY;
}
case TIMESTAMP_UTC_NANOS, TIMESTAMP_NTZ_NANOS -> {
long nanos = Math.floorMod(variant.getTimestampNanos(), NANOSECONDS_PER_DAY);
long nanos = floorMod(variant.getTimestampNanos(), NANOSECONDS_PER_DAY);
long timePicos = nanos * 1_000L;
// round can round up to a value equal to 24h, so we need to compute module 24h
yield round(timePicos, MAX_PRECISION - precision) % PICOSECONDS_PER_DAY;
Expand Down Expand Up @@ -591,8 +595,8 @@ public static LongTimestamp asLongTimestamp(Variant variant, int precision)
if (precision < 9) {
nanos = round(nanos, 9 - precision);
}
long micros = Math.floorDiv(nanos, 1_000L);
int picosOfMicro = toIntExact(Math.floorMod(nanos, 1_000L) * 1_000L);
long micros = floorDiv(nanos, 1_000L);
int picosOfMicro = floorMod(nanos, 1_000) * 1_000;
yield new LongTimestamp(micros, picosOfMicro);
}
case STRING -> VarcharToTimestampCast.castToLongTimestamp(precision, variant.getString().toStringUtf8());
Expand Down Expand Up @@ -644,17 +648,17 @@ public static LongTimestampWithTimeZone asLongTimestampWithTimeZone(Variant vari
if (precision < 6) {
micros = round(micros, 6 - precision);
}
long millis = Math.floorDiv(micros, 1_000L);
int picosOfMillis = toIntExact(Math.floorMod(micros, 1_000L) * 1_000_000L);
long millis = floorDiv(micros, 1_000L);
int picosOfMillis = floorMod(micros, 1_000) * 1_000_000;
yield fromEpochMillisAndFraction(millis, picosOfMillis, UTC_KEY);
}
case TIMESTAMP_UTC_NANOS, TIMESTAMP_NTZ_NANOS -> {
long nanos = variant.getTimestampNanos();
if (precision < 9) {
nanos = round(nanos, 9 - precision);
}
long millis = Math.floorDiv(nanos, 1_000_000L);
int picosOfMillis = toIntExact(Math.floorMod(nanos, 1_000_000L) * 1_000L);
long millis = floorDiv(nanos, 1_000_000L);
int picosOfMillis = floorMod(nanos, 1_000_000) * 1_000;
yield fromEpochMillisAndFraction(millis, picosOfMillis, UTC_KEY);
}
case STRING -> asLongTimestampWithTimeZone(variant.getString(), precision);
Expand Down Expand Up @@ -1211,91 +1215,90 @@ private static void parseVariantToSingleRowBlock(

public static Slice asJson(Variant variant)
{
try {
SliceOutput output = new DynamicSliceOutput(40);
try (JsonGenerator jsonGenerator = createJsonGenerator(JSON_MAPPER, output)) {
jsonGenerator.configure(ESCAPE_NON_ASCII.mappedFeature(), false);
toJsonValue(jsonGenerator, variant);
}
try (SliceOutput output = new DynamicSliceOutput(40); JsonGenerator jsonGenerator = createJsonGenerator(JSON_MAPPER, output)) {
Comment thread
wendigo marked this conversation as resolved.
toJsonValue(jsonGenerator, variant);
jsonGenerator.flush();
return output.slice();
}
catch (IOException e) {
throw new RuntimeException(e);
}
}

private static void toJsonValue(JsonGenerator jsonGenerator, Variant variant)
private static void toJsonValue(JsonGenerator generator, Variant variant)
throws IOException
{
switch (variant.basicType()) {
case PRIMITIVE -> {
switch (variant.primitiveType()) {
case NULL -> jsonGenerator.writeNull();
case NULL -> generator.writeNull();
case BINARY -> {
Slice binary = variant.getBinary();
jsonGenerator.writeBinary(binary.byteArray(), binary.byteArrayOffset(), binary.length());
generator.writeBinary(binary.byteArray(), binary.byteArrayOffset(), binary.length());
}
case STRING -> jsonGenerator.writeString(variant.getString().toStringUtf8());
case BOOLEAN_TRUE -> jsonGenerator.writeBoolean(true);
case BOOLEAN_FALSE -> jsonGenerator.writeBoolean(false);
case INT8 -> jsonGenerator.writeNumber(variant.getByte());
case INT16 -> jsonGenerator.writeNumber(variant.getShort());
case INT32 -> jsonGenerator.writeNumber(variant.getInt());
case INT64 -> jsonGenerator.writeNumber(variant.getLong());
case DECIMAL4, DECIMAL8, DECIMAL16 -> jsonGenerator.writeNumber(variant.getDecimal());
case FLOAT -> jsonGenerator.writeNumber(variant.getFloat());
case DOUBLE -> jsonGenerator.writeNumber(variant.getDouble());
case DATE -> jsonGenerator.writeString(DateOperators.castToVarchar(UNBOUNDED_LENGTH, variant.getDate()).toStringUtf8());
case TIME_NTZ_MICROS -> jsonGenerator.writeString(TimeOperators.castToVarchar(UNBOUNDED_LENGTH, 6, variant.getTimeMicros() * 1_000_000L).toStringUtf8());
case STRING -> generator.writeString(variant.getString().toStringUtf8());
case BOOLEAN_TRUE -> generator.writeBoolean(true);
case BOOLEAN_FALSE -> generator.writeBoolean(false);
case INT8 -> generator.writeNumber(variant.getByte());
case INT16 -> generator.writeNumber(variant.getShort());
case INT32 -> generator.writeNumber(variant.getInt());
case INT64 -> generator.writeNumber(variant.getLong());
case DECIMAL4, DECIMAL8, DECIMAL16 -> generator.writeNumber(variant.getDecimal());
case FLOAT -> generator.writeNumber(variant.getFloat());
case DOUBLE -> generator.writeNumber(variant.getDouble());
case DATE -> generator.writeString(DateOperators.castToVarchar(UNBOUNDED_LENGTH, variant.getDate()).toStringUtf8());
case TIME_NTZ_MICROS -> generator.writeString(TimeOperators.castToVarchar(UNBOUNDED_LENGTH, 6, variant.getTimeMicros() * 1_000_000L).toStringUtf8());
case TIMESTAMP_UTC_MICROS -> {
long micros = variant.getTimestampMicros();
long epochMillis = Math.floorDiv(micros, 1_000L);
int picosOfMilli = toIntExact(Math.floorMod(micros, 1_000L) * 1_000_000L);
jsonGenerator.writeString(DateTimes.formatTimestampWithTimeZone(6, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
long epochMillis = floorDiv(micros, 1_000L);
int picosOfMilli = floorMod(micros, 1_000) * 1_000_000;
generator.writeString(formatTimestampWithTimeZone(6, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
}
case TIMESTAMP_NTZ_MICROS -> jsonGenerator.writeString(DateTimes.formatTimestamp(6, variant.getTimestampMicros(), 0, UTC));
case TIMESTAMP_NTZ_MICROS -> generator.writeString(formatTimestamp(6, variant.getTimestampMicros(), 0, UTC));
case TIMESTAMP_UTC_NANOS -> {
long nanos = variant.getTimestampNanos();
long epochMillis = Math.floorDiv(nanos, 1_000_000L);
int picosOfMilli = toIntExact(Math.floorMod(nanos, 1_000_000L) * 1_000L);
jsonGenerator.writeString(DateTimes.formatTimestampWithTimeZone(9, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
long epochMillis = floorDiv(nanos, 1_000_000L);

int picosOfMilli = floorMod(nanos, 1_000_000) * 1_000;
generator.writeString(formatTimestampWithTimeZone(9, epochMillis, picosOfMilli, UTC_KEY.getZoneId()));
}
case TIMESTAMP_NTZ_NANOS -> {
long nanos = variant.getTimestampNanos();
long epochMicros = Math.floorDiv(nanos, 1_000L);
int picosOfMicros = toIntExact(Math.floorMod(nanos, 1_000L) * 1_000L);
jsonGenerator.writeString(DateTimes.formatTimestamp(9, epochMicros, picosOfMicros, UTC));
long epochMicros = floorDiv(nanos, 1_000L);

int picosOfMicros = floorMod(nanos, 1_000) * 1_000;
generator.writeString(formatTimestamp(9, epochMicros, picosOfMicros, UTC));
}
case UUID -> jsonGenerator.writeString(variant.getUuid().toString());
case UUID -> generator.writeString(variant.getUuid().toString());
}
}
case SHORT_STRING -> jsonGenerator.writeString(variant.getString().toStringUtf8());
case SHORT_STRING -> generator.writeString(variant.getString().toStringUtf8());
case ARRAY -> {
jsonGenerator.writeStartArray();
generator.writeStartArray();
variant.arrayElements().forEach(element -> {
try {
toJsonValue(jsonGenerator, element);
toJsonValue(generator, element);
}
catch (IOException e) {
throw new UncheckedIOException(e);
}
});
jsonGenerator.writeEndArray();
generator.writeEndArray();
}
case OBJECT -> {
Metadata metadata = variant.metadata();
jsonGenerator.writeStartObject();
generator.writeStartObject();
variant.objectFields().forEach(fieldIdValue -> {
try {
String fieldName = metadata.get(fieldIdValue.fieldId()).toStringUtf8();
jsonGenerator.writeFieldName(fieldName);
toJsonValue(jsonGenerator, fieldIdValue.value());
generator.writeFieldName(fieldName);
toJsonValue(generator, fieldIdValue.value());
}
catch (IOException e) {
throw new UncheckedIOException(e);
}
});
jsonGenerator.writeEndObject();
generator.writeEndObject();
}
}
}
Expand Down
Loading