hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmhs...@apache.org
Subject svn commit: r1446173 [1/5] - in /hbase/branches/hbase-7290v2: ./ bin/ hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/ hbase-common/src/main/java/org/apache/hadoop/hbase/util/ hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/...
Date Thu, 14 Feb 2013 13:35:59 GMT
Author: jmhsieh
Date: Thu Feb 14 13:35:54 2013
New Revision: 1446173

URL: http://svn.apache.org/r1446173
Log:
Merge online snapshot branch with trunk 2/12/13

Added:
    hbase/branches/hbase-7290v2/hbase-prefix-tree/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/pom.xml
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/pom.xml
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeBlockMeta.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeBlockMeta.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeCodec.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeCodec.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeSeeker.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/PrefixTreeSeeker.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/ArraySearcherPool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/ArraySearcherPool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/DecoderFactory.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/DecoderFactory.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayReversibleScanner.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArrayScanner.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeArraySearcher.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeCell.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/PrefixTreeCell.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnNodeReader.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnReader.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/column/ColumnReader.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/row/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/row/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/row/RowNodeReader.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/row/RowNodeReader.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/MvccVersionDecoder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/decode/timestamp/TimestampDecoder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderFactory.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderFactory.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderPool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/EncoderPool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/PrefixTreeEncoder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/ThreadLocalEncoderPool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnNodeWriter.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/column/ColumnSectionWriter.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/CellTypeEncoder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/LongEncoder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/other/LongEncoder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowNodeWriter.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowNodeWriter.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenDepthComparator.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/Tokenizer.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchPosition.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/encode/tokenize/TokenizerRowSearchResult.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellScanner.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellScanner.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellSearcher.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/CellSearcher.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/codec/prefixtree/scanner/ReversibleCellScanner.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/ByteRangeSet.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/ByteRangeSet.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeHashSet.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeHashSet.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeTreeSet.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/byterange/impl/ByteRangeTreeSet.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UFIntTool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UFIntTool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVIntTool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVIntTool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVLongTool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/main/java/org/apache/hbase/util/vint/UVLongTool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/keyvalue/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/keyvalue/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/keyvalue/TestKeyValueTool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/keyvalue/TestKeyValueTool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/PrefixTreeTestConstants.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/PrefixTreeTestConstants.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/blockmeta/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/blockmeta/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizer.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizer.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizerData.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTokenizerData.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTreeDepth.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/TestTreeDepth.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataBasic.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/builder/data/TestTokenizerDataEdgeCase.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnBuilder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnBuilder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnData.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/TestColumnData.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataRandom.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/column/data/TestColumnDataSimple.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/BaseTestRowData.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/BaseTestRowData.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowData.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowData.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowEncoder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/TestRowEncoder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataComplexQualifiers.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDeeper.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataDifferentTimestamps.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataEmpty.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataExerciseFInts.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataMultiFamilies.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNub.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNub.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataNumberStrings.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataQualifierByteOrdering.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataRandomKeyValues.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSearcherRowMiss.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSimple.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSimple.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataSingleQualifier.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataTrivial.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrls.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrls.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/row/data/TestRowDataUrlsExample.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampData.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampData.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataBasic.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataNumbers.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/codec/prefixtree/timestamp/data/TestTimestampDataRepeats.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/bytes/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/bytes/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/bytes/TestByteRange.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/bytes/TestByteRange.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/comparator/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/comparator/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/comparator/ByteArrayComparator.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/comparator/ByteArrayComparator.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/NumberFormatter.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/NumberFormatter.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/RandomNumberUtils.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/number/RandomNumberUtils.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/
      - copied from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestFIntTool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestFIntTool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVIntTool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVIntTool.java
    hbase/branches/hbase-7290v2/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVLongTool.java
      - copied unchanged from r1445294, hbase/trunk/hbase-prefix-tree/src/test/java/org/apache/hbase/util/vint/TestVLongTool.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormat.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormat.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatBase.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreConfigInformation.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreConfigInformation.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileManager.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFileManager.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/resources/hbase-webapps/rest/
      - copied from r1445294, hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/
    hbase/branches/hbase-7290v2/hbase-server/src/main/resources/hbase-webapps/rest/index.html
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/index.html
    hbase/branches/hbase-7290v2/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/resources/hbase-webapps/rest/rest.jsp
    hbase/branches/hbase-7290v2/hbase-server/src/main/resources/hbase-webapps/thrift/
      - copied from r1445294, hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/
    hbase/branches/hbase-7290v2/hbase-server/src/main/resources/hbase-webapps/thrift/index.html
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/index.html
    hbase/branches/hbase-7290v2/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/
      - copied from r1445294, hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java
      - copied unchanged from r1445294, hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java
    hbase/branches/hbase-7290v2/src/site/resources/images/big_h_logo.png
      - copied unchanged from r1445294, hbase/trunk/src/site/resources/images/big_h_logo.png
    hbase/branches/hbase-7290v2/src/site/resources/images/big_h_logo.svg
      - copied unchanged from r1445294, hbase/trunk/src/site/resources/images/big_h_logo.svg
Removed:
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreConfiguration.java
Modified:
    hbase/branches/hbase-7290v2/   (props changed)
    hbase/branches/hbase-7290v2/bin/rolling-restart.sh
    hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java
    hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeTool.java
    hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
    hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java
    hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellComparator.java
    hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellOutputStream.java
    hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
    hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRebalanceAndKillServersTargeted.java
    hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java
    hbase/branches/hbase-7290v2/hbase-server/pom.xml
    hbase/branches/hbase-7290v2/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/package-info.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/DeadServer.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/GeneralBulkAssigner.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionStates.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/ServerShutdownHandler.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyPrefixRegionSplitPolicy.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStore.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreUtils.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactSelection.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionConfiguration.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionPolicy.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/DefaultCompactionPolicy.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/handler/OpenRegionHandler.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLogSplitter.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServer.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftServer.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HMerge.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/util/hbck/HFileCorruptionChecker.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
    hbase/branches/hbase-7290v2/hbase-server/src/main/resources/hbase-webapps/static/hbase_logo.png
    hbase/branches/hbase-7290v2/hbase-server/src/main/ruby/hbase/admin.rb
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestCase.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/PerformanceEvaluation.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
    hbase/branches/hbase-7290v2/hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java
    hbase/branches/hbase-7290v2/pom.xml
    hbase/branches/hbase-7290v2/src/docbkx/book.xml
    hbase/branches/hbase-7290v2/src/docbkx/ops_mgt.xml
    hbase/branches/hbase-7290v2/src/site/resources/images/hbase_logo.png
    hbase/branches/hbase-7290v2/src/site/resources/images/hbase_logo.svg
    hbase/branches/hbase-7290v2/src/site/xdoc/index.xml

Propchange: hbase/branches/hbase-7290v2/
------------------------------------------------------------------------------
  Merged /hbase/trunk:r1441322-1445294

Modified: hbase/branches/hbase-7290v2/bin/rolling-restart.sh
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/bin/rolling-restart.sh?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/bin/rolling-restart.sh (original)
+++ hbase/branches/hbase-7290v2/bin/rolling-restart.sh Thu Feb 14 13:35:54 2013
@@ -107,7 +107,7 @@ else 
     if [ "$zmaster" == "null" ]; then zmaster="master"; fi
     zmaster=$zparent/$zmaster
     echo -n "Waiting for Master ZNode ${zmaster} to expire"
-    while ! bin/hbase zkcli stat $zmaster 2>&1 | grep "Node does not exist"; do
+    while ! "$bin"/hbase zkcli stat $zmaster 2>&1 | grep "Node does not exist"; do
       echo -n "."
       sleep 1
     done

Modified: hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java (original)
+++ hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/io/encoding/DataBlockEncoding.java Thu Feb 14 13:35:54 2013
@@ -38,7 +38,10 @@ public enum DataBlockEncoding {
   // id 1 is reserved for the BITSET algorithm to be added later
   PREFIX(2, createEncoder("org.apache.hadoop.hbase.io.encoding.PrefixKeyDeltaEncoder")),
   DIFF(3, createEncoder("org.apache.hadoop.hbase.io.encoding.DiffKeyDeltaEncoder")),
-  FAST_DIFF(4, createEncoder("org.apache.hadoop.hbase.io.encoding.FastDiffDeltaEncoder"));
+  FAST_DIFF(4, createEncoder("org.apache.hadoop.hbase.io.encoding.FastDiffDeltaEncoder")),
+  // id 5 is reserved for the COPY_KEY algorithm for benchmarking
+  // COPY_KEY(5, createEncoder("org.apache.hadoop.hbase.io.encoding.CopyKeyDataBlockEncoder")),
+  PREFIX_TREE(6, createEncoder("org.apache.hbase.codec.prefixtree.PrefixTreeCodec"));
 
   private final short id;
   private final byte[] idInBytes;

Modified: hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeTool.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeTool.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeTool.java (original)
+++ hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteRangeTool.java Thu Feb 14 13:35:54 2013
@@ -18,6 +18,8 @@
 
 package org.apache.hadoop.hbase.util;
 
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -50,4 +52,14 @@ public class ByteRangeTool {
     return ranges;
   }
 
+  public static void write(OutputStream os, ByteRange byteRange) throws IOException {
+    os.write(byteRange.getBytes(), byteRange.getOffset(), byteRange.getLength());
+  }
+
+  public static void write(OutputStream os, ByteRange byteRange, int byteRangeInnerOffset)
+      throws IOException {
+    os.write(byteRange.getBytes(), byteRange.getOffset() + byteRangeInnerOffset,
+      byteRange.getLength() - byteRangeInnerOffset);
+  }
+
 }

Modified: hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java (original)
+++ hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java Thu Feb 14 13:35:54 2013
@@ -27,8 +27,10 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
+import java.util.List;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,6 +45,7 @@ import org.apache.hadoop.io.WritableUtil
 import sun.misc.Unsafe;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Lists;
 
 /**
  * Utility class that handles byte arrays, conversions to/from other types,
@@ -1718,4 +1721,44 @@ public class Bytes {
     return out;
   }
 
+  public static boolean equals(List<byte[]> a, List<byte[]> b) {
+    if (a == null) {
+      if (b == null) {
+        return true;
+      }
+      return false;
+    }
+    if (b == null) {
+      return false;
+    }
+    if (a.size() != b.size()) {
+      return false;
+    }
+    for (int i = 0; i < a.size(); ++i) {
+      if (!Bytes.equals(a.get(i), b.get(i))) {
+        return false;
+      }
+    }
+    return true;
+  }
+
+  public static boolean isSorted(Collection<byte[]> arrays) {
+    byte[] previous = new byte[0];
+    for (byte[] array : IterableUtils.nullSafe(arrays)) {
+      if (Bytes.compareTo(previous, array) > 0) {
+        return false;
+      }
+      previous = array;
+    }
+    return true;
+  }
+
+  public static List<byte[]> getUtf8ByteArrays(List<String> strings) {
+    List<byte[]> byteArrays = Lists.newArrayListWithCapacity(CollectionUtils.nullSafeSize(strings));
+    for (String s : IterableUtils.nullSafe(strings)) {
+      byteArrays.add(Bytes.toBytes(s));
+    }
+    return byteArrays;
+  }
+
 }

Modified: hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java (original)
+++ hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hadoop/hbase/util/test/RedundantKVGenerator.java Thu Feb 14 13:35:54 2013
@@ -28,12 +28,15 @@ import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.util.ByteBufferUtils;
 import org.apache.hadoop.io.WritableUtils;
 
+import com.google.common.primitives.Bytes;
+
 /**
  * Generate list of key values which are very useful to test data block encoding
  * and compression.
  */
 public class RedundantKVGenerator {
   // row settings
+  static byte[] DEFAULT_COMMON_PREFIX = new byte[0];
   static int DEFAULT_NUMBER_OF_ROW_PREFIXES = 10;
   static int DEFAULT_AVERAGE_PREFIX_LENGTH = 6;
   static int DEFAULT_PREFIX_LENGTH_VARIANCE = 3;
@@ -107,6 +110,7 @@ public class RedundantKVGenerator {
       ) {
     this.randomizer = randomizer;
 
+    this.commonPrefix = DEFAULT_COMMON_PREFIX;
     this.numberOfRowPrefixes = numberOfRowPrefixes;
     this.averagePrefixLength = averagePrefixLength;
     this.prefixLengthVariance = prefixLengthVariance;
@@ -115,7 +119,7 @@ public class RedundantKVGenerator {
     this.numberOfRows = numberOfRows;
 
     this.chanceForSameQualifier = chanceForSameQualifier;
-    this.chanceForSimiliarQualifier = chanceForSimiliarQualifier;
+    this.chanceForSimilarQualifier = chanceForSimiliarQualifier;
     this.averageQualifierLength = averageQualifierLength;
     this.qualifierLengthVariance = qualifierLengthVariance;
 
@@ -131,6 +135,7 @@ public class RedundantKVGenerator {
   private Random randomizer;
 
   // row settings
+  private byte[] commonPrefix;//global prefix before rowPrefixes
   private int numberOfRowPrefixes;
   private int averagePrefixLength = 6;
   private int prefixLengthVariance = 3;
@@ -138,9 +143,12 @@ public class RedundantKVGenerator {
   private int suffixLengthVariance = 3;
   private int numberOfRows = 500;
 
+  //family
+  private byte[] family;
+
   // qualifier
   private float chanceForSameQualifier = 0.5f;
-  private float chanceForSimiliarQualifier = 0.4f;
+  private float chanceForSimilarQualifier = 0.4f;
   private int averageQualifierLength = 9;
   private int qualifierLengthVariance = 3;
 
@@ -161,7 +169,8 @@ public class RedundantKVGenerator {
           prefixLengthVariance;
       byte[] newPrefix = new byte[prefixLength];
       randomizer.nextBytes(newPrefix);
-      prefixes.add(newPrefix);
+      byte[] newPrefixWithCommon = newPrefix;
+      prefixes.add(newPrefixWithCommon);
     }
 
     // generate rest of the row
@@ -173,7 +182,8 @@ public class RedundantKVGenerator {
       int randomPrefix = randomizer.nextInt(prefixes.size());
       byte[] row = new byte[prefixes.get(randomPrefix).length +
                             suffixLength];
-      rows.add(row);
+      byte[] rowWithCommonPrefix = Bytes.concat(commonPrefix, row);
+      rows.add(rowWithCommonPrefix);
     }
 
     return rows;
@@ -188,20 +198,22 @@ public class RedundantKVGenerator {
     List<KeyValue> result = new ArrayList<KeyValue>();
 
     List<byte[]> rows = generateRows();
-    Map<Integer, List<byte[]>> rowsToQualifier =
-        new HashMap<Integer, List<byte[]>>();
+    Map<Integer, List<byte[]>> rowsToQualifier = new HashMap<Integer, List<byte[]>>();
 
-    byte[] family = new byte[columnFamilyLength];
-    randomizer.nextBytes(family);
+    if(family==null){
+      family = new byte[columnFamilyLength];
+      randomizer.nextBytes(family);
+    }
 
-    long baseTimestamp = Math.abs(randomizer.nextLong()) /
-        baseTimestampDivide;
+    long baseTimestamp = Math.abs(randomizer.nextLong()) / baseTimestampDivide;
 
     byte[] value = new byte[valueLength];
 
     for (int i = 0; i < howMany; ++i) {
-      long timestamp = baseTimestamp + randomizer.nextInt(
-          timestampDiffSize);
+      long timestamp = baseTimestamp;
+      if(timestampDiffSize > 0){
+        timestamp += randomizer.nextInt(timestampDiffSize);
+      }
       Integer rowId = randomizer.nextInt(rows.size());
       byte[] row = rows.get(rowId);
 
@@ -209,13 +221,11 @@ public class RedundantKVGenerator {
       // occasionally completely different
       byte[] qualifier;
       float qualifierChance = randomizer.nextFloat();
-      if (!rowsToQualifier.containsKey(rowId) ||
-          qualifierChance > chanceForSameQualifier +
-          chanceForSimiliarQualifier) {
+      if (!rowsToQualifier.containsKey(rowId)
+          || qualifierChance > chanceForSameQualifier + chanceForSimilarQualifier) {
         int qualifierLength = averageQualifierLength;
-        qualifierLength +=
-            randomizer.nextInt(2 * qualifierLengthVariance + 1) -
-            qualifierLengthVariance;
+        qualifierLength += randomizer.nextInt(2 * qualifierLengthVariance + 1)
+            - qualifierLengthVariance;
         qualifier = new byte[qualifierLength];
         randomizer.nextBytes(qualifier);
 
@@ -227,8 +237,8 @@ public class RedundantKVGenerator {
       } else if (qualifierChance > chanceForSameQualifier) {
         // similar qualifier
         List<byte[]> previousQualifiers = rowsToQualifier.get(rowId);
-        byte[] originalQualifier = previousQualifiers.get(
-            randomizer.nextInt(previousQualifiers.size()));
+        byte[] originalQualifier = previousQualifiers.get(randomizer.nextInt(previousQualifiers
+            .size()));
 
         qualifier = new byte[originalQualifier.length];
         int commonPrefix = randomizer.nextInt(qualifier.length);
@@ -241,8 +251,7 @@ public class RedundantKVGenerator {
       } else {
         // same qualifier
         List<byte[]> previousQualifiers = rowsToQualifier.get(rowId);
-        qualifier = previousQualifiers.get(
-            randomizer.nextInt(previousQualifiers.size()));
+        qualifier = previousQualifiers.get(randomizer.nextInt(previousQualifiers.size()));
       }
 
       if (randomizer.nextFloat() < chanceForZeroValue) {
@@ -286,5 +295,99 @@ public class RedundantKVGenerator {
 
     return result;
   }
+  
+  
+  /************************ get/set ***********************************/
+  
+  public RedundantKVGenerator setCommonPrefix(byte[] prefix){
+    this.commonPrefix = prefix;
+    return this;
+  }
+
+  public RedundantKVGenerator setRandomizer(Random randomizer) {
+    this.randomizer = randomizer;
+    return this;
+  }
+
+  public RedundantKVGenerator setNumberOfRowPrefixes(int numberOfRowPrefixes) {
+    this.numberOfRowPrefixes = numberOfRowPrefixes;
+    return this;
+  }
+
+  public RedundantKVGenerator setAveragePrefixLength(int averagePrefixLength) {
+    this.averagePrefixLength = averagePrefixLength;
+    return this;
+  }
 
+  public RedundantKVGenerator setPrefixLengthVariance(int prefixLengthVariance) {
+    this.prefixLengthVariance = prefixLengthVariance;
+    return this;
+  }
+
+  public RedundantKVGenerator setAverageSuffixLength(int averageSuffixLength) {
+    this.averageSuffixLength = averageSuffixLength;
+    return this;
+  }
+
+  public RedundantKVGenerator setSuffixLengthVariance(int suffixLengthVariance) {
+    this.suffixLengthVariance = suffixLengthVariance;
+    return this;
+  }
+
+  public RedundantKVGenerator setNumberOfRows(int numberOfRows) {
+    this.numberOfRows = numberOfRows;
+    return this;
+  }
+
+  public RedundantKVGenerator setChanceForSameQualifier(float chanceForSameQualifier) {
+    this.chanceForSameQualifier = chanceForSameQualifier;
+    return this;
+  }
+
+  public RedundantKVGenerator setChanceForSimilarQualifier(float chanceForSimiliarQualifier) {
+    this.chanceForSimilarQualifier = chanceForSimiliarQualifier;
+    return this;
+  }
+
+  public RedundantKVGenerator setAverageQualifierLength(int averageQualifierLength) {
+    this.averageQualifierLength = averageQualifierLength;
+    return this;
+  }
+
+  public RedundantKVGenerator setQualifierLengthVariance(int qualifierLengthVariance) {
+    this.qualifierLengthVariance = qualifierLengthVariance;
+    return this;
+  }
+
+  public RedundantKVGenerator setColumnFamilyLength(int columnFamilyLength) {
+    this.columnFamilyLength = columnFamilyLength;
+    return this;
+  }
+
+  public RedundantKVGenerator setFamily(byte[] family) {
+    this.family = family;
+    this.columnFamilyLength = family.length;
+    return this;
+  }
+
+  public RedundantKVGenerator setValueLength(int valueLength) {
+    this.valueLength = valueLength;
+    return this;
+  }
+
+  public RedundantKVGenerator setChanceForZeroValue(float chanceForZeroValue) {
+    this.chanceForZeroValue = chanceForZeroValue;
+    return this;
+  }
+
+  public RedundantKVGenerator setBaseTimestampDivide(int baseTimestampDivide) {
+    this.baseTimestampDivide = baseTimestampDivide;
+    return this;
+  }
+
+  public RedundantKVGenerator setTimestampDiffSize(int timestampDiffSize) {
+    this.timestampDiffSize = timestampDiffSize;
+    return this;
+  }
+  
 }

Modified: hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellComparator.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellComparator.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellComparator.java (original)
+++ hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellComparator.java Thu Feb 14 13:35:54 2013
@@ -79,22 +79,39 @@ public class CellComparator implements C
   /**************** equals ****************************/
 
   public static boolean equals(Cell a, Cell b){
-    if (!areKeyLengthsEqual(a, b)) {
-      return false;
-    }
-    //TODO compare byte[]'s in reverse since later bytes more likely to differ
-    return 0 == compareStatic(a, b);
+    return equalsRow(a, b)
+        && equalsFamily(a, b)
+        && equalsQualifier(a, b)
+        && equalsTimestamp(a, b)
+        && equalsType(a, b);
   }
 
   public static boolean equalsRow(Cell a, Cell b){
-    if(!areRowLengthsEqual(a, b)){
-      return false;
-    }
-    return 0 == Bytes.compareTo(
+    return Bytes.equals(
       a.getRowArray(), a.getRowOffset(), a.getRowLength(),
       b.getRowArray(), b.getRowOffset(), b.getRowLength());
   }
 
+  public static boolean equalsFamily(Cell a, Cell b){
+    return Bytes.equals(
+      a.getFamilyArray(), a.getFamilyOffset(), a.getFamilyLength(),
+      b.getFamilyArray(), b.getFamilyOffset(), b.getFamilyLength());
+  }
+
+  public static boolean equalsQualifier(Cell a, Cell b){
+    return Bytes.equals(
+      a.getQualifierArray(), a.getQualifierOffset(), a.getQualifierLength(),
+      b.getQualifierArray(), b.getQualifierOffset(), b.getQualifierLength());
+  }
+
+  public static boolean equalsTimestamp(Cell a, Cell b){
+    return a.getTimestamp() == b.getTimestamp();
+  }
+
+  public static boolean equalsType(Cell a, Cell b){
+    return a.getTypeByte() == b.getTypeByte();
+  }
+
 
   /********************* hashCode ************************/
 

Modified: hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellOutputStream.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellOutputStream.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellOutputStream.java (original)
+++ hbase/branches/hbase-7290v2/hbase-common/src/main/java/org/apache/hbase/cell/CellOutputStream.java Thu Feb 14 13:35:54 2013
@@ -18,6 +18,8 @@
 
 package org.apache.hbase.cell;
 
+import java.io.IOException;
+
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hbase.Cell;
@@ -45,6 +47,6 @@ public interface CellOutputStream {
    * that can then be read from the implementation to be sent to disk, put in the block cache, or
    * sent over the network.
    */
-  void flush();
+  void flush() throws IOException;
 
 }

Modified: hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java (original)
+++ hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java Thu Feb 14 13:35:54 2013
@@ -30,6 +30,7 @@ import org.apache.hadoop.hbase.client.HC
 import org.apache.hadoop.hbase.client.HConnectionManager;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.ServerInfo;
+import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Threads;
 
 import com.google.common.collect.Sets;
@@ -186,6 +187,9 @@ public class DistributedHBaseCluster ext
     HConnection connection = admin.getConnection();
     HRegionLocation regionLoc = connection.locateRegion(regionName);
     if (regionLoc == null) {
+      LOG.warn("Cannot find region server holding region " + Bytes.toString(regionName)
+          + " for table " + HRegionInfo.getTableName(regionName) + ", start key [" +
+          Bytes.toString(HRegionInfo.getStartKey(regionName)) + "]");
       return null;
     }
 

Modified: hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRebalanceAndKillServersTargeted.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRebalanceAndKillServersTargeted.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRebalanceAndKillServersTargeted.java (original)
+++ hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRebalanceAndKillServersTargeted.java Thu Feb 14 13:35:54 2013
@@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.util.Chao
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.Ignore;
 import org.junit.experimental.categories.Category;
 
 /**
@@ -42,7 +43,7 @@ import org.junit.experimental.categories
  * killing some of these servers, and triggering balancer.
  * It's configured using a set of constants on top, which cover this scenario and are
  * reasonable for minicluster. See constants if you want to tweak the test.
- * You can configure how long the test should run by using 
+ * You can configure how long the test should run by using
  * "hbase.IntegrationTestRebalanceAndKillServersTargeted.runtime" configuration parameter,
  * which is probably most useful on cluster.
  */
@@ -116,7 +117,8 @@ public class IntegrationTestRebalanceAnd
     super.tearDown();
   }
 
-  @Test
+  // Disabled until we fix hbase-7520
+  @Ignore @Test
   public void testDataIngest() throws Exception {
     runIngestTest(DEFAULT_RUN_TIME, 2500, 10, 100, 20);
   }

Modified: hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java (original)
+++ hbase/branches/hbase-7290v2/hbase-it/src/test/java/org/apache/hadoop/hbase/util/ChaosMonkey.java Thu Feb 14 13:35:54 2013
@@ -301,7 +301,7 @@ public class ChaosMonkey extends Abstrac
     @Override
     protected void perform() throws Exception {
       LOG.info("Performing action: Restart region server holding ROOT");
-      ServerName server = cluster.getServerHoldingMeta();
+      ServerName server = cluster.getServerHoldingRoot();
       if (server == null) {
         LOG.warn("No server is holding -ROOT- right now.");
         return;

Modified: hbase/branches/hbase-7290v2/hbase-server/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/pom.xml?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/pom.xml (original)
+++ hbase/branches/hbase-7290v2/hbase-server/pom.xml Thu Feb 14 13:35:54 2013
@@ -114,6 +114,10 @@
                 <jspcompiler uriroot="${src.webapps}/master" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.master" webxml="${build.webapps}/master/WEB-INF/web.xml"/>
                 <mkdir dir="${build.webapps}/regionserver/WEB-INF"/>
                 <jspcompiler uriroot="${src.webapps}/regionserver" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.regionserver" webxml="${build.webapps}/regionserver/WEB-INF/web.xml"/>
+                <mkdir dir="${build.webapps}/rest/WEB-INF"/>
+                <jspcompiler uriroot="${src.webapps}/rest" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.rest" webxml="${build.webapps}/rest/WEB-INF/web.xml"/>
+                <mkdir dir="${build.webapps}/thrift/WEB-INF"/>
+                <jspcompiler uriroot="${src.webapps}/thrift" outputdir="${generated.sources}/java" package="org.apache.hadoop.hbase.generated.thrift" webxml="${build.webapps}/thrift/WEB-INF/web.xml"/>
                 <exec executable="sh">
                   <arg line="${basedir}/src/saveVersion.sh ${project.version} ${generated.sources}/java"/>
                 </exec>
@@ -280,6 +284,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-prefix-tree</artifactId>
+      <!-- unfortunately, runtime scope causes eclipse to put it in the compile time classpath -->
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-common</artifactId>
       <type>test-jar</type>
     </dependency>

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Thu Feb 14 13:35:54 2013
@@ -299,6 +299,7 @@ org.apache.hadoop.hbase.protobuf.generat
         <%if (frags != null) %>
             <th title="Fragmentation - Will be 0% after a major compaction and fluctuate during normal usage.">Frag.</th>
         </%if>
+        <th>Online Regions</th>
         <th>Description</th>
     </tr>
     <%for HTableDescriptor htDesc : tables%>
@@ -307,6 +308,7 @@ org.apache.hadoop.hbase.protobuf.generat
         <%if (frags != null) %>
             <td align="center"><% frags.get(htDesc.getNameAsString()) != null ? frags.get(htDesc.getNameAsString()).intValue() + "%" : "n/a" %></td>
         </%if>
+        <td><% master.getAssignmentManager().getRegionStates().getRegionsOfTable(htDesc.getName()).size() %>
         <td><% htDesc.toStringCustomizedValues() %></td>
     </tr>
     </%for>

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/DoNotRetryIOException.java Thu Feb 14 13:35:54 2013
@@ -52,4 +52,8 @@ public class DoNotRetryIOException exten
   public DoNotRetryIOException(String message, Throwable cause) {
     super(message, cause);
   }
+
+  public DoNotRetryIOException(Throwable cause) {
+    super(cause);
+  }
 }

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/PleaseHoldException.java Thu Feb 14 13:35:54 2013
@@ -18,7 +18,6 @@
  */
 package org.apache.hadoop.hbase;
 
-import java.io.IOException;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 
@@ -26,13 +25,21 @@ import org.apache.hadoop.classification.
  * This exception is thrown by the master when a region server was shut down and
  * restarted so fast that the master still hasn't processed the server shutdown
  * of the first instance, or when master is initializing and client call admin
- * operations
+ * operations, or when an operation is performed on a region server that is still starting.
  */
 @SuppressWarnings("serial")
 @InterfaceAudience.Public
 @InterfaceStability.Stable
-public class PleaseHoldException extends IOException {
+public class PleaseHoldException extends HBaseIOException {
   public PleaseHoldException(String message) {
     super(message);
   }
+
+  public PleaseHoldException(String message, Throwable cause) {
+    super(message, cause);
+  }
+
+  public PleaseHoldException(Throwable cause) {
+    super(cause);
+  }
 }

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ConnectionUtils.java Thu Feb 14 13:35:54 2013
@@ -49,4 +49,19 @@ public class ConnectionUtils {
     long jitter =  (long)(normalPause * RANDOM.nextFloat() * 0.01f); // 1% possible jitter
     return normalPause + jitter;
   }
+
+
+  /**
+   * Adds / subs a 10% jitter to a pause time. Minimum is 1.
+   * @param pause the expected pause.
+   * @param jitter the jitter ratio, between 0 and 1, exclusive.
+   */
+  public static long addJitter(final long pause, final float jitter) {
+    float lag = pause * (RANDOM.nextFloat() - 0.5f) * jitter;
+    long newPause = pause + (long) lag;
+    if (newPause <= 0) {
+      return 1;
+    }
+    return newPause;
+  }
 }

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Thu Feb 14 13:35:54 2013
@@ -584,9 +584,6 @@ public class HConnectionManager {
     throws ZooKeeperConnectionException {
       this.conf = conf;
       this.managed = managed;
-      // ProtobufRpcClientEngine is the main RpcClientEngine implementation,
-      // but we maintain access through an interface to allow overriding for tests
-      this.rpcEngine = new ProtobufRpcClientEngine(conf);
       String adminClassName = conf.get(REGION_PROTOCOL_CLASS,
         DEFAULT_ADMIN_PROTOCOL_CLASS);
       this.closed = false;
@@ -621,6 +618,10 @@ public class HConnectionManager {
           HConstants.DEFAULT_HBASE_CLIENT_PREFETCH_LIMIT);
 
       retrieveClusterId();
+      // ProtobufRpcClientEngine is the main RpcClientEngine implementation,
+      // but we maintain access through an interface to allow overriding for tests
+      // RPC engine setup must follow obtaining the cluster ID for token authentication to work
+      this.rpcEngine = new ProtobufRpcClientEngine(this.conf);
     }
 
     /**

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/Scan.java Thu Feb 14 13:35:54 2013
@@ -96,11 +96,14 @@ public class Scan extends OperationWithA
 
   // If application wants to collect scan metrics, it needs to
   // call scan.setAttribute(SCAN_ATTRIBUTES_ENABLE, Bytes.toBytes(Boolean.TRUE))
-  static public final String SCAN_ATTRIBUTES_METRICS_ENABLE =
-    "scan.attributes.metrics.enable";
-  static public final String SCAN_ATTRIBUTES_METRICS_DATA =
-    "scan.attributes.metrics.data";
-
+  static public final String SCAN_ATTRIBUTES_METRICS_ENABLE = "scan.attributes.metrics.enable";
+  static public final String SCAN_ATTRIBUTES_METRICS_DATA = "scan.attributes.metrics.data";
+  
+  // If an application wants to use multiple scans over different tables each scan must
+  // define this attribute with the appropriate table name by calling
+  // scan.setAttribute(Scan.SCAN_ATTRIBUTES_TABLE_NAME, Bytes.toBytes(tableName))
+  static public final String SCAN_ATTRIBUTES_TABLE_NAME = "scan.attributes.table.name";
+  
   /*
    * -1 means no caching
    */

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ServerCallable.java Thu Feb 14 13:35:54 2013
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.HConstant
 import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.ipc.HBaseClientRPC;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.ipc.RemoteException;
 
 import com.google.protobuf.ServiceException;
@@ -59,7 +60,9 @@ public abstract class ServerCallable<T> 
   protected HRegionLocation location;
   protected ClientProtocol server;
   protected int callTimeout;
+  protected long globalStartTime;
   protected long startTime, endTime;
+  protected final static int MIN_RPC_TIMEOUT = 2000;
 
   /**
    * @param connection Connection to use.
@@ -112,27 +115,20 @@ public abstract class ServerCallable<T> 
   }
 
   public void beforeCall() {
-    HBaseClientRPC.setRpcTimeout(this.callTimeout);
-    this.startTime = System.currentTimeMillis();
+    this.startTime = EnvironmentEdgeManager.currentTimeMillis();
+    int remaining = (int)(callTimeout - (this.startTime - this.globalStartTime));
+    if (remaining < MIN_RPC_TIMEOUT) {
+      // If there is no time left, we're trying anyway. It's too late.
+      // 0 means no timeout, and it's not the intent here. So we secure both cases by
+      // resetting to the minimum.
+      remaining = MIN_RPC_TIMEOUT;
+    }
+    HBaseClientRPC.setRpcTimeout(remaining);
   }
 
   public void afterCall() {
     HBaseClientRPC.resetRpcTimeout();
-    this.endTime = System.currentTimeMillis();
-  }
-
-  public void shouldRetry(Throwable throwable) throws IOException {
-    if (this.callTimeout != HConstants.DEFAULT_HBASE_CLIENT_OPERATION_TIMEOUT)
-      if (throwable instanceof SocketTimeoutException
-          || (this.endTime - this.startTime > this.callTimeout)) {
-        throw (SocketTimeoutException) (SocketTimeoutException) new SocketTimeoutException(
-            "Call to access row '" + Bytes.toString(row) + "' on table '"
-                + Bytes.toString(tableName)
-                + "' failed on socket timeout exception: " + throwable)
-            .initCause(throwable);
-      } else {
-        this.callTimeout = ((int) (this.endTime - this.startTime));
-      }
+    this.endTime = EnvironmentEdgeManager.currentTimeMillis();
   }
 
   /**
@@ -159,13 +155,13 @@ public abstract class ServerCallable<T> 
       HConstants.DEFAULT_HBASE_CLIENT_RETRIES_NUMBER);
     List<RetriesExhaustedException.ThrowableWithExtraContext> exceptions =
       new ArrayList<RetriesExhaustedException.ThrowableWithExtraContext>();
+    this.globalStartTime = EnvironmentEdgeManager.currentTimeMillis();
     for (int tries = 0; tries < numRetries; tries++) {
       try {
         beforeCall();
         connect(tries != 0);
         return call();
       } catch (Throwable t) {
-        shouldRetry(t);
         t = translateException(t);
         if (t instanceof SocketTimeoutException ||
             t instanceof ConnectException ||
@@ -180,11 +176,21 @@ public abstract class ServerCallable<T> 
         }
         RetriesExhaustedException.ThrowableWithExtraContext qt =
           new RetriesExhaustedException.ThrowableWithExtraContext(t,
-            System.currentTimeMillis(), toString());
+              EnvironmentEdgeManager.currentTimeMillis(), toString());
         exceptions.add(qt);
         if (tries == numRetries - 1) {
           throw new RetriesExhaustedException(tries, exceptions);
         }
+        long expectedSleep = ConnectionUtils.getPauseTime(pause, tries);
+        // If, after the planned sleep, there won't be enough time left, we stop now.
+        if (((this.endTime - this.globalStartTime) + MIN_RPC_TIMEOUT + expectedSleep) >
+            this.callTimeout) {
+          throw (SocketTimeoutException) new SocketTimeoutException(
+              "Call to access row '" + Bytes.toString(row) + "' on table '"
+                  + Bytes.toString(tableName)
+                  + "' failed on timeout. " + " callTimeout=" + this.callTimeout +
+                  ", time=" + (this.endTime - this.startTime)).initCause(t);
+        }
       } finally {
         afterCall();
       }
@@ -192,7 +198,7 @@ public abstract class ServerCallable<T> 
         Thread.sleep(ConnectionUtils.getPauseTime(pause, tries));
       } catch (InterruptedException e) {
         Thread.currentThread().interrupt();
-        throw new IOException("Giving up after tries=" + tries, e);
+        throw new IOException("Interrupted after tries=" + tries, e);
       }
     }
     return null;
@@ -206,6 +212,7 @@ public abstract class ServerCallable<T> 
    */
   public T withoutRetries()
   throws IOException, RuntimeException {
+    this.globalStartTime = EnvironmentEdgeManager.currentTimeMillis();
     try {
       beforeCall();
       connect(false);

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/package-info.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/package-info.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/package-info.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/client/package-info.java Thu Feb 14 13:35:54 2013
@@ -179,6 +179,10 @@ public class MyLittleHBaseClient {
   more methods. Additionally, there are methods for managing tables in the
   HBaseAdmin class.</p>
 
+  <p>See also the section in the HBase Reference Guide where it discusses
+  <a href="http://hbase.apache.org/book.html#client">HBase Client</a>.  It
+  has section on how to access HBase from inside your multithreaded environtment
+  how to control resources consumed client-side, etc.</p>
 </body>
 </html>
 */

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventHandler.java Thu Feb 14 13:35:54 2013
@@ -145,7 +145,8 @@ public abstract class EventHandler imple
 
     // Master controlled events to be executed on the master
     M_SERVER_SHUTDOWN         (70, ExecutorType.MASTER_SERVER_OPERATIONS),  // Master is processing shutdown of a RS
-    M_META_SERVER_SHUTDOWN    (72, ExecutorType.MASTER_META_SERVER_OPERATIONS);  // Master is processing shutdown of RS hosting a meta region (-ROOT- or .META.).
+    M_META_SERVER_SHUTDOWN    (72, ExecutorType.MASTER_META_SERVER_OPERATIONS),  // Master is processing shutdown of RS hosting a meta region (-ROOT- or .META.).
+    M_MASTER_RECOVERY         (73, ExecutorType.MASTER_SERVER_OPERATIONS); // Master is processing recovery of regions found in ZK RIT
 
     private final int code;
     private final ExecutorService.ExecutorType executor;

Modified: hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java
URL: http://svn.apache.org/viewvc/hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java?rev=1446173&r1=1446172&r2=1446173&view=diff
==============================================================================
--- hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java (original)
+++ hbase/branches/hbase-7290v2/hbase-server/src/main/java/org/apache/hadoop/hbase/filter/FilterList.java Thu Feb 14 13:35:54 2013
@@ -263,12 +263,11 @@ public class FilterList extends Filter {
   public boolean filterRow() {
     for (Filter filter : filters) {
       if (operator == Operator.MUST_PASS_ALL) {
-        if (filter.filterAllRemaining() || filter.filterRow()) {
+        if (filter.filterRow()) {
           return true;
         }
       } else if (operator == Operator.MUST_PASS_ONE) {
-        if (!filter.filterAllRemaining()
-            && !filter.filterRow()) {
+        if (!filter.filterRow()) {
           return false;
         }
       }



Mime
View raw message