Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 16CCD19151 for ; Wed, 23 Mar 2016 15:17:50 +0000 (UTC) Received: (qmail 83512 invoked by uid 500); 23 Mar 2016 15:17:44 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 83427 invoked by uid 500); 23 Mar 2016 15:17:44 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 82167 invoked by uid 99); 23 Mar 2016 15:17:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Mar 2016 15:17:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8FE4E97E6; Wed, 23 Mar 2016 15:17:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: misty@apache.org To: commits@hbase.apache.org Date: Wed, 23 Mar 2016 15:18:10 -0000 Message-Id: <268a4616c96f4f1caeb7818f937281c9@git.apache.org> In-Reply-To: <5182b3fd74274f41a419840a1a2127f1@git.apache.org> References: <5182b3fd74274f41a419840a1a2127f1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/51] [partial] hbase-site git commit: Published site at cadfb21f4bb465d1e305db2a159b8574282c8150. http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html index 413a698..9bb19d0 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/BlockType.html @@ -306,13 +306,26 @@ the order they are declared. +private void +HFileBlock.init(BlockType blockType, + int onDiskSizeWithoutHeader, + int uncompressedSizeWithoutHeader, + long prevBlockOffset, + long offset, + int onDiskDataSizeWithHeader, + int nextBlockOnDiskSize, + HFileContext fileContext) +
Called from constructors.
+ + + HFileBlock HFileBlock.BlockIterator.nextBlockWithBlockType(BlockType blockType)
Similar to HFileBlock.BlockIterator.nextBlock() but checks block type, throws an exception if incorrect, and returns the HFile block
- + HFileBlock HFile.CachingBlockReader.readBlock(long offset, long onDiskBlockSize, @@ -325,7 +338,7 @@ the order they are declared.
Read in a file block.
- + HFileBlock HFileReaderImpl.readBlock(long dataBlockOffset, long onDiskBlockSize, @@ -336,31 +349,31 @@ the order they are declared. BlockType expectedBlockType, DataBlockEncoding expectedDataBlockEncoding)  - + private void HFileBlock.sanityCheckAssertion(BlockType valueFromBuf, BlockType valueFromField)  - + boolean CacheConfig.shouldLockOnCacheMiss(BlockType blockType)
If we make sure the block could not be cached, we will not acquire the lock otherwise we will acquire lock
- + boolean CacheConfig.shouldReadBlockFromCache(BlockType blockType)
Return true if we may find this type of block in block cache.
- + (package private) DataOutputStream HFileBlock.Writer.startWriting(BlockType newBlockType)
Starts writing into the block.
- + private void HFileReaderImpl.validateBlockType(HFileBlock block, BlockType expectedBlockType) @@ -377,29 +390,19 @@ the order they are declared. -HFileBlock(BlockType blockType, +HFileBlock(BlockType blockType, int onDiskSizeWithoutHeader, int uncompressedSizeWithoutHeader, long prevBlockOffset, - ByteBuff buf, + ByteBuffer b, boolean fillHeader, long offset, + int nextBlockOnDiskSize, int onDiskDataSizeWithHeader, HFileContext fileContext)
Creates a new HFile block from the given fields.
- -HFileBlock(BlockType blockType, - int onDiskSizeWithoutHeader, - int uncompressedSizeWithoutHeader, - long prevBlockOffset, - ByteBuffer buf, - boolean fillHeader, - long offset, - int onDiskDataSizeWithHeader, - HFileContext fileContext)  - http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html index 22e9253..29cfaa9 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.MemoryType.html @@ -155,9 +155,12 @@ the order they are declared. -HFileBlock(ByteBuff b, +HFileBlock(ByteBuff buf, boolean usesHBaseChecksum, - Cacheable.MemoryType memType) + Cacheable.MemoryType memType, + long offset, + int nextBlockOnDiskSize, + HFileContext fileContext)
Creates a block from an existing buffer starting with a header.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html index babe95d..52e75d4 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/Cacheable.html @@ -122,7 +122,7 @@ class  HFileBlock -
Reads HFile version 1 and version 2 blocks but writes version 2 blocks only.
+
Reads HFile version 2 blocks to HFiles and via Cacheable Interface to caches.
@@ -149,7 +149,7 @@ (package private) static CacheableDeserializer<Cacheable> -HFileBlock.blockDeserializer +HFileBlock.BLOCK_DESERIALIZER
Used deserializing blocks from Cache.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html index 08f48f6..65143a8 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/CacheableDeserializer.html @@ -106,7 +106,7 @@ (package private) static CacheableDeserializer<Cacheable> -HFileBlock.blockDeserializer +HFileBlock.BLOCK_DESERIALIZER
Used deserializing blocks from Cache.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.PrefetchedHeader.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.PrefetchedHeader.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.PrefetchedHeader.html index 7509971..924d3bb 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.PrefetchedHeader.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.PrefetchedHeader.html @@ -99,7 +99,9 @@ private ThreadLocal<HFileBlock.PrefetchedHeader> -HFileBlock.FSReaderImpl.prefetchedHeaderForThread  +HFileBlock.FSReaderImpl.prefetchedHeaderForThread +
When we read a block, we overread and pull in the next blocks header too.
+ http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html index 4d1e3ec..cde0c78 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileBlock.html @@ -209,9 +209,8 @@ HFileBlock -HFileBlock.FSReader.readBlockData(long offset, +HFileBlock.FSReader.readBlockData(long offset, long onDiskSize, - int uncompressedSize, boolean pread)
Reads the block at the given offset in the file with the given on-disk size and uncompressed size.
@@ -219,19 +218,17 @@ HFileBlock -HFileBlock.FSReaderImpl.readBlockData(long offset, +HFileBlock.FSReaderImpl.readBlockData(long offset, long onDiskSizeWithHeaderL, - int uncompressedSize, boolean pread)
Reads a version 2 block (version 1 blocks not supported and not expected).
private HFileBlock -HFileBlock.FSReaderImpl.readBlockDataInternal(org.apache.hadoop.fs.FSDataInputStream is, +HFileBlock.FSReaderImpl.readBlockDataInternal(org.apache.hadoop.fs.FSDataInputStream is, long offset, long onDiskSizeWithHeaderL, - int uncompressedSize, boolean pread, boolean verifyChecksum)
Reads a version 2 block.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html index 0d56ead..e88f07c 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileContext.html @@ -249,7 +249,7 @@ private HFileContext HFileBlock.fileContext -
Meta data that holds meta information on the hfileblock
+
Meta data that holds meta information on the hfileblock.
@@ -329,44 +329,57 @@ +private void +HFileBlock.init(BlockType blockType, + int onDiskSizeWithoutHeader, + int uncompressedSizeWithoutHeader, + long prevBlockOffset, + long offset, + int onDiskDataSizeWithHeader, + int nextBlockOnDiskSize, + HFileContext fileContext) +
Called from constructors.
+ + + HFileBlockDecodingContext HFileDataBlockEncoderImpl.newDataBlockDecodingContext(HFileContext fileContext)  - + HFileBlockDecodingContext HFileDataBlockEncoder.newDataBlockDecodingContext(HFileContext fileContext)
create a encoder specific decoding context for reading.
- + HFileBlockDecodingContext NoOpDataBlockEncoder.newDataBlockDecodingContext(HFileContext meta)  - + HFileBlockEncodingContext HFileDataBlockEncoderImpl.newDataBlockEncodingContext(byte[] dummyHeader, HFileContext fileContext)  - + HFileBlockEncodingContext HFileDataBlockEncoder.newDataBlockEncodingContext(byte[] headerBytes, HFileContext fileContext)
Create an encoder specific encoding context object for writing.
- + HFileBlockEncodingContext NoOpDataBlockEncoder.newDataBlockEncodingContext(byte[] dummyHeader, HFileContext meta)  - + (package private) HFileBlock HFileBlock.unpack(HFileContext fileContext, HFileBlock.FSReader reader)
Retrieves the decompressed/decrypted view of this block.
- + HFile.WriterFactory HFile.WriterFactory.withFileContext(HFileContext fileContext)  @@ -397,28 +410,28 @@ HFileContext fileContext)  -HFileBlock(BlockType blockType, +HFileBlock(BlockType blockType, int onDiskSizeWithoutHeader, int uncompressedSizeWithoutHeader, long prevBlockOffset, - ByteBuff buf, + ByteBuffer b, boolean fillHeader, long offset, + int nextBlockOnDiskSize, int onDiskDataSizeWithHeader, HFileContext fileContext)
Creates a new HFile block from the given fields.
-HFileBlock(BlockType blockType, - int onDiskSizeWithoutHeader, - int uncompressedSizeWithoutHeader, - long prevBlockOffset, - ByteBuffer buf, - boolean fillHeader, +HFileBlock(ByteBuff buf, + boolean usesHBaseChecksum, + Cacheable.MemoryType memType, long offset, - int onDiskDataSizeWithHeader, - HFileContext fileContext)  + int nextBlockOnDiskSize, + HFileContext fileContext) +
Creates a block from an existing buffer starting with a header.
+ HFileContext(HFileContext context) @@ -426,13 +439,18 @@ +HFileContextBuilder(HFileContext hfc) +
Use this constructor if you want to change a few settings only in another context.
+ + + HFileReaderImpl.EncodedScanner(HFile.Reader reader, boolean cacheBlocks, boolean pread, boolean isCompaction, HFileContext meta)  - + HFileWriterImpl(org.apache.hadoop.conf.Configuration conf, CacheConfig cacheConf, org.apache.hadoop.fs.Path path, http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileScanner.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileScanner.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileScanner.html index 044b8b7..adc305b 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileScanner.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/class-use/HFileScanner.html @@ -217,7 +217,11 @@ HFileScanner StoreFile.Reader.getScanner(boolean cacheBlocks, boolean pread) -
Deprecated. 
+
Deprecated.  +
Do not write further code which depends on this call. Instead + use getStoreFileScanner() which uses the StoreFileScanner class/interface + which is the preferred way to scan a store with higher level concepts.
+
@@ -225,7 +229,11 @@ StoreFile.Reader.getScanner(boolean cacheBlocks, boolean pread, boolean isCompaction) -
Deprecated. 
+
Deprecated.  +
Do not write further code which depends on this call. Instead + use getStoreFileScanner() which uses the StoreFileScanner class/interface + which is the preferred way to scan a store with higher level concepts.
+
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/package-summary.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-summary.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-summary.html index f411ecb..2c0d258 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-summary.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-summary.html @@ -308,7 +308,7 @@ HFileBlock -
Reads HFile version 1 and version 2 blocks but writes version 2 blocks only.
+
Reads HFile version 2 blocks to HFiles and via Cacheable Interface to caches.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html index 558a528..fd907a5 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html @@ -271,11 +271,11 @@
  • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
    • http://git-wip-us.apache.org/repos/asf/hbase-site/blob/123539c5/devapidocs/org/apache/hadoop/hbase/io/hfile/package-use.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-use.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-use.html index 1cc343d..449b591 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-use.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-use.html @@ -352,7 +352,7 @@ HFileBlock -
    Reads HFile version 1 and version 2 blocks but writes version 2 blocks only.
    +
    Reads HFile version 2 blocks to HFiles and via Cacheable Interface to caches.