http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
index b407bcf..dcb6354 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrContext.html
@@ -47,7 +47,7 @@
 <span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.39"></a>
 <span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a 
name="line.40"></a>
 <span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALHeader.Builder;<a
 name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit;<a 
name="line.42"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey;<a 
name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALTrailer;<a 
name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.45"></a>
@@ -341,7 +341,7 @@
 <span class="sourceLineNo">333</span>        }<a name="line.333"></a>
 <span class="sourceLineNo">334</span>        return false;<a 
name="line.334"></a>
 <span class="sourceLineNo">335</span>      }<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      WALEdit.Builder builder = 
WALEdit.newBuilder();<a name="line.336"></a>
+<span class="sourceLineNo">336</span>      WALKey.Builder builder = 
WALKey.newBuilder();<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      long size = 0;<a 
name="line.337"></a>
 <span class="sourceLineNo">338</span>      try {<a name="line.338"></a>
 <span class="sourceLineNo">339</span>        long available = -1;<a 
name="line.339"></a>
@@ -371,87 +371,86 @@
 <span class="sourceLineNo">363</span>          throw new EOFException("Partial 
PB while reading WAL, " +<a name="line.363"></a>
 <span class="sourceLineNo">364</span>              "probably an unexpected 
EOF, ignoring. current offset=" + this.inputStream.getPos());<a 
name="line.364"></a>
 <span class="sourceLineNo">365</span>        }<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        WALEdit walKey = 
builder.build();<a name="line.366"></a>
+<span class="sourceLineNo">366</span>        WALKey walKey = 
builder.build();<a name="line.366"></a>
 <span class="sourceLineNo">367</span>        
entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a 
name="line.367"></a>
 <span class="sourceLineNo">368</span>        if (!walKey.hasFollowingKvCount() 
|| 0 == walKey.getFollowingKvCount()) {<a name="line.368"></a>
 <span class="sourceLineNo">369</span>          if (LOG.isTraceEnabled()) {<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>            LOG.trace("WALKey has no KVs 
that follow it; trying the next one. current offset=" +<a name="line.370"></a>
-<span class="sourceLineNo">371</span>              
this.inputStream.getPos());<a name="line.371"></a>
-<span class="sourceLineNo">372</span>          }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          continue;<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        int expectedCells = 
walKey.getFollowingKvCount();<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        long posBefore = 
this.inputStream.getPos();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        try {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          int actualCells = 
entry.getEdit().readFromCells(cellDecoder, expectedCells);<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>          if (expectedCells != 
actualCells) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>            throw new EOFException("Only 
read " + actualCells); // other info added in catch<a name="line.380"></a>
-<span class="sourceLineNo">381</span>          }<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        } catch (Exception ex) {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>          String posAfterStr = 
"&lt;unknown&gt;";<a name="line.383"></a>
-<span class="sourceLineNo">384</span>          try {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>            posAfterStr = 
this.inputStream.getPos() + "";<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          } catch (Throwable t) {<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>            if (LOG.isTraceEnabled()) {<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>              LOG.trace("Error getting 
pos for error message - ignoring", t);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          String message = " while 
reading " + expectedCells + " WAL KVs; started reading at "<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>              + posBefore + " and read up 
to " + posAfterStr;<a name="line.392"></a>
-<span class="sourceLineNo">393</span>          IOException realEofEx = 
extractHiddenEof(ex);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>          throw (EOFException) new 
EOFException("EOF " + message).<a name="line.394"></a>
-<span class="sourceLineNo">395</span>              initCause(realEofEx != null 
? realEofEx : ex);<a name="line.395"></a>
-<span class="sourceLineNo">396</span>        }<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        if (trailerPresent &amp;&amp; 
this.inputStream.getPos() &gt; this.walEditsStopOffset) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          LOG.error("Read WALTrailer 
while reading WALEdits. wal: " + this.path<a name="line.398"></a>
-<span class="sourceLineNo">399</span>              + ", inputStream.getPos(): 
" + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.399"></a>
-<span class="sourceLineNo">400</span>              + 
this.walEditsStopOffset);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          throw new EOFException("Read 
WALTrailer while reading WALEdits");<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      } catch (EOFException eof) {<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>        // If originalPosition is &lt; 0, 
it is rubbish and we cannot use it (probably local fs)<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        if (originalPosition &lt; 0) {<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span>          if (LOG.isTraceEnabled()) {<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>            LOG.trace("Encountered a 
malformed edit, but can't seek back to last good position because 
originalPosition is negative. last offset=" + this.inputStream.getPos(), 
eof);<a name="line.407"></a>
-<span class="sourceLineNo">408</span>          }<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          throw eof;<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>        }<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        // Else restore our position to 
original location in hope that next time through we will<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        // read successfully.<a 
name="line.412"></a>
-<span class="sourceLineNo">413</span>        if (LOG.isTraceEnabled()) {<a 
name="line.413"></a>
-<span class="sourceLineNo">414</span>          LOG.trace("Encountered a 
malformed edit, seeking back to last good position in file, from "+ 
inputStream.getPos()+" to " + originalPosition, eof);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        }<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        seekOnFs(originalPosition);<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>        return false;<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      return true;<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  private IOException 
extractHiddenEof(Exception ex) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // There are two problems we are 
dealing with here. Hadoop stream throws generic exception<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    // for EOF, not EOFException; and 
scanner further hides it inside RuntimeException.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    IOException ioEx = null;<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>    if (ex instanceof EOFException) {<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>      return (EOFException)ex;<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>    } else if (ex instanceof IOException) 
{<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      ioEx = (IOException)ex;<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>    } else if (ex instanceof 
RuntimeException<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        &amp;&amp; ex.getCause() != null 
&amp;&amp; ex.getCause() instanceof IOException) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      ioEx = 
(IOException)ex.getCause();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    }<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    if (ioEx != null) {<a 
name="line.435"></a>
-<span class="sourceLineNo">436</span>      if 
(ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    return null;<a name="line.439"></a>
-<span class="sourceLineNo">440</span>  }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>  @Override<a name="line.442"></a>
-<span class="sourceLineNo">443</span>  protected void seekOnFs(long pos) 
throws IOException {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    this.inputStream.seek(pos);<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>  }<a name="line.445"></a>
-<span class="sourceLineNo">446</span>}<a name="line.446"></a>
+<span class="sourceLineNo">370</span>            LOG.trace("WALKey has no KVs 
that follow it; trying the next one. current offset=" + 
this.inputStream.getPos());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          continue;<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        }<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        int expectedCells = 
walKey.getFollowingKvCount();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        long posBefore = 
this.inputStream.getPos();<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        try {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          int actualCells = 
entry.getEdit().readFromCells(cellDecoder, expectedCells);<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>          if (expectedCells != 
actualCells) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>            throw new EOFException("Only 
read " + actualCells); // other info added in catch<a name="line.379"></a>
+<span class="sourceLineNo">380</span>          }<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        } catch (Exception ex) {<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>          String posAfterStr = 
"&lt;unknown&gt;";<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          try {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            posAfterStr = 
this.inputStream.getPos() + "";<a name="line.384"></a>
+<span class="sourceLineNo">385</span>          } catch (Throwable t) {<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>            if (LOG.isTraceEnabled()) {<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>              LOG.trace("Error getting 
pos for error message - ignoring", t);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>            }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          }<a name="line.389"></a>
+<span class="sourceLineNo">390</span>          String message = " while 
reading " + expectedCells + " WAL KVs; started reading at "<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>              + posBefore + " and read up 
to " + posAfterStr;<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          IOException realEofEx = 
extractHiddenEof(ex);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          throw (EOFException) new 
EOFException("EOF " + message).<a name="line.393"></a>
+<span class="sourceLineNo">394</span>              initCause(realEofEx != null 
? realEofEx : ex);<a name="line.394"></a>
+<span class="sourceLineNo">395</span>        }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        if (trailerPresent &amp;&amp; 
this.inputStream.getPos() &gt; this.walEditsStopOffset) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>          LOG.error("Read WALTrailer 
while reading WALEdits. wal: " + this.path<a name="line.397"></a>
+<span class="sourceLineNo">398</span>              + ", inputStream.getPos(): 
" + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.398"></a>
+<span class="sourceLineNo">399</span>              + 
this.walEditsStopOffset);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>          throw new EOFException("Read 
WALTrailer while reading WALEdits");<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      } catch (EOFException eof) {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>        // If originalPosition is &lt; 0, 
it is rubbish and we cannot use it (probably local fs)<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        if (originalPosition &lt; 0) {<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (LOG.isTraceEnabled()) {<a 
name="line.405"></a>
+<span class="sourceLineNo">406</span>            LOG.trace("Encountered a 
malformed edit, but can't seek back to last good position because 
originalPosition is negative. last offset=" + this.inputStream.getPos(), 
eof);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>          }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>          throw eof;<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>        }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        // Else restore our position to 
original location in hope that next time through we will<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        // read successfully.<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>        if (LOG.isTraceEnabled()) {<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>          LOG.trace("Encountered a 
malformed edit, seeking back to last good position in file, from "+ 
inputStream.getPos()+" to " + originalPosition, eof);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        seekOnFs(originalPosition);<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>        return false;<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>      }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>      return true;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  private IOException 
extractHiddenEof(Exception ex) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    // There are two problems we are 
dealing with here. Hadoop stream throws generic exception<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    // for EOF, not EOFException; and 
scanner further hides it inside RuntimeException.<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    IOException ioEx = null;<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>    if (ex instanceof EOFException) {<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>      return (EOFException)ex;<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>    } else if (ex instanceof IOException) 
{<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      ioEx = (IOException)ex;<a 
name="line.429"></a>
+<span class="sourceLineNo">430</span>    } else if (ex instanceof 
RuntimeException<a name="line.430"></a>
+<span class="sourceLineNo">431</span>        &amp;&amp; ex.getCause() != null 
&amp;&amp; ex.getCause() instanceof IOException) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      ioEx = 
(IOException)ex.getCause();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    if (ioEx != null) {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>      if 
(ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      return null;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    return null;<a name="line.438"></a>
+<span class="sourceLineNo">439</span>  }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>  @Override<a name="line.441"></a>
+<span class="sourceLineNo">442</span>  protected void seekOnFs(long pos) 
throws IOException {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    this.inputStream.seek(pos);<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>}<a name="line.445"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
index b407bcf..dcb6354 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html
@@ -47,7 +47,7 @@
 <span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.39"></a>
 <span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a 
name="line.40"></a>
 <span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALHeader.Builder;<a
 name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit;<a 
name="line.42"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey;<a 
name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALTrailer;<a 
name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.45"></a>
@@ -341,7 +341,7 @@
 <span class="sourceLineNo">333</span>        }<a name="line.333"></a>
 <span class="sourceLineNo">334</span>        return false;<a 
name="line.334"></a>
 <span class="sourceLineNo">335</span>      }<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      WALEdit.Builder builder = 
WALEdit.newBuilder();<a name="line.336"></a>
+<span class="sourceLineNo">336</span>      WALKey.Builder builder = 
WALKey.newBuilder();<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      long size = 0;<a 
name="line.337"></a>
 <span class="sourceLineNo">338</span>      try {<a name="line.338"></a>
 <span class="sourceLineNo">339</span>        long available = -1;<a 
name="line.339"></a>
@@ -371,87 +371,86 @@
 <span class="sourceLineNo">363</span>          throw new EOFException("Partial 
PB while reading WAL, " +<a name="line.363"></a>
 <span class="sourceLineNo">364</span>              "probably an unexpected 
EOF, ignoring. current offset=" + this.inputStream.getPos());<a 
name="line.364"></a>
 <span class="sourceLineNo">365</span>        }<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        WALEdit walKey = 
builder.build();<a name="line.366"></a>
+<span class="sourceLineNo">366</span>        WALKey walKey = 
builder.build();<a name="line.366"></a>
 <span class="sourceLineNo">367</span>        
entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a 
name="line.367"></a>
 <span class="sourceLineNo">368</span>        if (!walKey.hasFollowingKvCount() 
|| 0 == walKey.getFollowingKvCount()) {<a name="line.368"></a>
 <span class="sourceLineNo">369</span>          if (LOG.isTraceEnabled()) {<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>            LOG.trace("WALKey has no KVs 
that follow it; trying the next one. current offset=" +<a name="line.370"></a>
-<span class="sourceLineNo">371</span>              
this.inputStream.getPos());<a name="line.371"></a>
-<span class="sourceLineNo">372</span>          }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          continue;<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        int expectedCells = 
walKey.getFollowingKvCount();<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        long posBefore = 
this.inputStream.getPos();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        try {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          int actualCells = 
entry.getEdit().readFromCells(cellDecoder, expectedCells);<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>          if (expectedCells != 
actualCells) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>            throw new EOFException("Only 
read " + actualCells); // other info added in catch<a name="line.380"></a>
-<span class="sourceLineNo">381</span>          }<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        } catch (Exception ex) {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>          String posAfterStr = 
"&lt;unknown&gt;";<a name="line.383"></a>
-<span class="sourceLineNo">384</span>          try {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>            posAfterStr = 
this.inputStream.getPos() + "";<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          } catch (Throwable t) {<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>            if (LOG.isTraceEnabled()) {<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>              LOG.trace("Error getting 
pos for error message - ignoring", t);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          String message = " while 
reading " + expectedCells + " WAL KVs; started reading at "<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>              + posBefore + " and read up 
to " + posAfterStr;<a name="line.392"></a>
-<span class="sourceLineNo">393</span>          IOException realEofEx = 
extractHiddenEof(ex);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>          throw (EOFException) new 
EOFException("EOF " + message).<a name="line.394"></a>
-<span class="sourceLineNo">395</span>              initCause(realEofEx != null 
? realEofEx : ex);<a name="line.395"></a>
-<span class="sourceLineNo">396</span>        }<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        if (trailerPresent &amp;&amp; 
this.inputStream.getPos() &gt; this.walEditsStopOffset) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          LOG.error("Read WALTrailer 
while reading WALEdits. wal: " + this.path<a name="line.398"></a>
-<span class="sourceLineNo">399</span>              + ", inputStream.getPos(): 
" + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.399"></a>
-<span class="sourceLineNo">400</span>              + 
this.walEditsStopOffset);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          throw new EOFException("Read 
WALTrailer while reading WALEdits");<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      } catch (EOFException eof) {<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>        // If originalPosition is &lt; 0, 
it is rubbish and we cannot use it (probably local fs)<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        if (originalPosition &lt; 0) {<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span>          if (LOG.isTraceEnabled()) {<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>            LOG.trace("Encountered a 
malformed edit, but can't seek back to last good position because 
originalPosition is negative. last offset=" + this.inputStream.getPos(), 
eof);<a name="line.407"></a>
-<span class="sourceLineNo">408</span>          }<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          throw eof;<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>        }<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        // Else restore our position to 
original location in hope that next time through we will<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        // read successfully.<a 
name="line.412"></a>
-<span class="sourceLineNo">413</span>        if (LOG.isTraceEnabled()) {<a 
name="line.413"></a>
-<span class="sourceLineNo">414</span>          LOG.trace("Encountered a 
malformed edit, seeking back to last good position in file, from "+ 
inputStream.getPos()+" to " + originalPosition, eof);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        }<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        seekOnFs(originalPosition);<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>        return false;<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      return true;<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  private IOException 
extractHiddenEof(Exception ex) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // There are two problems we are 
dealing with here. Hadoop stream throws generic exception<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    // for EOF, not EOFException; and 
scanner further hides it inside RuntimeException.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    IOException ioEx = null;<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>    if (ex instanceof EOFException) {<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>      return (EOFException)ex;<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>    } else if (ex instanceof IOException) 
{<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      ioEx = (IOException)ex;<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>    } else if (ex instanceof 
RuntimeException<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        &amp;&amp; ex.getCause() != null 
&amp;&amp; ex.getCause() instanceof IOException) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      ioEx = 
(IOException)ex.getCause();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    }<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    if (ioEx != null) {<a 
name="line.435"></a>
-<span class="sourceLineNo">436</span>      if 
(ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    return null;<a name="line.439"></a>
-<span class="sourceLineNo">440</span>  }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>  @Override<a name="line.442"></a>
-<span class="sourceLineNo">443</span>  protected void seekOnFs(long pos) 
throws IOException {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    this.inputStream.seek(pos);<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>  }<a name="line.445"></a>
-<span class="sourceLineNo">446</span>}<a name="line.446"></a>
+<span class="sourceLineNo">370</span>            LOG.trace("WALKey has no KVs 
that follow it; trying the next one. current offset=" + 
this.inputStream.getPos());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          continue;<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        }<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        int expectedCells = 
walKey.getFollowingKvCount();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        long posBefore = 
this.inputStream.getPos();<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        try {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          int actualCells = 
entry.getEdit().readFromCells(cellDecoder, expectedCells);<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>          if (expectedCells != 
actualCells) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>            throw new EOFException("Only 
read " + actualCells); // other info added in catch<a name="line.379"></a>
+<span class="sourceLineNo">380</span>          }<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        } catch (Exception ex) {<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>          String posAfterStr = 
"&lt;unknown&gt;";<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          try {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            posAfterStr = 
this.inputStream.getPos() + "";<a name="line.384"></a>
+<span class="sourceLineNo">385</span>          } catch (Throwable t) {<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>            if (LOG.isTraceEnabled()) {<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>              LOG.trace("Error getting 
pos for error message - ignoring", t);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>            }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          }<a name="line.389"></a>
+<span class="sourceLineNo">390</span>          String message = " while 
reading " + expectedCells + " WAL KVs; started reading at "<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>              + posBefore + " and read up 
to " + posAfterStr;<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          IOException realEofEx = 
extractHiddenEof(ex);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          throw (EOFException) new 
EOFException("EOF " + message).<a name="line.393"></a>
+<span class="sourceLineNo">394</span>              initCause(realEofEx != null 
? realEofEx : ex);<a name="line.394"></a>
+<span class="sourceLineNo">395</span>        }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        if (trailerPresent &amp;&amp; 
this.inputStream.getPos() &gt; this.walEditsStopOffset) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>          LOG.error("Read WALTrailer 
while reading WALEdits. wal: " + this.path<a name="line.397"></a>
+<span class="sourceLineNo">398</span>              + ", inputStream.getPos(): 
" + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.398"></a>
+<span class="sourceLineNo">399</span>              + 
this.walEditsStopOffset);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>          throw new EOFException("Read 
WALTrailer while reading WALEdits");<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      } catch (EOFException eof) {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>        // If originalPosition is &lt; 0, 
it is rubbish and we cannot use it (probably local fs)<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        if (originalPosition &lt; 0) {<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (LOG.isTraceEnabled()) {<a 
name="line.405"></a>
+<span class="sourceLineNo">406</span>            LOG.trace("Encountered a 
malformed edit, but can't seek back to last good position because 
originalPosition is negative. last offset=" + this.inputStream.getPos(), 
eof);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>          }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>          throw eof;<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>        }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        // Else restore our position to 
original location in hope that next time through we will<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        // read successfully.<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>        if (LOG.isTraceEnabled()) {<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>          LOG.trace("Encountered a 
malformed edit, seeking back to last good position in file, from "+ 
inputStream.getPos()+" to " + originalPosition, eof);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        seekOnFs(originalPosition);<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>        return false;<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>      }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>      return true;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  private IOException 
extractHiddenEof(Exception ex) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    // There are two problems we are 
dealing with here. Hadoop stream throws generic exception<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    // for EOF, not EOFException; and 
scanner further hides it inside RuntimeException.<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    IOException ioEx = null;<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>    if (ex instanceof EOFException) {<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>      return (EOFException)ex;<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>    } else if (ex instanceof IOException) 
{<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      ioEx = (IOException)ex;<a 
name="line.429"></a>
+<span class="sourceLineNo">430</span>    } else if (ex instanceof 
RuntimeException<a name="line.430"></a>
+<span class="sourceLineNo">431</span>        &amp;&amp; ex.getCause() != null 
&amp;&amp; ex.getCause() instanceof IOException) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      ioEx = 
(IOException)ex.getCause();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    if (ioEx != null) {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>      if 
(ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      return null;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    return null;<a name="line.438"></a>
+<span class="sourceLineNo">439</span>  }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>  @Override<a name="line.441"></a>
+<span class="sourceLineNo">442</span>  protected void seekOnFs(long pos) 
throws IOException {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    this.inputStream.seek(pos);<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>}<a name="line.445"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
index b407bcf..dcb6354 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.html
@@ -47,7 +47,7 @@
 <span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.39"></a>
 <span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a 
name="line.40"></a>
 <span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALHeader.Builder;<a
 name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit;<a 
name="line.42"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey;<a 
name="line.42"></a>
 <span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALTrailer;<a 
name="line.43"></a>
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.45"></a>
@@ -341,7 +341,7 @@
 <span class="sourceLineNo">333</span>        }<a name="line.333"></a>
 <span class="sourceLineNo">334</span>        return false;<a 
name="line.334"></a>
 <span class="sourceLineNo">335</span>      }<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      WALEdit.Builder builder = 
WALEdit.newBuilder();<a name="line.336"></a>
+<span class="sourceLineNo">336</span>      WALKey.Builder builder = 
WALKey.newBuilder();<a name="line.336"></a>
 <span class="sourceLineNo">337</span>      long size = 0;<a 
name="line.337"></a>
 <span class="sourceLineNo">338</span>      try {<a name="line.338"></a>
 <span class="sourceLineNo">339</span>        long available = -1;<a 
name="line.339"></a>
@@ -371,87 +371,86 @@
 <span class="sourceLineNo">363</span>          throw new EOFException("Partial 
PB while reading WAL, " +<a name="line.363"></a>
 <span class="sourceLineNo">364</span>              "probably an unexpected 
EOF, ignoring. current offset=" + this.inputStream.getPos());<a 
name="line.364"></a>
 <span class="sourceLineNo">365</span>        }<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        WALEdit walKey = 
builder.build();<a name="line.366"></a>
+<span class="sourceLineNo">366</span>        WALKey walKey = 
builder.build();<a name="line.366"></a>
 <span class="sourceLineNo">367</span>        
entry.getKey().readFieldsFromPb(walKey, this.byteStringUncompressor);<a 
name="line.367"></a>
 <span class="sourceLineNo">368</span>        if (!walKey.hasFollowingKvCount() 
|| 0 == walKey.getFollowingKvCount()) {<a name="line.368"></a>
 <span class="sourceLineNo">369</span>          if (LOG.isTraceEnabled()) {<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>            LOG.trace("WALKey has no KVs 
that follow it; trying the next one. current offset=" +<a name="line.370"></a>
-<span class="sourceLineNo">371</span>              
this.inputStream.getPos());<a name="line.371"></a>
-<span class="sourceLineNo">372</span>          }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>          continue;<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        }<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        int expectedCells = 
walKey.getFollowingKvCount();<a name="line.375"></a>
-<span class="sourceLineNo">376</span>        long posBefore = 
this.inputStream.getPos();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>        try {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>          int actualCells = 
entry.getEdit().readFromCells(cellDecoder, expectedCells);<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>          if (expectedCells != 
actualCells) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>            throw new EOFException("Only 
read " + actualCells); // other info added in catch<a name="line.380"></a>
-<span class="sourceLineNo">381</span>          }<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        } catch (Exception ex) {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>          String posAfterStr = 
"&lt;unknown&gt;";<a name="line.383"></a>
-<span class="sourceLineNo">384</span>          try {<a name="line.384"></a>
-<span class="sourceLineNo">385</span>            posAfterStr = 
this.inputStream.getPos() + "";<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          } catch (Throwable t) {<a 
name="line.386"></a>
-<span class="sourceLineNo">387</span>            if (LOG.isTraceEnabled()) {<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>              LOG.trace("Error getting 
pos for error message - ignoring", t);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>            }<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          }<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          String message = " while 
reading " + expectedCells + " WAL KVs; started reading at "<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>              + posBefore + " and read up 
to " + posAfterStr;<a name="line.392"></a>
-<span class="sourceLineNo">393</span>          IOException realEofEx = 
extractHiddenEof(ex);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>          throw (EOFException) new 
EOFException("EOF " + message).<a name="line.394"></a>
-<span class="sourceLineNo">395</span>              initCause(realEofEx != null 
? realEofEx : ex);<a name="line.395"></a>
-<span class="sourceLineNo">396</span>        }<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        if (trailerPresent &amp;&amp; 
this.inputStream.getPos() &gt; this.walEditsStopOffset) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>          LOG.error("Read WALTrailer 
while reading WALEdits. wal: " + this.path<a name="line.398"></a>
-<span class="sourceLineNo">399</span>              + ", inputStream.getPos(): 
" + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.399"></a>
-<span class="sourceLineNo">400</span>              + 
this.walEditsStopOffset);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>          throw new EOFException("Read 
WALTrailer while reading WALEdits");<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      } catch (EOFException eof) {<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>        // If originalPosition is &lt; 0, 
it is rubbish and we cannot use it (probably local fs)<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        if (originalPosition &lt; 0) {<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span>          if (LOG.isTraceEnabled()) {<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>            LOG.trace("Encountered a 
malformed edit, but can't seek back to last good position because 
originalPosition is negative. last offset=" + this.inputStream.getPos(), 
eof);<a name="line.407"></a>
-<span class="sourceLineNo">408</span>          }<a name="line.408"></a>
-<span class="sourceLineNo">409</span>          throw eof;<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>        }<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        // Else restore our position to 
original location in hope that next time through we will<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        // read successfully.<a 
name="line.412"></a>
-<span class="sourceLineNo">413</span>        if (LOG.isTraceEnabled()) {<a 
name="line.413"></a>
-<span class="sourceLineNo">414</span>          LOG.trace("Encountered a 
malformed edit, seeking back to last good position in file, from "+ 
inputStream.getPos()+" to " + originalPosition, eof);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        }<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        seekOnFs(originalPosition);<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>        return false;<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      return true;<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  private IOException 
extractHiddenEof(Exception ex) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // There are two problems we are 
dealing with here. Hadoop stream throws generic exception<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    // for EOF, not EOFException; and 
scanner further hides it inside RuntimeException.<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    IOException ioEx = null;<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>    if (ex instanceof EOFException) {<a 
name="line.427"></a>
-<span class="sourceLineNo">428</span>      return (EOFException)ex;<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>    } else if (ex instanceof IOException) 
{<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      ioEx = (IOException)ex;<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>    } else if (ex instanceof 
RuntimeException<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        &amp;&amp; ex.getCause() != null 
&amp;&amp; ex.getCause() instanceof IOException) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      ioEx = 
(IOException)ex.getCause();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    }<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    if (ioEx != null) {<a 
name="line.435"></a>
-<span class="sourceLineNo">436</span>      if 
(ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      return null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    return null;<a name="line.439"></a>
-<span class="sourceLineNo">440</span>  }<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>  @Override<a name="line.442"></a>
-<span class="sourceLineNo">443</span>  protected void seekOnFs(long pos) 
throws IOException {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    this.inputStream.seek(pos);<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>  }<a name="line.445"></a>
-<span class="sourceLineNo">446</span>}<a name="line.446"></a>
+<span class="sourceLineNo">370</span>            LOG.trace("WALKey has no KVs 
that follow it; trying the next one. current offset=" + 
this.inputStream.getPos());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>          }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>          continue;<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        }<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        int expectedCells = 
walKey.getFollowingKvCount();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        long posBefore = 
this.inputStream.getPos();<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        try {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>          int actualCells = 
entry.getEdit().readFromCells(cellDecoder, expectedCells);<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>          if (expectedCells != 
actualCells) {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>            throw new EOFException("Only 
read " + actualCells); // other info added in catch<a name="line.379"></a>
+<span class="sourceLineNo">380</span>          }<a name="line.380"></a>
+<span class="sourceLineNo">381</span>        } catch (Exception ex) {<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>          String posAfterStr = 
"&lt;unknown&gt;";<a name="line.382"></a>
+<span class="sourceLineNo">383</span>          try {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>            posAfterStr = 
this.inputStream.getPos() + "";<a name="line.384"></a>
+<span class="sourceLineNo">385</span>          } catch (Throwable t) {<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>            if (LOG.isTraceEnabled()) {<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>              LOG.trace("Error getting 
pos for error message - ignoring", t);<a name="line.387"></a>
+<span class="sourceLineNo">388</span>            }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>          }<a name="line.389"></a>
+<span class="sourceLineNo">390</span>          String message = " while 
reading " + expectedCells + " WAL KVs; started reading at "<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>              + posBefore + " and read up 
to " + posAfterStr;<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          IOException realEofEx = 
extractHiddenEof(ex);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>          throw (EOFException) new 
EOFException("EOF " + message).<a name="line.393"></a>
+<span class="sourceLineNo">394</span>              initCause(realEofEx != null 
? realEofEx : ex);<a name="line.394"></a>
+<span class="sourceLineNo">395</span>        }<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        if (trailerPresent &amp;&amp; 
this.inputStream.getPos() &gt; this.walEditsStopOffset) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>          LOG.error("Read WALTrailer 
while reading WALEdits. wal: " + this.path<a name="line.397"></a>
+<span class="sourceLineNo">398</span>              + ", inputStream.getPos(): 
" + this.inputStream.getPos() + ", walEditsStopOffset: "<a name="line.398"></a>
+<span class="sourceLineNo">399</span>              + 
this.walEditsStopOffset);<a name="line.399"></a>
+<span class="sourceLineNo">400</span>          throw new EOFException("Read 
WALTrailer while reading WALEdits");<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      } catch (EOFException eof) {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>        // If originalPosition is &lt; 0, 
it is rubbish and we cannot use it (probably local fs)<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        if (originalPosition &lt; 0) {<a 
name="line.404"></a>
+<span class="sourceLineNo">405</span>          if (LOG.isTraceEnabled()) {<a 
name="line.405"></a>
+<span class="sourceLineNo">406</span>            LOG.trace("Encountered a 
malformed edit, but can't seek back to last good position because 
originalPosition is negative. last offset=" + this.inputStream.getPos(), 
eof);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>          }<a name="line.407"></a>
+<span class="sourceLineNo">408</span>          throw eof;<a 
name="line.408"></a>
+<span class="sourceLineNo">409</span>        }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        // Else restore our position to 
original location in hope that next time through we will<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        // read successfully.<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>        if (LOG.isTraceEnabled()) {<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>          LOG.trace("Encountered a 
malformed edit, seeking back to last good position in file, from "+ 
inputStream.getPos()+" to " + originalPosition, eof);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        seekOnFs(originalPosition);<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>        return false;<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>      }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>      return true;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    }<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  private IOException 
extractHiddenEof(Exception ex) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    // There are two problems we are 
dealing with here. Hadoop stream throws generic exception<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    // for EOF, not EOFException; and 
scanner further hides it inside RuntimeException.<a name="line.424"></a>
+<span class="sourceLineNo">425</span>    IOException ioEx = null;<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>    if (ex instanceof EOFException) {<a 
name="line.426"></a>
+<span class="sourceLineNo">427</span>      return (EOFException)ex;<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>    } else if (ex instanceof IOException) 
{<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      ioEx = (IOException)ex;<a 
name="line.429"></a>
+<span class="sourceLineNo">430</span>    } else if (ex instanceof 
RuntimeException<a name="line.430"></a>
+<span class="sourceLineNo">431</span>        &amp;&amp; ex.getCause() != null 
&amp;&amp; ex.getCause() instanceof IOException) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      ioEx = 
(IOException)ex.getCause();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    }<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    if (ioEx != null) {<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>      if 
(ioEx.getMessage().contains("EOF")) return ioEx;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      return null;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    }<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    return null;<a name="line.438"></a>
+<span class="sourceLineNo">439</span>  }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>  @Override<a name="line.441"></a>
+<span class="sourceLineNo">442</span>  protected void seekOnFs(long pos) 
throws IOException {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    this.inputStream.seek(pos);<a 
name="line.443"></a>
+<span class="sourceLineNo">444</span>  }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>}<a name="line.445"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fa7d6c0c/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.html
index 9fae518..113aba0 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.html
@@ -167,7 +167,7 @@
 <span class="sourceLineNo">159</span><a name="line.159"></a>
 <span class="sourceLineNo">160</span>      for (WALEntry entry : entries) {<a 
name="line.160"></a>
 <span class="sourceLineNo">161</span>        TableName table =<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>            
TableName.valueOf(entry.getEdit().getTableName().toByteArray());<a 
name="line.162"></a>
+<span class="sourceLineNo">162</span>            
TableName.valueOf(entry.getKey().getTableName().toByteArray());<a 
name="line.162"></a>
 <span class="sourceLineNo">163</span>        Cell previousCell = null;<a 
name="line.163"></a>
 <span class="sourceLineNo">164</span>        Mutation m = null;<a 
name="line.164"></a>
 <span class="sourceLineNo">165</span>        int count = 
entry.getAssociatedCellCount();<a name="line.165"></a>
@@ -191,8 +191,8 @@
 <span class="sourceLineNo">183</span>                  CellUtil.isDelete(cell) 
? new Delete(cell.getRowArray(), cell.getRowOffset(),<a name="line.183"></a>
 <span class="sourceLineNo">184</span>                      
cell.getRowLength()) : new Put(cell.getRowArray(), cell.getRowOffset(),<a 
name="line.184"></a>
 <span class="sourceLineNo">185</span>                      
cell.getRowLength());<a name="line.185"></a>
-<span class="sourceLineNo">186</span>              List&lt;UUID&gt; clusterIds 
= new ArrayList&lt;&gt;(entry.getEdit().getClusterIdsList().size());<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>              for (HBaseProtos.UUID 
clusterId : entry.getEdit().getClusterIdsList()) {<a name="line.187"></a>
+<span class="sourceLineNo">186</span>              List&lt;UUID&gt; clusterIds 
= new ArrayList&lt;&gt;(entry.getKey().getClusterIdsList().size());<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>              for (HBaseProtos.UUID 
clusterId : entry.getKey().getClusterIdsList()) {<a name="line.187"></a>
 <span class="sourceLineNo">188</span>                
clusterIds.add(toUUID(clusterId));<a name="line.188"></a>
 <span class="sourceLineNo">189</span>              }<a name="line.189"></a>
 <span class="sourceLineNo">190</span>              
m.setClusterIds(clusterIds);<a name="line.190"></a>
@@ -229,7 +229,7 @@
 <span class="sourceLineNo">221</span>      }<a name="line.221"></a>
 <span class="sourceLineNo">222</span><a name="line.222"></a>
 <span class="sourceLineNo">223</span>      int size = entries.size();<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span>      
this.metrics.setAgeOfLastAppliedOp(entries.get(size - 
1).getEdit().getWriteTime());<a name="line.224"></a>
+<span class="sourceLineNo">224</span>      
this.metrics.setAgeOfLastAppliedOp(entries.get(size - 
1).getKey().getWriteTime());<a name="line.224"></a>
 <span class="sourceLineNo">225</span>      this.metrics.applyBatch(size + 
hfilesReplicated, hfilesReplicated);<a name="line.225"></a>
 <span class="sourceLineNo">226</span>      
this.totalReplicatedEdits.addAndGet(totalReplicated);<a name="line.226"></a>
 <span class="sourceLineNo">227</span>    } catch (IOException ex) {<a 
name="line.227"></a>

Reply via email to