Repository: tajo Updated Branches: refs/heads/master 1706746ce -> 83228ce67
TAJO-1697: RCFile progress causes NPE occasionally. (jinho) Closes #641 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/83228ce6 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/83228ce6 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/83228ce6 Branch: refs/heads/master Commit: 83228ce670370e7a8b2fa74c8683b8f1bd7b0ae3 Parents: 1706746 Author: Jinho Kim <[email protected]> Authored: Wed Jul 22 18:23:39 2015 +0900 Committer: Jinho Kim <[email protected]> Committed: Wed Jul 22 18:23:39 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../src/main/java/org/apache/tajo/storage/rcfile/RCFile.java | 2 ++ .../main/java/org/apache/tajo/storage/text/DelimitedTextFile.java | 2 ++ 3 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/83228ce6/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index eef1f12..aef8235 100644 --- a/CHANGES +++ b/CHANGES @@ -188,6 +188,8 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1697: RCFile progress causes NPE occasionally. (jinho) + TAJO-1689: Metrics file reporter prints histogram metric without group name. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/83228ce6/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java index 47d0267..99c727c 100644 --- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java +++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/rcfile/RCFile.java @@ -1651,6 +1651,8 @@ public class RCFile { @Override public float getProgress() { + if(!inited) return super.getProgress(); + try { if(!more) { return 1.0f; http://git-wip-us.apache.org/repos/asf/tajo/blob/83228ce6/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java index c68690a..4a691df 100644 --- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java +++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/DelimitedTextFile.java @@ -359,6 +359,8 @@ public class DelimitedTextFile { @Override public float getProgress() { + if(!inited) return super.getProgress(); + try { if (!reader.isReadable()) { return 1.0f;
