You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2017/09/11 15:29:29 UTC
[07/26] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/util/ForeignExceptionUtil.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/ForeignExceptionUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/ForeignExceptionUtil.html
index 562ee44..ed951bb 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/ForeignExceptionUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/ForeignExceptionUtil.html
@@ -31,127 +31,129 @@
<span class="sourceLineNo">023</span>import java.util.ArrayList;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a>
<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Helper to convert Exceptions and StackTraces from/to protobuf.<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * (see ErrorHandling.proto for the internal of the proto messages)<a name="line.34"></a>
-<span class="sourceLineNo">035</span> */<a name="line.35"></a>
-<span class="sourceLineNo">036</span>@InterfaceAudience.Private<a name="line.36"></a>
-<span class="sourceLineNo">037</span>@InterfaceStability.Evolving<a name="line.37"></a>
-<span class="sourceLineNo">038</span>public final class ForeignExceptionUtil {<a name="line.38"></a>
-<span class="sourceLineNo">039</span> private ForeignExceptionUtil() { }<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span> public static Exception toException(final ForeignExceptionMessage eem) {<a name="line.41"></a>
-<span class="sourceLineNo">042</span> Exception re;<a name="line.42"></a>
-<span class="sourceLineNo">043</span> try {<a name="line.43"></a>
-<span class="sourceLineNo">044</span> re = createException(Exception.class, eem);<a name="line.44"></a>
-<span class="sourceLineNo">045</span> } catch (Throwable e) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span> re = new Exception(eem.getGenericException().getMessage());<a name="line.46"></a>
-<span class="sourceLineNo">047</span> }<a name="line.47"></a>
-<span class="sourceLineNo">048</span> return setExceptionDetails(re, eem);<a name="line.48"></a>
-<span class="sourceLineNo">049</span> }<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span> public static IOException toIOException(final ForeignExceptionMessage eem) {<a name="line.51"></a>
-<span class="sourceLineNo">052</span> IOException re;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> try {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> re = createException(IOException.class, eem);<a name="line.54"></a>
-<span class="sourceLineNo">055</span> } catch (Throwable e) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> re = new IOException(eem.getGenericException().getMessage());<a name="line.56"></a>
-<span class="sourceLineNo">057</span> }<a name="line.57"></a>
-<span class="sourceLineNo">058</span> return setExceptionDetails(re, eem);<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> private static <T extends Exception> T createException(final Class<T> clazz,<a name="line.61"></a>
-<span class="sourceLineNo">062</span> final ForeignExceptionMessage eem) throws ClassNotFoundException, NoSuchMethodException,<a name="line.62"></a>
-<span class="sourceLineNo">063</span> InstantiationException, IllegalAccessException, InvocationTargetException {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> final GenericExceptionMessage gem = eem.getGenericException();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> final Class<?> realClass = Class.forName(gem.getClassName());<a name="line.65"></a>
-<span class="sourceLineNo">066</span> final Class<? extends T> cls = realClass.asSubclass(clazz);<a name="line.66"></a>
-<span class="sourceLineNo">067</span> final Constructor<? extends T> cn = cls.getConstructor(String.class);<a name="line.67"></a>
-<span class="sourceLineNo">068</span> cn.setAccessible(true);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> return cn.newInstance(gem.getMessage());<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> private static <T extends Exception> T setExceptionDetails(final T exception,<a name="line.72"></a>
-<span class="sourceLineNo">073</span> final ForeignExceptionMessage eem) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> final GenericExceptionMessage gem = eem.getGenericException();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> final StackTraceElement[] trace = toStackTrace(gem.getTraceList());<a name="line.75"></a>
-<span class="sourceLineNo">076</span> exception.setStackTrace(trace);<a name="line.76"></a>
-<span class="sourceLineNo">077</span> return exception;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> public static ForeignExceptionMessage toProtoForeignException(final Throwable t) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return toProtoForeignException(null, t);<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> public static ForeignExceptionMessage toProtoForeignException(String source, Throwable t) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> GenericExceptionMessage.Builder gemBuilder = GenericExceptionMessage.newBuilder();<a name="line.85"></a>
-<span class="sourceLineNo">086</span> gemBuilder.setClassName(t.getClass().getName());<a name="line.86"></a>
-<span class="sourceLineNo">087</span> if (t.getMessage() != null) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span> gemBuilder.setMessage(t.getMessage());<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span> // set the stack trace, if there is one<a name="line.90"></a>
-<span class="sourceLineNo">091</span> List<StackTraceElementMessage> stack = toProtoStackTraceElement(t.getStackTrace());<a name="line.91"></a>
-<span class="sourceLineNo">092</span> if (stack != null) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> gemBuilder.addAllTrace(stack);<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span> GenericExceptionMessage payload = gemBuilder.build();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> ForeignExceptionMessage.Builder exception = ForeignExceptionMessage.newBuilder();<a name="line.96"></a>
-<span class="sourceLineNo">097</span> exception.setGenericException(payload);<a name="line.97"></a>
-<span class="sourceLineNo">098</span> if (source != null) exception.setSource(source);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> return exception.build();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> }<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> * Convert a stack trace to list of {@link StackTraceElement}.<a name="line.103"></a>
-<span class="sourceLineNo">104</span> * @param trace the stack trace to convert to protobuf message<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * @return <tt>null</tt> if the passed stack is <tt>null</tt>.<a name="line.105"></a>
-<span class="sourceLineNo">106</span> */<a name="line.106"></a>
-<span class="sourceLineNo">107</span> public static List<StackTraceElementMessage> toProtoStackTraceElement(StackTraceElement[] trace) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // if there is no stack trace, ignore it and just return the message<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (trace == null) return null;<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // build the stack trace for the message<a name="line.110"></a>
-<span class="sourceLineNo">111</span> List<StackTraceElementMessage> pbTrace = new ArrayList<>(trace.length);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> for (StackTraceElement elem : trace) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> StackTraceElementMessage.Builder stackBuilder = StackTraceElementMessage.newBuilder();<a name="line.113"></a>
-<span class="sourceLineNo">114</span> stackBuilder.setDeclaringClass(elem.getClassName());<a name="line.114"></a>
-<span class="sourceLineNo">115</span> if (elem.getFileName() != null) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> stackBuilder.setFileName(elem.getFileName());<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> stackBuilder.setLineNumber(elem.getLineNumber());<a name="line.118"></a>
-<span class="sourceLineNo">119</span> stackBuilder.setMethodName(elem.getMethodName());<a name="line.119"></a>
-<span class="sourceLineNo">120</span> pbTrace.add(stackBuilder.build());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span> return pbTrace;<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> /**<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * Unwind a serialized array of {@link StackTraceElementMessage}s to a<a name="line.126"></a>
-<span class="sourceLineNo">127</span> * {@link StackTraceElement}s.<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * @param traceList list that was serialized<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @return the deserialized list or <tt>null</tt> if it couldn't be unwound (e.g. wasn't set on<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * the sender).<a name="line.130"></a>
-<span class="sourceLineNo">131</span> */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> public static StackTraceElement[] toStackTrace(List<StackTraceElementMessage> traceList) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if (traceList == null || traceList.isEmpty()) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> return new StackTraceElement[0]; // empty array<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span> StackTraceElement[] trace = new StackTraceElement[traceList.size()];<a name="line.136"></a>
-<span class="sourceLineNo">137</span> for (int i = 0; i < traceList.size(); i++) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> StackTraceElementMessage elem = traceList.get(i);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> trace[i] = new StackTraceElement(<a name="line.139"></a>
-<span class="sourceLineNo">140</span> elem.getDeclaringClass(), elem.getMethodName(),<a name="line.140"></a>
-<span class="sourceLineNo">141</span> elem.hasFileName() ? elem.getFileName() : null,<a name="line.141"></a>
-<span class="sourceLineNo">142</span> elem.getLineNumber());<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return trace;<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>}<a name="line.146"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.ForeignExceptionMessage;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.GenericExceptionMessage;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ErrorHandlingProtos.StackTraceElementMessage;<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
+<span class="sourceLineNo">031</span> * Helper to convert Exceptions and StackTraces from/to protobuf.<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * (see ErrorHandling.proto for the internal of the proto messages)<a name="line.32"></a>
+<span class="sourceLineNo">033</span> */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>// @InterfaceAudience.Private<a name="line.34"></a>
+<span class="sourceLineNo">035</span>// @InterfaceStability.Evolving<a name="line.35"></a>
+<span class="sourceLineNo">036</span>// This class has NO InterfaceAudience. It is commented out. We do not want to import<a name="line.36"></a>
+<span class="sourceLineNo">037</span>// InterfaceAudience. This would be only class in this module with the IA import and we do not want<a name="line.37"></a>
+<span class="sourceLineNo">038</span>// to have this module depend annotations module just for one class.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>// NO InterfaceAudience defaults to mean InterfaceAudience.Private!<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public final class ForeignExceptionUtil {<a name="line.40"></a>
+<span class="sourceLineNo">041</span> private ForeignExceptionUtil() { }<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span> public static Exception toException(final ForeignExceptionMessage eem) {<a name="line.43"></a>
+<span class="sourceLineNo">044</span> Exception re;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> try {<a name="line.45"></a>
+<span class="sourceLineNo">046</span> re = createException(Exception.class, eem);<a name="line.46"></a>
+<span class="sourceLineNo">047</span> } catch (Throwable e) {<a name="line.47"></a>
+<span class="sourceLineNo">048</span> re = new Exception(eem.getGenericException().getMessage());<a name="line.48"></a>
+<span class="sourceLineNo">049</span> }<a name="line.49"></a>
+<span class="sourceLineNo">050</span> return setExceptionDetails(re, eem);<a name="line.50"></a>
+<span class="sourceLineNo">051</span> }<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> public static IOException toIOException(final ForeignExceptionMessage eem) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span> IOException re;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> try {<a name="line.55"></a>
+<span class="sourceLineNo">056</span> re = createException(IOException.class, eem);<a name="line.56"></a>
+<span class="sourceLineNo">057</span> } catch (Throwable e) {<a name="line.57"></a>
+<span class="sourceLineNo">058</span> re = new IOException(eem.getGenericException().getMessage());<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span> return setExceptionDetails(re, eem);<a name="line.60"></a>
+<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> private static <T extends Exception> T createException(final Class<T> clazz,<a name="line.63"></a>
+<span class="sourceLineNo">064</span> final ForeignExceptionMessage eem) throws ClassNotFoundException, NoSuchMethodException,<a name="line.64"></a>
+<span class="sourceLineNo">065</span> InstantiationException, IllegalAccessException, InvocationTargetException {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> final GenericExceptionMessage gem = eem.getGenericException();<a name="line.66"></a>
+<span class="sourceLineNo">067</span> final Class<?> realClass = Class.forName(gem.getClassName());<a name="line.67"></a>
+<span class="sourceLineNo">068</span> final Class<? extends T> cls = realClass.asSubclass(clazz);<a name="line.68"></a>
+<span class="sourceLineNo">069</span> final Constructor<? extends T> cn = cls.getConstructor(String.class);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> cn.setAccessible(true);<a name="line.70"></a>
+<span class="sourceLineNo">071</span> return cn.newInstance(gem.getMessage());<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> private static <T extends Exception> T setExceptionDetails(final T exception,<a name="line.74"></a>
+<span class="sourceLineNo">075</span> final ForeignExceptionMessage eem) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> final GenericExceptionMessage gem = eem.getGenericException();<a name="line.76"></a>
+<span class="sourceLineNo">077</span> final StackTraceElement[] trace = toStackTrace(gem.getTraceList());<a name="line.77"></a>
+<span class="sourceLineNo">078</span> exception.setStackTrace(trace);<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return exception;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> public static ForeignExceptionMessage toProtoForeignException(final Throwable t) {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return toProtoForeignException(null, t);<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 static ForeignExceptionMessage toProtoForeignException(String source, Throwable t) {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> GenericExceptionMessage.Builder gemBuilder = GenericExceptionMessage.newBuilder();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> gemBuilder.setClassName(t.getClass().getName());<a name="line.88"></a>
+<span class="sourceLineNo">089</span> if (t.getMessage() != null) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> gemBuilder.setMessage(t.getMessage());<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> // set the stack trace, if there is one<a name="line.92"></a>
+<span class="sourceLineNo">093</span> List<StackTraceElementMessage> stack = toProtoStackTraceElement(t.getStackTrace());<a name="line.93"></a>
+<span class="sourceLineNo">094</span> if (stack != null) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> gemBuilder.addAllTrace(stack);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> }<a name="line.96"></a>
+<span class="sourceLineNo">097</span> GenericExceptionMessage payload = gemBuilder.build();<a name="line.97"></a>
+<span class="sourceLineNo">098</span> ForeignExceptionMessage.Builder exception = ForeignExceptionMessage.newBuilder();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> exception.setGenericException(payload);<a name="line.99"></a>
+<span class="sourceLineNo">100</span> if (source != null) exception.setSource(source);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> return exception.build();<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> * Convert a stack trace to list of {@link StackTraceElement}.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * @param trace the stack trace to convert to protobuf message<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * @return <tt>null</tt> if the passed stack is <tt>null</tt>.<a name="line.107"></a>
+<span class="sourceLineNo">108</span> */<a name="line.108"></a>
+<span class="sourceLineNo">109</span> public static List<StackTraceElementMessage> toProtoStackTraceElement(StackTraceElement[] trace) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> // if there is no stack trace, ignore it and just return the message<a name="line.110"></a>
+<span class="sourceLineNo">111</span> if (trace == null) return null;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> // build the stack trace for the message<a name="line.112"></a>
+<span class="sourceLineNo">113</span> List<StackTraceElementMessage> pbTrace = new ArrayList<>(trace.length);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> for (StackTraceElement elem : trace) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> StackTraceElementMessage.Builder stackBuilder = StackTraceElementMessage.newBuilder();<a name="line.115"></a>
+<span class="sourceLineNo">116</span> stackBuilder.setDeclaringClass(elem.getClassName());<a name="line.116"></a>
+<span class="sourceLineNo">117</span> if (elem.getFileName() != null) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span> stackBuilder.setFileName(elem.getFileName());<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span> stackBuilder.setLineNumber(elem.getLineNumber());<a name="line.120"></a>
+<span class="sourceLineNo">121</span> stackBuilder.setMethodName(elem.getMethodName());<a name="line.121"></a>
+<span class="sourceLineNo">122</span> pbTrace.add(stackBuilder.build());<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<a name="line.123"></a>
+<span class="sourceLineNo">124</span> return pbTrace;<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> * Unwind a serialized array of {@link StackTraceElementMessage}s to a<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * {@link StackTraceElement}s.<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @param traceList list that was serialized<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @return the deserialized list or <tt>null</tt> if it couldn't be unwound (e.g. wasn't set on<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * the sender).<a name="line.132"></a>
+<span class="sourceLineNo">133</span> */<a name="line.133"></a>
+<span class="sourceLineNo">134</span> public static StackTraceElement[] toStackTrace(List<StackTraceElementMessage> traceList) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> if (traceList == null || traceList.isEmpty()) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span> return new StackTraceElement[0]; // empty array<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span> StackTraceElement[] trace = new StackTraceElement[traceList.size()];<a name="line.138"></a>
+<span class="sourceLineNo">139</span> for (int i = 0; i < traceList.size(); i++) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> StackTraceElementMessage elem = traceList.get(i);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> trace[i] = new StackTraceElement(<a name="line.141"></a>
+<span class="sourceLineNo">142</span> elem.getDeclaringClass(), elem.getMethodName(),<a name="line.142"></a>
+<span class="sourceLineNo">143</span> elem.hasFileName() ? elem.getFileName() : null,<a name="line.143"></a>
+<span class="sourceLineNo">144</span> elem.getLineNumber());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span> return trace;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALKey.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALKey.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALKey.html
index da70902..c147556 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALKey.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALKey.html
@@ -547,9 +547,9 @@
<span class="sourceLineNo">539</span> this.encodedRegionName = encodedRegionName;<a name="line.539"></a>
<span class="sourceLineNo">540</span> }<a name="line.540"></a>
<span class="sourceLineNo">541</span><a name="line.541"></a>
-<span class="sourceLineNo">542</span> public WALProtos.WALKey.Builder getBuilder(<a name="line.542"></a>
+<span class="sourceLineNo">542</span> public WALProtos.WALEdit.Builder getBuilder(<a name="line.542"></a>
<span class="sourceLineNo">543</span> WALCellCodec.ByteStringCompressor compressor) throws IOException {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> WALProtos.WALKey.Builder builder = WALProtos.WALKey.newBuilder();<a name="line.544"></a>
+<span class="sourceLineNo">544</span> WALProtos.WALEdit.Builder builder = WALProtos.WALEdit.newBuilder();<a name="line.544"></a>
<span class="sourceLineNo">545</span> if (compressionContext == null) {<a name="line.545"></a>
<span class="sourceLineNo">546</span> builder.setEncodedRegionName(UnsafeByteOperations.unsafeWrap(this.encodedRegionName));<a name="line.546"></a>
<span class="sourceLineNo">547</span> builder.setTableName(UnsafeByteOperations.unsafeWrap(this.tablename.getName()));<a name="line.547"></a>
@@ -588,42 +588,42 @@
<span class="sourceLineNo">580</span> return builder;<a name="line.580"></a>
<span class="sourceLineNo">581</span> }<a name="line.581"></a>
<span class="sourceLineNo">582</span><a name="line.582"></a>
-<span class="sourceLineNo">583</span> public void readFieldsFromPb(WALProtos.WALKey walKey,<a name="line.583"></a>
+<span class="sourceLineNo">583</span> public void readFieldsFromPb(WALProtos.WALEdit walEdit,<a name="line.583"></a>
<span class="sourceLineNo">584</span> WALCellCodec.ByteStringUncompressor uncompressor)<a name="line.584"></a>
<span class="sourceLineNo">585</span> throws IOException {<a name="line.585"></a>
<span class="sourceLineNo">586</span> if (this.compressionContext != null) {<a name="line.586"></a>
<span class="sourceLineNo">587</span> this.encodedRegionName = uncompressor.uncompress(<a name="line.587"></a>
-<span class="sourceLineNo">588</span> walKey.getEncodedRegionName(), compressionContext.regionDict);<a name="line.588"></a>
+<span class="sourceLineNo">588</span> walEdit.getEncodedRegionName(), compressionContext.regionDict);<a name="line.588"></a>
<span class="sourceLineNo">589</span> byte[] tablenameBytes = uncompressor.uncompress(<a name="line.589"></a>
-<span class="sourceLineNo">590</span> walKey.getTableName(), compressionContext.tableDict);<a name="line.590"></a>
+<span class="sourceLineNo">590</span> walEdit.getTableName(), compressionContext.tableDict);<a name="line.590"></a>
<span class="sourceLineNo">591</span> this.tablename = TableName.valueOf(tablenameBytes);<a name="line.591"></a>
<span class="sourceLineNo">592</span> } else {<a name="line.592"></a>
-<span class="sourceLineNo">593</span> this.encodedRegionName = walKey.getEncodedRegionName().toByteArray();<a name="line.593"></a>
-<span class="sourceLineNo">594</span> this.tablename = TableName.valueOf(walKey.getTableName().toByteArray());<a name="line.594"></a>
+<span class="sourceLineNo">593</span> this.encodedRegionName = walEdit.getEncodedRegionName().toByteArray();<a name="line.593"></a>
+<span class="sourceLineNo">594</span> this.tablename = TableName.valueOf(walEdit.getTableName().toByteArray());<a name="line.594"></a>
<span class="sourceLineNo">595</span> }<a name="line.595"></a>
<span class="sourceLineNo">596</span> clusterIds.clear();<a name="line.596"></a>
-<span class="sourceLineNo">597</span> for (HBaseProtos.UUID clusterId : walKey.getClusterIdsList()) {<a name="line.597"></a>
+<span class="sourceLineNo">597</span> for (HBaseProtos.UUID clusterId : walEdit.getClusterIdsList()) {<a name="line.597"></a>
<span class="sourceLineNo">598</span> clusterIds.add(new UUID(clusterId.getMostSigBits(), clusterId.getLeastSigBits()));<a name="line.598"></a>
<span class="sourceLineNo">599</span> }<a name="line.599"></a>
-<span class="sourceLineNo">600</span> if (walKey.hasNonceGroup()) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span> this.nonceGroup = walKey.getNonceGroup();<a name="line.601"></a>
+<span class="sourceLineNo">600</span> if (walEdit.hasNonceGroup()) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span> this.nonceGroup = walEdit.getNonceGroup();<a name="line.601"></a>
<span class="sourceLineNo">602</span> }<a name="line.602"></a>
-<span class="sourceLineNo">603</span> if (walKey.hasNonce()) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> this.nonce = walKey.getNonce();<a name="line.604"></a>
+<span class="sourceLineNo">603</span> if (walEdit.hasNonce()) {<a name="line.603"></a>
+<span class="sourceLineNo">604</span> this.nonce = walEdit.getNonce();<a name="line.604"></a>
<span class="sourceLineNo">605</span> }<a name="line.605"></a>
<span class="sourceLineNo">606</span> this.replicationScope = null;<a name="line.606"></a>
-<span class="sourceLineNo">607</span> if (walKey.getScopesCount() > 0) {<a name="line.607"></a>
+<span class="sourceLineNo">607</span> if (walEdit.getScopesCount() > 0) {<a name="line.607"></a>
<span class="sourceLineNo">608</span> this.replicationScope = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> for (FamilyScope scope : walKey.getScopesList()) {<a name="line.609"></a>
+<span class="sourceLineNo">609</span> for (FamilyScope scope : walEdit.getScopesList()) {<a name="line.609"></a>
<span class="sourceLineNo">610</span> byte[] family = (compressionContext == null) ? scope.getFamily().toByteArray() :<a name="line.610"></a>
<span class="sourceLineNo">611</span> uncompressor.uncompress(scope.getFamily(), compressionContext.familyDict);<a name="line.611"></a>
<span class="sourceLineNo">612</span> this.replicationScope.put(family, scope.getScopeType().getNumber());<a name="line.612"></a>
<span class="sourceLineNo">613</span> }<a name="line.613"></a>
<span class="sourceLineNo">614</span> }<a name="line.614"></a>
-<span class="sourceLineNo">615</span> setSequenceId(walKey.getLogSequenceNumber());<a name="line.615"></a>
-<span class="sourceLineNo">616</span> this.writeTime = walKey.getWriteTime();<a name="line.616"></a>
-<span class="sourceLineNo">617</span> if(walKey.hasOrigSequenceNumber()) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span> this.origLogSeqNum = walKey.getOrigSequenceNumber();<a name="line.618"></a>
+<span class="sourceLineNo">615</span> setSequenceId(walEdit.getLogSequenceNumber());<a name="line.615"></a>
+<span class="sourceLineNo">616</span> this.writeTime = walEdit.getWriteTime();<a name="line.616"></a>
+<span class="sourceLineNo">617</span> if(walEdit.hasOrigSequenceNumber()) {<a name="line.617"></a>
+<span class="sourceLineNo">618</span> this.origLogSeqNum = walEdit.getOrigSequenceNumber();<a name="line.618"></a>
<span class="sourceLineNo">619</span> }<a name="line.619"></a>
<span class="sourceLineNo">620</span> }<a name="line.620"></a>
<span class="sourceLineNo">621</span><a name="line.621"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.CorruptedLogFileException.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.EntryBuffers.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogRecoveredEditsOutputSink.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogReplayOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogReplayOutputSink.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogReplayOutputSink.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogReplayOutputSink.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.LogReplayOutputSink.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.MutationReplay.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.OutputSink.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.PipelineController.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionEntryBuffer.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionServerWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionServerWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionServerWriter.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionServerWriter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.RegionServerWriter.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.SinkWriter.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539471a7/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
index f4f27c4..eafce64 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.WriterAndPath.html
@@ -2346,8 +2346,8 @@
<span class="sourceLineNo">2338</span> return new ArrayList<>();<a name="line.2338"></a>
<span class="sourceLineNo">2339</span> }<a name="line.2339"></a>
<span class="sourceLineNo">2340</span><a name="line.2340"></a>
-<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getKey().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span> entry.getKey().getOrigSequenceNumber() : entry.getKey().getLogSequenceNumber();<a name="line.2342"></a>
+<span class="sourceLineNo">2341</span> long replaySeqId = (entry.getEdit().hasOrigSequenceNumber()) ?<a name="line.2341"></a>
+<span class="sourceLineNo">2342</span> entry.getEdit().getOrigSequenceNumber() : entry.getEdit().getLogSequenceNumber();<a name="line.2342"></a>
<span class="sourceLineNo">2343</span> int count = entry.getAssociatedCellCount();<a name="line.2343"></a>
<span class="sourceLineNo">2344</span> List<MutationReplay> mutations = new ArrayList<>();<a name="line.2344"></a>
<span class="sourceLineNo">2345</span> Cell previousCell = null;<a name="line.2345"></a>
@@ -2377,9 +2377,9 @@
<span class="sourceLineNo">2369</span> } else {<a name="line.2369"></a>
<span class="sourceLineNo">2370</span> m = new Put(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.2370"></a>
<span class="sourceLineNo">2371</span> // Puts might come from increment or append, thus we need nonces.<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span> long nonceGroup = entry.getKey().hasNonceGroup()<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span> ? entry.getKey().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span> long nonce = entry.getKey().hasNonce() ? entry.getKey().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
+<span class="sourceLineNo">2372</span> long nonceGroup = entry.getEdit().hasNonceGroup()<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span> ? entry.getEdit().getNonceGroup() : HConstants.NO_NONCE;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span> long nonce = entry.getEdit().hasNonce() ? entry.getEdit().getNonce() : HConstants.NO_NONCE;<a name="line.2374"></a>
<span class="sourceLineNo">2375</span> mutations.add(new MutationReplay(MutationType.PUT, m, nonceGroup, nonce));<a name="line.2375"></a>
<span class="sourceLineNo">2376</span> }<a name="line.2376"></a>
<span class="sourceLineNo">2377</span> }<a name="line.2377"></a>
@@ -2394,10 +2394,10 @@
<span class="sourceLineNo">2386</span><a name="line.2386"></a>
<span class="sourceLineNo">2387</span> // reconstruct WALKey<a name="line.2387"></a>
<span class="sourceLineNo">2388</span> if (logEntry != null) {<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALKey walKeyProto =<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span> entry.getKey();<a name="line.2390"></a>
+<span class="sourceLineNo">2389</span> org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.WALEdit walKeyProto =<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span> entry.getEdit();<a name="line.2390"></a>
<span class="sourceLineNo">2391</span> List<UUID> clusterIds = new ArrayList<>(walKeyProto.getClusterIdsCount());<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getKey().getClusterIdsList()) {<a name="line.2392"></a>
+<span class="sourceLineNo">2392</span> for (HBaseProtos.UUID uuid : entry.getEdit().getClusterIdsList()) {<a name="line.2392"></a>
<span class="sourceLineNo">2393</span> clusterIds.add(new UUID(uuid.getMostSigBits(), uuid.getLeastSigBits()));<a name="line.2393"></a>
<span class="sourceLineNo">2394</span> }<a name="line.2394"></a>
<span class="sourceLineNo">2395</span> key = new WALKey(walKeyProto.getEncodedRegionName().toByteArray(), TableName.valueOf(<a name="line.2395"></a>