You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/12/18 14:56:50 UTC
[03/51] [partial] hbase-site git commit: Published site at
c448604ceb987d113913f0583452b2abce04db0d.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4f8b8424/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html
index 93aa689..8634180 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/HFileWriterImpl.html
@@ -550,301 +550,302 @@
<span class="sourceLineNo">542</span> * the cache key.<a name="line.542"></a>
<span class="sourceLineNo">543</span> */<a name="line.543"></a>
<span class="sourceLineNo">544</span> private void doCacheOnWrite(long offset) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> HFileBlock cacheFormatBlock = blockWriter.getBlockForCaching(cacheConf);<a name="line.545"></a>
-<span class="sourceLineNo">546</span> cacheConf.getBlockCache().cacheBlock(<a name="line.546"></a>
-<span class="sourceLineNo">547</span> new BlockCacheKey(name, offset, true, cacheFormatBlock.getBlockType()),<a name="line.547"></a>
-<span class="sourceLineNo">548</span> cacheFormatBlock);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> }<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span> /**<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * Ready a new block for writing.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> *<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * @throws IOException<a name="line.554"></a>
-<span class="sourceLineNo">555</span> */<a name="line.555"></a>
-<span class="sourceLineNo">556</span> protected void newBlock() throws IOException {<a name="line.556"></a>
-<span class="sourceLineNo">557</span> // This is where the next block begins.<a name="line.557"></a>
-<span class="sourceLineNo">558</span> blockWriter.startWriting(BlockType.DATA);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> firstCellInBlock = null;<a name="line.559"></a>
-<span class="sourceLineNo">560</span> if (lastCell != null) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span> lastCellOfPreviousBlock = lastCell;<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span> }<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span> /**<a name="line.565"></a>
-<span class="sourceLineNo">566</span> * Add a meta block to the end of the file. Call before close(). Metadata<a name="line.566"></a>
-<span class="sourceLineNo">567</span> * blocks are expensive. Fill one with a bunch of serialized data rather than<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * do a metadata block per metadata instance. If metadata is small, consider<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * adding to file info using {@link #appendFileInfo(byte[], byte[])}<a name="line.569"></a>
-<span class="sourceLineNo">570</span> *<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * @param metaBlockName<a name="line.571"></a>
-<span class="sourceLineNo">572</span> * name of the block<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * @param content<a name="line.573"></a>
-<span class="sourceLineNo">574</span> * will call readFields to get data later (DO NOT REUSE)<a name="line.574"></a>
-<span class="sourceLineNo">575</span> */<a name="line.575"></a>
-<span class="sourceLineNo">576</span> @Override<a name="line.576"></a>
-<span class="sourceLineNo">577</span> public void appendMetaBlock(String metaBlockName, Writable content) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span> byte[] key = Bytes.toBytes(metaBlockName);<a name="line.578"></a>
-<span class="sourceLineNo">579</span> int i;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> for (i = 0; i < metaNames.size(); ++i) {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> // stop when the current key is greater than our own<a name="line.581"></a>
-<span class="sourceLineNo">582</span> byte[] cur = metaNames.get(i);<a name="line.582"></a>
-<span class="sourceLineNo">583</span> if (Bytes.BYTES_RAWCOMPARATOR.compare(cur, 0, cur.length, key, 0,<a name="line.583"></a>
-<span class="sourceLineNo">584</span> key.length) > 0) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> break;<a name="line.585"></a>
-<span class="sourceLineNo">586</span> }<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> metaNames.add(i, key);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> metaData.add(i, content);<a name="line.589"></a>
-<span class="sourceLineNo">590</span> }<a name="line.590"></a>
-<span class="sourceLineNo">591</span><a name="line.591"></a>
-<span class="sourceLineNo">592</span> @Override<a name="line.592"></a>
-<span class="sourceLineNo">593</span> public void close() throws IOException {<a name="line.593"></a>
-<span class="sourceLineNo">594</span> if (outputStream == null) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> return;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span> // Save data block encoder metadata in the file info.<a name="line.597"></a>
-<span class="sourceLineNo">598</span> blockEncoder.saveMetadata(this);<a name="line.598"></a>
-<span class="sourceLineNo">599</span> // Write out the end of the data blocks, then write meta data blocks.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> // followed by fileinfo, data block index and meta block index.<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span> finishBlock();<a name="line.602"></a>
-<span class="sourceLineNo">603</span> writeInlineBlocks(true);<a name="line.603"></a>
-<span class="sourceLineNo">604</span><a name="line.604"></a>
-<span class="sourceLineNo">605</span> FixedFileTrailer trailer = new FixedFileTrailer(getMajorVersion(), getMinorVersion());<a name="line.605"></a>
-<span class="sourceLineNo">606</span><a name="line.606"></a>
-<span class="sourceLineNo">607</span> // Write out the metadata blocks if any.<a name="line.607"></a>
-<span class="sourceLineNo">608</span> if (!metaNames.isEmpty()) {<a name="line.608"></a>
-<span class="sourceLineNo">609</span> for (int i = 0; i < metaNames.size(); ++i) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> // store the beginning offset<a name="line.610"></a>
-<span class="sourceLineNo">611</span> long offset = outputStream.getPos();<a name="line.611"></a>
-<span class="sourceLineNo">612</span> // write the metadata content<a name="line.612"></a>
-<span class="sourceLineNo">613</span> DataOutputStream dos = blockWriter.startWriting(BlockType.META);<a name="line.613"></a>
-<span class="sourceLineNo">614</span> metaData.get(i).write(dos);<a name="line.614"></a>
-<span class="sourceLineNo">615</span><a name="line.615"></a>
-<span class="sourceLineNo">616</span> blockWriter.writeHeaderAndData(outputStream);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.617"></a>
-<span class="sourceLineNo">618</span><a name="line.618"></a>
-<span class="sourceLineNo">619</span> // Add the new meta block to the meta index.<a name="line.619"></a>
-<span class="sourceLineNo">620</span> metaBlockIndexWriter.addEntry(metaNames.get(i), offset,<a name="line.620"></a>
-<span class="sourceLineNo">621</span> blockWriter.getOnDiskSizeWithHeader());<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span> // Load-on-open section.<a name="line.625"></a>
-<span class="sourceLineNo">626</span><a name="line.626"></a>
-<span class="sourceLineNo">627</span> // Data block index.<a name="line.627"></a>
-<span class="sourceLineNo">628</span> //<a name="line.628"></a>
-<span class="sourceLineNo">629</span> // In version 2, this section of the file starts with the root level data<a name="line.629"></a>
-<span class="sourceLineNo">630</span> // block index. We call a function that writes intermediate-level blocks<a name="line.630"></a>
-<span class="sourceLineNo">631</span> // first, then root level, and returns the offset of the root level block<a name="line.631"></a>
-<span class="sourceLineNo">632</span> // index.<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span> long rootIndexOffset = dataBlockIndexWriter.writeIndexBlocks(outputStream);<a name="line.634"></a>
-<span class="sourceLineNo">635</span> trailer.setLoadOnOpenOffset(rootIndexOffset);<a name="line.635"></a>
-<span class="sourceLineNo">636</span><a name="line.636"></a>
-<span class="sourceLineNo">637</span> // Meta block index.<a name="line.637"></a>
-<span class="sourceLineNo">638</span> metaBlockIndexWriter.writeSingleLevelIndex(blockWriter.startWriting(<a name="line.638"></a>
-<span class="sourceLineNo">639</span> BlockType.ROOT_INDEX), "meta");<a name="line.639"></a>
-<span class="sourceLineNo">640</span> blockWriter.writeHeaderAndData(outputStream);<a name="line.640"></a>
-<span class="sourceLineNo">641</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span> if (this.hFileContext.isIncludesMvcc()) {<a name="line.643"></a>
-<span class="sourceLineNo">644</span> appendFileInfo(MAX_MEMSTORE_TS_KEY, Bytes.toBytes(maxMemstoreTS));<a name="line.644"></a>
-<span class="sourceLineNo">645</span> appendFileInfo(KEY_VALUE_VERSION, Bytes.toBytes(KEY_VALUE_VER_WITH_MEMSTORE));<a name="line.645"></a>
-<span class="sourceLineNo">646</span> }<a name="line.646"></a>
-<span class="sourceLineNo">647</span><a name="line.647"></a>
-<span class="sourceLineNo">648</span> // File info<a name="line.648"></a>
-<span class="sourceLineNo">649</span> writeFileInfo(trailer, blockWriter.startWriting(BlockType.FILE_INFO));<a name="line.649"></a>
-<span class="sourceLineNo">650</span> blockWriter.writeHeaderAndData(outputStream);<a name="line.650"></a>
-<span class="sourceLineNo">651</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span> // Load-on-open data supplied by higher levels, e.g. Bloom filters.<a name="line.653"></a>
-<span class="sourceLineNo">654</span> for (BlockWritable w : additionalLoadOnOpenData){<a name="line.654"></a>
-<span class="sourceLineNo">655</span> blockWriter.writeBlock(w, outputStream);<a name="line.655"></a>
-<span class="sourceLineNo">656</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.656"></a>
-<span class="sourceLineNo">657</span> }<a name="line.657"></a>
-<span class="sourceLineNo">658</span><a name="line.658"></a>
-<span class="sourceLineNo">659</span> // Now finish off the trailer.<a name="line.659"></a>
-<span class="sourceLineNo">660</span> trailer.setNumDataIndexLevels(dataBlockIndexWriter.getNumLevels());<a name="line.660"></a>
-<span class="sourceLineNo">661</span> trailer.setUncompressedDataIndexSize(<a name="line.661"></a>
-<span class="sourceLineNo">662</span> dataBlockIndexWriter.getTotalUncompressedSize());<a name="line.662"></a>
-<span class="sourceLineNo">663</span> trailer.setFirstDataBlockOffset(firstDataBlockOffset);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> trailer.setLastDataBlockOffset(lastDataBlockOffset);<a name="line.664"></a>
-<span class="sourceLineNo">665</span> trailer.setComparatorClass(comparator.getClass());<a name="line.665"></a>
-<span class="sourceLineNo">666</span> trailer.setDataIndexCount(dataBlockIndexWriter.getNumRootEntries());<a name="line.666"></a>
-<span class="sourceLineNo">667</span><a name="line.667"></a>
+<span class="sourceLineNo">545</span> cacheConf.getBlockCache().ifPresent(cache -> {<a name="line.545"></a>
+<span class="sourceLineNo">546</span> HFileBlock cacheFormatBlock = blockWriter.getBlockForCaching(cacheConf);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> cache.cacheBlock(new BlockCacheKey(name, offset, true, cacheFormatBlock.getBlockType()),<a name="line.547"></a>
+<span class="sourceLineNo">548</span> cacheFormatBlock);<a name="line.548"></a>
+<span class="sourceLineNo">549</span> });<a name="line.549"></a>
+<span class="sourceLineNo">550</span> }<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> /**<a name="line.552"></a>
+<span class="sourceLineNo">553</span> * Ready a new block for writing.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> *<a name="line.554"></a>
+<span class="sourceLineNo">555</span> * @throws IOException<a name="line.555"></a>
+<span class="sourceLineNo">556</span> */<a name="line.556"></a>
+<span class="sourceLineNo">557</span> protected void newBlock() throws IOException {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> // This is where the next block begins.<a name="line.558"></a>
+<span class="sourceLineNo">559</span> blockWriter.startWriting(BlockType.DATA);<a name="line.559"></a>
+<span class="sourceLineNo">560</span> firstCellInBlock = null;<a name="line.560"></a>
+<span class="sourceLineNo">561</span> if (lastCell != null) {<a name="line.561"></a>
+<span class="sourceLineNo">562</span> lastCellOfPreviousBlock = lastCell;<a name="line.562"></a>
+<span class="sourceLineNo">563</span> }<a name="line.563"></a>
+<span class="sourceLineNo">564</span> }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> /**<a name="line.566"></a>
+<span class="sourceLineNo">567</span> * Add a meta block to the end of the file. Call before close(). Metadata<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * blocks are expensive. Fill one with a bunch of serialized data rather than<a name="line.568"></a>
+<span class="sourceLineNo">569</span> * do a metadata block per metadata instance. If metadata is small, consider<a name="line.569"></a>
+<span class="sourceLineNo">570</span> * adding to file info using {@link #appendFileInfo(byte[], byte[])}<a name="line.570"></a>
+<span class="sourceLineNo">571</span> *<a name="line.571"></a>
+<span class="sourceLineNo">572</span> * @param metaBlockName<a name="line.572"></a>
+<span class="sourceLineNo">573</span> * name of the block<a name="line.573"></a>
+<span class="sourceLineNo">574</span> * @param content<a name="line.574"></a>
+<span class="sourceLineNo">575</span> * will call readFields to get data later (DO NOT REUSE)<a name="line.575"></a>
+<span class="sourceLineNo">576</span> */<a name="line.576"></a>
+<span class="sourceLineNo">577</span> @Override<a name="line.577"></a>
+<span class="sourceLineNo">578</span> public void appendMetaBlock(String metaBlockName, Writable content) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span> byte[] key = Bytes.toBytes(metaBlockName);<a name="line.579"></a>
+<span class="sourceLineNo">580</span> int i;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> for (i = 0; i < metaNames.size(); ++i) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> // stop when the current key is greater than our own<a name="line.582"></a>
+<span class="sourceLineNo">583</span> byte[] cur = metaNames.get(i);<a name="line.583"></a>
+<span class="sourceLineNo">584</span> if (Bytes.BYTES_RAWCOMPARATOR.compare(cur, 0, cur.length, key, 0,<a name="line.584"></a>
+<span class="sourceLineNo">585</span> key.length) > 0) {<a name="line.585"></a>
+<span class="sourceLineNo">586</span> break;<a name="line.586"></a>
+<span class="sourceLineNo">587</span> }<a name="line.587"></a>
+<span class="sourceLineNo">588</span> }<a name="line.588"></a>
+<span class="sourceLineNo">589</span> metaNames.add(i, key);<a name="line.589"></a>
+<span class="sourceLineNo">590</span> metaData.add(i, content);<a name="line.590"></a>
+<span class="sourceLineNo">591</span> }<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span> @Override<a name="line.593"></a>
+<span class="sourceLineNo">594</span> public void close() throws IOException {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> if (outputStream == null) {<a name="line.595"></a>
+<span class="sourceLineNo">596</span> return;<a name="line.596"></a>
+<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">598</span> // Save data block encoder metadata in the file info.<a name="line.598"></a>
+<span class="sourceLineNo">599</span> blockEncoder.saveMetadata(this);<a name="line.599"></a>
+<span class="sourceLineNo">600</span> // Write out the end of the data blocks, then write meta data blocks.<a name="line.600"></a>
+<span class="sourceLineNo">601</span> // followed by fileinfo, data block index and meta block index.<a name="line.601"></a>
+<span class="sourceLineNo">602</span><a name="line.602"></a>
+<span class="sourceLineNo">603</span> finishBlock();<a name="line.603"></a>
+<span class="sourceLineNo">604</span> writeInlineBlocks(true);<a name="line.604"></a>
+<span class="sourceLineNo">605</span><a name="line.605"></a>
+<span class="sourceLineNo">606</span> FixedFileTrailer trailer = new FixedFileTrailer(getMajorVersion(), getMinorVersion());<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span> // Write out the metadata blocks if any.<a name="line.608"></a>
+<span class="sourceLineNo">609</span> if (!metaNames.isEmpty()) {<a name="line.609"></a>
+<span class="sourceLineNo">610</span> for (int i = 0; i < metaNames.size(); ++i) {<a name="line.610"></a>
+<span class="sourceLineNo">611</span> // store the beginning offset<a name="line.611"></a>
+<span class="sourceLineNo">612</span> long offset = outputStream.getPos();<a name="line.612"></a>
+<span class="sourceLineNo">613</span> // write the metadata content<a name="line.613"></a>
+<span class="sourceLineNo">614</span> DataOutputStream dos = blockWriter.startWriting(BlockType.META);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> metaData.get(i).write(dos);<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span> blockWriter.writeHeaderAndData(outputStream);<a name="line.617"></a>
+<span class="sourceLineNo">618</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> // Add the new meta block to the meta index.<a name="line.620"></a>
+<span class="sourceLineNo">621</span> metaBlockIndexWriter.addEntry(metaNames.get(i), offset,<a name="line.621"></a>
+<span class="sourceLineNo">622</span> blockWriter.getOnDiskSizeWithHeader());<a name="line.622"></a>
+<span class="sourceLineNo">623</span> }<a name="line.623"></a>
+<span class="sourceLineNo">624</span> }<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span> // Load-on-open section.<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span> // Data block index.<a name="line.628"></a>
+<span class="sourceLineNo">629</span> //<a name="line.629"></a>
+<span class="sourceLineNo">630</span> // In version 2, this section of the file starts with the root level data<a name="line.630"></a>
+<span class="sourceLineNo">631</span> // block index. We call a function that writes intermediate-level blocks<a name="line.631"></a>
+<span class="sourceLineNo">632</span> // first, then root level, and returns the offset of the root level block<a name="line.632"></a>
+<span class="sourceLineNo">633</span> // index.<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span> long rootIndexOffset = dataBlockIndexWriter.writeIndexBlocks(outputStream);<a name="line.635"></a>
+<span class="sourceLineNo">636</span> trailer.setLoadOnOpenOffset(rootIndexOffset);<a name="line.636"></a>
+<span class="sourceLineNo">637</span><a name="line.637"></a>
+<span class="sourceLineNo">638</span> // Meta block index.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> metaBlockIndexWriter.writeSingleLevelIndex(blockWriter.startWriting(<a name="line.639"></a>
+<span class="sourceLineNo">640</span> BlockType.ROOT_INDEX), "meta");<a name="line.640"></a>
+<span class="sourceLineNo">641</span> blockWriter.writeHeaderAndData(outputStream);<a name="line.641"></a>
+<span class="sourceLineNo">642</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span> if (this.hFileContext.isIncludesMvcc()) {<a name="line.644"></a>
+<span class="sourceLineNo">645</span> appendFileInfo(MAX_MEMSTORE_TS_KEY, Bytes.toBytes(maxMemstoreTS));<a name="line.645"></a>
+<span class="sourceLineNo">646</span> appendFileInfo(KEY_VALUE_VERSION, Bytes.toBytes(KEY_VALUE_VER_WITH_MEMSTORE));<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span><a name="line.648"></a>
+<span class="sourceLineNo">649</span> // File info<a name="line.649"></a>
+<span class="sourceLineNo">650</span> writeFileInfo(trailer, blockWriter.startWriting(BlockType.FILE_INFO));<a name="line.650"></a>
+<span class="sourceLineNo">651</span> blockWriter.writeHeaderAndData(outputStream);<a name="line.651"></a>
+<span class="sourceLineNo">652</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.652"></a>
+<span class="sourceLineNo">653</span><a name="line.653"></a>
+<span class="sourceLineNo">654</span> // Load-on-open data supplied by higher levels, e.g. Bloom filters.<a name="line.654"></a>
+<span class="sourceLineNo">655</span> for (BlockWritable w : additionalLoadOnOpenData){<a name="line.655"></a>
+<span class="sourceLineNo">656</span> blockWriter.writeBlock(w, outputStream);<a name="line.656"></a>
+<span class="sourceLineNo">657</span> totalUncompressedBytes += blockWriter.getUncompressedSizeWithHeader();<a name="line.657"></a>
+<span class="sourceLineNo">658</span> }<a name="line.658"></a>
+<span class="sourceLineNo">659</span><a name="line.659"></a>
+<span class="sourceLineNo">660</span> // Now finish off the trailer.<a name="line.660"></a>
+<span class="sourceLineNo">661</span> trailer.setNumDataIndexLevels(dataBlockIndexWriter.getNumLevels());<a name="line.661"></a>
+<span class="sourceLineNo">662</span> trailer.setUncompressedDataIndexSize(<a name="line.662"></a>
+<span class="sourceLineNo">663</span> dataBlockIndexWriter.getTotalUncompressedSize());<a name="line.663"></a>
+<span class="sourceLineNo">664</span> trailer.setFirstDataBlockOffset(firstDataBlockOffset);<a name="line.664"></a>
+<span class="sourceLineNo">665</span> trailer.setLastDataBlockOffset(lastDataBlockOffset);<a name="line.665"></a>
+<span class="sourceLineNo">666</span> trailer.setComparatorClass(comparator.getClass());<a name="line.666"></a>
+<span class="sourceLineNo">667</span> trailer.setDataIndexCount(dataBlockIndexWriter.getNumRootEntries());<a name="line.667"></a>
<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span> finishClose(trailer);<a name="line.669"></a>
-<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span> blockWriter.release();<a name="line.671"></a>
-<span class="sourceLineNo">672</span> }<a name="line.672"></a>
-<span class="sourceLineNo">673</span><a name="line.673"></a>
-<span class="sourceLineNo">674</span> @Override<a name="line.674"></a>
-<span class="sourceLineNo">675</span> public void addInlineBlockWriter(InlineBlockWriter ibw) {<a name="line.675"></a>
-<span class="sourceLineNo">676</span> inlineBlockWriters.add(ibw);<a name="line.676"></a>
-<span class="sourceLineNo">677</span> }<a name="line.677"></a>
-<span class="sourceLineNo">678</span><a name="line.678"></a>
-<span class="sourceLineNo">679</span> @Override<a name="line.679"></a>
-<span class="sourceLineNo">680</span> public void addGeneralBloomFilter(final BloomFilterWriter bfw) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span> this.addBloomFilter(bfw, BlockType.GENERAL_BLOOM_META);<a name="line.681"></a>
-<span class="sourceLineNo">682</span> }<a name="line.682"></a>
-<span class="sourceLineNo">683</span><a name="line.683"></a>
-<span class="sourceLineNo">684</span> @Override<a name="line.684"></a>
-<span class="sourceLineNo">685</span> public void addDeleteFamilyBloomFilter(final BloomFilterWriter bfw) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> this.addBloomFilter(bfw, BlockType.DELETE_FAMILY_BLOOM_META);<a name="line.686"></a>
-<span class="sourceLineNo">687</span> }<a name="line.687"></a>
-<span class="sourceLineNo">688</span><a name="line.688"></a>
-<span class="sourceLineNo">689</span> private void addBloomFilter(final BloomFilterWriter bfw,<a name="line.689"></a>
-<span class="sourceLineNo">690</span> final BlockType blockType) {<a name="line.690"></a>
-<span class="sourceLineNo">691</span> if (bfw.getKeyCount() <= 0)<a name="line.691"></a>
-<span class="sourceLineNo">692</span> return;<a name="line.692"></a>
-<span class="sourceLineNo">693</span><a name="line.693"></a>
-<span class="sourceLineNo">694</span> if (blockType != BlockType.GENERAL_BLOOM_META &&<a name="line.694"></a>
-<span class="sourceLineNo">695</span> blockType != BlockType.DELETE_FAMILY_BLOOM_META) {<a name="line.695"></a>
-<span class="sourceLineNo">696</span> throw new RuntimeException("Block Type: " + blockType.toString() +<a name="line.696"></a>
-<span class="sourceLineNo">697</span> "is not supported");<a name="line.697"></a>
-<span class="sourceLineNo">698</span> }<a name="line.698"></a>
-<span class="sourceLineNo">699</span> additionalLoadOnOpenData.add(new BlockWritable() {<a name="line.699"></a>
-<span class="sourceLineNo">700</span> @Override<a name="line.700"></a>
-<span class="sourceLineNo">701</span> public BlockType getBlockType() {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> return blockType;<a name="line.702"></a>
-<span class="sourceLineNo">703</span> }<a name="line.703"></a>
-<span class="sourceLineNo">704</span><a name="line.704"></a>
-<span class="sourceLineNo">705</span> @Override<a name="line.705"></a>
-<span class="sourceLineNo">706</span> public void writeToBlock(DataOutput out) throws IOException {<a name="line.706"></a>
-<span class="sourceLineNo">707</span> bfw.getMetaWriter().write(out);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> Writable dataWriter = bfw.getDataWriter();<a name="line.708"></a>
-<span class="sourceLineNo">709</span> if (dataWriter != null)<a name="line.709"></a>
-<span class="sourceLineNo">710</span> dataWriter.write(out);<a name="line.710"></a>
-<span class="sourceLineNo">711</span> }<a name="line.711"></a>
-<span class="sourceLineNo">712</span> });<a name="line.712"></a>
-<span class="sourceLineNo">713</span> }<a name="line.713"></a>
-<span class="sourceLineNo">714</span><a name="line.714"></a>
-<span class="sourceLineNo">715</span> @Override<a name="line.715"></a>
-<span class="sourceLineNo">716</span> public HFileContext getFileContext() {<a name="line.716"></a>
-<span class="sourceLineNo">717</span> return hFileContext;<a name="line.717"></a>
-<span class="sourceLineNo">718</span> }<a name="line.718"></a>
-<span class="sourceLineNo">719</span><a name="line.719"></a>
-<span class="sourceLineNo">720</span> /**<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * Add key/value to file. Keys must be added in an order that agrees with the<a name="line.721"></a>
-<span class="sourceLineNo">722</span> * Comparator passed on construction.<a name="line.722"></a>
-<span class="sourceLineNo">723</span> *<a name="line.723"></a>
-<span class="sourceLineNo">724</span> * @param cell<a name="line.724"></a>
-<span class="sourceLineNo">725</span> * Cell to add. Cannot be empty nor null.<a name="line.725"></a>
-<span class="sourceLineNo">726</span> * @throws IOException<a name="line.726"></a>
-<span class="sourceLineNo">727</span> */<a name="line.727"></a>
-<span class="sourceLineNo">728</span> @Override<a name="line.728"></a>
-<span class="sourceLineNo">729</span> public void append(final Cell cell) throws IOException {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> // checkKey uses comparator to check we are writing in order.<a name="line.730"></a>
-<span class="sourceLineNo">731</span> boolean dupKey = checkKey(cell);<a name="line.731"></a>
-<span class="sourceLineNo">732</span> if (!dupKey) {<a name="line.732"></a>
-<span class="sourceLineNo">733</span> checkBlockBoundary();<a name="line.733"></a>
-<span class="sourceLineNo">734</span> }<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span> if (!blockWriter.isWriting()) {<a name="line.736"></a>
-<span class="sourceLineNo">737</span> newBlock();<a name="line.737"></a>
-<span class="sourceLineNo">738</span> }<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span> blockWriter.write(cell);<a name="line.740"></a>
-<span class="sourceLineNo">741</span><a name="line.741"></a>
-<span class="sourceLineNo">742</span> totalKeyLength += PrivateCellUtil.estimatedSerializedSizeOfKey(cell);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> totalValueLength += cell.getValueLength();<a name="line.743"></a>
-<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span> // Are we the first key in this block?<a name="line.745"></a>
-<span class="sourceLineNo">746</span> if (firstCellInBlock == null) {<a name="line.746"></a>
-<span class="sourceLineNo">747</span> // If cell is big, block will be closed and this firstCellInBlock reference will only last<a name="line.747"></a>
-<span class="sourceLineNo">748</span> // a short while.<a name="line.748"></a>
-<span class="sourceLineNo">749</span> firstCellInBlock = cell;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span><a name="line.751"></a>
-<span class="sourceLineNo">752</span> // TODO: What if cell is 10MB and we write infrequently? We hold on to cell here indefinitely?<a name="line.752"></a>
-<span class="sourceLineNo">753</span> lastCell = cell;<a name="line.753"></a>
-<span class="sourceLineNo">754</span> entryCount++;<a name="line.754"></a>
-<span class="sourceLineNo">755</span> this.maxMemstoreTS = Math.max(this.maxMemstoreTS, cell.getSequenceId());<a name="line.755"></a>
-<span class="sourceLineNo">756</span> int tagsLength = cell.getTagsLength();<a name="line.756"></a>
-<span class="sourceLineNo">757</span> if (tagsLength > this.maxTagsLength) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> this.maxTagsLength = tagsLength;<a name="line.758"></a>
-<span class="sourceLineNo">759</span> }<a name="line.759"></a>
-<span class="sourceLineNo">760</span> }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span> @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span> public void beforeShipped() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> // Add clone methods for every cell<a name="line.764"></a>
-<span class="sourceLineNo">765</span> if (this.lastCell != null) {<a name="line.765"></a>
-<span class="sourceLineNo">766</span> this.lastCell = KeyValueUtil.toNewKeyCell(this.lastCell);<a name="line.766"></a>
-<span class="sourceLineNo">767</span> }<a name="line.767"></a>
-<span class="sourceLineNo">768</span> if (this.firstCellInBlock != null) {<a name="line.768"></a>
-<span class="sourceLineNo">769</span> this.firstCellInBlock = KeyValueUtil.toNewKeyCell(this.firstCellInBlock);<a name="line.769"></a>
-<span class="sourceLineNo">770</span> }<a name="line.770"></a>
-<span class="sourceLineNo">771</span> if (this.lastCellOfPreviousBlock != null) {<a name="line.771"></a>
-<span class="sourceLineNo">772</span> this.lastCellOfPreviousBlock = KeyValueUtil.toNewKeyCell(this.lastCellOfPreviousBlock);<a name="line.772"></a>
-<span class="sourceLineNo">773</span> }<a name="line.773"></a>
-<span class="sourceLineNo">774</span> }<a name="line.774"></a>
-<span class="sourceLineNo">775</span><a name="line.775"></a>
-<span class="sourceLineNo">776</span> protected void finishFileInfo() throws IOException {<a name="line.776"></a>
-<span class="sourceLineNo">777</span> if (lastCell != null) {<a name="line.777"></a>
-<span class="sourceLineNo">778</span> // Make a copy. The copy is stuffed into our fileinfo map. Needs a clean<a name="line.778"></a>
-<span class="sourceLineNo">779</span> // byte buffer. Won't take a tuple.<a name="line.779"></a>
-<span class="sourceLineNo">780</span> byte [] lastKey = PrivateCellUtil.getCellKeySerializedAsKeyValueKey(this.lastCell);<a name="line.780"></a>
-<span class="sourceLineNo">781</span> fileInfo.append(FileInfo.LASTKEY, lastKey, false);<a name="line.781"></a>
-<span class="sourceLineNo">782</span> }<a name="line.782"></a>
-<span class="sourceLineNo">783</span><a name="line.783"></a>
-<span class="sourceLineNo">784</span> // Average key length.<a name="line.784"></a>
-<span class="sourceLineNo">785</span> int avgKeyLen =<a name="line.785"></a>
-<span class="sourceLineNo">786</span> entryCount == 0 ? 0 : (int) (totalKeyLength / entryCount);<a name="line.786"></a>
-<span class="sourceLineNo">787</span> fileInfo.append(FileInfo.AVG_KEY_LEN, Bytes.toBytes(avgKeyLen), false);<a name="line.787"></a>
-<span class="sourceLineNo">788</span> fileInfo.append(FileInfo.CREATE_TIME_TS, Bytes.toBytes(hFileContext.getFileCreateTime()),<a name="line.788"></a>
-<span class="sourceLineNo">789</span> false);<a name="line.789"></a>
-<span class="sourceLineNo">790</span><a name="line.790"></a>
-<span class="sourceLineNo">791</span> // Average value length.<a name="line.791"></a>
-<span class="sourceLineNo">792</span> int avgValueLen =<a name="line.792"></a>
-<span class="sourceLineNo">793</span> entryCount == 0 ? 0 : (int) (totalValueLength / entryCount);<a name="line.793"></a>
-<span class="sourceLineNo">794</span> fileInfo.append(FileInfo.AVG_VALUE_LEN, Bytes.toBytes(avgValueLen), false);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> if (hFileContext.isIncludesTags()) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span> // When tags are not being written in this file, MAX_TAGS_LEN is excluded<a name="line.796"></a>
-<span class="sourceLineNo">797</span> // from the FileInfo<a name="line.797"></a>
-<span class="sourceLineNo">798</span> fileInfo.append(FileInfo.MAX_TAGS_LEN, Bytes.toBytes(this.maxTagsLength), false);<a name="line.798"></a>
-<span class="sourceLineNo">799</span> boolean tagsCompressed = (hFileContext.getDataBlockEncoding() != DataBlockEncoding.NONE)<a name="line.799"></a>
-<span class="sourceLineNo">800</span> && hFileContext.isCompressTags();<a name="line.800"></a>
-<span class="sourceLineNo">801</span> fileInfo.append(FileInfo.TAGS_COMPRESSED, Bytes.toBytes(tagsCompressed), false);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> }<a name="line.802"></a>
-<span class="sourceLineNo">803</span> }<a name="line.803"></a>
-<span class="sourceLineNo">804</span><a name="line.804"></a>
-<span class="sourceLineNo">805</span> protected int getMajorVersion() {<a name="line.805"></a>
-<span class="sourceLineNo">806</span> return 3;<a name="line.806"></a>
-<span class="sourceLineNo">807</span> }<a name="line.807"></a>
-<span class="sourceLineNo">808</span><a name="line.808"></a>
-<span class="sourceLineNo">809</span> protected int getMinorVersion() {<a name="line.809"></a>
-<span class="sourceLineNo">810</span> return HFileReaderImpl.MAX_MINOR_VERSION;<a name="line.810"></a>
-<span class="sourceLineNo">811</span> }<a name="line.811"></a>
-<span class="sourceLineNo">812</span><a name="line.812"></a>
-<span class="sourceLineNo">813</span> protected void finishClose(FixedFileTrailer trailer) throws IOException {<a name="line.813"></a>
-<span class="sourceLineNo">814</span> // Write out encryption metadata before finalizing if we have a valid crypto context<a name="line.814"></a>
-<span class="sourceLineNo">815</span> Encryption.Context cryptoContext = hFileContext.getEncryptionContext();<a name="line.815"></a>
-<span class="sourceLineNo">816</span> if (cryptoContext != Encryption.Context.NONE) {<a name="line.816"></a>
-<span class="sourceLineNo">817</span> // Wrap the context's key and write it as the encryption metadata, the wrapper includes<a name="line.817"></a>
-<span class="sourceLineNo">818</span> // all information needed for decryption<a name="line.818"></a>
-<span class="sourceLineNo">819</span> trailer.setEncryptionKey(EncryptionUtil.wrapKey(cryptoContext.getConf(),<a name="line.819"></a>
-<span class="sourceLineNo">820</span> cryptoContext.getConf().get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY,<a name="line.820"></a>
-<span class="sourceLineNo">821</span> User.getCurrent().getShortName()),<a name="line.821"></a>
-<span class="sourceLineNo">822</span> cryptoContext.getKey()));<a name="line.822"></a>
-<span class="sourceLineNo">823</span> }<a name="line.823"></a>
-<span class="sourceLineNo">824</span> // Now we can finish the close<a name="line.824"></a>
-<span class="sourceLineNo">825</span> trailer.setMetaIndexCount(metaNames.size());<a name="line.825"></a>
-<span class="sourceLineNo">826</span> trailer.setTotalUncompressedBytes(totalUncompressedBytes+ trailer.getTrailerSize());<a name="line.826"></a>
-<span class="sourceLineNo">827</span> trailer.setEntryCount(entryCount);<a name="line.827"></a>
-<span class="sourceLineNo">828</span> trailer.setCompressionCodec(hFileContext.getCompression());<a name="line.828"></a>
-<span class="sourceLineNo">829</span><a name="line.829"></a>
-<span class="sourceLineNo">830</span> long startTime = System.currentTimeMillis();<a name="line.830"></a>
-<span class="sourceLineNo">831</span> trailer.serialize(outputStream);<a name="line.831"></a>
-<span class="sourceLineNo">832</span> HFile.updateWriteLatency(System.currentTimeMillis() - startTime);<a name="line.832"></a>
-<span class="sourceLineNo">833</span><a name="line.833"></a>
-<span class="sourceLineNo">834</span> if (closeOutputStream) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span> outputStream.close();<a name="line.835"></a>
-<span class="sourceLineNo">836</span> outputStream = null;<a name="line.836"></a>
-<span class="sourceLineNo">837</span> }<a name="line.837"></a>
-<span class="sourceLineNo">838</span> }<a name="line.838"></a>
-<span class="sourceLineNo">839</span>}<a name="line.839"></a>
+<span class="sourceLineNo">669</span><a name="line.669"></a>
+<span class="sourceLineNo">670</span> finishClose(trailer);<a name="line.670"></a>
+<span class="sourceLineNo">671</span><a name="line.671"></a>
+<span class="sourceLineNo">672</span> blockWriter.release();<a name="line.672"></a>
+<span class="sourceLineNo">673</span> }<a name="line.673"></a>
+<span class="sourceLineNo">674</span><a name="line.674"></a>
+<span class="sourceLineNo">675</span> @Override<a name="line.675"></a>
+<span class="sourceLineNo">676</span> public void addInlineBlockWriter(InlineBlockWriter ibw) {<a name="line.676"></a>
+<span class="sourceLineNo">677</span> inlineBlockWriters.add(ibw);<a name="line.677"></a>
+<span class="sourceLineNo">678</span> }<a name="line.678"></a>
+<span class="sourceLineNo">679</span><a name="line.679"></a>
+<span class="sourceLineNo">680</span> @Override<a name="line.680"></a>
+<span class="sourceLineNo">681</span> public void addGeneralBloomFilter(final BloomFilterWriter bfw) {<a name="line.681"></a>
+<span class="sourceLineNo">682</span> this.addBloomFilter(bfw, BlockType.GENERAL_BLOOM_META);<a name="line.682"></a>
+<span class="sourceLineNo">683</span> }<a name="line.683"></a>
+<span class="sourceLineNo">684</span><a name="line.684"></a>
+<span class="sourceLineNo">685</span> @Override<a name="line.685"></a>
+<span class="sourceLineNo">686</span> public void addDeleteFamilyBloomFilter(final BloomFilterWriter bfw) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> this.addBloomFilter(bfw, BlockType.DELETE_FAMILY_BLOOM_META);<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span><a name="line.689"></a>
+<span class="sourceLineNo">690</span> private void addBloomFilter(final BloomFilterWriter bfw,<a name="line.690"></a>
+<span class="sourceLineNo">691</span> final BlockType blockType) {<a name="line.691"></a>
+<span class="sourceLineNo">692</span> if (bfw.getKeyCount() <= 0)<a name="line.692"></a>
+<span class="sourceLineNo">693</span> return;<a name="line.693"></a>
+<span class="sourceLineNo">694</span><a name="line.694"></a>
+<span class="sourceLineNo">695</span> if (blockType != BlockType.GENERAL_BLOOM_META &&<a name="line.695"></a>
+<span class="sourceLineNo">696</span> blockType != BlockType.DELETE_FAMILY_BLOOM_META) {<a name="line.696"></a>
+<span class="sourceLineNo">697</span> throw new RuntimeException("Block Type: " + blockType.toString() +<a name="line.697"></a>
+<span class="sourceLineNo">698</span> "is not supported");<a name="line.698"></a>
+<span class="sourceLineNo">699</span> }<a name="line.699"></a>
+<span class="sourceLineNo">700</span> additionalLoadOnOpenData.add(new BlockWritable() {<a name="line.700"></a>
+<span class="sourceLineNo">701</span> @Override<a name="line.701"></a>
+<span class="sourceLineNo">702</span> public BlockType getBlockType() {<a name="line.702"></a>
+<span class="sourceLineNo">703</span> return blockType;<a name="line.703"></a>
+<span class="sourceLineNo">704</span> }<a name="line.704"></a>
+<span class="sourceLineNo">705</span><a name="line.705"></a>
+<span class="sourceLineNo">706</span> @Override<a name="line.706"></a>
+<span class="sourceLineNo">707</span> public void writeToBlock(DataOutput out) throws IOException {<a name="line.707"></a>
+<span class="sourceLineNo">708</span> bfw.getMetaWriter().write(out);<a name="line.708"></a>
+<span class="sourceLineNo">709</span> Writable dataWriter = bfw.getDataWriter();<a name="line.709"></a>
+<span class="sourceLineNo">710</span> if (dataWriter != null)<a name="line.710"></a>
+<span class="sourceLineNo">711</span> dataWriter.write(out);<a name="line.711"></a>
+<span class="sourceLineNo">712</span> }<a name="line.712"></a>
+<span class="sourceLineNo">713</span> });<a name="line.713"></a>
+<span class="sourceLineNo">714</span> }<a name="line.714"></a>
+<span class="sourceLineNo">715</span><a name="line.715"></a>
+<span class="sourceLineNo">716</span> @Override<a name="line.716"></a>
+<span class="sourceLineNo">717</span> public HFileContext getFileContext() {<a name="line.717"></a>
+<span class="sourceLineNo">718</span> return hFileContext;<a name="line.718"></a>
+<span class="sourceLineNo">719</span> }<a name="line.719"></a>
+<span class="sourceLineNo">720</span><a name="line.720"></a>
+<span class="sourceLineNo">721</span> /**<a name="line.721"></a>
+<span class="sourceLineNo">722</span> * Add key/value to file. Keys must be added in an order that agrees with the<a name="line.722"></a>
+<span class="sourceLineNo">723</span> * Comparator passed on construction.<a name="line.723"></a>
+<span class="sourceLineNo">724</span> *<a name="line.724"></a>
+<span class="sourceLineNo">725</span> * @param cell<a name="line.725"></a>
+<span class="sourceLineNo">726</span> * Cell to add. Cannot be empty nor null.<a name="line.726"></a>
+<span class="sourceLineNo">727</span> * @throws IOException<a name="line.727"></a>
+<span class="sourceLineNo">728</span> */<a name="line.728"></a>
+<span class="sourceLineNo">729</span> @Override<a name="line.729"></a>
+<span class="sourceLineNo">730</span> public void append(final Cell cell) throws IOException {<a name="line.730"></a>
+<span class="sourceLineNo">731</span> // checkKey uses comparator to check we are writing in order.<a name="line.731"></a>
+<span class="sourceLineNo">732</span> boolean dupKey = checkKey(cell);<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (!dupKey) {<a name="line.733"></a>
+<span class="sourceLineNo">734</span> checkBlockBoundary();<a name="line.734"></a>
+<span class="sourceLineNo">735</span> }<a name="line.735"></a>
+<span class="sourceLineNo">736</span><a name="line.736"></a>
+<span class="sourceLineNo">737</span> if (!blockWriter.isWriting()) {<a name="line.737"></a>
+<span class="sourceLineNo">738</span> newBlock();<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span><a name="line.740"></a>
+<span class="sourceLineNo">741</span> blockWriter.write(cell);<a name="line.741"></a>
+<span class="sourceLineNo">742</span><a name="line.742"></a>
+<span class="sourceLineNo">743</span> totalKeyLength += PrivateCellUtil.estimatedSerializedSizeOfKey(cell);<a name="line.743"></a>
+<span class="sourceLineNo">744</span> totalValueLength += cell.getValueLength();<a name="line.744"></a>
+<span class="sourceLineNo">745</span><a name="line.745"></a>
+<span class="sourceLineNo">746</span> // Are we the first key in this block?<a name="line.746"></a>
+<span class="sourceLineNo">747</span> if (firstCellInBlock == null) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span> // If cell is big, block will be closed and this firstCellInBlock reference will only last<a name="line.748"></a>
+<span class="sourceLineNo">749</span> // a short while.<a name="line.749"></a>
+<span class="sourceLineNo">750</span> firstCellInBlock = cell;<a name="line.750"></a>
+<span class="sourceLineNo">751</span> }<a name="line.751"></a>
+<span class="sourceLineNo">752</span><a name="line.752"></a>
+<span class="sourceLineNo">753</span> // TODO: What if cell is 10MB and we write infrequently? We hold on to cell here indefinitely?<a name="line.753"></a>
+<span class="sourceLineNo">754</span> lastCell = cell;<a name="line.754"></a>
+<span class="sourceLineNo">755</span> entryCount++;<a name="line.755"></a>
+<span class="sourceLineNo">756</span> this.maxMemstoreTS = Math.max(this.maxMemstoreTS, cell.getSequenceId());<a name="line.756"></a>
+<span class="sourceLineNo">757</span> int tagsLength = cell.getTagsLength();<a name="line.757"></a>
+<span class="sourceLineNo">758</span> if (tagsLength > this.maxTagsLength) {<a name="line.758"></a>
+<span class="sourceLineNo">759</span> this.maxTagsLength = tagsLength;<a name="line.759"></a>
+<span class="sourceLineNo">760</span> }<a name="line.760"></a>
+<span class="sourceLineNo">761</span> }<a name="line.761"></a>
+<span class="sourceLineNo">762</span><a name="line.762"></a>
+<span class="sourceLineNo">763</span> @Override<a name="line.763"></a>
+<span class="sourceLineNo">764</span> public void beforeShipped() throws IOException {<a name="line.764"></a>
+<span class="sourceLineNo">765</span> // Add clone methods for every cell<a name="line.765"></a>
+<span class="sourceLineNo">766</span> if (this.lastCell != null) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span> this.lastCell = KeyValueUtil.toNewKeyCell(this.lastCell);<a name="line.767"></a>
+<span class="sourceLineNo">768</span> }<a name="line.768"></a>
+<span class="sourceLineNo">769</span> if (this.firstCellInBlock != null) {<a name="line.769"></a>
+<span class="sourceLineNo">770</span> this.firstCellInBlock = KeyValueUtil.toNewKeyCell(this.firstCellInBlock);<a name="line.770"></a>
+<span class="sourceLineNo">771</span> }<a name="line.771"></a>
+<span class="sourceLineNo">772</span> if (this.lastCellOfPreviousBlock != null) {<a name="line.772"></a>
+<span class="sourceLineNo">773</span> this.lastCellOfPreviousBlock = KeyValueUtil.toNewKeyCell(this.lastCellOfPreviousBlock);<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
+<span class="sourceLineNo">775</span> }<a name="line.775"></a>
+<span class="sourceLineNo">776</span><a name="line.776"></a>
+<span class="sourceLineNo">777</span> protected void finishFileInfo() throws IOException {<a name="line.777"></a>
+<span class="sourceLineNo">778</span> if (lastCell != null) {<a name="line.778"></a>
+<span class="sourceLineNo">779</span> // Make a copy. The copy is stuffed into our fileinfo map. Needs a clean<a name="line.779"></a>
+<span class="sourceLineNo">780</span> // byte buffer. Won't take a tuple.<a name="line.780"></a>
+<span class="sourceLineNo">781</span> byte [] lastKey = PrivateCellUtil.getCellKeySerializedAsKeyValueKey(this.lastCell);<a name="line.781"></a>
+<span class="sourceLineNo">782</span> fileInfo.append(FileInfo.LASTKEY, lastKey, false);<a name="line.782"></a>
+<span class="sourceLineNo">783</span> }<a name="line.783"></a>
+<span class="sourceLineNo">784</span><a name="line.784"></a>
+<span class="sourceLineNo">785</span> // Average key length.<a name="line.785"></a>
+<span class="sourceLineNo">786</span> int avgKeyLen =<a name="line.786"></a>
+<span class="sourceLineNo">787</span> entryCount == 0 ? 0 : (int) (totalKeyLength / entryCount);<a name="line.787"></a>
+<span class="sourceLineNo">788</span> fileInfo.append(FileInfo.AVG_KEY_LEN, Bytes.toBytes(avgKeyLen), false);<a name="line.788"></a>
+<span class="sourceLineNo">789</span> fileInfo.append(FileInfo.CREATE_TIME_TS, Bytes.toBytes(hFileContext.getFileCreateTime()),<a name="line.789"></a>
+<span class="sourceLineNo">790</span> false);<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span> // Average value length.<a name="line.792"></a>
+<span class="sourceLineNo">793</span> int avgValueLen =<a name="line.793"></a>
+<span class="sourceLineNo">794</span> entryCount == 0 ? 0 : (int) (totalValueLength / entryCount);<a name="line.794"></a>
+<span class="sourceLineNo">795</span> fileInfo.append(FileInfo.AVG_VALUE_LEN, Bytes.toBytes(avgValueLen), false);<a name="line.795"></a>
+<span class="sourceLineNo">796</span> if (hFileContext.isIncludesTags()) {<a name="line.796"></a>
+<span class="sourceLineNo">797</span> // When tags are not being written in this file, MAX_TAGS_LEN is excluded<a name="line.797"></a>
+<span class="sourceLineNo">798</span> // from the FileInfo<a name="line.798"></a>
+<span class="sourceLineNo">799</span> fileInfo.append(FileInfo.MAX_TAGS_LEN, Bytes.toBytes(this.maxTagsLength), false);<a name="line.799"></a>
+<span class="sourceLineNo">800</span> boolean tagsCompressed = (hFileContext.getDataBlockEncoding() != DataBlockEncoding.NONE)<a name="line.800"></a>
+<span class="sourceLineNo">801</span> && hFileContext.isCompressTags();<a name="line.801"></a>
+<span class="sourceLineNo">802</span> fileInfo.append(FileInfo.TAGS_COMPRESSED, Bytes.toBytes(tagsCompressed), false);<a name="line.802"></a>
+<span class="sourceLineNo">803</span> }<a name="line.803"></a>
+<span class="sourceLineNo">804</span> }<a name="line.804"></a>
+<span class="sourceLineNo">805</span><a name="line.805"></a>
+<span class="sourceLineNo">806</span> protected int getMajorVersion() {<a name="line.806"></a>
+<span class="sourceLineNo">807</span> return 3;<a name="line.807"></a>
+<span class="sourceLineNo">808</span> }<a name="line.808"></a>
+<span class="sourceLineNo">809</span><a name="line.809"></a>
+<span class="sourceLineNo">810</span> protected int getMinorVersion() {<a name="line.810"></a>
+<span class="sourceLineNo">811</span> return HFileReaderImpl.MAX_MINOR_VERSION;<a name="line.811"></a>
+<span class="sourceLineNo">812</span> }<a name="line.812"></a>
+<span class="sourceLineNo">813</span><a name="line.813"></a>
+<span class="sourceLineNo">814</span> protected void finishClose(FixedFileTrailer trailer) throws IOException {<a name="line.814"></a>
+<span class="sourceLineNo">815</span> // Write out encryption metadata before finalizing if we have a valid crypto context<a name="line.815"></a>
+<span class="sourceLineNo">816</span> Encryption.Context cryptoContext = hFileContext.getEncryptionContext();<a name="line.816"></a>
+<span class="sourceLineNo">817</span> if (cryptoContext != Encryption.Context.NONE) {<a name="line.817"></a>
+<span class="sourceLineNo">818</span> // Wrap the context's key and write it as the encryption metadata, the wrapper includes<a name="line.818"></a>
+<span class="sourceLineNo">819</span> // all information needed for decryption<a name="line.819"></a>
+<span class="sourceLineNo">820</span> trailer.setEncryptionKey(EncryptionUtil.wrapKey(cryptoContext.getConf(),<a name="line.820"></a>
+<span class="sourceLineNo">821</span> cryptoContext.getConf().get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY,<a name="line.821"></a>
+<span class="sourceLineNo">822</span> User.getCurrent().getShortName()),<a name="line.822"></a>
+<span class="sourceLineNo">823</span> cryptoContext.getKey()));<a name="line.823"></a>
+<span class="sourceLineNo">824</span> }<a name="line.824"></a>
+<span class="sourceLineNo">825</span> // Now we can finish the close<a name="line.825"></a>
+<span class="sourceLineNo">826</span> trailer.setMetaIndexCount(metaNames.size());<a name="line.826"></a>
+<span class="sourceLineNo">827</span> trailer.setTotalUncompressedBytes(totalUncompressedBytes+ trailer.getTrailerSize());<a name="line.827"></a>
+<span class="sourceLineNo">828</span> trailer.setEntryCount(entryCount);<a name="line.828"></a>
+<span class="sourceLineNo">829</span> trailer.setCompressionCodec(hFileContext.getCompression());<a name="line.829"></a>
+<span class="sourceLineNo">830</span><a name="line.830"></a>
+<span class="sourceLineNo">831</span> long startTime = System.currentTimeMillis();<a name="line.831"></a>
+<span class="sourceLineNo">832</span> trailer.serialize(outputStream);<a name="line.832"></a>
+<span class="sourceLineNo">833</span> HFile.updateWriteLatency(System.currentTimeMillis() - startTime);<a name="line.833"></a>
+<span class="sourceLineNo">834</span><a name="line.834"></a>
+<span class="sourceLineNo">835</span> if (closeOutputStream) {<a name="line.835"></a>
+<span class="sourceLineNo">836</span> outputStream.close();<a name="line.836"></a>
+<span class="sourceLineNo">837</span> outputStream = null;<a name="line.837"></a>
+<span class="sourceLineNo">838</span> }<a name="line.838"></a>
+<span class="sourceLineNo">839</span> }<a name="line.839"></a>
+<span class="sourceLineNo">840</span>}<a name="line.840"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4f8b8424/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.Bucket.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.Bucket.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.Bucket.html
index 29f1b92..65b7a57 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.Bucket.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.Bucket.html
@@ -37,11 +37,11 @@
<span class="sourceLineNo">029</span>import java.util.Set;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import java.util.concurrent.atomic.LongAdder;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.slf4j.Logger;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.slf4j.LoggerFactory;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.CacheConfig;<a name="line.36"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheFactory;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.slf4j.Logger;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.36"></a>
<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.BucketEntry;<a name="line.37"></a>
<span class="sourceLineNo">038</span>import com.fasterxml.jackson.annotation.JsonIgnoreProperties;<a name="line.38"></a>
<span class="sourceLineNo">039</span><a name="line.39"></a>
@@ -459,7 +459,7 @@
<span class="sourceLineNo">451</span> BucketSizeInfo bsi = roundUpToBucketSizeInfo(blockSize);<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (bsi == null) {<a name="line.452"></a>
<span class="sourceLineNo">453</span> throw new BucketAllocatorException("Allocation too big size=" + blockSize +<a name="line.453"></a>
-<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + CacheConfig.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
+<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + BlockCacheFactory.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
<span class="sourceLineNo">455</span> " to accomodate if size seems reasonable and you want it cached.");<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
<span class="sourceLineNo">457</span> long offset = bsi.allocateBlock();<a name="line.457"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4f8b8424/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.BucketSizeInfo.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.BucketSizeInfo.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.BucketSizeInfo.html
index 29f1b92..65b7a57 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.BucketSizeInfo.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.BucketSizeInfo.html
@@ -37,11 +37,11 @@
<span class="sourceLineNo">029</span>import java.util.Set;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import java.util.concurrent.atomic.LongAdder;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.slf4j.Logger;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.slf4j.LoggerFactory;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.CacheConfig;<a name="line.36"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheFactory;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.slf4j.Logger;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.36"></a>
<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.BucketEntry;<a name="line.37"></a>
<span class="sourceLineNo">038</span>import com.fasterxml.jackson.annotation.JsonIgnoreProperties;<a name="line.38"></a>
<span class="sourceLineNo">039</span><a name="line.39"></a>
@@ -459,7 +459,7 @@
<span class="sourceLineNo">451</span> BucketSizeInfo bsi = roundUpToBucketSizeInfo(blockSize);<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (bsi == null) {<a name="line.452"></a>
<span class="sourceLineNo">453</span> throw new BucketAllocatorException("Allocation too big size=" + blockSize +<a name="line.453"></a>
-<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + CacheConfig.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
+<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + BlockCacheFactory.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
<span class="sourceLineNo">455</span> " to accomodate if size seems reasonable and you want it cached.");<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
<span class="sourceLineNo">457</span> long offset = bsi.allocateBlock();<a name="line.457"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4f8b8424/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.IndexStatistics.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.IndexStatistics.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.IndexStatistics.html
index 29f1b92..65b7a57 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.IndexStatistics.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.IndexStatistics.html
@@ -37,11 +37,11 @@
<span class="sourceLineNo">029</span>import java.util.Set;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import java.util.concurrent.atomic.LongAdder;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.slf4j.Logger;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.slf4j.LoggerFactory;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.CacheConfig;<a name="line.36"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheFactory;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.slf4j.Logger;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.36"></a>
<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.BucketEntry;<a name="line.37"></a>
<span class="sourceLineNo">038</span>import com.fasterxml.jackson.annotation.JsonIgnoreProperties;<a name="line.38"></a>
<span class="sourceLineNo">039</span><a name="line.39"></a>
@@ -459,7 +459,7 @@
<span class="sourceLineNo">451</span> BucketSizeInfo bsi = roundUpToBucketSizeInfo(blockSize);<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (bsi == null) {<a name="line.452"></a>
<span class="sourceLineNo">453</span> throw new BucketAllocatorException("Allocation too big size=" + blockSize +<a name="line.453"></a>
-<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + CacheConfig.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
+<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + BlockCacheFactory.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
<span class="sourceLineNo">455</span> " to accomodate if size seems reasonable and you want it cached.");<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
<span class="sourceLineNo">457</span> long offset = bsi.allocateBlock();<a name="line.457"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4f8b8424/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.html b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.html
index 29f1b92..65b7a57 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.html
@@ -37,11 +37,11 @@
<span class="sourceLineNo">029</span>import java.util.Set;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import java.util.concurrent.atomic.LongAdder;<a name="line.30"></a>
<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.slf4j.Logger;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.slf4j.LoggerFactory;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.CacheConfig;<a name="line.36"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheFactory;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.slf4j.Logger;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.io.hfile.BlockCacheKey;<a name="line.36"></a>
<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.BucketEntry;<a name="line.37"></a>
<span class="sourceLineNo">038</span>import com.fasterxml.jackson.annotation.JsonIgnoreProperties;<a name="line.38"></a>
<span class="sourceLineNo">039</span><a name="line.39"></a>
@@ -459,7 +459,7 @@
<span class="sourceLineNo">451</span> BucketSizeInfo bsi = roundUpToBucketSizeInfo(blockSize);<a name="line.451"></a>
<span class="sourceLineNo">452</span> if (bsi == null) {<a name="line.452"></a>
<span class="sourceLineNo">453</span> throw new BucketAllocatorException("Allocation too big size=" + blockSize +<a name="line.453"></a>
-<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + CacheConfig.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
+<span class="sourceLineNo">454</span> "; adjust BucketCache sizes " + BlockCacheFactory.BUCKET_CACHE_BUCKETS_KEY +<a name="line.454"></a>
<span class="sourceLineNo">455</span> " to accomodate if size seems reasonable and you want it cached.");<a name="line.455"></a>
<span class="sourceLineNo">456</span> }<a name="line.456"></a>
<span class="sourceLineNo">457</span> long offset = bsi.allocateBlock();<a name="line.457"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4f8b8424/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionServerTracker.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionServerTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionServerTracker.html
index abfa74b..11f49fa 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionServerTracker.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/RegionServerTracker.html
@@ -136,72 +136,75 @@
<span class="sourceLineNo">128</span> // '-SPLITTING'. Each splitting server should have a corresponding SCP. Log if not.<a name="line.128"></a>
<span class="sourceLineNo">129</span> splittingServersFromWALDir.stream().filter(s -> !deadServersFromPE.contains(s)).<a name="line.129"></a>
<span class="sourceLineNo">130</span> forEach(s -> LOG.error("{} has no matching ServerCrashProcedure", s));<a name="line.130"></a>
-<span class="sourceLineNo">131</span> watcher.registerListener(this);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> synchronized (this) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> List<String> servers =<a name="line.133"></a>
-<span class="sourceLineNo">134</span> ZKUtil.listChildrenAndWatchForNewChildren(watcher, watcher.getZNodePaths().rsZNode);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> for (String n : servers) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> Pair<ServerName, RegionServerInfo> pair = getServerInfo(n);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> ServerName serverName = pair.getFirst();<a name="line.137"></a>
-<span class="sourceLineNo">138</span> RegionServerInfo info = pair.getSecond();<a name="line.138"></a>
-<span class="sourceLineNo">139</span> regionServers.add(serverName);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> ServerMetrics serverMetrics = info != null ? ServerMetricsBuilder.of(serverName,<a name="line.140"></a>
-<span class="sourceLineNo">141</span> VersionInfoUtil.getVersionNumber(info.getVersionInfo()),<a name="line.141"></a>
-<span class="sourceLineNo">142</span> info.getVersionInfo().getVersion()) : ServerMetricsBuilder.of(serverName);<a name="line.142"></a>
-<span class="sourceLineNo">143</span> serverManager.checkAndRecordNewServer(serverName, serverMetrics);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> }<a name="line.144"></a>
-<span class="sourceLineNo">145</span> serverManager.findDeadServersAndProcess(deadServersFromPE, liveServersFromWALDir);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span> public void stop() {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> executor.shutdownNow();<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> private synchronized void refresh() {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> List<String> names;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> try {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> names = ZKUtil.listChildrenAndWatchForNewChildren(watcher, watcher.getZNodePaths().rsZNode);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> } catch (KeeperException e) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // here we need to abort as we failed to set watcher on the rs node which means that we can<a name="line.158"></a>
-<span class="sourceLineNo">159</span> // not track the node deleted evetnt any more.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> server.abort("Unexpected zk exception getting RS nodes", e);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> return;<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span> Set<ServerName> servers =<a name="line.163"></a>
-<span class="sourceLineNo">164</span> names.stream().map(ServerName::parseServerName).collect(Collectors.toSet());<a name="line.164"></a>
-<span class="sourceLineNo">165</span> for (Iterator<ServerName> iter = regionServers.iterator(); iter.hasNext();) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> ServerName sn = iter.next();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> if (!servers.contains(sn)) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> LOG.info("RegionServer ephemeral node deleted, processing expiration [{}]", sn);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> serverManager.expireServer(sn);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> iter.remove();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span> // here we do not need to parse the region server info as it is useless now, we only need the<a name="line.173"></a>
-<span class="sourceLineNo">174</span> // server name.<a name="line.174"></a>
-<span class="sourceLineNo">175</span> boolean newServerAdded = false;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> for (ServerName sn : servers) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> if (regionServers.add(sn)) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> newServerAdded = true;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("RegionServer ephemeral node created, adding [" + sn + "]");<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (newServerAdded && server.isInitialized()) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> // Only call the check to move servers if a RegionServer was added to the cluster; in this<a name="line.183"></a>
-<span class="sourceLineNo">184</span> // case it could be a server with a new version so it makes sense to run the check.<a name="line.184"></a>
-<span class="sourceLineNo">185</span> server.checkIfShouldMoveSystemRegionAsync();<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> @Override<a name="line.189"></a>
-<span class="sourceLineNo">190</span> public void nodeChildrenChanged(String path) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> if (path.equals(watcher.getZNodePaths().rsZNode) && !server.isAborted() &&<a name="line.191"></a>
-<span class="sourceLineNo">192</span> !server.isStopped()) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> executor.execute(this::refresh);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>}<a name="line.196"></a>
+<span class="sourceLineNo">131</span> //create ServerNode for all possible live servers from wal directory<a name="line.131"></a>
+<span class="sourceLineNo">132</span> liveServersFromWALDir.stream()<a name="line.132"></a>
+<span class="sourceLineNo">133</span> .forEach(sn -> server.getAssignmentManager().getRegionStates().getOrCreateServer(sn));<a name="line.133"></a>
+<span class="sourceLineNo">134</span> watcher.registerListener(this);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> synchronized (this) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> List<String> servers =<a name="line.136"></a>
+<span class="sourceLineNo">137</span> ZKUtil.listChildrenAndWatchForNewChildren(watcher, watcher.getZNodePaths().rsZNode);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> for (String n : servers) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span> Pair<ServerName, RegionServerInfo> pair = getServerInfo(n);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> ServerName serverName = pair.getFirst();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> RegionServerInfo info = pair.getSecond();<a name="line.141"></a>
+<span class="sourceLineNo">142</span> regionServers.add(serverName);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> ServerMetrics serverMetrics = info != null ? ServerMetricsBuilder.of(serverName,<a name="line.143"></a>
+<span class="sourceLineNo">144</span> VersionInfoUtil.getVersionNumber(info.getVersionInfo()),<a name="line.144"></a>
+<span class="sourceLineNo">145</span> info.getVersionInfo().getVersion()) : ServerMetricsBuilder.of(serverName);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> serverManager.checkAndRecordNewServer(serverName, serverMetrics);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span> serverManager.findDeadServersAndProcess(deadServersFromPE, liveServersFromWALDir);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> public void stop() {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> executor.shutdownNow();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> private synchronized void refresh() {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> List<String> names;<a name="line.157"></a>
+<span class="sourceLineNo">158</span> try {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> names = ZKUtil.listChildrenAndWatchForNewChildren(watcher, watcher.getZNodePaths().rsZNode);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> } catch (KeeperException e) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // here we need to abort as we failed to set watcher on the rs node which means that we can<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // not track the node deleted evetnt any more.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> server.abort("Unexpected zk exception getting RS nodes", e);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> return;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span> Set<ServerName> servers =<a name="line.166"></a>
+<span class="sourceLineNo">167</span> names.stream().map(ServerName::parseServerName).collect(Collectors.toSet());<a name="line.167"></a>
+<span class="sourceLineNo">168</span> for (Iterator<ServerName> iter = regionServers.iterator(); iter.hasNext();) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> ServerName sn = iter.next();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> if (!servers.contains(sn)) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> LOG.info("RegionServer ephemeral node deleted, processing expiration [{}]", sn);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> serverManager.expireServer(sn);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> iter.remove();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> // here we do not need to parse the region server info as it is useless now, we only need the<a name="line.176"></a>
+<span class="sourceLineNo">177</span> // server name.<a name="line.177"></a>
+<span class="sourceLineNo">178</span> boolean newServerAdded = false;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> for (ServerName sn : servers) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> if (regionServers.add(sn)) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> newServerAdded = true;<a name="line.181"></a>
+<span class="sourceLineNo">182</span> LOG.info("RegionServer ephemeral node created, adding [" + sn + "]");<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span> }<a name="line.184"></a>
+<span class="sourceLineNo">185</span> if (newServerAdded && server.isInitialized()) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> // Only call the check to move servers if a RegionServer was added to the cluster; in this<a name="line.186"></a>
+<span class="sourceLineNo">187</span> // case it could be a server with a new version so it makes sense to run the check.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> server.checkIfShouldMoveSystemRegionAsync();<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
+<span class="sourceLineNo">193</span> public void nodeChildrenChanged(String path) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> if (path.equals(watcher.getZNodePaths().rsZNode) && !server.isAborted() &&<a name="line.194"></a>
+<span class="sourceLineNo">195</span> !server.isStopped()) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> executor.execute(this::refresh);<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>}<a name="line.199"></a>