Skip to content
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

Adds support to string coercions #18

Merged
merged 2 commits into from
Jan 14, 2025
Merged

Adds support to string coercions #18

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
a050424
Adds support to string coercions
desaikd Dec 24, 2024
b3c8a5a
Adds suggested changes
desaikd Jan 13, 2025
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
53 changes: 46 additions & 7 deletions lib/trino-hive-formats/src/main/java/io/trino/hive/formats/ion/IonDecoderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import com.amazon.ion.IonException;
import com.amazon.ion.IonReader;
import com.amazon.ion.IonType;
import com.amazon.ion.IonWriter;
import com.amazon.ion.Timestamp;
import com.amazon.ion.system.IonTextWriterBuilder;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import io.airlift.slice.Slices;
Expand Down Expand Up @@ -53,6 +55,7 @@
import io.trino.spi.type.VarcharType;
import io.trino.spi.type.Varchars;

import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.RoundingMode;
Expand Down Expand Up @@ -127,8 +130,8 @@ private static BlockDecoder decoderForType(Type type)
case BooleanType t -> wrapDecoder(boolDecoder, t, IonType.BOOL);
case DateType t -> wrapDecoder(dateDecoder, t, IonType.TIMESTAMP);
case TimestampType t -> wrapDecoder(timestampDecoder(t), t, IonType.TIMESTAMP);
case VarcharType t -> wrapDecoder(varcharDecoder(t), t, IonType.STRING, IonType.SYMBOL);
case CharType t -> wrapDecoder(charDecoder(t), t, IonType.STRING, IonType.SYMBOL);
case VarcharType t -> wrapDecoder(varcharDecoder(t), t, IonType.values());
case CharType t -> wrapDecoder(charDecoder(t), t, IonType.values());
case VarbinaryType t -> wrapDecoder(binaryDecoder, t, IonType.BLOB, IonType.CLOB);
case RowType t -> wrapDecoder(RowDecoder.forFields(t.getFields()), t, IonType.STRUCT);
case ArrayType t -> wrapDecoder(new ArrayDecoder(decoderForType(t.getElementType())), t, IonType.LIST, IonType.SEXP);
Expand All @@ -148,7 +151,7 @@ private static BlockDecoder decoderForType(Type type)
*/
private static BlockDecoder wrapDecoder(BlockDecoder decoder, Type trinoType, IonType... allowedTypes)
{
Set<IonType> allowedWithNull = new HashSet<>(Arrays.asList(allowedTypes));
final Set<IonType> allowedWithNull = new HashSet<>(Arrays.asList(allowedTypes));
allowedWithNull.add(IonType.NULL);

return (reader, builder) -> {
Expand Down Expand Up @@ -360,16 +363,52 @@ private static BlockDecoder decimalDecoder(DecimalType type)
};
}

private static String getCoercedValue(IonReader ionReader)
{
IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard();
StringBuilder stringBuilder = new StringBuilder();
IonWriter writer = textWriterBuilder.build(stringBuilder);
try {
writer.writeValue(ionReader);
}
catch (IOException e) {
throw new RuntimeException(e);
}
return stringBuilder.toString();
}

private static BlockDecoder varcharDecoder(VarcharType type)
{
return (ionReader, blockBuilder) ->
type.writeSlice(blockBuilder, Varchars.truncateToLength(Slices.utf8Slice(ionReader.stringValue()), type));
return (ionReader, blockBuilder) -> {
IonType valueType = ionReader.getType();
String value;

if (valueType == IonType.SYMBOL || valueType == IonType.STRING) {
value = ionReader.stringValue();
}
else {
// For any types other than IonType.SYMBOL and IonType.STRING, performs text coercion
value = getCoercedValue(ionReader);
}
type.writeSlice(blockBuilder, Varchars.truncateToLength(Slices.utf8Slice(value), type));
};
}

private static BlockDecoder charDecoder(CharType type)
{
return (ionReader, blockBuilder) ->
type.writeSlice(blockBuilder, Chars.truncateToLengthAndTrimSpaces(Slices.utf8Slice(ionReader.stringValue()), type));
return (ionReader, blockBuilder) -> {
IonType valueType = ionReader.getType();
String value;

if (valueType == IonType.SYMBOL || valueType == IonType.STRING) {
value = ionReader.stringValue();
}
else {
// For any types other than IonType.SYMBOL and IonType.STRING, performs text coercion
value = getCoercedValue(ionReader);
}
type.writeSlice(blockBuilder, Chars.truncateToLengthAndTrimSpaces(Slices.utf8Slice(value), type));
};
}

private static final BlockDecoder byteDecoder = (ionReader, blockBuilder) ->
Expand Down
36 changes: 36 additions & 0 deletions lib/trino-hive-formats/src/test/java/io/trino/hive/formats/ion/TestIonFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,42 @@ public void testCaseInsensitivityOfKeys()
List.of(31, "baz"));
}

@Test
public void testStringCoercions()
throws IOException
{
assertValues(
RowType.rowType(
field("foo", VARCHAR)),
"{ foo: true }",
List.of("true"));
assertValues(
RowType.rowType(
field("foo", VARCHAR)),
"{ foo: 31 }",
List.of("31"));
assertValues(
RowType.rowType(
field("foo", VARCHAR)),
"{ foo: 31.50 }",
List.of("31.50"));
assertValues(
RowType.rowType(
field("foo", VARCHAR)),
"{ foo: [1, 2, 3] }",
List.of("[1,2,3]"));
assertValues(
RowType.rowType(
field("foo", VARCHAR)),
"{ foo: \"bar\" }",
List.of("bar"));
assertValues(
RowType.rowType(
field("foo", VARCHAR)),
"{ foo: { nested_foo: 12 } }",
List.of("{nested_foo:12}"));
}

@Test
public void testCaseInsensitivityOfDuplicateKeys()
throws IOException
Expand Down
Loading