http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e11cf2cb/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
index 64099d9..2cafba9 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.html
@@ -55,82 +55,81 @@
 <span class="sourceLineNo">047</span><a name="line.47"></a>
 <span class="sourceLineNo">048</span>  @Override<a name="line.48"></a>
 <span class="sourceLineNo">049</span>  public void append(Entry entry) throws 
IOException {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    
entry.setCompressionContext(compressionContext);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    
entry.getKey().getBuilder(compressor).<a name="line.51"></a>
-<span class="sourceLineNo">052</span>        
setFollowingKvCount(entry.getEdit().size()).build().writeDelimitedTo(output);<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>    for (Cell cell : 
entry.getEdit().getCells()) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>      // cellEncoder must assume little 
about the stream, since we write PB and cells in turn.<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      cellEncoder.write(cell);<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>    }<a name="line.56"></a>
-<span class="sourceLineNo">057</span>    length.set(output.getPos());<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>  }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  @Override<a name="line.60"></a>
-<span class="sourceLineNo">061</span>  public void close() throws IOException 
{<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    if (this.output != null) {<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>      try {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>        if (!trailerWritten) 
writeWALTrailer();<a name="line.64"></a>
-<span class="sourceLineNo">065</span>        this.output.close();<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>      } catch (NullPointerException npe) 
{<a name="line.66"></a>
-<span class="sourceLineNo">067</span>        // Can get a NPE coming up from 
down in DFSClient$DFSOutputStream#close<a name="line.67"></a>
-<span class="sourceLineNo">068</span>        LOG.warn(npe.toString(), npe);<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>      }<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      this.output = null;<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>    }<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  public void sync(boolean forceSync) 
throws IOException {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    FSDataOutputStream fsdos = 
this.output;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    if (fsdos == null) return; // Presume 
closed<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    fsdos.flush();<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    if (forceSync) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      fsdos.hsync();<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    } else {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      fsdos.hflush();<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public FSDataOutputStream getStream() 
{<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    return this.output;<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>  }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  @SuppressWarnings("deprecation")<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>  @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  protected void initOutput(FileSystem 
fs, Path path, boolean overwritable, int bufferSize,<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      short replication, long blockSize) 
throws IOException, StreamLacksCapabilityException {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    this.output = 
fs.createNonRecursive(path, overwritable, bufferSize, replication, blockSize,<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>      null);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    if 
(fs.getConf().getBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE, true)) 
{<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      if 
(!CommonFSUtils.hasCapability(output, "hflush")) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>        throw new 
StreamLacksCapabilityException("hflush");<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      }<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      if 
(!CommonFSUtils.hasCapability(output, "hsync")) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>        throw new 
StreamLacksCapabilityException("hsync");<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @Override<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  protected long 
writeMagicAndWALHeader(byte[] magic, WALHeader header) throws IOException {<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    output.write(magic);<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>    header.writeDelimitedTo(output);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    return output.getPos();<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  @Override<a name="line.113"></a>
-<span class="sourceLineNo">114</span>  protected OutputStream 
getOutputStreamForCellEncoder() {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    return this.output;<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>  @Override<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  protected long 
writeWALTrailerAndMagic(WALTrailer trailer, byte[] magic) throws IOException 
{<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    trailer.writeTo(output);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    
output.writeInt(trailer.getSerializedSize());<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    output.write(magic);<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    return output.getPos();<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
-<span class="sourceLineNo">125</span>}<a name="line.125"></a>
+<span class="sourceLineNo">050</span>    
entry.getKey().getBuilder(compressor).<a name="line.50"></a>
+<span class="sourceLineNo">051</span>        
setFollowingKvCount(entry.getEdit().size()).build().writeDelimitedTo(output);<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>    for (Cell cell : 
entry.getEdit().getCells()) {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      // cellEncoder must assume little 
about the stream, since we write PB and cells in turn.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      cellEncoder.write(cell);<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>    }<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    length.set(output.getPos());<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  public void close() throws IOException 
{<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    if (this.output != null) {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>      try {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>        if (!trailerWritten) 
writeWALTrailer();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>        this.output.close();<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>      } catch (NullPointerException npe) 
{<a name="line.65"></a>
+<span class="sourceLineNo">066</span>        // Can get a NPE coming up from 
down in DFSClient$DFSOutputStream#close<a name="line.66"></a>
+<span class="sourceLineNo">067</span>        LOG.warn(npe.toString(), npe);<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>      }<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      this.output = null;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>    }<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  public void sync(boolean forceSync) 
throws IOException {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    FSDataOutputStream fsdos = 
this.output;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    if (fsdos == null) return; // Presume 
closed<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    fsdos.flush();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    if (forceSync) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      fsdos.hsync();<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    } else {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>      fsdos.hflush();<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public FSDataOutputStream getStream() 
{<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    return this.output;<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>  }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>  @SuppressWarnings("deprecation")<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>  @Override<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  protected void initOutput(FileSystem 
fs, Path path, boolean overwritable, int bufferSize,<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      short replication, long blockSize) 
throws IOException, StreamLacksCapabilityException {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    this.output = 
fs.createNonRecursive(path, overwritable, bufferSize, replication, blockSize,<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>      null);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    if 
(fs.getConf().getBoolean(CommonFSUtils.UNSAFE_STREAM_CAPABILITY_ENFORCE, true)) 
{<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      if 
(!CommonFSUtils.hasCapability(output, "hflush")) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        throw new 
StreamLacksCapabilityException("hflush");<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      if 
(!CommonFSUtils.hasCapability(output, "hsync")) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        throw new 
StreamLacksCapabilityException("hsync");<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    }<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>  @Override<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  protected long 
writeMagicAndWALHeader(byte[] magic, WALHeader header) throws IOException {<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    output.write(magic);<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>    header.writeDelimitedTo(output);<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    return output.getPos();<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>  }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>  @Override<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  protected OutputStream 
getOutputStreamForCellEncoder() {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    return this.output;<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>  }<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  @Override<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  protected long 
writeWALTrailerAndMagic(WALTrailer trailer, byte[] magic) throws IOException 
{<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    trailer.writeTo(output);<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    
output.writeInt(trailer.getSerializedSize());<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    output.write(magic);<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>    return output.getPos();<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>}<a name="line.124"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e11cf2cb/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.html
index 934dca2..b35994e 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ReaderBase.html
@@ -100,81 +100,78 @@
 <span class="sourceLineNo">092</span>    if (e == null) {<a name="line.92"></a>
 <span class="sourceLineNo">093</span>      e = new Entry();<a 
name="line.93"></a>
 <span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    if (compressionContext != null) {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      
e.setCompressionContext(compressionContext);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>    boolean hasEntry = false;<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    try {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      hasEntry = readNext(e);<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    } catch (IllegalArgumentException 
iae) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      TableName tableName = 
e.getKey().getTableName();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>      if (tableName != null &amp;&amp; 
tableName.equals(TableName.OLD_ROOT_TABLE_NAME)) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        // It is old ROOT table edit, 
ignore it<a name="line.105"></a>
-<span class="sourceLineNo">106</span>        LOG.info("Got an old ROOT edit, 
ignoring ");<a name="line.106"></a>
-<span class="sourceLineNo">107</span>        return next(e);<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>      }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      else throw iae;<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    edit++;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    if (compressionContext != null 
&amp;&amp; emptyCompressionContext) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      emptyCompressionContext = false;<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>    }<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    return hasEntry ? e : null;<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>  @Override<a name="line.118"></a>
-<span class="sourceLineNo">119</span>  public void seek(long pos) throws 
IOException {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    if (compressionContext != null 
&amp;&amp; emptyCompressionContext) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      while (next() != null) {<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>        if (getPosition() == pos) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>          emptyCompressionContext = 
false;<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          break;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>        }<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    seekOnFs(pos);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  /**<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * Initializes the log reader with a 
particular stream (may be null).<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   * Reader assumes ownership of the 
stream if not null and may use it. Called once.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>   * @return the class name of cell 
Codec, null if such information is not available<a name="line.134"></a>
-<span class="sourceLineNo">135</span>   */<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  protected abstract String 
initReader(FSDataInputStream stream) throws IOException;<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  /**<a name="line.138"></a>
-<span class="sourceLineNo">139</span>   * Initializes the compression after 
the shared stuff has been initialized. Called once.<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  protected abstract void 
initAfterCompression() throws IOException;<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span>   * Initializes the compression after 
the shared stuff has been initialized. Called once.<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * @param cellCodecClsName class name 
of cell Codec<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   */<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  protected abstract void 
initAfterCompression(String cellCodecClsName) throws IOException;<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>  /**<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   * @return Whether compression is 
enabled for this log.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  protected abstract boolean 
hasCompression();<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  /**<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * @return Whether tag compression is 
enabled for this log.<a name="line.154"></a>
-<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  protected abstract boolean 
hasTagCompression();<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>  /**<a name="line.158"></a>
-<span class="sourceLineNo">159</span>   * Read next entry.<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>   * @param e The entry to read into.<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>   * @return Whether there was anything 
to read.<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   */<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  protected abstract boolean 
readNext(Entry e) throws IOException;<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  /**<a name="line.165"></a>
-<span class="sourceLineNo">166</span>   * Performs a filesystem-level seek to 
a certain position in an underlying file.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>   */<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  protected abstract void seekOnFs(long 
pos) throws IOException;<a name="line.168"></a>
-<span class="sourceLineNo">169</span>}<a name="line.169"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>    boolean hasEntry = false;<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      hasEntry = readNext(e);<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>    } catch (IllegalArgumentException 
iae) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      TableName tableName = 
e.getKey().getTableName();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      if (tableName != null &amp;&amp; 
tableName.equals(TableName.OLD_ROOT_TABLE_NAME)) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>        // It is old ROOT table edit, 
ignore it<a name="line.102"></a>
+<span class="sourceLineNo">103</span>        LOG.info("Got an old ROOT edit, 
ignoring ");<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        return next(e);<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>      }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>      else throw iae;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    edit++;<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    if (compressionContext != null 
&amp;&amp; emptyCompressionContext) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      emptyCompressionContext = false;<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>    }<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    return hasEntry ? e : null;<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span>  @Override<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public void seek(long pos) throws 
IOException {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (compressionContext != null 
&amp;&amp; emptyCompressionContext) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      while (next() != null) {<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>        if (getPosition() == pos) {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>          emptyCompressionContext = 
false;<a name="line.120"></a>
+<span class="sourceLineNo">121</span>          break;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    seekOnFs(pos);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  /**<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   * Initializes the log reader with a 
particular stream (may be null).<a name="line.129"></a>
+<span class="sourceLineNo">130</span>   * Reader assumes ownership of the 
stream if not null and may use it. Called once.<a name="line.130"></a>
+<span class="sourceLineNo">131</span>   * @return the class name of cell 
Codec, null if such information is not available<a name="line.131"></a>
+<span class="sourceLineNo">132</span>   */<a name="line.132"></a>
+<span class="sourceLineNo">133</span>  protected abstract String 
initReader(FSDataInputStream stream) throws IOException;<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   * Initializes the compression after 
the shared stuff has been initialized. Called once.<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   */<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  protected abstract void 
initAfterCompression() throws IOException;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  /**<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   * Initializes the compression after 
the shared stuff has been initialized. Called once.<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   * @param cellCodecClsName class name 
of cell Codec<a name="line.142"></a>
+<span class="sourceLineNo">143</span>   */<a name="line.143"></a>
+<span class="sourceLineNo">144</span>  protected abstract void 
initAfterCompression(String cellCodecClsName) throws IOException;<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>  /**<a name="line.145"></a>
+<span class="sourceLineNo">146</span>   * @return Whether compression is 
enabled for this log.<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   */<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  protected abstract boolean 
hasCompression();<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * @return Whether tag compression is 
enabled for this log.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   */<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  protected abstract boolean 
hasTagCompression();<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>  /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span>   * Read next entry.<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>   * @param e The entry to read into.<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>   * @return Whether there was anything 
to read.<a name="line.158"></a>
+<span class="sourceLineNo">159</span>   */<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  protected abstract boolean 
readNext(Entry e) throws IOException;<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>  /**<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * Performs a filesystem-level seek to 
a certain position in an underlying file.<a name="line.163"></a>
+<span class="sourceLineNo">164</span>   */<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  protected abstract void seekOnFs(long 
pos) throws IOException;<a name="line.165"></a>
+<span class="sourceLineNo">166</span>}<a name="line.166"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/e11cf2cb/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
index 0da9705..1caf2a5 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.html
@@ -149,13 +149,14 @@
 <span class="sourceLineNo">141</span>      this.cellDecoder = 
codec.getDecoder(this.inputStream);<a name="line.141"></a>
 <span class="sourceLineNo">142</span>      // We do not support compression 
with WAL encryption<a name="line.142"></a>
 <span class="sourceLineNo">143</span>      this.compressionContext = null;<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      this.hasCompression = false;<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    } else {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      
super.initAfterCompression(cellCodecClsName);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    }<a name="line.147"></a>
-<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>}<a name="line.150"></a>
+<span class="sourceLineNo">144</span>      this.byteStringUncompressor = 
WALCellCodec.getNoneUncompressor();<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      this.hasCompression = false;<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>    } else {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      
super.initAfterCompression(cellCodecClsName);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>}<a name="line.151"></a>
 
 
 

Reply via email to