diff --git a/storage-api/src/java/org/apache/hadoop/hive/common/io/encoded/EncodedColumnBatch.java b/storage-api/src/java/org/apache/hadoop/hive/common/io/encoded/EncodedColumnBatch.java index 29a3b0f2f4..db24f8c67e 100644 --- a/storage-api/src/java/org/apache/hadoop/hive/common/io/encoded/EncodedColumnBatch.java +++ b/storage-api/src/java/org/apache/hadoop/hive/common/io/encoded/EncodedColumnBatch.java @@ -19,12 +19,11 @@ package org.apache.hadoop.hive.common.io.encoded; import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * A block of data for a given section of a file, similar to VRB but in encoded form. * Stores a set of buffers for each encoded stream that is a part of each column. @@ -36,7 +35,7 @@ * it tracks the number of such users via a refcount. */ public static class ColumnStreamData { - private List cacheBuffers; + private List cacheBuffers = Collections.emptyList(); /** Base offset from the beginning of the indexable unit; for example, for ORC, * offset from the CB in a compressed file, from the stream in uncompressed file. */ private int indexBaseOffset = 0; @@ -78,13 +77,19 @@ public void setIndexBaseOffset(int indexBaseOffset) { @Override public String toString() { - String bufStr = ""; - if (cacheBuffers != null) { - for (MemoryBuffer mb : cacheBuffers) { - bufStr += mb.getClass().getSimpleName() + " with " + mb.getByteBufferRaw().remaining() + " bytes, "; + StringBuilder sb = new StringBuilder(); + Iterator iter = cacheBuffers.iterator(); + while (iter.hasNext()) { + MemoryBuffer mb = iter.next(); + sb.append(mb.getClass().getSimpleName()); + sb.append(" with "); + sb.append(mb.getByteBufferRaw().remaining()); + sb.append(" bytes"); + if (iter.hasNext()) { + sb.append(", "); } } - return "ColumnStreamData [cacheBuffers=[" + bufStr + return "ColumnStreamData [cacheBuffers=[" + sb + "], indexBaseOffset=" + indexBaseOffset + "]"; } @@ -124,7 +129,6 @@ public void initColumn(int colIx, int streamCount) { } } - private static final Logger LOG = LoggerFactory.getLogger(EncodedColumnBatch.class); public void setStreamData(int colIx, int streamIx, ColumnStreamData csd) { assert hasData[colIx]; columnData[colIx][streamIx] = csd;