http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilder.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilder.html b/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilder.html index 6f58dbe..b93bf76 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilder.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilder.html @@ -55,24 +55,26 @@ <span class="sourceLineNo">047</span> ExtendedCellBuilder setTimestamp(final long timestamp);<a name="line.47"></a> <span class="sourceLineNo">048</span><a name="line.48"></a> <span class="sourceLineNo">049</span> @Override<a name="line.49"></a> -<span class="sourceLineNo">050</span> ExtendedCellBuilder setType(final byte type);<a name="line.50"></a> +<span class="sourceLineNo">050</span> ExtendedCellBuilder setType(final DataType type);<a name="line.50"></a> <span class="sourceLineNo">051</span><a name="line.51"></a> -<span class="sourceLineNo">052</span> @Override<a name="line.52"></a> -<span class="sourceLineNo">053</span> ExtendedCellBuilder setValue(final byte[] value);<a name="line.53"></a> +<span class="sourceLineNo">052</span> ExtendedCellBuilder setType(final byte type);<a name="line.52"></a> +<span class="sourceLineNo">053</span><a name="line.53"></a> <span class="sourceLineNo">054</span> @Override<a name="line.54"></a> -<span class="sourceLineNo">055</span> ExtendedCellBuilder setValue(final byte[] value, final int vOffset, final int vLength);<a name="line.55"></a> -<span class="sourceLineNo">056</span><a name="line.56"></a> -<span class="sourceLineNo">057</span> @Override<a name="line.57"></a> -<span class="sourceLineNo">058</span> ExtendedCell build();<a name="line.58"></a> -<span class="sourceLineNo">059</span><a name="line.59"></a> -<span class="sourceLineNo">060</span> @Override<a name="line.60"></a> -<span class="sourceLineNo">061</span> ExtendedCellBuilder clear();<a name="line.61"></a> -<span class="sourceLineNo">062</span><a name="line.62"></a> -<span class="sourceLineNo">063</span> ExtendedCellBuilder setTags(final byte[] tags);<a name="line.63"></a> -<span class="sourceLineNo">064</span> ExtendedCellBuilder setTags(final byte[] tags, int tagsOffset, int tagsLength);<a name="line.64"></a> -<span class="sourceLineNo">065</span><a name="line.65"></a> -<span class="sourceLineNo">066</span> ExtendedCellBuilder setSequenceId(final long seqId);<a name="line.66"></a> -<span class="sourceLineNo">067</span>}<a name="line.67"></a> +<span class="sourceLineNo">055</span> ExtendedCellBuilder setValue(final byte[] value);<a name="line.55"></a> +<span class="sourceLineNo">056</span> @Override<a name="line.56"></a> +<span class="sourceLineNo">057</span> ExtendedCellBuilder setValue(final byte[] value, final int vOffset, final int vLength);<a name="line.57"></a> +<span class="sourceLineNo">058</span><a name="line.58"></a> +<span class="sourceLineNo">059</span> @Override<a name="line.59"></a> +<span class="sourceLineNo">060</span> ExtendedCell build();<a name="line.60"></a> +<span class="sourceLineNo">061</span><a name="line.61"></a> +<span class="sourceLineNo">062</span> @Override<a name="line.62"></a> +<span class="sourceLineNo">063</span> ExtendedCellBuilder clear();<a name="line.63"></a> +<span class="sourceLineNo">064</span><a name="line.64"></a> +<span class="sourceLineNo">065</span> ExtendedCellBuilder setTags(final byte[] tags);<a name="line.65"></a> +<span class="sourceLineNo">066</span> ExtendedCellBuilder setTags(final byte[] tags, int tagsOffset, int tagsLength);<a name="line.66"></a> +<span class="sourceLineNo">067</span><a name="line.67"></a> +<span class="sourceLineNo">068</span> ExtendedCellBuilder setSequenceId(final long seqId);<a name="line.68"></a> +<span class="sourceLineNo">069</span>}<a name="line.69"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilderImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilderImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilderImpl.html index 32e08d7..54a2937 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilderImpl.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/ExtendedCellBuilderImpl.html @@ -40,7 +40,7 @@ <span class="sourceLineNo">032</span> protected int qOffset = 0;<a name="line.32"></a> <span class="sourceLineNo">033</span> protected int qLength = 0;<a name="line.33"></a> <span class="sourceLineNo">034</span> protected long timestamp = HConstants.LATEST_TIMESTAMP;<a name="line.34"></a> -<span class="sourceLineNo">035</span> protected Byte type = null;<a name="line.35"></a> +<span class="sourceLineNo">035</span> protected KeyValue.Type type = null;<a name="line.35"></a> <span class="sourceLineNo">036</span> protected byte[] value = null;<a name="line.36"></a> <span class="sourceLineNo">037</span> protected int vOffset = 0;<a name="line.37"></a> <span class="sourceLineNo">038</span> protected int vLength = 0;<a name="line.38"></a> @@ -95,80 +95,97 @@ <span class="sourceLineNo">087</span> }<a name="line.87"></a> <span class="sourceLineNo">088</span><a name="line.88"></a> <span class="sourceLineNo">089</span> @Override<a name="line.89"></a> -<span class="sourceLineNo">090</span> public ExtendedCellBuilder setType(final byte type) {<a name="line.90"></a> -<span class="sourceLineNo">091</span> this.type = type;<a name="line.91"></a> +<span class="sourceLineNo">090</span> public ExtendedCellBuilder setType(final DataType type) {<a name="line.90"></a> +<span class="sourceLineNo">091</span> this.type = toKeyValueType(type);<a name="line.91"></a> <span class="sourceLineNo">092</span> return this;<a name="line.92"></a> <span class="sourceLineNo">093</span> }<a name="line.93"></a> <span class="sourceLineNo">094</span><a name="line.94"></a> <span class="sourceLineNo">095</span> @Override<a name="line.95"></a> -<span class="sourceLineNo">096</span> public ExtendedCellBuilder setValue(final byte[] value) {<a name="line.96"></a> -<span class="sourceLineNo">097</span> return setValue(value, 0, ArrayUtils.length(value));<a name="line.97"></a> -<span class="sourceLineNo">098</span> }<a name="line.98"></a> -<span class="sourceLineNo">099</span><a name="line.99"></a> -<span class="sourceLineNo">100</span> @Override<a name="line.100"></a> -<span class="sourceLineNo">101</span> public ExtendedCellBuilder setValue(final byte[] value, int vOffset, int vLength) {<a name="line.101"></a> -<span class="sourceLineNo">102</span> this.value = value;<a name="line.102"></a> -<span class="sourceLineNo">103</span> this.vOffset = vOffset;<a name="line.103"></a> -<span class="sourceLineNo">104</span> this.vLength = vLength;<a name="line.104"></a> -<span class="sourceLineNo">105</span> return this;<a name="line.105"></a> -<span class="sourceLineNo">106</span> }<a name="line.106"></a> -<span class="sourceLineNo">107</span><a name="line.107"></a> -<span class="sourceLineNo">108</span> @Override<a name="line.108"></a> -<span class="sourceLineNo">109</span> public ExtendedCellBuilder setTags(final byte[] tags) {<a name="line.109"></a> -<span class="sourceLineNo">110</span> return setTags(tags, 0, ArrayUtils.length(tags));<a name="line.110"></a> -<span class="sourceLineNo">111</span> }<a name="line.111"></a> -<span class="sourceLineNo">112</span><a name="line.112"></a> -<span class="sourceLineNo">113</span> @Override<a name="line.113"></a> -<span class="sourceLineNo">114</span> public ExtendedCellBuilder setTags(final byte[] tags, int tagsOffset, int tagsLength) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> this.tags = tags;<a name="line.115"></a> -<span class="sourceLineNo">116</span> this.tagsOffset = tagsOffset;<a name="line.116"></a> -<span class="sourceLineNo">117</span> this.tagsLength = tagsLength;<a name="line.117"></a> -<span class="sourceLineNo">118</span> return this;<a name="line.118"></a> -<span class="sourceLineNo">119</span> }<a name="line.119"></a> -<span class="sourceLineNo">120</span><a name="line.120"></a> -<span class="sourceLineNo">121</span> @Override<a name="line.121"></a> -<span class="sourceLineNo">122</span> public ExtendedCellBuilder setSequenceId(final long seqId) {<a name="line.122"></a> -<span class="sourceLineNo">123</span> this.seqId = seqId;<a name="line.123"></a> +<span class="sourceLineNo">096</span> public ExtendedCellBuilder setType(final byte type) {<a name="line.96"></a> +<span class="sourceLineNo">097</span> this.type = KeyValue.Type.codeToType(type);<a name="line.97"></a> +<span class="sourceLineNo">098</span> return this;<a name="line.98"></a> +<span class="sourceLineNo">099</span> }<a name="line.99"></a> +<span class="sourceLineNo">100</span><a name="line.100"></a> +<span class="sourceLineNo">101</span> @Override<a name="line.101"></a> +<span class="sourceLineNo">102</span> public ExtendedCellBuilder setValue(final byte[] value) {<a name="line.102"></a> +<span class="sourceLineNo">103</span> return setValue(value, 0, ArrayUtils.length(value));<a name="line.103"></a> +<span class="sourceLineNo">104</span> }<a name="line.104"></a> +<span class="sourceLineNo">105</span><a name="line.105"></a> +<span class="sourceLineNo">106</span> @Override<a name="line.106"></a> +<span class="sourceLineNo">107</span> public ExtendedCellBuilder setValue(final byte[] value, int vOffset, int vLength) {<a name="line.107"></a> +<span class="sourceLineNo">108</span> this.value = value;<a name="line.108"></a> +<span class="sourceLineNo">109</span> this.vOffset = vOffset;<a name="line.109"></a> +<span class="sourceLineNo">110</span> this.vLength = vLength;<a name="line.110"></a> +<span class="sourceLineNo">111</span> return this;<a name="line.111"></a> +<span class="sourceLineNo">112</span> }<a name="line.112"></a> +<span class="sourceLineNo">113</span><a name="line.113"></a> +<span class="sourceLineNo">114</span> @Override<a name="line.114"></a> +<span class="sourceLineNo">115</span> public ExtendedCellBuilder setTags(final byte[] tags) {<a name="line.115"></a> +<span class="sourceLineNo">116</span> return setTags(tags, 0, ArrayUtils.length(tags));<a name="line.116"></a> +<span class="sourceLineNo">117</span> }<a name="line.117"></a> +<span class="sourceLineNo">118</span><a name="line.118"></a> +<span class="sourceLineNo">119</span> @Override<a name="line.119"></a> +<span class="sourceLineNo">120</span> public ExtendedCellBuilder setTags(final byte[] tags, int tagsOffset, int tagsLength) {<a name="line.120"></a> +<span class="sourceLineNo">121</span> this.tags = tags;<a name="line.121"></a> +<span class="sourceLineNo">122</span> this.tagsOffset = tagsOffset;<a name="line.122"></a> +<span class="sourceLineNo">123</span> this.tagsLength = tagsLength;<a name="line.123"></a> <span class="sourceLineNo">124</span> return this;<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> private void checkBeforeBuild() {<a name="line.127"></a> -<span class="sourceLineNo">128</span> if (type == null) {<a name="line.128"></a> -<span class="sourceLineNo">129</span> throw new IllegalArgumentException("The type can't be NULL");<a name="line.129"></a> -<span class="sourceLineNo">130</span> }<a name="line.130"></a> +<span class="sourceLineNo">127</span> @Override<a name="line.127"></a> +<span class="sourceLineNo">128</span> public ExtendedCellBuilder setSequenceId(final long seqId) {<a name="line.128"></a> +<span class="sourceLineNo">129</span> this.seqId = seqId;<a name="line.129"></a> +<span class="sourceLineNo">130</span> return this;<a name="line.130"></a> <span class="sourceLineNo">131</span> }<a name="line.131"></a> <span class="sourceLineNo">132</span><a name="line.132"></a> -<span class="sourceLineNo">133</span> protected abstract ExtendedCell innerBuild();<a name="line.133"></a> -<span class="sourceLineNo">134</span><a name="line.134"></a> -<span class="sourceLineNo">135</span> @Override<a name="line.135"></a> -<span class="sourceLineNo">136</span> public ExtendedCell build() {<a name="line.136"></a> -<span class="sourceLineNo">137</span> checkBeforeBuild();<a name="line.137"></a> -<span class="sourceLineNo">138</span> return innerBuild();<a name="line.138"></a> -<span class="sourceLineNo">139</span> }<a name="line.139"></a> +<span class="sourceLineNo">133</span> private void checkBeforeBuild() {<a name="line.133"></a> +<span class="sourceLineNo">134</span> if (type == null) {<a name="line.134"></a> +<span class="sourceLineNo">135</span> throw new IllegalArgumentException("The type can't be NULL");<a name="line.135"></a> +<span class="sourceLineNo">136</span> }<a name="line.136"></a> +<span class="sourceLineNo">137</span> }<a name="line.137"></a> +<span class="sourceLineNo">138</span><a name="line.138"></a> +<span class="sourceLineNo">139</span> protected abstract ExtendedCell innerBuild();<a name="line.139"></a> <span class="sourceLineNo">140</span><a name="line.140"></a> <span class="sourceLineNo">141</span> @Override<a name="line.141"></a> -<span class="sourceLineNo">142</span> public ExtendedCellBuilder clear() {<a name="line.142"></a> -<span class="sourceLineNo">143</span> row = null;<a name="line.143"></a> -<span class="sourceLineNo">144</span> rOffset = 0;<a name="line.144"></a> -<span class="sourceLineNo">145</span> rLength = 0;<a name="line.145"></a> -<span class="sourceLineNo">146</span> family = null;<a name="line.146"></a> -<span class="sourceLineNo">147</span> fOffset = 0;<a name="line.147"></a> -<span class="sourceLineNo">148</span> fLength = 0;<a name="line.148"></a> -<span class="sourceLineNo">149</span> qualifier = null;<a name="line.149"></a> -<span class="sourceLineNo">150</span> qOffset = 0;<a name="line.150"></a> -<span class="sourceLineNo">151</span> qLength = 0;<a name="line.151"></a> -<span class="sourceLineNo">152</span> timestamp = HConstants.LATEST_TIMESTAMP;<a name="line.152"></a> -<span class="sourceLineNo">153</span> type = null;<a name="line.153"></a> -<span class="sourceLineNo">154</span> value = null;<a name="line.154"></a> -<span class="sourceLineNo">155</span> vOffset = 0;<a name="line.155"></a> -<span class="sourceLineNo">156</span> vLength = 0;<a name="line.156"></a> -<span class="sourceLineNo">157</span> seqId = 0;<a name="line.157"></a> -<span class="sourceLineNo">158</span> tags = null;<a name="line.158"></a> -<span class="sourceLineNo">159</span> tagsOffset = 0;<a name="line.159"></a> -<span class="sourceLineNo">160</span> tagsLength = 0;<a name="line.160"></a> -<span class="sourceLineNo">161</span> return this;<a name="line.161"></a> -<span class="sourceLineNo">162</span> }<a name="line.162"></a> -<span class="sourceLineNo">163</span>}<a name="line.163"></a> +<span class="sourceLineNo">142</span> public ExtendedCell build() {<a name="line.142"></a> +<span class="sourceLineNo">143</span> checkBeforeBuild();<a name="line.143"></a> +<span class="sourceLineNo">144</span> return innerBuild();<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">147</span> @Override<a name="line.147"></a> +<span class="sourceLineNo">148</span> public ExtendedCellBuilder clear() {<a name="line.148"></a> +<span class="sourceLineNo">149</span> row = null;<a name="line.149"></a> +<span class="sourceLineNo">150</span> rOffset = 0;<a name="line.150"></a> +<span class="sourceLineNo">151</span> rLength = 0;<a name="line.151"></a> +<span class="sourceLineNo">152</span> family = null;<a name="line.152"></a> +<span class="sourceLineNo">153</span> fOffset = 0;<a name="line.153"></a> +<span class="sourceLineNo">154</span> fLength = 0;<a name="line.154"></a> +<span class="sourceLineNo">155</span> qualifier = null;<a name="line.155"></a> +<span class="sourceLineNo">156</span> qOffset = 0;<a name="line.156"></a> +<span class="sourceLineNo">157</span> qLength = 0;<a name="line.157"></a> +<span class="sourceLineNo">158</span> timestamp = HConstants.LATEST_TIMESTAMP;<a name="line.158"></a> +<span class="sourceLineNo">159</span> type = null;<a name="line.159"></a> +<span class="sourceLineNo">160</span> value = null;<a name="line.160"></a> +<span class="sourceLineNo">161</span> vOffset = 0;<a name="line.161"></a> +<span class="sourceLineNo">162</span> vLength = 0;<a name="line.162"></a> +<span class="sourceLineNo">163</span> seqId = 0;<a name="line.163"></a> +<span class="sourceLineNo">164</span> tags = null;<a name="line.164"></a> +<span class="sourceLineNo">165</span> tagsOffset = 0;<a name="line.165"></a> +<span class="sourceLineNo">166</span> tagsLength = 0;<a name="line.166"></a> +<span class="sourceLineNo">167</span> return this;<a name="line.167"></a> +<span class="sourceLineNo">168</span> }<a name="line.168"></a> +<span class="sourceLineNo">169</span><a name="line.169"></a> +<span class="sourceLineNo">170</span> private static KeyValue.Type toKeyValueType(DataType type) {<a name="line.170"></a> +<span class="sourceLineNo">171</span> switch (type) {<a name="line.171"></a> +<span class="sourceLineNo">172</span> case Put: return KeyValue.Type.Put;<a name="line.172"></a> +<span class="sourceLineNo">173</span> case Delete: return KeyValue.Type.Delete;<a name="line.173"></a> +<span class="sourceLineNo">174</span> case DeleteColumn: return KeyValue.Type.DeleteColumn;<a name="line.174"></a> +<span class="sourceLineNo">175</span> case DeleteFamilyVersion: return KeyValue.Type.DeleteFamilyVersion;<a name="line.175"></a> +<span class="sourceLineNo">176</span> case DeleteFamily: return KeyValue.Type.DeleteFamily;<a name="line.176"></a> +<span class="sourceLineNo">177</span> default: throw new UnsupportedOperationException("Unsupported data type:" + type);<a name="line.177"></a> +<span class="sourceLineNo">178</span> }<a name="line.178"></a> +<span class="sourceLineNo">179</span> }<a name="line.179"></a> +<span class="sourceLineNo">180</span>}<a name="line.180"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/IndividualBytesFieldCellBuilder.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/IndividualBytesFieldCellBuilder.html b/devapidocs/src-html/org/apache/hadoop/hbase/IndividualBytesFieldCellBuilder.html index 33272ed..5a263a6 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/IndividualBytesFieldCellBuilder.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/IndividualBytesFieldCellBuilder.html @@ -34,7 +34,7 @@ <span class="sourceLineNo">026</span> return new IndividualBytesFieldCell(row, rOffset, rLength,<a name="line.26"></a> <span class="sourceLineNo">027</span> family, fOffset, fLength,<a name="line.27"></a> <span class="sourceLineNo">028</span> qualifier, qOffset, qLength,<a name="line.28"></a> -<span class="sourceLineNo">029</span> timestamp, KeyValue.Type.codeToType(type), seqId,<a name="line.29"></a> +<span class="sourceLineNo">029</span> timestamp, type, seqId,<a name="line.29"></a> <span class="sourceLineNo">030</span> value, vOffset, vLength,<a name="line.30"></a> <span class="sourceLineNo">031</span> tags, tagsOffset, tagsLength);<a name="line.31"></a> <span class="sourceLineNo">032</span> }<a name="line.32"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueBuilder.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueBuilder.html b/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueBuilder.html index 111424d..895c7a0 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueBuilder.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/KeyValueBuilder.html @@ -34,7 +34,7 @@ <span class="sourceLineNo">026</span> KeyValue kv = new KeyValue(row, rOffset, rLength,<a name="line.26"></a> <span class="sourceLineNo">027</span> family, fOffset, fLength,<a name="line.27"></a> <span class="sourceLineNo">028</span> qualifier, qOffset, qLength,<a name="line.28"></a> -<span class="sourceLineNo">029</span> timestamp, KeyValue.Type.codeToType(type),<a name="line.29"></a> +<span class="sourceLineNo">029</span> timestamp, type,<a name="line.29"></a> <span class="sourceLineNo">030</span> value, vOffset, vLength,<a name="line.30"></a> <span class="sourceLineNo">031</span> tags, tagsOffset, tagsLength);<a name="line.31"></a> <span class="sourceLineNo">032</span> kv.setSequenceId(seqId);<a name="line.32"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/Version.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html index 253c083..e6e642f 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html @@ -16,11 +16,11 @@ <span class="sourceLineNo">008</span>@InterfaceAudience.Private<a name="line.8"></a> <span class="sourceLineNo">009</span>public class Version {<a name="line.9"></a> <span class="sourceLineNo">010</span> public static final String version = "3.0.0-SNAPSHOT";<a name="line.10"></a> -<span class="sourceLineNo">011</span> public static final String revision = "0a24178d06ac3dd5780522d52b5054e7aff1e50f";<a name="line.11"></a> +<span class="sourceLineNo">011</span> public static final String revision = "98d1637bcd1954f73817d77b6aba7ebb6fc24890";<a name="line.11"></a> <span class="sourceLineNo">012</span> public static final String user = "jenkins";<a name="line.12"></a> -<span class="sourceLineNo">013</span> public static final String date = "Wed Oct 4 14:41:10 UTC 2017";<a name="line.13"></a> +<span class="sourceLineNo">013</span> public static final String date = "Thu Oct 5 14:41:46 UTC 2017";<a name="line.13"></a> <span class="sourceLineNo">014</span> public static final String url = "git://asf920.gq1.ygridcore.net/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.14"></a> -<span class="sourceLineNo">015</span> public static final String srcChecksum = "3f298dac1dfd08f6a08b8462627db9ee";<a name="line.15"></a> +<span class="sourceLineNo">015</span> public static final String srcChecksum = "c0bc25a3f87cc1c0b54505153742c14a";<a name="line.15"></a> <span class="sourceLineNo">016</span>}<a name="line.16"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html index 2185d33..bcf966e 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html @@ -229,7 +229,7 @@ <span class="sourceLineNo">221</span> // fail the overall backup and return<a name="line.221"></a> <span class="sourceLineNo">222</span> failBackup(conn, backupInfo, backupManager, e, "Unexpected Exception : ",<a name="line.222"></a> <span class="sourceLineNo">223</span> BackupType.INCREMENTAL, conf);<a name="line.223"></a> -<span class="sourceLineNo">224</span> return;<a name="line.224"></a> +<span class="sourceLineNo">224</span> throw new IOException(e);<a name="line.224"></a> <span class="sourceLineNo">225</span> }<a name="line.225"></a> <span class="sourceLineNo">226</span><a name="line.226"></a> <span class="sourceLineNo">227</span> // case INCREMENTAL_COPY:<a name="line.227"></a> @@ -245,7 +245,7 @@ <span class="sourceLineNo">237</span> String msg = "Unexpected exception in incremental-backup: incremental copy " + backupId;<a name="line.237"></a> <span class="sourceLineNo">238</span> // fail the overall backup and return<a name="line.238"></a> <span class="sourceLineNo">239</span> failBackup(conn, backupInfo, backupManager, e, msg, BackupType.INCREMENTAL, conf);<a name="line.239"></a> -<span class="sourceLineNo">240</span> return;<a name="line.240"></a> +<span class="sourceLineNo">240</span> throw new IOException(e);<a name="line.240"></a> <span class="sourceLineNo">241</span> }<a name="line.241"></a> <span class="sourceLineNo">242</span> // case INCR_BACKUP_COMPLETE:<a name="line.242"></a> <span class="sourceLineNo">243</span> // set overall backup status: complete. Here we make sure to complete the backup.<a name="line.243"></a> @@ -274,115 +274,116 @@ <span class="sourceLineNo">266</span> } catch (IOException e) {<a name="line.266"></a> <span class="sourceLineNo">267</span> failBackup(conn, backupInfo, backupManager, e, "Unexpected Exception : ",<a name="line.267"></a> <span class="sourceLineNo">268</span> BackupType.INCREMENTAL, conf);<a name="line.268"></a> -<span class="sourceLineNo">269</span> }<a name="line.269"></a> -<span class="sourceLineNo">270</span> }<a name="line.270"></a> -<span class="sourceLineNo">271</span><a name="line.271"></a> -<span class="sourceLineNo">272</span> protected void incrementalCopyHFiles(BackupInfo backupInfo) throws Exception {<a name="line.272"></a> -<span class="sourceLineNo">273</span><a name="line.273"></a> -<span class="sourceLineNo">274</span> try {<a name="line.274"></a> -<span class="sourceLineNo">275</span> LOG.debug("Incremental copy HFiles is starting.");<a name="line.275"></a> -<span class="sourceLineNo">276</span> // set overall backup phase: incremental_copy<a name="line.276"></a> -<span class="sourceLineNo">277</span> backupInfo.setPhase(BackupPhase.INCREMENTAL_COPY);<a name="line.277"></a> -<span class="sourceLineNo">278</span> // get incremental backup file list and prepare parms for DistCp<a name="line.278"></a> -<span class="sourceLineNo">279</span> List<String> incrBackupFileList = new ArrayList<String>();<a name="line.279"></a> -<span class="sourceLineNo">280</span> // Add Bulk output<a name="line.280"></a> -<span class="sourceLineNo">281</span> incrBackupFileList.add(getBulkOutputDir().toString());<a name="line.281"></a> -<span class="sourceLineNo">282</span> String[] strArr = incrBackupFileList.toArray(new String[incrBackupFileList.size() + 1]);<a name="line.282"></a> -<span class="sourceLineNo">283</span> strArr[strArr.length - 1] = backupInfo.getBackupRootDir();<a name="line.283"></a> -<span class="sourceLineNo">284</span> BackupCopyJob copyService = BackupRestoreFactory.getBackupCopyJob(conf);<a name="line.284"></a> -<span class="sourceLineNo">285</span> int res = copyService.copy(backupInfo, backupManager, conf, BackupType.INCREMENTAL, strArr);<a name="line.285"></a> -<span class="sourceLineNo">286</span> if (res != 0) {<a name="line.286"></a> -<span class="sourceLineNo">287</span> LOG.error("Copy incremental HFile files failed with return code: " + res + ".");<a name="line.287"></a> -<span class="sourceLineNo">288</span> throw new IOException("Failed copy from " + StringUtils.join(incrBackupFileList, ',')<a name="line.288"></a> -<span class="sourceLineNo">289</span> + " to " + backupInfo.getHLogTargetDir());<a name="line.289"></a> -<span class="sourceLineNo">290</span> }<a name="line.290"></a> -<span class="sourceLineNo">291</span> LOG.debug("Incremental copy HFiles from " + StringUtils.join(incrBackupFileList, ',')<a name="line.291"></a> -<span class="sourceLineNo">292</span> + " to " + backupInfo.getBackupRootDir() + " finished.");<a name="line.292"></a> -<span class="sourceLineNo">293</span> } finally {<a name="line.293"></a> -<span class="sourceLineNo">294</span> deleteBulkLoadDirectory();<a name="line.294"></a> -<span class="sourceLineNo">295</span> }<a name="line.295"></a> -<span class="sourceLineNo">296</span> }<a name="line.296"></a> -<span class="sourceLineNo">297</span><a name="line.297"></a> -<span class="sourceLineNo">298</span> protected void deleteBulkLoadDirectory() throws IOException {<a name="line.298"></a> -<span class="sourceLineNo">299</span> // delete original bulk load directory on method exit<a name="line.299"></a> -<span class="sourceLineNo">300</span> Path path = getBulkOutputDir();<a name="line.300"></a> -<span class="sourceLineNo">301</span> FileSystem fs = FileSystem.get(conf);<a name="line.301"></a> -<span class="sourceLineNo">302</span> boolean result = fs.delete(path, true);<a name="line.302"></a> -<span class="sourceLineNo">303</span> if (!result) {<a name="line.303"></a> -<span class="sourceLineNo">304</span> LOG.warn("Could not delete " + path);<a name="line.304"></a> -<span class="sourceLineNo">305</span> }<a name="line.305"></a> -<span class="sourceLineNo">306</span><a name="line.306"></a> -<span class="sourceLineNo">307</span> }<a name="line.307"></a> -<span class="sourceLineNo">308</span><a name="line.308"></a> -<span class="sourceLineNo">309</span> protected void convertWALsToHFiles(BackupInfo backupInfo) throws IOException {<a name="line.309"></a> -<span class="sourceLineNo">310</span> // get incremental backup file list and prepare parameters for DistCp<a name="line.310"></a> -<span class="sourceLineNo">311</span> List<String> incrBackupFileList = backupInfo.getIncrBackupFileList();<a name="line.311"></a> -<span class="sourceLineNo">312</span> // Get list of tables in incremental backup set<a name="line.312"></a> -<span class="sourceLineNo">313</span> Set<TableName> tableSet = backupManager.getIncrementalBackupTableSet();<a name="line.313"></a> -<span class="sourceLineNo">314</span> // filter missing files out (they have been copied by previous backups)<a name="line.314"></a> -<span class="sourceLineNo">315</span> incrBackupFileList = filterMissingFiles(incrBackupFileList);<a name="line.315"></a> -<span class="sourceLineNo">316</span> for (TableName table : tableSet) {<a name="line.316"></a> -<span class="sourceLineNo">317</span> // Check if table exists<a name="line.317"></a> -<span class="sourceLineNo">318</span> if (tableExists(table, conn)) {<a name="line.318"></a> -<span class="sourceLineNo">319</span> walToHFiles(incrBackupFileList, table);<a name="line.319"></a> -<span class="sourceLineNo">320</span> } else {<a name="line.320"></a> -<span class="sourceLineNo">321</span> LOG.warn("Table " + table + " does not exists. Skipping in WAL converter");<a name="line.321"></a> -<span class="sourceLineNo">322</span> }<a name="line.322"></a> -<span class="sourceLineNo">323</span> }<a name="line.323"></a> -<span class="sourceLineNo">324</span> }<a name="line.324"></a> -<span class="sourceLineNo">325</span><a name="line.325"></a> +<span class="sourceLineNo">269</span> throw new IOException(e);<a name="line.269"></a> +<span class="sourceLineNo">270</span> }<a name="line.270"></a> +<span class="sourceLineNo">271</span> }<a name="line.271"></a> +<span class="sourceLineNo">272</span><a name="line.272"></a> +<span class="sourceLineNo">273</span> protected void incrementalCopyHFiles(BackupInfo backupInfo) throws Exception {<a name="line.273"></a> +<span class="sourceLineNo">274</span><a name="line.274"></a> +<span class="sourceLineNo">275</span> try {<a name="line.275"></a> +<span class="sourceLineNo">276</span> LOG.debug("Incremental copy HFiles is starting.");<a name="line.276"></a> +<span class="sourceLineNo">277</span> // set overall backup phase: incremental_copy<a name="line.277"></a> +<span class="sourceLineNo">278</span> backupInfo.setPhase(BackupPhase.INCREMENTAL_COPY);<a name="line.278"></a> +<span class="sourceLineNo">279</span> // get incremental backup file list and prepare parms for DistCp<a name="line.279"></a> +<span class="sourceLineNo">280</span> List<String> incrBackupFileList = new ArrayList<String>();<a name="line.280"></a> +<span class="sourceLineNo">281</span> // Add Bulk output<a name="line.281"></a> +<span class="sourceLineNo">282</span> incrBackupFileList.add(getBulkOutputDir().toString());<a name="line.282"></a> +<span class="sourceLineNo">283</span> String[] strArr = incrBackupFileList.toArray(new String[incrBackupFileList.size() + 1]);<a name="line.283"></a> +<span class="sourceLineNo">284</span> strArr[strArr.length - 1] = backupInfo.getBackupRootDir();<a name="line.284"></a> +<span class="sourceLineNo">285</span> BackupCopyJob copyService = BackupRestoreFactory.getBackupCopyJob(conf);<a name="line.285"></a> +<span class="sourceLineNo">286</span> int res = copyService.copy(backupInfo, backupManager, conf, BackupType.INCREMENTAL, strArr);<a name="line.286"></a> +<span class="sourceLineNo">287</span> if (res != 0) {<a name="line.287"></a> +<span class="sourceLineNo">288</span> LOG.error("Copy incremental HFile files failed with return code: " + res + ".");<a name="line.288"></a> +<span class="sourceLineNo">289</span> throw new IOException("Failed copy from " + StringUtils.join(incrBackupFileList, ',')<a name="line.289"></a> +<span class="sourceLineNo">290</span> + " to " + backupInfo.getHLogTargetDir());<a name="line.290"></a> +<span class="sourceLineNo">291</span> }<a name="line.291"></a> +<span class="sourceLineNo">292</span> LOG.debug("Incremental copy HFiles from " + StringUtils.join(incrBackupFileList, ',')<a name="line.292"></a> +<span class="sourceLineNo">293</span> + " to " + backupInfo.getBackupRootDir() + " finished.");<a name="line.293"></a> +<span class="sourceLineNo">294</span> } finally {<a name="line.294"></a> +<span class="sourceLineNo">295</span> deleteBulkLoadDirectory();<a name="line.295"></a> +<span class="sourceLineNo">296</span> }<a name="line.296"></a> +<span class="sourceLineNo">297</span> }<a name="line.297"></a> +<span class="sourceLineNo">298</span><a name="line.298"></a> +<span class="sourceLineNo">299</span> protected void deleteBulkLoadDirectory() throws IOException {<a name="line.299"></a> +<span class="sourceLineNo">300</span> // delete original bulk load directory on method exit<a name="line.300"></a> +<span class="sourceLineNo">301</span> Path path = getBulkOutputDir();<a name="line.301"></a> +<span class="sourceLineNo">302</span> FileSystem fs = FileSystem.get(conf);<a name="line.302"></a> +<span class="sourceLineNo">303</span> boolean result = fs.delete(path, true);<a name="line.303"></a> +<span class="sourceLineNo">304</span> if (!result) {<a name="line.304"></a> +<span class="sourceLineNo">305</span> LOG.warn("Could not delete " + path);<a name="line.305"></a> +<span class="sourceLineNo">306</span> }<a name="line.306"></a> +<span class="sourceLineNo">307</span><a name="line.307"></a> +<span class="sourceLineNo">308</span> }<a name="line.308"></a> +<span class="sourceLineNo">309</span><a name="line.309"></a> +<span class="sourceLineNo">310</span> protected void convertWALsToHFiles(BackupInfo backupInfo) throws IOException {<a name="line.310"></a> +<span class="sourceLineNo">311</span> // get incremental backup file list and prepare parameters for DistCp<a name="line.311"></a> +<span class="sourceLineNo">312</span> List<String> incrBackupFileList = backupInfo.getIncrBackupFileList();<a name="line.312"></a> +<span class="sourceLineNo">313</span> // Get list of tables in incremental backup set<a name="line.313"></a> +<span class="sourceLineNo">314</span> Set<TableName> tableSet = backupManager.getIncrementalBackupTableSet();<a name="line.314"></a> +<span class="sourceLineNo">315</span> // filter missing files out (they have been copied by previous backups)<a name="line.315"></a> +<span class="sourceLineNo">316</span> incrBackupFileList = filterMissingFiles(incrBackupFileList);<a name="line.316"></a> +<span class="sourceLineNo">317</span> for (TableName table : tableSet) {<a name="line.317"></a> +<span class="sourceLineNo">318</span> // Check if table exists<a name="line.318"></a> +<span class="sourceLineNo">319</span> if (tableExists(table, conn)) {<a name="line.319"></a> +<span class="sourceLineNo">320</span> walToHFiles(incrBackupFileList, table);<a name="line.320"></a> +<span class="sourceLineNo">321</span> } else {<a name="line.321"></a> +<span class="sourceLineNo">322</span> LOG.warn("Table " + table + " does not exists. Skipping in WAL converter");<a name="line.322"></a> +<span class="sourceLineNo">323</span> }<a name="line.323"></a> +<span class="sourceLineNo">324</span> }<a name="line.324"></a> +<span class="sourceLineNo">325</span> }<a name="line.325"></a> <span class="sourceLineNo">326</span><a name="line.326"></a> -<span class="sourceLineNo">327</span> protected boolean tableExists(TableName table, Connection conn) throws IOException {<a name="line.327"></a> -<span class="sourceLineNo">328</span> try (Admin admin = conn.getAdmin();) {<a name="line.328"></a> -<span class="sourceLineNo">329</span> return admin.tableExists(table);<a name="line.329"></a> -<span class="sourceLineNo">330</span> }<a name="line.330"></a> -<span class="sourceLineNo">331</span> }<a name="line.331"></a> -<span class="sourceLineNo">332</span><a name="line.332"></a> -<span class="sourceLineNo">333</span> protected void walToHFiles(List<String> dirPaths, TableName tableName) throws IOException {<a name="line.333"></a> -<span class="sourceLineNo">334</span><a name="line.334"></a> -<span class="sourceLineNo">335</span> Tool player = new WALPlayer();<a name="line.335"></a> -<span class="sourceLineNo">336</span><a name="line.336"></a> -<span class="sourceLineNo">337</span> // Player reads all files in arbitrary directory structure and creates<a name="line.337"></a> -<span class="sourceLineNo">338</span> // a Map task for each file. We use ';' as separator<a name="line.338"></a> -<span class="sourceLineNo">339</span> // because WAL file names contains ','<a name="line.339"></a> -<span class="sourceLineNo">340</span> String dirs = StringUtils.join(dirPaths, ';');<a name="line.340"></a> -<span class="sourceLineNo">341</span><a name="line.341"></a> -<span class="sourceLineNo">342</span> Path bulkOutputPath = getBulkOutputDirForTable(tableName);<a name="line.342"></a> -<span class="sourceLineNo">343</span> conf.set(WALPlayer.BULK_OUTPUT_CONF_KEY, bulkOutputPath.toString());<a name="line.343"></a> -<span class="sourceLineNo">344</span> conf.set(WALPlayer.INPUT_FILES_SEPARATOR_KEY, ";");<a name="line.344"></a> -<span class="sourceLineNo">345</span> String[] playerArgs = { dirs, tableName.getNameAsString() };<a name="line.345"></a> -<span class="sourceLineNo">346</span><a name="line.346"></a> -<span class="sourceLineNo">347</span> try {<a name="line.347"></a> -<span class="sourceLineNo">348</span> player.setConf(conf);<a name="line.348"></a> -<span class="sourceLineNo">349</span> int result = player.run(playerArgs);<a name="line.349"></a> -<span class="sourceLineNo">350</span> if(result != 0) {<a name="line.350"></a> -<span class="sourceLineNo">351</span> throw new IOException("WAL Player failed");<a name="line.351"></a> -<span class="sourceLineNo">352</span> }<a name="line.352"></a> -<span class="sourceLineNo">353</span> conf.unset(WALPlayer.INPUT_FILES_SEPARATOR_KEY);<a name="line.353"></a> -<span class="sourceLineNo">354</span> } catch (IOException e) {<a name="line.354"></a> -<span class="sourceLineNo">355</span> throw e;<a name="line.355"></a> -<span class="sourceLineNo">356</span> } catch (Exception ee) {<a name="line.356"></a> -<span class="sourceLineNo">357</span> throw new IOException("Can not convert from directory " + dirs<a name="line.357"></a> -<span class="sourceLineNo">358</span> + " (check Hadoop, HBase and WALPlayer M/R job logs) ", ee);<a name="line.358"></a> -<span class="sourceLineNo">359</span> }<a name="line.359"></a> -<span class="sourceLineNo">360</span> }<a name="line.360"></a> -<span class="sourceLineNo">361</span><a name="line.361"></a> -<span class="sourceLineNo">362</span> protected Path getBulkOutputDirForTable(TableName table) {<a name="line.362"></a> -<span class="sourceLineNo">363</span> Path tablePath = getBulkOutputDir();<a name="line.363"></a> -<span class="sourceLineNo">364</span> tablePath = new Path(tablePath, table.getNamespaceAsString());<a name="line.364"></a> -<span class="sourceLineNo">365</span> tablePath = new Path(tablePath, table.getQualifierAsString());<a name="line.365"></a> -<span class="sourceLineNo">366</span> return new Path(tablePath, "data");<a name="line.366"></a> -<span class="sourceLineNo">367</span> }<a name="line.367"></a> -<span class="sourceLineNo">368</span><a name="line.368"></a> -<span class="sourceLineNo">369</span> protected Path getBulkOutputDir() {<a name="line.369"></a> -<span class="sourceLineNo">370</span> String backupId = backupInfo.getBackupId();<a name="line.370"></a> -<span class="sourceLineNo">371</span> Path path = new Path(backupInfo.getBackupRootDir());<a name="line.371"></a> -<span class="sourceLineNo">372</span> path = new Path(path, ".tmp");<a name="line.372"></a> -<span class="sourceLineNo">373</span> path = new Path(path, backupId);<a name="line.373"></a> -<span class="sourceLineNo">374</span> return path;<a name="line.374"></a> -<span class="sourceLineNo">375</span> }<a name="line.375"></a> -<span class="sourceLineNo">376</span><a name="line.376"></a> -<span class="sourceLineNo">377</span>}<a name="line.377"></a> +<span class="sourceLineNo">327</span><a name="line.327"></a> +<span class="sourceLineNo">328</span> protected boolean tableExists(TableName table, Connection conn) throws IOException {<a name="line.328"></a> +<span class="sourceLineNo">329</span> try (Admin admin = conn.getAdmin();) {<a name="line.329"></a> +<span class="sourceLineNo">330</span> return admin.tableExists(table);<a name="line.330"></a> +<span class="sourceLineNo">331</span> }<a name="line.331"></a> +<span class="sourceLineNo">332</span> }<a name="line.332"></a> +<span class="sourceLineNo">333</span><a name="line.333"></a> +<span class="sourceLineNo">334</span> protected void walToHFiles(List<String> dirPaths, TableName tableName) throws IOException {<a name="line.334"></a> +<span class="sourceLineNo">335</span><a name="line.335"></a> +<span class="sourceLineNo">336</span> Tool player = new WALPlayer();<a name="line.336"></a> +<span class="sourceLineNo">337</span><a name="line.337"></a> +<span class="sourceLineNo">338</span> // Player reads all files in arbitrary directory structure and creates<a name="line.338"></a> +<span class="sourceLineNo">339</span> // a Map task for each file. We use ';' as separator<a name="line.339"></a> +<span class="sourceLineNo">340</span> // because WAL file names contains ','<a name="line.340"></a> +<span class="sourceLineNo">341</span> String dirs = StringUtils.join(dirPaths, ';');<a name="line.341"></a> +<span class="sourceLineNo">342</span><a name="line.342"></a> +<span class="sourceLineNo">343</span> Path bulkOutputPath = getBulkOutputDirForTable(tableName);<a name="line.343"></a> +<span class="sourceLineNo">344</span> conf.set(WALPlayer.BULK_OUTPUT_CONF_KEY, bulkOutputPath.toString());<a name="line.344"></a> +<span class="sourceLineNo">345</span> conf.set(WALPlayer.INPUT_FILES_SEPARATOR_KEY, ";");<a name="line.345"></a> +<span class="sourceLineNo">346</span> String[] playerArgs = { dirs, tableName.getNameAsString() };<a name="line.346"></a> +<span class="sourceLineNo">347</span><a name="line.347"></a> +<span class="sourceLineNo">348</span> try {<a name="line.348"></a> +<span class="sourceLineNo">349</span> player.setConf(conf);<a name="line.349"></a> +<span class="sourceLineNo">350</span> int result = player.run(playerArgs);<a name="line.350"></a> +<span class="sourceLineNo">351</span> if(result != 0) {<a name="line.351"></a> +<span class="sourceLineNo">352</span> throw new IOException("WAL Player failed");<a name="line.352"></a> +<span class="sourceLineNo">353</span> }<a name="line.353"></a> +<span class="sourceLineNo">354</span> conf.unset(WALPlayer.INPUT_FILES_SEPARATOR_KEY);<a name="line.354"></a> +<span class="sourceLineNo">355</span> } catch (IOException e) {<a name="line.355"></a> +<span class="sourceLineNo">356</span> throw e;<a name="line.356"></a> +<span class="sourceLineNo">357</span> } catch (Exception ee) {<a name="line.357"></a> +<span class="sourceLineNo">358</span> throw new IOException("Can not convert from directory " + dirs<a name="line.358"></a> +<span class="sourceLineNo">359</span> + " (check Hadoop, HBase and WALPlayer M/R job logs) ", ee);<a name="line.359"></a> +<span class="sourceLineNo">360</span> }<a name="line.360"></a> +<span class="sourceLineNo">361</span> }<a name="line.361"></a> +<span class="sourceLineNo">362</span><a name="line.362"></a> +<span class="sourceLineNo">363</span> protected Path getBulkOutputDirForTable(TableName table) {<a name="line.363"></a> +<span class="sourceLineNo">364</span> Path tablePath = getBulkOutputDir();<a name="line.364"></a> +<span class="sourceLineNo">365</span> tablePath = new Path(tablePath, table.getNamespaceAsString());<a name="line.365"></a> +<span class="sourceLineNo">366</span> tablePath = new Path(tablePath, table.getQualifierAsString());<a name="line.366"></a> +<span class="sourceLineNo">367</span> return new Path(tablePath, "data");<a name="line.367"></a> +<span class="sourceLineNo">368</span> }<a name="line.368"></a> +<span class="sourceLineNo">369</span><a name="line.369"></a> +<span class="sourceLineNo">370</span> protected Path getBulkOutputDir() {<a name="line.370"></a> +<span class="sourceLineNo">371</span> String backupId = backupInfo.getBackupId();<a name="line.371"></a> +<span class="sourceLineNo">372</span> Path path = new Path(backupInfo.getBackupRootDir());<a name="line.372"></a> +<span class="sourceLineNo">373</span> path = new Path(path, ".tmp");<a name="line.373"></a> +<span class="sourceLineNo">374</span> path = new Path(path, backupId);<a name="line.374"></a> +<span class="sourceLineNo">375</span> return path;<a name="line.375"></a> +<span class="sourceLineNo">376</span> }<a name="line.376"></a> +<span class="sourceLineNo">377</span><a name="line.377"></a> +<span class="sourceLineNo">378</span>}<a name="line.378"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html index 07027e1..358baa9 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html @@ -116,10 +116,10 @@ <span class="sourceLineNo">108</span> if (!isOverwrite) {<a name="line.108"></a> <span class="sourceLineNo">109</span> LOG.error("Existing table (" + existTableList<a name="line.109"></a> <span class="sourceLineNo">110</span> + ") found in the restore target, please add "<a name="line.110"></a> -<span class="sourceLineNo">111</span> + "\"-overwrite\" option in the command if you mean"<a name="line.111"></a> +<span class="sourceLineNo">111</span> + "\"-o\" as overwrite option in the command if you mean"<a name="line.111"></a> <span class="sourceLineNo">112</span> + " to restore to these existing tables");<a name="line.112"></a> -<span class="sourceLineNo">113</span> throw new IOException("Existing table found in target while no \"-overwrite\" "<a name="line.113"></a> -<span class="sourceLineNo">114</span> + "option found");<a name="line.114"></a> +<span class="sourceLineNo">113</span> throw new IOException("Existing table found in target while no \"-o\" "<a name="line.113"></a> +<span class="sourceLineNo">114</span> + "as overwrite option found");<a name="line.114"></a> <span class="sourceLineNo">115</span> } else {<a name="line.115"></a> <span class="sourceLineNo">116</span> if (disabledTableList.size() > 0) {<a name="line.116"></a> <span class="sourceLineNo">117</span> LOG.error("Found offline table in the restore target, "<a name="line.117"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/client/VersionInfoUtil.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/VersionInfoUtil.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/VersionInfoUtil.html index a73e28b..027f0d4 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/client/VersionInfoUtil.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/VersionInfoUtil.html @@ -79,77 +79,76 @@ <span class="sourceLineNo">071</span> * @return the versionInfo extracted from the current RpcCallContext<a name="line.71"></a> <span class="sourceLineNo">072</span> */<a name="line.72"></a> <span class="sourceLineNo">073</span> private static HBaseProtos.VersionInfo getCurrentClientVersionInfo() {<a name="line.73"></a> -<span class="sourceLineNo">074</span> RpcCallContext call = RpcServer.getCurrentCall();<a name="line.74"></a> -<span class="sourceLineNo">075</span> return call != null ? call.getClientVersionInfo() : null;<a name="line.75"></a> -<span class="sourceLineNo">076</span> }<a name="line.76"></a> -<span class="sourceLineNo">077</span><a name="line.77"></a> -<span class="sourceLineNo">078</span> /**<a name="line.78"></a> -<span class="sourceLineNo">079</span> * @return the version number extracted from the current RpcCallContext as int.<a name="line.79"></a> -<span class="sourceLineNo">080</span> * (e.g. 0x0103004 is 1.3.4)<a name="line.80"></a> -<span class="sourceLineNo">081</span> */<a name="line.81"></a> -<span class="sourceLineNo">082</span> public static int getCurrentClientVersionNumber() {<a name="line.82"></a> -<span class="sourceLineNo">083</span> return getVersionNumber(getCurrentClientVersionInfo());<a name="line.83"></a> -<span class="sourceLineNo">084</span> }<a name="line.84"></a> +<span class="sourceLineNo">074</span> return RpcServer.getCurrentCall().map(RpcCallContext::getClientVersionInfo).orElse(null);<a name="line.74"></a> +<span class="sourceLineNo">075</span> }<a name="line.75"></a> +<span class="sourceLineNo">076</span><a name="line.76"></a> +<span class="sourceLineNo">077</span> /**<a name="line.77"></a> +<span class="sourceLineNo">078</span> * @return the version number extracted from the current RpcCallContext as int.<a name="line.78"></a> +<span class="sourceLineNo">079</span> * (e.g. 0x0103004 is 1.3.4)<a name="line.79"></a> +<span class="sourceLineNo">080</span> */<a name="line.80"></a> +<span class="sourceLineNo">081</span> public static int getCurrentClientVersionNumber() {<a name="line.81"></a> +<span class="sourceLineNo">082</span> return getVersionNumber(getCurrentClientVersionInfo());<a name="line.82"></a> +<span class="sourceLineNo">083</span> }<a name="line.83"></a> +<span class="sourceLineNo">084</span><a name="line.84"></a> <span class="sourceLineNo">085</span><a name="line.85"></a> -<span class="sourceLineNo">086</span><a name="line.86"></a> -<span class="sourceLineNo">087</span> /**<a name="line.87"></a> -<span class="sourceLineNo">088</span> * @param version<a name="line.88"></a> -<span class="sourceLineNo">089</span> * @return the passed-in <code>version</code> int as a version String<a name="line.89"></a> -<span class="sourceLineNo">090</span> * (e.g. 0x0103004 is 1.3.4)<a name="line.90"></a> -<span class="sourceLineNo">091</span> */<a name="line.91"></a> -<span class="sourceLineNo">092</span> public static String versionNumberToString(final int version) {<a name="line.92"></a> -<span class="sourceLineNo">093</span> return String.format("%d.%d.%d",<a name="line.93"></a> -<span class="sourceLineNo">094</span> ((version >> 20) & 0xff),<a name="line.94"></a> -<span class="sourceLineNo">095</span> ((version >> 12) & 0xff),<a name="line.95"></a> -<span class="sourceLineNo">096</span> (version & 0xfff));<a name="line.96"></a> -<span class="sourceLineNo">097</span> }<a name="line.97"></a> -<span class="sourceLineNo">098</span><a name="line.98"></a> -<span class="sourceLineNo">099</span> /**<a name="line.99"></a> -<span class="sourceLineNo">100</span> * Pack the full number version in a int. by shifting each component by 8bit,<a name="line.100"></a> -<span class="sourceLineNo">101</span> * except the dot release which has 12bit.<a name="line.101"></a> -<span class="sourceLineNo">102</span> * Examples: (1.3.4 is 0x0103004, 2.1.0 is 0x0201000)<a name="line.102"></a> -<span class="sourceLineNo">103</span> * @param versionInfo the VersionInfo object to pack<a name="line.103"></a> -<span class="sourceLineNo">104</span> * @return the version number as int. (e.g. 0x0103004 is 1.3.4)<a name="line.104"></a> -<span class="sourceLineNo">105</span> */<a name="line.105"></a> -<span class="sourceLineNo">106</span> private static int getVersionNumber(final HBaseProtos.VersionInfo versionInfo) {<a name="line.106"></a> -<span class="sourceLineNo">107</span> if (versionInfo != null) {<a name="line.107"></a> -<span class="sourceLineNo">108</span> try {<a name="line.108"></a> -<span class="sourceLineNo">109</span> final String[] components = getVersionComponents(versionInfo);<a name="line.109"></a> -<span class="sourceLineNo">110</span> int clientMajor = components.length > 0 ? Integer.parseInt(components[0]) : 0;<a name="line.110"></a> -<span class="sourceLineNo">111</span> int clientMinor = components.length > 1 ? Integer.parseInt(components[1]) : 0;<a name="line.111"></a> -<span class="sourceLineNo">112</span> int clientPatch = components.length > 2 ? Integer.parseInt(components[2]) : 0;<a name="line.112"></a> -<span class="sourceLineNo">113</span> return buildVersionNumber(clientMajor, clientMinor, clientPatch);<a name="line.113"></a> -<span class="sourceLineNo">114</span> } catch (NumberFormatException e) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> int clientMajor = versionInfo.hasVersionMajor() ? versionInfo.getVersionMajor() : 0;<a name="line.115"></a> -<span class="sourceLineNo">116</span> int clientMinor = versionInfo.hasVersionMinor() ? versionInfo.getVersionMinor() : 0;<a name="line.116"></a> -<span class="sourceLineNo">117</span> return buildVersionNumber(clientMajor, clientMinor, 0);<a name="line.117"></a> -<span class="sourceLineNo">118</span> }<a name="line.118"></a> -<span class="sourceLineNo">119</span> }<a name="line.119"></a> -<span class="sourceLineNo">120</span> return(0); // no version<a name="line.120"></a> -<span class="sourceLineNo">121</span> }<a name="line.121"></a> -<span class="sourceLineNo">122</span><a name="line.122"></a> -<span class="sourceLineNo">123</span> /**<a name="line.123"></a> -<span class="sourceLineNo">124</span> * Pack the full number version in a int. by shifting each component by 8bit,<a name="line.124"></a> -<span class="sourceLineNo">125</span> * except the dot release which has 12bit.<a name="line.125"></a> -<span class="sourceLineNo">126</span> * Examples: (1.3.4 is 0x0103004, 2.1.0 is 0x0201000)<a name="line.126"></a> -<span class="sourceLineNo">127</span> * @param major version major number<a name="line.127"></a> -<span class="sourceLineNo">128</span> * @param minor version minor number<a name="line.128"></a> -<span class="sourceLineNo">129</span> * @param patch version patch number<a name="line.129"></a> -<span class="sourceLineNo">130</span> * @return the version number as int. (e.g. 0x0103004 is 1.3.4)<a name="line.130"></a> -<span class="sourceLineNo">131</span> */<a name="line.131"></a> -<span class="sourceLineNo">132</span> private static int buildVersionNumber(int major, int minor, int patch) {<a name="line.132"></a> -<span class="sourceLineNo">133</span> return (major << 20) | (minor << 12) | patch;<a name="line.133"></a> -<span class="sourceLineNo">134</span> }<a name="line.134"></a> -<span class="sourceLineNo">135</span><a name="line.135"></a> -<span class="sourceLineNo">136</span> /**<a name="line.136"></a> -<span class="sourceLineNo">137</span> * Returns the version components<a name="line.137"></a> -<span class="sourceLineNo">138</span> * Examples: "1.2.3" returns [1, 2, 3], "4.5.6-SNAPSHOT" returns [4, 5, 6, "SNAPSHOT"]<a name="line.138"></a> -<span class="sourceLineNo">139</span> * @returns the components of the version string<a name="line.139"></a> -<span class="sourceLineNo">140</span> */<a name="line.140"></a> -<span class="sourceLineNo">141</span> private static String[] getVersionComponents(final HBaseProtos.VersionInfo versionInfo) {<a name="line.141"></a> -<span class="sourceLineNo">142</span> return versionInfo.getVersion().split("[\\.-]");<a name="line.142"></a> -<span class="sourceLineNo">143</span> }<a name="line.143"></a> -<span class="sourceLineNo">144</span>}<a name="line.144"></a> +<span class="sourceLineNo">086</span> /**<a name="line.86"></a> +<span class="sourceLineNo">087</span> * @param version<a name="line.87"></a> +<span class="sourceLineNo">088</span> * @return the passed-in <code>version</code> int as a version String<a name="line.88"></a> +<span class="sourceLineNo">089</span> * (e.g. 0x0103004 is 1.3.4)<a name="line.89"></a> +<span class="sourceLineNo">090</span> */<a name="line.90"></a> +<span class="sourceLineNo">091</span> public static String versionNumberToString(final int version) {<a name="line.91"></a> +<span class="sourceLineNo">092</span> return String.format("%d.%d.%d",<a name="line.92"></a> +<span class="sourceLineNo">093</span> ((version >> 20) & 0xff),<a name="line.93"></a> +<span class="sourceLineNo">094</span> ((version >> 12) & 0xff),<a name="line.94"></a> +<span class="sourceLineNo">095</span> (version & 0xfff));<a name="line.95"></a> +<span class="sourceLineNo">096</span> }<a name="line.96"></a> +<span class="sourceLineNo">097</span><a name="line.97"></a> +<span class="sourceLineNo">098</span> /**<a name="line.98"></a> +<span class="sourceLineNo">099</span> * Pack the full number version in a int. by shifting each component by 8bit,<a name="line.99"></a> +<span class="sourceLineNo">100</span> * except the dot release which has 12bit.<a name="line.100"></a> +<span class="sourceLineNo">101</span> * Examples: (1.3.4 is 0x0103004, 2.1.0 is 0x0201000)<a name="line.101"></a> +<span class="sourceLineNo">102</span> * @param versionInfo the VersionInfo object to pack<a name="line.102"></a> +<span class="sourceLineNo">103</span> * @return the version number as int. (e.g. 0x0103004 is 1.3.4)<a name="line.103"></a> +<span class="sourceLineNo">104</span> */<a name="line.104"></a> +<span class="sourceLineNo">105</span> private static int getVersionNumber(final HBaseProtos.VersionInfo versionInfo) {<a name="line.105"></a> +<span class="sourceLineNo">106</span> if (versionInfo != null) {<a name="line.106"></a> +<span class="sourceLineNo">107</span> try {<a name="line.107"></a> +<span class="sourceLineNo">108</span> final String[] components = getVersionComponents(versionInfo);<a name="line.108"></a> +<span class="sourceLineNo">109</span> int clientMajor = components.length > 0 ? Integer.parseInt(components[0]) : 0;<a name="line.109"></a> +<span class="sourceLineNo">110</span> int clientMinor = components.length > 1 ? Integer.parseInt(components[1]) : 0;<a name="line.110"></a> +<span class="sourceLineNo">111</span> int clientPatch = components.length > 2 ? Integer.parseInt(components[2]) : 0;<a name="line.111"></a> +<span class="sourceLineNo">112</span> return buildVersionNumber(clientMajor, clientMinor, clientPatch);<a name="line.112"></a> +<span class="sourceLineNo">113</span> } catch (NumberFormatException e) {<a name="line.113"></a> +<span class="sourceLineNo">114</span> int clientMajor = versionInfo.hasVersionMajor() ? versionInfo.getVersionMajor() : 0;<a name="line.114"></a> +<span class="sourceLineNo">115</span> int clientMinor = versionInfo.hasVersionMinor() ? versionInfo.getVersionMinor() : 0;<a name="line.115"></a> +<span class="sourceLineNo">116</span> return buildVersionNumber(clientMajor, clientMinor, 0);<a name="line.116"></a> +<span class="sourceLineNo">117</span> }<a name="line.117"></a> +<span class="sourceLineNo">118</span> }<a name="line.118"></a> +<span class="sourceLineNo">119</span> return(0); // no version<a name="line.119"></a> +<span class="sourceLineNo">120</span> }<a name="line.120"></a> +<span class="sourceLineNo">121</span><a name="line.121"></a> +<span class="sourceLineNo">122</span> /**<a name="line.122"></a> +<span class="sourceLineNo">123</span> * Pack the full number version in a int. by shifting each component by 8bit,<a name="line.123"></a> +<span class="sourceLineNo">124</span> * except the dot release which has 12bit.<a name="line.124"></a> +<span class="sourceLineNo">125</span> * Examples: (1.3.4 is 0x0103004, 2.1.0 is 0x0201000)<a name="line.125"></a> +<span class="sourceLineNo">126</span> * @param major version major number<a name="line.126"></a> +<span class="sourceLineNo">127</span> * @param minor version minor number<a name="line.127"></a> +<span class="sourceLineNo">128</span> * @param patch version patch number<a name="line.128"></a> +<span class="sourceLineNo">129</span> * @return the version number as int. (e.g. 0x0103004 is 1.3.4)<a name="line.129"></a> +<span class="sourceLineNo">130</span> */<a name="line.130"></a> +<span class="sourceLineNo">131</span> private static int buildVersionNumber(int major, int minor, int patch) {<a name="line.131"></a> +<span class="sourceLineNo">132</span> return (major << 20) | (minor << 12) | patch;<a name="line.132"></a> +<span class="sourceLineNo">133</span> }<a name="line.133"></a> +<span class="sourceLineNo">134</span><a name="line.134"></a> +<span class="sourceLineNo">135</span> /**<a name="line.135"></a> +<span class="sourceLineNo">136</span> * Returns the version components<a name="line.136"></a> +<span class="sourceLineNo">137</span> * Examples: "1.2.3" returns [1, 2, 3], "4.5.6-SNAPSHOT" returns [4, 5, 6, "SNAPSHOT"]<a name="line.137"></a> +<span class="sourceLineNo">138</span> * @returns the components of the version string<a name="line.138"></a> +<span class="sourceLineNo">139</span> */<a name="line.139"></a> +<span class="sourceLineNo">140</span> private static String[] getVersionComponents(final HBaseProtos.VersionInfo versionInfo) {<a name="line.140"></a> +<span class="sourceLineNo">141</span> return versionInfo.getVersion().split("[\\.-]");<a name="line.141"></a> +<span class="sourceLineNo">142</span> }<a name="line.142"></a> +<span class="sourceLineNo">143</span>}<a name="line.143"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.EnvironmentPriorityComparator.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.EnvironmentPriorityComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.EnvironmentPriorityComparator.html index f7eb10f..c80e867 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.EnvironmentPriorityComparator.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.EnvironmentPriorityComparator.html @@ -557,7 +557,7 @@ <span class="sourceLineNo">549</span> ObserverGetter<C, O> observerGetter;<a name="line.549"></a> <span class="sourceLineNo">550</span><a name="line.550"></a> <span class="sourceLineNo">551</span> ObserverOperation(ObserverGetter<C, O> observerGetter) {<a name="line.551"></a> -<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser());<a name="line.552"></a> +<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser().orElse(null));<a name="line.552"></a> <span class="sourceLineNo">553</span> }<a name="line.553"></a> <span class="sourceLineNo">554</span><a name="line.554"></a> <span class="sourceLineNo">555</span> ObserverOperation(ObserverGetter<C, O> observerGetter, User user) {<a name="line.555"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverGetter.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverGetter.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverGetter.html index f7eb10f..c80e867 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverGetter.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverGetter.html @@ -557,7 +557,7 @@ <span class="sourceLineNo">549</span> ObserverGetter<C, O> observerGetter;<a name="line.549"></a> <span class="sourceLineNo">550</span><a name="line.550"></a> <span class="sourceLineNo">551</span> ObserverOperation(ObserverGetter<C, O> observerGetter) {<a name="line.551"></a> -<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser());<a name="line.552"></a> +<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser().orElse(null));<a name="line.552"></a> <span class="sourceLineNo">553</span> }<a name="line.553"></a> <span class="sourceLineNo">554</span><a name="line.554"></a> <span class="sourceLineNo">555</span> ObserverOperation(ObserverGetter<C, O> observerGetter, User user) {<a name="line.555"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperation.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperation.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperation.html index f7eb10f..c80e867 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperation.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperation.html @@ -557,7 +557,7 @@ <span class="sourceLineNo">549</span> ObserverGetter<C, O> observerGetter;<a name="line.549"></a> <span class="sourceLineNo">550</span><a name="line.550"></a> <span class="sourceLineNo">551</span> ObserverOperation(ObserverGetter<C, O> observerGetter) {<a name="line.551"></a> -<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser());<a name="line.552"></a> +<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser().orElse(null));<a name="line.552"></a> <span class="sourceLineNo">553</span> }<a name="line.553"></a> <span class="sourceLineNo">554</span><a name="line.554"></a> <span class="sourceLineNo">555</span> ObserverOperation(ObserverGetter<C, O> observerGetter, User user) {<a name="line.555"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithResult.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithResult.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithResult.html index f7eb10f..c80e867 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithResult.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithResult.html @@ -557,7 +557,7 @@ <span class="sourceLineNo">549</span> ObserverGetter<C, O> observerGetter;<a name="line.549"></a> <span class="sourceLineNo">550</span><a name="line.550"></a> <span class="sourceLineNo">551</span> ObserverOperation(ObserverGetter<C, O> observerGetter) {<a name="line.551"></a> -<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser());<a name="line.552"></a> +<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser().orElse(null));<a name="line.552"></a> <span class="sourceLineNo">553</span> }<a name="line.553"></a> <span class="sourceLineNo">554</span><a name="line.554"></a> <span class="sourceLineNo">555</span> ObserverOperation(ObserverGetter<C, O> observerGetter, User user) {<a name="line.555"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithoutResult.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithoutResult.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithoutResult.html index f7eb10f..c80e867 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithoutResult.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.ObserverOperationWithoutResult.html @@ -557,7 +557,7 @@ <span class="sourceLineNo">549</span> ObserverGetter<C, O> observerGetter;<a name="line.549"></a> <span class="sourceLineNo">550</span><a name="line.550"></a> <span class="sourceLineNo">551</span> ObserverOperation(ObserverGetter<C, O> observerGetter) {<a name="line.551"></a> -<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser());<a name="line.552"></a> +<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser().orElse(null));<a name="line.552"></a> <span class="sourceLineNo">553</span> }<a name="line.553"></a> <span class="sourceLineNo">554</span><a name="line.554"></a> <span class="sourceLineNo">555</span> ObserverOperation(ObserverGetter<C, O> observerGetter, User user) {<a name="line.555"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.html index f7eb10f..c80e867 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/CoprocessorHost.html @@ -557,7 +557,7 @@ <span class="sourceLineNo">549</span> ObserverGetter<C, O> observerGetter;<a name="line.549"></a> <span class="sourceLineNo">550</span><a name="line.550"></a> <span class="sourceLineNo">551</span> ObserverOperation(ObserverGetter<C, O> observerGetter) {<a name="line.551"></a> -<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser());<a name="line.552"></a> +<span class="sourceLineNo">552</span> this(observerGetter, RpcServer.getRequestUser().orElse(null));<a name="line.552"></a> <span class="sourceLineNo">553</span> }<a name="line.553"></a> <span class="sourceLineNo">554</span><a name="line.554"></a> <span class="sourceLineNo">555</span> ObserverOperation(ObserverGetter<C, O> observerGetter, User user) {<a name="line.555"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b838bdf0/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.PrivilegedWriter.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.PrivilegedWriter.html b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.PrivilegedWriter.html index fbb0a14..95f6ef8 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.PrivilegedWriter.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/coprocessor/Export.PrivilegedWriter.html @@ -461,90 +461,87 @@ <span class="sourceLineNo">453</span> }<a name="line.453"></a> <span class="sourceLineNo">454</span><a name="line.454"></a> <span class="sourceLineNo">455</span> private static User getActiveUser(final UserProvider userProvider, final Token userToken) throws IOException {<a name="line.455"></a> -<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser();<a name="line.456"></a> -<span class="sourceLineNo">457</span> if (user == null) {<a name="line.457"></a> -<span class="sourceLineNo">458</span> user = userProvider.getCurrent();<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span> if (user == null && userToken != null) {<a name="line.460"></a> -<span class="sourceLineNo">461</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.461"></a> -<span class="sourceLineNo">462</span> } else if (user != null && userToken != null) {<a name="line.462"></a> -<span class="sourceLineNo">463</span> user.addToken(userToken);<a name="line.463"></a> -<span class="sourceLineNo">464</span> }<a name="line.464"></a> -<span class="sourceLineNo">465</span> return user;<a name="line.465"></a> -<span class="sourceLineNo">466</span> }<a name="line.466"></a> -<span class="sourceLineNo">467</span><a name="line.467"></a> -<span class="sourceLineNo">468</span> @Override<a name="line.468"></a> -<span class="sourceLineNo">469</span> public void close() throws IOException {<a name="line.469"></a> -<span class="sourceLineNo">470</span> privilegedWriter.close();<a name="line.470"></a> -<span class="sourceLineNo">471</span> }<a name="line.471"></a> -<span class="sourceLineNo">472</span> }<a name="line.472"></a> -<span class="sourceLineNo">473</span><a name="line.473"></a> -<span class="sourceLineNo">474</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.474"></a> -<span class="sourceLineNo">475</span> private final User user;<a name="line.475"></a> -<span class="sourceLineNo">476</span> private final SequenceFile.Writer out;<a name="line.476"></a> -<span class="sourceLineNo">477</span> private Object key;<a name="line.477"></a> -<span class="sourceLineNo">478</span> private Object value;<a name="line.478"></a> -<span class="sourceLineNo">479</span><a name="line.479"></a> -<span class="sourceLineNo">480</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.480"></a> -<span class="sourceLineNo">481</span> this.user = user;<a name="line.481"></a> -<span class="sourceLineNo">482</span> this.out = out;<a name="line.482"></a> -<span class="sourceLineNo">483</span> }<a name="line.483"></a> -<span class="sourceLineNo">484</span><a name="line.484"></a> -<span class="sourceLineNo">485</span> void append(final Object key, final Object value) throws IOException {<a name="line.485"></a> -<span class="sourceLineNo">486</span> if (user == null) {<a name="line.486"></a> -<span class="sourceLineNo">487</span> out.append(key, value);<a name="line.487"></a> -<span class="sourceLineNo">488</span> } else {<a name="line.488"></a> -<span class="sourceLineNo">489</span> this.key = key;<a name="line.489"></a> -<span class="sourceLineNo">490</span> this.value = value;<a name="line.490"></a> -<span class="sourceLineNo">491</span> try {<a name="line.491"></a> -<span class="sourceLineNo">492</span> user.runAs(this);<a name="line.492"></a> -<span class="sourceLineNo">493</span> } catch (InterruptedException ex) {<a name="line.493"></a> -<span class="sourceLineNo">494</span> throw new IOException(ex);<a name="line.494"></a> -<span class="sourceLineNo">495</span> }<a name="line.495"></a> -<span class="sourceLineNo">496</span> }<a name="line.496"></a> -<span class="sourceLineNo">497</span> }<a name="line.497"></a> -<span class="sourceLineNo">498</span><a name="line.498"></a> -<span class="sourceLineNo">499</span> @Override<a name="line.499"></a> -<span class="sourceLineNo">500</span> public Boolean run() throws Exception {<a name="line.500"></a> -<span class="sourceLineNo">501</span> out.append(key, value);<a name="line.501"></a> -<span class="sourceLineNo">502</span> return true;<a name="line.502"></a> -<span class="sourceLineNo">503</span> }<a name="line.503"></a> -<span class="sourceLineNo">504</span><a name="line.504"></a> -<span class="sourceLineNo">505</span> @Override<a name="line.505"></a> -<span class="sourceLineNo">506</span> public void close() throws IOException {<a name="line.506"></a> -<span class="sourceLineNo">507</span> out.close();<a name="line.507"></a> -<span class="sourceLineNo">508</span> }<a name="line.508"></a> -<span class="sourceLineNo">509</span> }<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> public static class Response {<a name="line.511"></a> +<span class="sourceLineNo">456</span> User user = RpcServer.getRequestUser().orElse(userProvider.getCurrent());<a name="line.456"></a> +<span class="sourceLineNo">457</span> if (user == null && userToken != null) {<a name="line.457"></a> +<span class="sourceLineNo">458</span> LOG.warn("No found of user credentials, but a token was got from user request");<a name="line.458"></a> +<span class="sourceLineNo">459</span> } else if (user != null && userToken != null) {<a name="line.459"></a> +<span class="sourceLineNo">460</span> user.addToken(userToken);<a name="line.460"></a> +<span class="sourceLineNo">461</span> }<a name="line.461"></a> +<span class="sourceLineNo">462</span> return user;<a name="line.462"></a> +<span class="sourceLineNo">463</span> }<a name="line.463"></a> +<span class="sourceLineNo">464</span><a name="line.464"></a> +<span class="sourceLineNo">465</span> @Override<a name="line.465"></a> +<span class="sourceLineNo">466</span> public void close() throws IOException {<a name="line.466"></a> +<span class="sourceLineNo">467</span> privilegedWriter.close();<a name="line.467"></a> +<span class="sourceLineNo">468</span> }<a name="line.468"></a> +<span class="sourceLineNo">469</span> }<a name="line.469"></a> +<span class="sourceLineNo">470</span><a name="line.470"></a> +<span class="sourceLineNo">471</span> private static class PrivilegedWriter implements PrivilegedExceptionAction<Boolean>, Closeable {<a name="line.471"></a> +<span class="sourceLineNo">472</span> private final User user;<a name="line.472"></a> +<span class="sourceLineNo">473</span> private final SequenceFile.Writer out;<a name="line.473"></a> +<span class="sourceLineNo">474</span> private Object key;<a name="line.474"></a> +<span class="sourceLineNo">475</span> private Object value;<a name="line.475"></a> +<span class="sourceLineNo">476</span><a name="line.476"></a> +<span class="sourceLineNo">477</span> PrivilegedWriter(final User user, final SequenceFile.Writer out) {<a name="line.477"></a> +<span class="sourceLineNo">478</span> this.user = user;<a name="line.478"></a> +<span class="sourceLineNo">479</span> this.out = out;<a name="line.479"></a> +<span class="sourceLineNo">480</span> }<a name="line.480"></a> +<span class="sourceLineNo">481</span><a name="line.481"></a> +<span class="sourceLineNo">482</span> void append(final Object key, final Object value) throws IOException {<a name="line.482"></a> +<span class="sourceLineNo">483</span> if (user == null) {<a name="line.483"></a> +<span class="sourceLineNo">484</span> out.append(key, value);<a name="line.484"></a> +<span class="sourceLineNo">485</span> } else {<a name="line.485"></a> +<span class="sourceLineNo">486</span> this.key = key;<a name="line.486"></a> +<span class="sourceLineNo">487</span> this.value = value;<a name="line.487"></a> +<span class="sourceLineNo">488</span> try {<a name="line.488"></a> +<span class="sourceLineNo">489</span> user.runAs(this);<a name="line.489"></a> +<span class="sourceLineNo">490</span> } catch (InterruptedException ex) {<a name="line.490"></a> +<span class="sourceLineNo">491</span> throw new IOException(ex);<a name="line.491"></a> +<span class="sourceLineNo">492</span> }<a name="line.492"></a> +<span class="sourceLineNo">493</span> }<a name="line.493"></a> +<span class="sourceLineNo">494</span> }<a name="line.494"></a> +<span class="sourceLineNo">495</span><a name="line.495"></a> +<span class="sourceLineNo">496</span> @Override<a name="line.496"></a> +<span class="sourceLineNo">497</span> public Boolean run() throws Exception {<a name="line.497"></a> +<span class="sourceLineNo">498</span> out.append(key, value);<a name="line.498"></a> +<span class="sourceLineNo">499</span> return true;<a name="line.499"></a> +<span class="sourceLineNo">500</span> }<a name="line.500"></a> +<span class="sourceLineNo">501</span><a name="line.501"></a> +<span class="sourceLineNo">502</span> @Override<a name="line.502"></a> +<span class="sourceLineNo">503</span> public void close() throws IOException {<a name="line.503"></a> +<span class="sourceLineNo">504</span> out.close();<a name="line.504"></a> +<span class="sourceLineNo">505</span> }<a name="line.505"></a> +<span class="sourceLineNo">506</span> }<a name="line.506"></a> +<span class="sourceLineNo">507</span><a name="line.507"></a> +<span class="sourceLineNo">508</span> public static class Response {<a name="line.508"></a> +<span class="sourceLineNo">509</span><a name="line.509"></a> +<span class="sourceLineNo">510</span> private final long rowCount;<a name="line.510"></a> +<span class="sourceLineNo">511</span> private final long cellCount;<a name="line.511"></a> <span class="sourceLineNo">512</span><a name="line.512"></a> -<span class="sourceLineNo">513</span> private final long rowCount;<a name="line.513"></a> -<span class="sourceLineNo">514</span> private final long cellCount;<a name="line.514"></a> -<span class="sourceLineNo">515</span><a name="line.515"></a> -<span class="sourceLineNo">516</span> private Response(ExportProtos.ExportResponse r) {<a name="line.516"></a> -<span class="sourceLineNo">517</span> this.rowCount = r.getRowCount();<a name="line.517"></a> -<span class="sourceLineNo">518</span> this.cellCount = r.getCellCount();<a name="line.518"></a> -<span class="sourceLineNo">519</span> }<a name="line.519"></a> -<span class="sourceLineNo">520</span><a name="line.520"></a> -<span class="sourceLineNo">521</span> public long getRowCount() {<a name="line.521"></a> -<span class="sourceLineNo">522</span> return rowCount;<a name="line.522"></a> -<span class="sourceLineNo">523</span> }<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> public long getCellCount() {<a name="line.525"></a> -<span class="sourceLineNo">526</span> return cellCount;<a name="line.526"></a> -<span class="sourceLineNo">527</span> }<a name="line.527"></a> -<span class="sourceLineNo">528</span><a name="line.528"></a> -<span class="sourceLineNo">529</span> @Override<a name="line.529"></a> -<span class="sourceLineNo">530</span> public String toString() {<a name="line.530"></a> -<span class="sourceLineNo">531</span> StringBuilder builder = new StringBuilder(35);<a name="line.531"></a> -<span class="sourceLineNo">532</span> return builder.append("rowCount=")<a name="line.532"></a> -<span class="sourceLineNo">533</span> .append(rowCount)<a name="line.533"></a> -<span class="sourceLineNo">534</span> .append(", cellCount=")<a name="line.534"></a> -<span class="sourceLineNo">535</span> .append(cellCount)<a name="line.535"></a> -<span class="sourceLineNo">536</span> .toString();<a name="line.536"></a> -<span class="sourceLineNo">537</span> }<a name="line.537"></a> -<span class="sourceLineNo">538</span> }<a name="line.538"></a> -<span class="sourceLineNo">539</span>}<a name="line.539"></a> +<span class="sourceLineNo">513</span> private Response(ExportProtos.ExportResponse r) {<a name="line.513"></a> +<span class="sourceLineNo">514</span> this.rowCount = r.getRowCount();<a name="line.514"></a> +<span class="sourceLineNo">515</span> this.cellCount = r.getCellCount();<a name="line.515"></a> +<span class="sourceLineNo">516</span> }<a name="line.516"></a> +<span class="sourceLineNo">517</span><a name="line.517"></a> +<span class="sourceLineNo">518</span> public long getRowCount() {<a name="line.518"></a> +<span class="sourceLineNo">519</span> return rowCount;<a name="line.519"></a> +<span class="sourceLineNo">520</span> }<a name="line.520"></a> +<span class="sourceLineNo">521</span><a name="line.521"></a> +<span class="sourceLineNo">522</span> public long getCellCount() {<a name="line.522"></a> +<span class="sourceLineNo">523</span> return cellCount;<a name="line.523"></a> +<span class="sourceLineNo">524</span> }<a name="line.524"></a> +<span class="sourceLineNo">525</span><a name="line.525"></a> +<span class="sourceLineNo">526</span> @Override<a name="line.526"></a> +<span class="sourceLineNo">527</span> public String toString() {<a name="line.527"></a> +<span class="sourceLineNo">528</span> StringBuilder builder = new StringBuilder(35);<a name="line.528"></a> +<span class="sourceLineNo">529</span> return builder.append("rowCount=")<a name="line.529"></a> +<span class="sourceLineNo">530</span> .append(rowCount)<a name="line.530"></a> +<span class="sourceLineNo">531</span> .append(", cellCount=")<a name="line.531"></a> +<span class="sourceLineNo">532</span> .append(cellCount)<a name="line.532"></a> +<span class="sourceLineNo">533</span> .toString();<a name="line.533"></a> +<span class="sourceLineNo">534</span> }<a name="line.534"></a> +<span class="sourceLineNo">535</span> }<a name="line.535"></a> +<span class="sourceLineNo">536</span>}<a name="line.536"></a>
