You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2021/01/25 12:28:05 UTC
[hive] branch branch-3.1 updated: HIVE-22981: DataFileReader is not closed in AvroGenericRecordReader#extractWriterTimezoneFromMetadata (Karen Coppage via Marta Kuczora) (ported to branch-3 by Łukasz Osipiuk) (#1686)
This is an automated email from the ASF dual-hosted git repository.
kgyrtkirk pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new cf72bd8 HIVE-22981: DataFileReader is not closed in AvroGenericRecordReader#extractWriterTimezoneFromMetadata (Karen Coppage via Marta Kuczora) (ported to branch-3 by Łukasz Osipiuk) (#1686)
cf72bd8 is described below
commit cf72bd8d86598b3256cb6d985168fe690dbd63bc
Author: Łukasz Osipiuk <lu...@osipiuk.net>
AuthorDate: Mon Jan 25 13:27:37 2021 +0100
HIVE-22981: DataFileReader is not closed in AvroGenericRecordReader#extractWriterTimezoneFromMetadata (Karen Coppage via Marta Kuczora) (ported to branch-3 by Łukasz Osipiuk) (#1686)
---
.../apache/hadoop/hive/ql/io/avro/AvroGenericRecordReader.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/avro/AvroGenericRecordReader.java b/ql/src/java/org/apache/hadoop/hive/ql/io/avro/AvroGenericRecordReader.java
index 3159c5b..485337e 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/io/avro/AvroGenericRecordReader.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/io/avro/AvroGenericRecordReader.java
@@ -152,13 +152,12 @@ public class AvroGenericRecordReader implements
}
private ZoneId extractWriterTimezoneFromMetadata(JobConf job, FileSplit split,
- GenericDatumReader<GenericRecord> gdr) throws IOException {
+ GenericDatumReader<GenericRecord> gdr) {
if (job == null || gdr == null || split == null || split.getPath() == null) {
return null;
}
- try {
- DataFileReader<GenericRecord> dataFileReader =
- new DataFileReader<GenericRecord>(new FsInput(split.getPath(), job), gdr);
+ try (DataFileReader<GenericRecord> dataFileReader = new DataFileReader<GenericRecord>(
+ new FsInput(split.getPath(), job), gdr)) {
if (dataFileReader.getMeta(AvroSerDe.WRITER_TIME_ZONE) != null) {
try {
return ZoneId.of(new String(dataFileReader.getMeta(AvroSerDe.WRITER_TIME_ZONE),
@@ -169,6 +168,7 @@ public class AvroGenericRecordReader implements
}
} catch (IOException e) {
// Can't access metadata, carry on.
+ LOG.debug(e.getMessage(), e);
}
return null;
}