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 5C90D18405 for ; Wed, 10 Feb 2016 16:27:22 +0000 (UTC) Received: (qmail 56250 invoked by uid 500); 10 Feb 2016 16:27:14 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 56130 invoked by uid 500); 10 Feb 2016 16:27:14 -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 53937 invoked by uid 99); 10 Feb 2016 16:27:12 -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, 10 Feb 2016 16:27:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AF53FE04A2; Wed, 10 Feb 2016 16:27:12 +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, 10 Feb 2016 16:27:56 -0000 Message-Id: <0894ad6745cc414b8e1d206dbe71ef56@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [46/51] [partial] hbase-site git commit: Published site at df829ea7d1b4d2ef745e29d2b25b12966000eeb2. http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40ef21e4/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html index 20e8756..856561e 100644 --- a/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html +++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/HFileReaderImpl.html @@ -896,7 +896,7 @@ implements

  • MINOR_VERSION_WITH_CHECKSUM

    -
    public static final int MINOR_VERSION_WITH_CHECKSUM
    +
    public static final int MINOR_VERSION_WITH_CHECKSUM
    Minor versions in HFile starting with this number have hbase checksums
    See Also:
    Constant Field Values
    • @@ -907,7 +907,7 @@ implements

  • MINOR_VERSION_NO_CHECKSUM

    -
    public static final int MINOR_VERSION_NO_CHECKSUM
    +
    public static final int MINOR_VERSION_NO_CHECKSUM
    In HFile minor version that does not support checksums
    See Also:
    Constant Field Values
    • @@ -918,7 +918,7 @@ implements

  • PBUF_TRAILER_MINOR_VERSION

    -
    public static final int PBUF_TRAILER_MINOR_VERSION
    +
    public static final int PBUF_TRAILER_MINOR_VERSION
    HFile minor version that introduced pbuf filetrailer
    See Also:
    Constant Field Values
    • @@ -929,7 +929,7 @@ implements

  • KEY_VALUE_LEN_SIZE

    -
    public static final int KEY_VALUE_LEN_SIZE
    +
    public static final int KEY_VALUE_LEN_SIZE
    The size of a (key length, value length) tuple that prefixes each entry in a data block.
    See Also:
    Constant Field Values
    @@ -941,7 +941,7 @@ implements

  • includesMemstoreTS

    -
    private boolean includesMemstoreTS
    +
    private boolean includesMemstoreTS
    • @@ -950,7 +950,7 @@ implements

  • decodeMemstoreTS

    -
    protected boolean decodeMemstoreTS
    +
    protected boolean decodeMemstoreTS
    • @@ -996,7 +996,7 @@ implements

  • checkFileVersion

    -
    private void checkFileVersion()
    +
    private void checkFileVersion()
    File version check is a little sloppy. We read v3 files but can also read v2 files if their content has been pb'd; files written with 0.98.
    • @@ -1007,7 +1007,7 @@ implements

  • toStringFirstKey

    -
    private String toStringFirstKey()
    +
    private String toStringFirstKey()
    • @@ -1016,7 +1016,7 @@ implements

  • toStringLastKey

    -
    private String toStringLastKey()
    +
    private String toStringLastKey()
    • @@ -1025,7 +1025,7 @@ implements

  • toString

    -
    public String toString()
    +
    public String toString()
    Overrides:
    toString in class Object
    @@ -1038,7 +1038,7 @@ implements

  • length

    -
    public long length()
    +
    public long length()
    Specified by:
    length in interface HFile.Reader
    @@ -1051,7 +1051,7 @@ implements

  • returnBlock

    -
    public void returnBlock(HFileBlock block)
    +
    public void returnBlock(HFileBlock block)
    Description copied from interface: HFile.CachingBlockReader
    Return the given block back to the cache, if it was obtained from cache.
    @@ -1066,7 +1066,7 @@ implements

  • getFirstKey

    -
    public Cell getFirstKey()
    +
    public Cell getFirstKey()
    Specified by:
    getFirstKey in interface HFile.Reader
    @@ -1081,7 +1081,7 @@ implements

  • getFirstRowKey

    -
    public byte[] getFirstRowKey()
    +
    public byte[] getFirstRowKey()
    TODO left from HFile version 1: move this to StoreFile after Ryan's patch goes in to eliminate KeyValue here.
    @@ -1096,7 +1096,7 @@ implements

  • getLastRowKey

    -
    public byte[] getLastRowKey()
    +
    public byte[] getLastRowKey()
    TODO left from HFile version 1: move this to StoreFile after Ryan's patch goes in to eliminate KeyValue here.
    @@ -1111,7 +1111,7 @@ implements

  • getEntries

    -
    public long getEntries()
    +
    public long getEntries()
    Specified by:
    getEntries in interface HFile.Reader
    @@ -1124,7 +1124,7 @@ implements

  • getComparator

    -
    public CellComparator getComparator()
    +
    public CellComparator getComparator()
    Specified by:
    getComparator in interface HFile.Reader
    @@ -1137,7 +1137,7 @@ implements

  • getCompressionAlgorithm

    -
    public Compression.Algorithm getCompressionAlgorithm()
    +
    public Compression.Algorithm getCompressionAlgorithm()
    Specified by:
    getCompressionAlgorithm in interface HFile.Reader
    @@ -1150,7 +1150,7 @@ implements

  • indexSize

    -
    public long indexSize()
    +
    public long indexSize()
    Specified by:
    indexSize in interface HFile.Reader
    @@ -1164,7 +1164,7 @@ implements

  • getName

    -
    public String getName()
    +
    public String getName()
    Description copied from interface: HFile.Reader
    Returns this reader's "name". Usually the last component of the path. Needs to be constant as the file is being moved to support caching on @@ -1181,7 +1181,7 @@ implements

  • getDataBlockIndexReader

    -
    public HFileBlockIndex.BlockIndexReader getDataBlockIndexReader()
    +
    public HFileBlockIndex.BlockIndexReader getDataBlockIndexReader()
    Specified by:
    getDataBlockIndexReader in interface HFile.Reader
    @@ -1194,7 +1194,7 @@ implements

  • getTrailer

    -
    public FixedFileTrailer getTrailer()
    +
    public FixedFileTrailer getTrailer()
    Specified by:
    getTrailer in interface HFile.Reader
    @@ -1207,7 +1207,7 @@ implements

  • isPrimaryReplicaReader

    -
    public boolean isPrimaryReplicaReader()
    +
    public boolean isPrimaryReplicaReader()
    Specified by:
    isPrimaryReplicaReader in interface HFile.Reader
    @@ -1220,7 +1220,7 @@ implements

  • setPrimaryReplicaReader

    -
    public void setPrimaryReplicaReader(boolean isPrimaryReplicaReader)
    +
    public void setPrimaryReplicaReader(boolean isPrimaryReplicaReader)
    Specified by:
    setPrimaryReplicaReader in interface HFile.Reader
    @@ -1233,7 +1233,7 @@ implements

  • loadFileInfo

    -
    public HFile.FileInfo loadFileInfo()
+
    public HFile.FileInfo loadFileInfo()
                             throws IOException
    
 
    
 
    Specified by:
    
@@ -1248,7 +1248,7 @@ implements 
 
  • 
 
    getPath
    
-
    public org.apache.hadoop.fs.Path getPath()
    
+
    public org.apache.hadoop.fs.Path getPath()
    
 
    
 
    Specified by:
    
 
    getPath in interface HFile.Reader
    
@@ -1261,7 +1261,7 @@ implements 
 
  • 
 
    getDataBlockEncoding
    
-
    public DataBlockEncoding getDataBlockEncoding()
    
+
    public DataBlockEncoding getDataBlockEncoding()
    
 
    
 
    Specified by:
    
 
    getDataBlockEncoding in interface HFile.Reader
    
@@ -1274,7 +1274,7 @@ implements 
 
  • 
 
    getConf
    
-
    public org.apache.hadoop.conf.Configuration getConf()
    
+
    public org.apache.hadoop.conf.Configuration getConf()
    
 
    
 
    Specified by:
    
 
    getConf in interface org.apache.hadoop.conf.Configurable
    
@@ -1287,7 +1287,7 @@ implements 
 
  • 
 
    setConf
    
-
    public void setConf(org.apache.hadoop.conf.Configuration conf)
    
+
    public void setConf(org.apache.hadoop.conf.Configuration conf)
    
 
    
 
    Specified by:
    
 
    setConf in interface org.apache.hadoop.conf.Configurable
    
@@ -1300,7 +1300,7 @@ implements 
 
  • 
 
    isDecodeMemstoreTS
    
-
    public boolean isDecodeMemstoreTS()
    
+
    public boolean isDecodeMemstoreTS()
    
 
    
 
    Specified by:
    
 
    isDecodeMemstoreTS in interface HFile.Reader
    
@@ -1313,7 +1313,7 @@ implements 
 
  • 
 
    shouldIncludeMemstoreTS
    
-
    public boolean shouldIncludeMemstoreTS()
    
+
    public boolean shouldIncludeMemstoreTS()
    
 
    
 
    Specified by:
    
 
    shouldIncludeMemstoreTS in interface HFile.Reader
    
@@ -1326,7 +1326,7 @@ implements 
 
  • 
 
    getCachedBlock
    
-
    private HFileBlock getCachedBlock(BlockCacheKey cacheKey,
+
    private HFileBlock getCachedBlock(BlockCacheKey cacheKey,
                         boolean cacheBlock,
                         boolean useLock,
                         boolean isCompaction,
@@ -1346,7 +1346,7 @@ implements 
 
  • 
 
    getMetaBlock
    
-
    public HFileBlock getMetaBlock(String metaBlockName,
+
    public HFileBlock getMetaBlock(String metaBlockName,
                       boolean cacheBlock)
                         throws IOException
    
 
    
@@ -1364,7 +1364,7 @@ implements 
 
  • 
 
    readBlock
    
-
    public HFileBlock readBlock(long dataBlockOffset,
+
    public HFileBlock readBlock(long dataBlockOffset,
                    long onDiskBlockSize,
                    boolean cacheBlock,
                    boolean pread,
@@ -1395,7 +1395,7 @@ implements 
 
  • 
 
    hasMVCCInfo
    
-
    public boolean hasMVCCInfo()
    
+
    public boolean hasMVCCInfo()
    
 
    
 
    Specified by:
    
 
    hasMVCCInfo in interface HFile.Reader
    
@@ -1408,7 +1408,7 @@ implements 
 
  • 
 
    validateBlockType
    
-
    private void validateBlockType(HFileBlock block,
+
    private void validateBlockType(HFileBlock block,
                      BlockType expectedBlockType)
                         throws IOException
    
 
    Compares the actual type of a block retrieved from cache or disk with its
@@ -1427,7 +1427,7 @@ implements 
 
  • 
 
    getLastKey
    
-
    public Cell getLastKey()
    
+
    public Cell getLastKey()
    
 
    
 
    Specified by:
    
 
    getLastKey in interface HFile.Reader
    
@@ -1442,7 +1442,7 @@ implements 
 
  • 
 
    midkey
    
-
    public Cell midkey()
+
    public Cell midkey()
             throws IOException
    
 
    
 
    Specified by:
    
@@ -1459,7 +1459,7 @@ implements 
 
  • 
 
    close
    
-
    public void close()
+
    public void close()
            throws IOException
    
 
    
 
    Specified by:
    
@@ -1476,7 +1476,7 @@ implements 
 
  • 
 
    close
    
-
    public void close(boolean evictOnClose)
+
    public void close(boolean evictOnClose)
            throws IOException
    
 
    Description copied from interface: HFile.Reader
    
 
    Close method with optional evictOnClose
    
@@ -1493,7 +1493,7 @@ implements 
 
  • 
 
    getEffectiveEncodingInCache
    
-
    public DataBlockEncoding getEffectiveEncodingInCache(boolean isCompaction)
    
+
    public DataBlockEncoding getEffectiveEncodingInCache(boolean isCompaction)
    
 
    
 
    Specified by:
    
 
    getEffectiveEncodingInCache in interface HFile.Reader
    
@@ -1506,7 +1506,7 @@ implements 
 
  • 
 
    getUncachedBlockReader
    
-
    public HFileBlock.FSReader getUncachedBlockReader()
    
+
    public HFileBlock.FSReader getUncachedBlockReader()
    
 
    For testing
    
 
    
 
    Specified by:
    
@@ -1520,7 +1520,7 @@ implements 
 
  • 
 
    getGeneralBloomFilterMetadata
    
-
    public DataInput getGeneralBloomFilterMetadata()
+
    public DataInput getGeneralBloomFilterMetadata()
                                         throws IOException
    
 
    Returns a buffer with the Bloom filter metadata. The caller takes
  ownership of the buffer.
    
@@ -1537,7 +1537,7 @@ implements 
 
  • 
 
    getDeleteBloomFilterMetadata
    
-
    public DataInput getDeleteBloomFilterMetadata()
+
    public DataInput getDeleteBloomFilterMetadata()
                                        throws IOException
    
 
    Description copied from interface: HFile.Reader
    
 
    Retrieves delete family Bloom filter metadata as appropriate for each
@@ -1556,7 +1556,7 @@ implements 
 
  • 
 
    getBloomFilterMetadata
    
-
    private DataInput getBloomFilterMetadata(BlockType blockType)
+
    private DataInput getBloomFilterMetadata(BlockType blockType)
                                   throws IOException
    
 
    Throws:
    
 
    IOException
    
@@ -1568,7 +1568,7 @@ implements 
 
  • 
 
    isFileInfoLoaded
    
-
    public boolean isFileInfoLoaded()
    
+
    public boolean isFileInfoLoaded()
    
 
    • 
 
 
@@ -1577,7 +1577,7 @@ implements 
 
  • 
 
    getFileContext
    
-
    public HFileContext getFileContext()
    
+
    public HFileContext getFileContext()
    
 
    Description copied from interface: HFile.Reader
    
 
    Return the file context of the HFile this reader belongs to
    
 
    
@@ -1592,7 +1592,7 @@ implements 
 
  • 
 
    prefetchComplete
    
-
    public boolean prefetchComplete()
    
+
    public boolean prefetchComplete()
    
 
    Returns false if block prefetching was requested for this file and has
  not completed, true otherwise
    
 
    
@@ -1607,7 +1607,7 @@ implements 
 
  • 
 
    createHFileContext
    
-
    protected HFileContext createHFileContext(FSDataInputStreamWrapper fsdis,
+
    protected HFileContext createHFileContext(FSDataInputStreamWrapper fsdis,
                               long fileSize,
                               HFileSystem hfs,
                               org.apache.hadoop.fs.Path path,
@@ -1623,7 +1623,7 @@ implements 
 
  • 
 
    getScanner
    
-
    public HFileScanner getScanner(boolean cacheBlocks,
+
    public HFileScanner getScanner(boolean cacheBlocks,
                       boolean pread)
    
 
    Create a Scanner on this file. No seeks or reads are done on creation. Call
  HFileScanner.seekTo(Cell) to position an start the read. There is
@@ -1644,7 +1644,7 @@ implements 
 
  • 
 
    getScanner
    
-
    public HFileScanner getScanner(boolean cacheBlocks,
+
    public HFileScanner getScanner(boolean cacheBlocks,
                       boolean pread,
                       boolean isCompaction)
    
 
    Create a Scanner on this file. No seeks or reads are done on creation. Call
@@ -1665,7 +1665,7 @@ implements 
 
  • 
 
    getMajorVersion
    
-
    public int getMajorVersion()
    
+
    public int getMajorVersion()
    
 
    • 
 
 
    • 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40ef21e4/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 3ef5593..6d4d805 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
@@ -390,7 +390,8 @@
 
 
 protected boolean
-HFileBlock.FSReaderImpl.validateBlockChecksum(HFileBlock block,
+HFileBlock.FSReaderImpl.validateBlockChecksum(HFileBlock block,
+                                          long offset,
                                           byte[] data,
                                           int hdrSize)
 
    Generates the checksum for the header as well as the data and
@@ -399,7 +400,8 @@
 
 
 (package private) static boolean
-ChecksumUtil.validateBlockChecksum(String pathName,
+ChecksumUtil.validateBlockChecksum(String pathName,
+                                          long offset,
                                           HFileBlock block,
                                           byte[] data,
                                           int hdrSize)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40ef21e4/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 4e3d45a..7b98af0 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -270,12 +270,12 @@
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40ef21e4/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index 8697762..e166280 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -267,9 +267,9 @@