Repository: hive Updated Branches: refs/heads/master d76c774a7 -> 8432dd8d7
HIVE-15901 : LLAP: incorrect usage of gap cache (Sergey Shelukhin, reviewed by Prasanth Jayachandran) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/8432dd8d Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/8432dd8d Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/8432dd8d Branch: refs/heads/master Commit: 8432dd8d77b3c36f0e269ad8a0d2b20a1574b477 Parents: d76c774 Author: Sergey Shelukhin <[email protected]> Authored: Tue Feb 14 11:59:29 2017 -0800 Committer: Sergey Shelukhin <[email protected]> Committed: Tue Feb 14 12:15:21 2017 -0800 ---------------------------------------------------------------------- .../hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java | 6 +++--- .../org/apache/hadoop/hive/ql/io/orc/encoded/CacheChunk.java | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/8432dd8d/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java ---------------------------------------------------------------------- diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java index fb00419..6554fa2 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/io/encoded/OrcEncodedDataReader.java @@ -834,11 +834,11 @@ public class OrcEncodedDataReader extends CallableWithNdc<Void> fileKey, range, baseOffset, factory, counters, gotAllData); if (LlapIoImpl.ORC_LOGGER.isTraceEnabled()) { LlapIoImpl.ORC_LOGGER.trace("Disk ranges after data cache (file " + fileKey + - ", base offset " + baseOffset + "): " + RecordReaderUtils.stringifyDiskRanges(range)); + ", base offset " + baseOffset + "): " + RecordReaderUtils.stringifyDiskRanges(result)); } if (gotAllData.value) return result; - return (metadataCache == null) ? range - : metadataCache.getIncompleteCbs(fileKey, range, baseOffset, factory, gotAllData); + return (metadataCache == null) ? result + : metadataCache.getIncompleteCbs(fileKey, result, baseOffset, factory, gotAllData); } @Override http://git-wip-us.apache.org/repos/asf/hive/blob/8432dd8d/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/CacheChunk.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/CacheChunk.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/CacheChunk.java index 8857d3e..16fdbf7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/CacheChunk.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/encoded/CacheChunk.java @@ -43,6 +43,7 @@ public class CacheChunk extends DiskRangeList { this.buffer = buffer; this.offset = offset; this.end = end; + this.next = this.prev = null; // Just in case. } @Override @@ -87,4 +88,4 @@ public class CacheChunk extends DiskRangeList { public void adjustEnd(long l) { this.end += l; } -} \ No newline at end of file +}
