Repository: tajo Updated Branches: refs/heads/master 384aca59f -> 175f3f016
TAJO-1779: Remove "DFSInputStream has been closed already" messages in DelimitedLineReader. Closes #697 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/175f3f01 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/175f3f01 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/175f3f01 Branch: refs/heads/master Commit: 175f3f01684483b60c6afd48a0f50f1c3ae74953 Parents: 384aca5 Author: Jinho Kim <[email protected]> Authored: Mon Aug 17 19:01:19 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Mon Aug 17 19:01:19 2015 +0900 ---------------------------------------------------------------------- CHANGES | 5 +++++ .../java/org/apache/tajo/storage/ByteBufInputChannel.java | 2 +- .../java/org/apache/tajo/storage/FSDataInputChannel.java | 6 +++++- .../org/apache/tajo/storage/text/DelimitedLineReader.java | 2 +- .../test/java/org/apache/tajo/storage/TestLineReader.java | 8 ++++++-- 5 files changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/175f3f01/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 39908e0..382787d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ Tajo Change Log +Release 0.12.0 - unreleased + Release 0.11.0 - unreleased NEW FEATURES @@ -221,6 +223,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1779: Remove "DFSInputStream has been closed already" messages + in DelimitedLineReader. (jinho) + TAJO-1763: tpch/*.tbl files cannot be founded in maven modules except for core-tests. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/175f3f01/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/ByteBufInputChannel.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/ByteBufInputChannel.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/ByteBufInputChannel.java index bdfec91..0c289c3 100644 --- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/ByteBufInputChannel.java +++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/ByteBufInputChannel.java @@ -45,6 +45,6 @@ public class ByteBufInputChannel extends InputChannel { @Override protected void implCloseChannel() throws IOException { - IOUtils.cleanup(null, channel, inputStream); + IOUtils.cleanup(null, channel); } } http://git-wip-us.apache.org/repos/asf/tajo/blob/175f3f01/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/FSDataInputChannel.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/FSDataInputChannel.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/FSDataInputChannel.java index 3f638c0..605516d 100644 --- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/FSDataInputChannel.java +++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/FSDataInputChannel.java @@ -74,6 +74,10 @@ public final class FSDataInputChannel extends SeekableInputChannel { @Override protected void implCloseChannel() throws IOException { - IOUtils.cleanup(null, channel, inputStream); + if (isDirectRead) { + IOUtils.cleanup(null, inputStream); + } else { + IOUtils.cleanup(null, channel); + } } } http://git-wip-us.apache.org/repos/asf/tajo/blob/175f3f01/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedLineReader.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedLineReader.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedLineReader.java index 5b93c5c..6d6cf72 100644 --- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedLineReader.java +++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedLineReader.java @@ -179,7 +179,7 @@ public class DelimitedLineReader implements Closeable { @Override public void close() throws IOException { try { - IOUtils.cleanup(LOG, lineReader, is, fis); + IOUtils.cleanup(LOG, lineReader); fs = null; is = null; fis = null; http://git-wip-us.apache.org/repos/asf/tajo/blob/175f3f01/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java index 7410778..21fff58 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java @@ -96,7 +96,8 @@ public class TestLineReader { if(buf == null) break; i++; } - IOUtils.cleanup(null, reader, channel, fs); + IOUtils.cleanup(null, reader, fs); + assertFalse(channel.isOpen()); assertEquals(tupleNum, i); assertEquals(status.getLen(), totalRead); assertEquals(status.getLen(), reader.readBytes()); @@ -229,6 +230,7 @@ public class TestLineReader { i++; } IOUtils.cleanup(null, reader); + assertFalse(channel.isOpen()); assertEquals(file.length(), totalRead); assertEquals(file.length(), reader.readBytes()); assertEquals(data.split("\n").length, i); @@ -261,6 +263,7 @@ public class TestLineReader { i++; } IOUtils.cleanup(null, reader); + assertFalse(channel.isOpen()); assertEquals(status.getLen(), totalRead); assertEquals(status.getLen(), reader.readBytes()); } @@ -319,7 +322,8 @@ public class TestLineReader { i++; } - IOUtils.cleanup(null, reader, channel, fs); + IOUtils.cleanup(null, reader, fs); + assertFalse(channel.isOpen()); assertEquals(tupleNum, i); assertEquals(status.getLen(), totalRead);
