Skip to content

Remove unused codepath in AvroColumnDecoder #17188

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
kokosing merged 1 commit into from
Apr 24, 2023
Merged

Remove unused codepath in AvroColumnDecoder #17188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/AvroColumnDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ public boolean isNull()
@Override
public double getDouble()
{
if (value instanceof Double || value instanceof Float) {
Copy link
Member

@jklamer jklamer Apr 24, 2023

Choose a reason for hiding this comment

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

This is for avro data promotion and is needed.

if (value instanceof Double) {
return ((Number) value).doubleValue();
}
throw new TrinoException(DECODER_CONVERSION_NOT_SUPPORTED, format("cannot decode object of '%s' as '%s' for column '%s'", value.getClass(), columnType, columnName));
Expand Down
12 changes: 2 additions & 10 deletions lib/trino-record-decoder/src/test/java/io/trino/decoder/avro/TestAvroDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
import static io.trino.spi.type.VarcharType.createUnboundedVarcharType;
import static io.trino.spi.type.VarcharType.createVarcharType;
import static io.trino.type.InternalTypeManager.TESTING_TYPE_MANAGER;
import static java.lang.Float.floatToIntBits;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.testng.Assert.assertEquals;
Expand Down Expand Up @@ -414,22 +415,13 @@ public void testIntDecodedAsTinyInt()
checkValue(decodedRow, row, 100);
}

@Test
public void testFloatDecodedAsDouble()
{
DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", DOUBLE, "float_field", null, null, false, false, false);
Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "float_field", "\"float\"", 10.2f);

checkValue(decodedRow, row, 10.2);
}

@Test
public void testFloatDecodedAsReal()
{
DecoderTestColumnHandle row = new DecoderTestColumnHandle(0, "row", REAL, "float_field", null, null, false, false, false);
Map<DecoderColumnHandle, FieldValueProvider> decodedRow = buildAndDecodeColumn(row, "float_field", "\"float\"", 10.2f);

checkValue(decodedRow, row, 10.2);
checkValue(decodedRow, row, floatToIntBits(10.2f));
}

@Test
Expand Down