You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2015/10/07 18:25:41 UTC
hive git commit: HIVE-11977 : Hive should handle an external avro
table with zero length files present (Aaron Dossett via Ashutosh Chauhan)
Repository: hive
Updated Branches:
refs/heads/master b2f63ba91 -> 1e0c508d7
HIVE-11977 : Hive should handle an external avro table with zero length files present (Aaron Dossett via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/1e0c508d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/1e0c508d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/1e0c508d
Branch: refs/heads/master
Commit: 1e0c508d7335b255a7f2638730e2fff8494809f9
Parents: b2f63ba
Author: Aaron Dossett <do...@apache.org>
Authored: Mon Sep 28 11:30:00 2015 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Wed Oct 7 09:25:14 2015 -0700
----------------------------------------------------------------------
.../ql/io/avro/AvroGenericRecordReader.java | 22 ++++++--
.../ql/io/avro/TestAvroGenericRecordReader.java | 59 ++++++++++++++++++++
2 files changed, 75 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/1e0c508d/ql/src/java/org/apache/hadoop/hive/ql/io/avro/AvroGenericRecordReader.java
----------------------------------------------------------------------
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 1381514..8d58d74 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
@@ -57,6 +57,7 @@ public class AvroGenericRecordReader implements
final private long start;
final private long stop;
protected JobConf jobConf;
+ final private boolean isEmptyInput;
/**
* A unique ID for each record reader.
*/
@@ -78,9 +79,17 @@ public class AvroGenericRecordReader implements
gdr.setExpected(latest);
}
- this.reader = new DataFileReader<GenericRecord>(new FsInput(split.getPath(), job), gdr);
- this.reader.sync(split.getStart());
- this.start = reader.tell();
+ if (split.getLength() == 0) {
+ this.isEmptyInput = true;
+ this.start = 0;
+ this.reader = null;
+ }
+ else {
+ this.isEmptyInput = false;
+ this.reader = new DataFileReader<GenericRecord>(new FsInput(split.getPath(), job), gdr);
+ this.reader.sync(split.getStart());
+ this.start = reader.tell();
+ }
this.stop = split.getStart() + split.getLength();
this.recordReaderID = new UID();
}
@@ -146,7 +155,7 @@ public class AvroGenericRecordReader implements
@Override
public boolean next(NullWritable nullWritable, AvroGenericRecordWritable record) throws IOException {
- if(!reader.hasNext() || reader.pastSync(stop)) {
+ if(isEmptyInput || !reader.hasNext() || reader.pastSync(stop)) {
return false;
}
@@ -170,12 +179,13 @@ public class AvroGenericRecordReader implements
@Override
public long getPos() throws IOException {
- return reader.tell();
+ return isEmptyInput ? 0 : reader.tell();
}
@Override
public void close() throws IOException {
- reader.close();
+ if (isEmptyInput == false)
+ reader.close();
}
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/1e0c508d/ql/src/test/org/apache/hadoop/hive/ql/io/avro/TestAvroGenericRecordReader.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/avro/TestAvroGenericRecordReader.java b/ql/src/test/org/apache/hadoop/hive/ql/io/avro/TestAvroGenericRecordReader.java
new file mode 100644
index 0000000..6d4356a
--- /dev/null
+++ b/ql/src/test/org/apache/hadoop/hive/ql/io/avro/TestAvroGenericRecordReader.java
@@ -0,0 +1,59 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hive.ql.io.avro;
+
+import org.apache.hadoop.mapred.FileSplit;
+import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.Reporter;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+
+public class TestAvroGenericRecordReader {
+
+ @Mock private JobConf jobConf;
+ @Mock private FileSplit emptyFileSplit;
+ @Mock private Reporter reporter;
+
+ @Before
+ public void setup() {
+ MockitoAnnotations.initMocks(this);
+ when(emptyFileSplit.getLength()).thenReturn(0l);
+ }
+
+ @Test
+ public void emptyFile() throws IOException
+ {
+ AvroGenericRecordReader reader = new AvroGenericRecordReader(jobConf, emptyFileSplit, reporter);
+
+ //next() should always return false
+ Assert.assertEquals(false, reader.next(null, null));
+
+ //getPos() should always return 0
+ Assert.assertEquals(0, reader.getPos());
+
+ //close() should just do nothing
+ reader.close();
+ }
+}