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

Set message corrupt in case of decode problems of tombstone #17479

Merged
merged 1 commit into from
May 17, 2023
Merged

Set message corrupt in case of decode problems of tombstone #17479

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
8 changes: 7 additions & 1 deletion lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/GenericRecordRowDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,13 @@ public GenericRecordRowDecoder(AvroDeserializer<GenericRecord> deserializer, Set
@Override
public Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodeRow(byte[] data)
{
GenericRecord avroRecord = deserializer.deserialize(data);
GenericRecord avroRecord;
try {
avroRecord = deserializer.deserialize(data);
}
catch (RuntimeException e) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Does it make sense to log exception here ?

return Optional.empty();
}
return Optional.of(columnDecoders.stream()
.collect(toImmutableMap(Map.Entry::getKey, entry -> entry.getValue().decodeField(avroRecord))));
}
Expand Down
8 changes: 7 additions & 1 deletion lib/trino-record-decoder/src/main/java/io/trino/decoder/avro/SingleValueRowDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,13 @@ public SingleValueRowDecoder(AvroDeserializer<Object> deserializer, DecoderColum
@Override
public Optional<Map<DecoderColumnHandle, FieldValueProvider>> decodeRow(byte[] data)
{
Object avroValue = deserializer.deserialize(data);
Object avroValue;
try {
avroValue = deserializer.deserialize(data);
}
catch (RuntimeException e) {
return Optional.empty();
}
return Optional.of(ImmutableMap.of(column, new AvroColumnDecoder.ObjectValueProvider(avroValue, column.getType(), column.getName())));
}
}
9 changes: 3 additions & 6 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 @@ -31,7 +31,6 @@
import io.trino.spi.type.RowType;
import io.trino.spi.type.Type;
import io.trino.spi.type.VarbinaryType;
import org.apache.avro.AvroTypeException;
import org.apache.avro.Schema;
import org.apache.avro.SchemaBuilder;
import org.apache.avro.SchemaBuilder.FieldAssembler;
Expand Down Expand Up @@ -166,7 +165,7 @@ private static Map<DecoderColumnHandle, FieldValueProvider> decodeRow(byte[] avr
{
RowDecoder rowDecoder = DECODER_FACTORY.create(dataParams, columns);
return rowDecoder.decodeRow(avroData)
.orElseThrow(AssertionError::new);
.orElseThrow(() -> new IllegalStateException("Problems during decode phase"));
}

private static byte[] buildAvroData(Schema schema, String name, Object value)
Expand Down Expand Up @@ -364,10 +363,8 @@ public void testSchemaEvolutionToIncompatibleType()
.toString();

assertThatThrownBy(() -> decodeRow(originalIntData, ImmutableSet.of(stringColumnReadingIntData), ImmutableMap.of(DATA_SCHEMA, changedTypeSchema)))
.isInstanceOf(TrinoException.class)
.hasCauseExactlyInstanceOf(AvroTypeException.class)
.hasStackTraceContaining("Found int, expecting string")
.hasMessageMatching("Decoding Avro record failed.");
.isInstanceOf(IllegalStateException.class)
.hasMessageMatching("Problems during decode phase");
}

@Test
Expand Down