http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.html new file mode 100644 index 0000000..7f46600 --- /dev/null +++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityNewVersionBehaivorTracker.html @@ -0,0 +1,274 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> +<head> +<title>Source code</title> +<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style"> +</head> +<body> +<div class="sourceContainer"> +<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a> +<span class="sourceLineNo">002</span> *<a name="line.2"></a> +<span class="sourceLineNo">003</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.3"></a> +<span class="sourceLineNo">004</span> * or more contributor license agreements. See the NOTICE file<a name="line.4"></a> +<span class="sourceLineNo">005</span> * distributed with this work for additional information<a name="line.5"></a> +<span class="sourceLineNo">006</span> * regarding copyright ownership. The ASF licenses this file<a name="line.6"></a> +<span class="sourceLineNo">007</span> * to you under the Apache License, Version 2.0 (the<a name="line.7"></a> +<span class="sourceLineNo">008</span> * "License"); you may not use this file except in compliance<a name="line.8"></a> +<span class="sourceLineNo">009</span> * with the License. You may obtain a copy of the License at<a name="line.9"></a> +<span class="sourceLineNo">010</span> *<a name="line.10"></a> +<span class="sourceLineNo">011</span> * http://www.apache.org/licenses/LICENSE-2.0<a name="line.11"></a> +<span class="sourceLineNo">012</span> *<a name="line.12"></a> +<span class="sourceLineNo">013</span> * Unless required by applicable law or agreed to in writing, software<a name="line.13"></a> +<span class="sourceLineNo">014</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.14"></a> +<span class="sourceLineNo">015</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.15"></a> +<span class="sourceLineNo">016</span> * See the License for the specific language governing permissions and<a name="line.16"></a> +<span class="sourceLineNo">017</span> * limitations under the License.<a name="line.17"></a> +<span class="sourceLineNo">018</span> */<a name="line.18"></a> +<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.security.visibility;<a name="line.19"></a> +<span class="sourceLineNo">020</span><a name="line.20"></a> +<span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a> +<span class="sourceLineNo">022</span>import java.util.ArrayList;<a name="line.22"></a> +<span class="sourceLineNo">023</span>import java.util.HashMap;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import java.util.Map;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import java.util.NavigableMap;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import java.util.NavigableSet;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import java.util.SortedMap;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import java.util.SortedSet;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import java.util.TreeMap;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import java.util.TreeSet;<a name="line.31"></a> +<span class="sourceLineNo">032</span><a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.commons.logging.Log;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.commons.logging.LogFactory;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.Cell;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.Tag;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.regionserver.querymatcher.NewVersionBehaviorTracker;<a name="line.38"></a> +<span class="sourceLineNo">039</span><a name="line.39"></a> +<span class="sourceLineNo">040</span>/**<a name="line.40"></a> +<span class="sourceLineNo">041</span> * Similar to MvccSensitiveTracker but tracks the visibility expression also before<a name="line.41"></a> +<span class="sourceLineNo">042</span> * deciding if a Cell can be considered deleted<a name="line.42"></a> +<span class="sourceLineNo">043</span> */<a name="line.43"></a> +<span class="sourceLineNo">044</span>public class VisibilityNewVersionBehaivorTracker extends NewVersionBehaviorTracker {<a name="line.44"></a> +<span class="sourceLineNo">045</span><a name="line.45"></a> +<span class="sourceLineNo">046</span> private static final Log LOG = LogFactory.getLog(VisibilityNewVersionBehaivorTracker.class);<a name="line.46"></a> +<span class="sourceLineNo">047</span><a name="line.47"></a> +<span class="sourceLineNo">048</span> public VisibilityNewVersionBehaivorTracker(NavigableSet<byte[]> columns, int minVersion,<a name="line.48"></a> +<span class="sourceLineNo">049</span> int maxVersion,<a name="line.49"></a> +<span class="sourceLineNo">050</span> int resultMaxVersions, long oldestUnexpiredTS) {<a name="line.50"></a> +<span class="sourceLineNo">051</span> super(columns, minVersion, maxVersion, resultMaxVersions, oldestUnexpiredTS);<a name="line.51"></a> +<span class="sourceLineNo">052</span> }<a name="line.52"></a> +<span class="sourceLineNo">053</span><a name="line.53"></a> +<span class="sourceLineNo">054</span> private static class TagInfo {<a name="line.54"></a> +<span class="sourceLineNo">055</span> List<Tag> tags;<a name="line.55"></a> +<span class="sourceLineNo">056</span> Byte format;<a name="line.56"></a> +<span class="sourceLineNo">057</span><a name="line.57"></a> +<span class="sourceLineNo">058</span> private TagInfo(Cell c) {<a name="line.58"></a> +<span class="sourceLineNo">059</span> tags = new ArrayList<>();<a name="line.59"></a> +<span class="sourceLineNo">060</span> format = VisibilityUtils.extractVisibilityTags(c, tags);<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 TagInfo() {<a name="line.63"></a> +<span class="sourceLineNo">064</span> tags = new ArrayList<>();<a name="line.64"></a> +<span class="sourceLineNo">065</span> }<a name="line.65"></a> +<span class="sourceLineNo">066</span> }<a name="line.66"></a> +<span class="sourceLineNo">067</span><a name="line.67"></a> +<span class="sourceLineNo">068</span> private class VisibilityDeleteVersionsNode extends DeleteVersionsNode {<a name="line.68"></a> +<span class="sourceLineNo">069</span> private TagInfo tagInfo;<a name="line.69"></a> +<span class="sourceLineNo">070</span><a name="line.70"></a> +<span class="sourceLineNo">071</span> // <timestamp, set<mvcc>><a name="line.71"></a> +<span class="sourceLineNo">072</span> // Key is ts of version deletes, value is its mvccs.<a name="line.72"></a> +<span class="sourceLineNo">073</span> // We may delete more than one time for a version.<a name="line.73"></a> +<span class="sourceLineNo">074</span> private Map<Long, SortedMap<Long, TagInfo>> deletesMap = new HashMap<>();<a name="line.74"></a> +<span class="sourceLineNo">075</span><a name="line.75"></a> +<span class="sourceLineNo">076</span> // <mvcc, set<mvcc>><a name="line.76"></a> +<span class="sourceLineNo">077</span> // Key is mvcc of version deletes, value is mvcc of visible puts before the delete effect.<a name="line.77"></a> +<span class="sourceLineNo">078</span> private NavigableMap<Long, SortedSet<Long>> mvccCountingMap = new TreeMap<>();<a name="line.78"></a> +<span class="sourceLineNo">079</span><a name="line.79"></a> +<span class="sourceLineNo">080</span> protected VisibilityDeleteVersionsNode(long ts, long mvcc, TagInfo tagInfo) {<a name="line.80"></a> +<span class="sourceLineNo">081</span> this.tagInfo = tagInfo;<a name="line.81"></a> +<span class="sourceLineNo">082</span> this.ts = ts;<a name="line.82"></a> +<span class="sourceLineNo">083</span> this.mvcc = mvcc;<a name="line.83"></a> +<span class="sourceLineNo">084</span> mvccCountingMap.put(Long.MAX_VALUE, new TreeSet<Long>());<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> protected VisibilityDeleteVersionsNode getDeepCopy() {<a name="line.87"></a> +<span class="sourceLineNo">088</span> VisibilityDeleteVersionsNode node = new VisibilityDeleteVersionsNode(ts, mvcc, tagInfo);<a name="line.88"></a> +<span class="sourceLineNo">089</span> for (Map.Entry<Long, SortedMap<Long, TagInfo>> e : deletesMap.entrySet()) {<a name="line.89"></a> +<span class="sourceLineNo">090</span> node.deletesMap.put(e.getKey(), new TreeMap<>(e.getValue()));<a name="line.90"></a> +<span class="sourceLineNo">091</span> }<a name="line.91"></a> +<span class="sourceLineNo">092</span> for (Map.Entry<Long, SortedSet<Long>> e : mvccCountingMap.entrySet()) {<a name="line.92"></a> +<span class="sourceLineNo">093</span> node.mvccCountingMap.put(e.getKey(), new TreeSet<>(e.getValue()));<a name="line.93"></a> +<span class="sourceLineNo">094</span> }<a name="line.94"></a> +<span class="sourceLineNo">095</span> return node;<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> public void addVersionDelete(Cell cell) {<a name="line.98"></a> +<span class="sourceLineNo">099</span> SortedMap<Long, TagInfo> set = deletesMap.get(cell.getTimestamp());<a name="line.99"></a> +<span class="sourceLineNo">100</span> if (set == null) {<a name="line.100"></a> +<span class="sourceLineNo">101</span> set = new TreeMap<>();<a name="line.101"></a> +<span class="sourceLineNo">102</span> deletesMap.put(cell.getTimestamp(), set);<a name="line.102"></a> +<span class="sourceLineNo">103</span> }<a name="line.103"></a> +<span class="sourceLineNo">104</span> set.put(cell.getSequenceId(), new TagInfo(cell));<a name="line.104"></a> +<span class="sourceLineNo">105</span> // The init set should be the puts whose mvcc is smaller than this Delete. Because<a name="line.105"></a> +<span class="sourceLineNo">106</span> // there may be some Puts masked by them. The Puts whose mvcc is larger than this Delete can<a name="line.106"></a> +<span class="sourceLineNo">107</span> // not be copied to this node because we may delete one version and the oldest put may not be<a name="line.107"></a> +<span class="sourceLineNo">108</span> // masked.<a name="line.108"></a> +<span class="sourceLineNo">109</span> SortedSet<Long> nextValue = mvccCountingMap.ceilingEntry(cell.getSequenceId()).getValue();<a name="line.109"></a> +<span class="sourceLineNo">110</span> SortedSet<Long> thisValue = new TreeSet<>(nextValue.headSet(cell.getSequenceId()));<a name="line.110"></a> +<span class="sourceLineNo">111</span> mvccCountingMap.put(cell.getSequenceId(), thisValue);<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> }<a name="line.114"></a> +<span class="sourceLineNo">115</span><a name="line.115"></a> +<span class="sourceLineNo">116</span> @Override<a name="line.116"></a> +<span class="sourceLineNo">117</span> public void add(Cell cell) {<a name="line.117"></a> +<span class="sourceLineNo">118</span> prepare(cell);<a name="line.118"></a> +<span class="sourceLineNo">119</span> byte type = cell.getTypeByte();<a name="line.119"></a> +<span class="sourceLineNo">120</span> switch (KeyValue.Type.codeToType(type)) {<a name="line.120"></a> +<span class="sourceLineNo">121</span> // By the order of seen. We put null cq at first.<a name="line.121"></a> +<span class="sourceLineNo">122</span> case DeleteFamily: // Delete all versions of all columns of the specified family<a name="line.122"></a> +<span class="sourceLineNo">123</span> delFamMap.put(cell.getSequenceId(),<a name="line.123"></a> +<span class="sourceLineNo">124</span> new VisibilityDeleteVersionsNode(cell.getTimestamp(), cell.getSequenceId(),<a name="line.124"></a> +<span class="sourceLineNo">125</span> new TagInfo(cell)));<a name="line.125"></a> +<span class="sourceLineNo">126</span> break;<a name="line.126"></a> +<span class="sourceLineNo">127</span> case DeleteFamilyVersion: // Delete all columns of the specified family and specified version<a name="line.127"></a> +<span class="sourceLineNo">128</span> delFamMap.ceilingEntry(cell.getSequenceId()).getValue().addVersionDelete(cell);<a name="line.128"></a> +<span class="sourceLineNo">129</span> break;<a name="line.129"></a> +<span class="sourceLineNo">130</span><a name="line.130"></a> +<span class="sourceLineNo">131</span> // These two kinds of markers are mix with Puts.<a name="line.131"></a> +<span class="sourceLineNo">132</span> case DeleteColumn: // Delete all versions of the specified column<a name="line.132"></a> +<span class="sourceLineNo">133</span> delColMap.put(cell.getSequenceId(),<a name="line.133"></a> +<span class="sourceLineNo">134</span> new VisibilityDeleteVersionsNode(cell.getTimestamp(), cell.getSequenceId(),<a name="line.134"></a> +<span class="sourceLineNo">135</span> new TagInfo(cell)));<a name="line.135"></a> +<span class="sourceLineNo">136</span> break;<a name="line.136"></a> +<span class="sourceLineNo">137</span> case Delete: // Delete the specified version of the specified column.<a name="line.137"></a> +<span class="sourceLineNo">138</span> delColMap.ceilingEntry(cell.getSequenceId()).getValue().addVersionDelete(cell);<a name="line.138"></a> +<span class="sourceLineNo">139</span> break;<a name="line.139"></a> +<span class="sourceLineNo">140</span> default:<a name="line.140"></a> +<span class="sourceLineNo">141</span> throw new AssertionError("Unknown delete marker type for " + cell);<a name="line.141"></a> +<span class="sourceLineNo">142</span> }<a name="line.142"></a> +<span class="sourceLineNo">143</span> }<a name="line.143"></a> +<span class="sourceLineNo">144</span><a name="line.144"></a> +<span class="sourceLineNo">145</span> private boolean tagMatched(Cell put, TagInfo delInfo) throws IOException {<a name="line.145"></a> +<span class="sourceLineNo">146</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.146"></a> +<span class="sourceLineNo">147</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(put, putVisTags);<a name="line.147"></a> +<span class="sourceLineNo">148</span> return putVisTags.isEmpty() == delInfo.tags.isEmpty() && (<a name="line.148"></a> +<span class="sourceLineNo">149</span> putVisTags.isEmpty() && delInfo.tags.isEmpty() || VisibilityLabelServiceManager<a name="line.149"></a> +<span class="sourceLineNo">150</span> .getInstance().getVisibilityLabelService()<a name="line.150"></a> +<span class="sourceLineNo">151</span> .matchVisibility(putVisTags, putCellVisTagsFormat, delInfo.tags, delInfo.format));<a name="line.151"></a> +<span class="sourceLineNo">152</span> }<a name="line.152"></a> +<span class="sourceLineNo">153</span><a name="line.153"></a> +<span class="sourceLineNo">154</span> @Override<a name="line.154"></a> +<span class="sourceLineNo">155</span> public DeleteResult isDeleted(Cell cell) {<a name="line.155"></a> +<span class="sourceLineNo">156</span> try {<a name="line.156"></a> +<span class="sourceLineNo">157</span> long duplicateMvcc = prepare(cell);<a name="line.157"></a> +<span class="sourceLineNo">158</span><a name="line.158"></a> +<span class="sourceLineNo">159</span> for (Map.Entry<Long, DeleteVersionsNode> e : delColMap.tailMap(cell.getSequenceId())<a name="line.159"></a> +<span class="sourceLineNo">160</span> .entrySet()) {<a name="line.160"></a> +<span class="sourceLineNo">161</span> VisibilityDeleteVersionsNode node = (VisibilityDeleteVersionsNode) e.getValue();<a name="line.161"></a> +<span class="sourceLineNo">162</span> long deleteMvcc = Long.MAX_VALUE;<a name="line.162"></a> +<span class="sourceLineNo">163</span> SortedMap<Long, TagInfo> deleteVersionMvccs = node.deletesMap.get(cell.getTimestamp());<a name="line.163"></a> +<span class="sourceLineNo">164</span> if (deleteVersionMvccs != null) {<a name="line.164"></a> +<span class="sourceLineNo">165</span> SortedMap<Long, TagInfo> tail = deleteVersionMvccs.tailMap(cell.getSequenceId());<a name="line.165"></a> +<span class="sourceLineNo">166</span> for (Map.Entry<Long, TagInfo> entry : tail.entrySet()) {<a name="line.166"></a> +<span class="sourceLineNo">167</span> if (tagMatched(cell, entry.getValue())) {<a name="line.167"></a> +<span class="sourceLineNo">168</span> deleteMvcc = tail.firstKey();<a name="line.168"></a> +<span class="sourceLineNo">169</span> break;<a name="line.169"></a> +<span class="sourceLineNo">170</span> }<a name="line.170"></a> +<span class="sourceLineNo">171</span> }<a name="line.171"></a> +<span class="sourceLineNo">172</span> }<a name="line.172"></a> +<span class="sourceLineNo">173</span> SortedMap<Long, SortedSet<Long>> subMap = node.mvccCountingMap<a name="line.173"></a> +<span class="sourceLineNo">174</span> .subMap(cell.getSequenceId(), true, Math.min(duplicateMvcc, deleteMvcc), true);<a name="line.174"></a> +<span class="sourceLineNo">175</span> for (Map.Entry<Long, SortedSet<Long>> seg : subMap.entrySet()) {<a name="line.175"></a> +<span class="sourceLineNo">176</span> if (seg.getValue().size() >= maxVersions) {<a name="line.176"></a> +<span class="sourceLineNo">177</span> return DeleteResult.VERSION_MASKED;<a name="line.177"></a> +<span class="sourceLineNo">178</span> }<a name="line.178"></a> +<span class="sourceLineNo">179</span> seg.getValue().add(cell.getSequenceId());<a name="line.179"></a> +<span class="sourceLineNo">180</span> }<a name="line.180"></a> +<span class="sourceLineNo">181</span> if (deleteMvcc < Long.MAX_VALUE) {<a name="line.181"></a> +<span class="sourceLineNo">182</span> return DeleteResult.VERSION_DELETED;<a name="line.182"></a> +<span class="sourceLineNo">183</span> }<a name="line.183"></a> +<span class="sourceLineNo">184</span><a name="line.184"></a> +<span class="sourceLineNo">185</span> if (cell.getTimestamp() <= node.ts && tagMatched(cell, node.tagInfo)) {<a name="line.185"></a> +<span class="sourceLineNo">186</span> return DeleteResult.COLUMN_DELETED;<a name="line.186"></a> +<span class="sourceLineNo">187</span> }<a name="line.187"></a> +<span class="sourceLineNo">188</span> }<a name="line.188"></a> +<span class="sourceLineNo">189</span> if (duplicateMvcc < Long.MAX_VALUE) {<a name="line.189"></a> +<span class="sourceLineNo">190</span> return DeleteResult.VERSION_MASKED;<a name="line.190"></a> +<span class="sourceLineNo">191</span> }<a name="line.191"></a> +<span class="sourceLineNo">192</span> } catch (IOException e) {<a name="line.192"></a> +<span class="sourceLineNo">193</span> LOG.error("Error in isDeleted() check! Will treat cell as not deleted", e);<a name="line.193"></a> +<span class="sourceLineNo">194</span> }<a name="line.194"></a> +<span class="sourceLineNo">195</span> return DeleteResult.NOT_DELETED;<a name="line.195"></a> +<span class="sourceLineNo">196</span> }<a name="line.196"></a> +<span class="sourceLineNo">197</span><a name="line.197"></a> +<span class="sourceLineNo">198</span> protected void resetInternal() {<a name="line.198"></a> +<span class="sourceLineNo">199</span> delFamMap.put(Long.MAX_VALUE,<a name="line.199"></a> +<span class="sourceLineNo">200</span> new VisibilityDeleteVersionsNode(Long.MIN_VALUE, Long.MAX_VALUE, new TagInfo()));<a name="line.200"></a> +<span class="sourceLineNo">201</span> }<a name="line.201"></a> +<span class="sourceLineNo">202</span>}<a name="line.202"></a> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +</pre> +</div> +</body> +</html>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftUtilities.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftUtilities.html b/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftUtilities.html index a486d25..e292417 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftUtilities.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/thrift2/ThriftUtilities.html @@ -276,318 +276,331 @@ <span class="sourceLineNo">268</span> if (in.isSetColumns()) {<a name="line.268"></a> <span class="sourceLineNo">269</span> out = new Delete(in.getRow());<a name="line.269"></a> <span class="sourceLineNo">270</span> for (TColumn column : in.getColumns()) {<a name="line.270"></a> -<span class="sourceLineNo">271</span> if (column.isSetQualifier()) {<a name="line.271"></a> -<span class="sourceLineNo">272</span> if (column.isSetTimestamp()) {<a name="line.272"></a> -<span class="sourceLineNo">273</span> if (in.isSetDeleteType() &&<a name="line.273"></a> -<span class="sourceLineNo">274</span> in.getDeleteType().equals(TDeleteType.DELETE_COLUMNS))<a name="line.274"></a> -<span class="sourceLineNo">275</span> out.addColumns(column.getFamily(), column.getQualifier(), column.getTimestamp());<a name="line.275"></a> -<span class="sourceLineNo">276</span> else<a name="line.276"></a> -<span class="sourceLineNo">277</span> out.addColumn(column.getFamily(), column.getQualifier(), column.getTimestamp());<a name="line.277"></a> -<span class="sourceLineNo">278</span> } else {<a name="line.278"></a> -<span class="sourceLineNo">279</span> if (in.isSetDeleteType() &&<a name="line.279"></a> -<span class="sourceLineNo">280</span> in.getDeleteType().equals(TDeleteType.DELETE_COLUMNS))<a name="line.280"></a> -<span class="sourceLineNo">281</span> out.addColumns(column.getFamily(), column.getQualifier());<a name="line.281"></a> -<span class="sourceLineNo">282</span> else<a name="line.282"></a> -<span class="sourceLineNo">283</span> out.addColumn(column.getFamily(), column.getQualifier());<a name="line.283"></a> -<span class="sourceLineNo">284</span> }<a name="line.284"></a> -<span class="sourceLineNo">285</span><a name="line.285"></a> -<span class="sourceLineNo">286</span> } else {<a name="line.286"></a> -<span class="sourceLineNo">287</span> if (column.isSetTimestamp()) {<a name="line.287"></a> -<span class="sourceLineNo">288</span> out.addFamily(column.getFamily(), column.getTimestamp());<a name="line.288"></a> -<span class="sourceLineNo">289</span> } else {<a name="line.289"></a> -<span class="sourceLineNo">290</span> out.addFamily(column.getFamily());<a name="line.290"></a> -<span class="sourceLineNo">291</span> }<a name="line.291"></a> -<span class="sourceLineNo">292</span> }<a name="line.292"></a> -<span class="sourceLineNo">293</span> }<a name="line.293"></a> -<span class="sourceLineNo">294</span> } else {<a name="line.294"></a> -<span class="sourceLineNo">295</span> if (in.isSetTimestamp()) {<a name="line.295"></a> -<span class="sourceLineNo">296</span> out = new Delete(in.getRow(), in.getTimestamp());<a name="line.296"></a> -<span class="sourceLineNo">297</span> } else {<a name="line.297"></a> -<span class="sourceLineNo">298</span> out = new Delete(in.getRow());<a name="line.298"></a> -<span class="sourceLineNo">299</span> }<a name="line.299"></a> -<span class="sourceLineNo">300</span> }<a name="line.300"></a> -<span class="sourceLineNo">301</span><a name="line.301"></a> -<span class="sourceLineNo">302</span> if (in.isSetAttributes()) {<a name="line.302"></a> -<span class="sourceLineNo">303</span> addAttributes(out,in.getAttributes());<a name="line.303"></a> -<span class="sourceLineNo">304</span> }<a name="line.304"></a> -<span class="sourceLineNo">305</span><a name="line.305"></a> -<span class="sourceLineNo">306</span> if (in.isSetDurability()) {<a name="line.306"></a> -<span class="sourceLineNo">307</span> out.setDurability(durabilityFromThrift(in.getDurability()));<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> return out;<a name="line.310"></a> -<span class="sourceLineNo">311</span> }<a name="line.311"></a> -<span class="sourceLineNo">312</span><a name="line.312"></a> -<span class="sourceLineNo">313</span> /**<a name="line.313"></a> -<span class="sourceLineNo">314</span> * Converts multiple {@link TDelete}s (Thrift) into a list of {@link Delete}s (HBase).<a name="line.314"></a> -<span class="sourceLineNo">315</span> *<a name="line.315"></a> -<span class="sourceLineNo">316</span> * @param in list of <code>TDelete</code>s to convert<a name="line.316"></a> -<span class="sourceLineNo">317</span> *<a name="line.317"></a> -<span class="sourceLineNo">318</span> * @return list of converted <code>Delete</code>s<a name="line.318"></a> -<span class="sourceLineNo">319</span> *<a name="line.319"></a> -<span class="sourceLineNo">320</span> * @see #deleteFromThrift(TDelete)<a name="line.320"></a> -<span class="sourceLineNo">321</span> */<a name="line.321"></a> +<span class="sourceLineNo">271</span> if (in.isSetDeleteType()) {<a name="line.271"></a> +<span class="sourceLineNo">272</span> switch (in.getDeleteType()) {<a name="line.272"></a> +<span class="sourceLineNo">273</span> case DELETE_COLUMN:<a name="line.273"></a> +<span class="sourceLineNo">274</span> if (column.isSetTimestamp()) {<a name="line.274"></a> +<span class="sourceLineNo">275</span> out.addColumn(column.getFamily(), column.getQualifier(), column.getTimestamp());<a name="line.275"></a> +<span class="sourceLineNo">276</span> } else {<a name="line.276"></a> +<span class="sourceLineNo">277</span> out.addColumn(column.getFamily(), column.getQualifier());<a name="line.277"></a> +<span class="sourceLineNo">278</span> }<a name="line.278"></a> +<span class="sourceLineNo">279</span> break;<a name="line.279"></a> +<span class="sourceLineNo">280</span> case DELETE_COLUMNS:<a name="line.280"></a> +<span class="sourceLineNo">281</span> if (column.isSetTimestamp()) {<a name="line.281"></a> +<span class="sourceLineNo">282</span> out.addColumns(column.getFamily(), column.getQualifier(), column.getTimestamp());<a name="line.282"></a> +<span class="sourceLineNo">283</span> } else {<a name="line.283"></a> +<span class="sourceLineNo">284</span> out.addColumns(column.getFamily(), column.getQualifier());<a name="line.284"></a> +<span class="sourceLineNo">285</span> }<a name="line.285"></a> +<span class="sourceLineNo">286</span> break;<a name="line.286"></a> +<span class="sourceLineNo">287</span> case DELETE_FAMILY:<a name="line.287"></a> +<span class="sourceLineNo">288</span> if (column.isSetTimestamp()) {<a name="line.288"></a> +<span class="sourceLineNo">289</span> out.addFamily(column.getFamily(), column.getTimestamp());<a name="line.289"></a> +<span class="sourceLineNo">290</span> } else {<a name="line.290"></a> +<span class="sourceLineNo">291</span> out.addFamily(column.getFamily());<a name="line.291"></a> +<span class="sourceLineNo">292</span> }<a name="line.292"></a> +<span class="sourceLineNo">293</span> break;<a name="line.293"></a> +<span class="sourceLineNo">294</span> case DELETE_FAMILY_VERSION:<a name="line.294"></a> +<span class="sourceLineNo">295</span> if (column.isSetTimestamp()) {<a name="line.295"></a> +<span class="sourceLineNo">296</span> out.addFamilyVersion(column.getFamily(), column.getTimestamp());<a name="line.296"></a> +<span class="sourceLineNo">297</span> } else {<a name="line.297"></a> +<span class="sourceLineNo">298</span> throw new IllegalArgumentException(<a name="line.298"></a> +<span class="sourceLineNo">299</span> "Timestamp is required for TDelete with DeleteFamilyVersion type");<a name="line.299"></a> +<span class="sourceLineNo">300</span> }<a name="line.300"></a> +<span class="sourceLineNo">301</span> break;<a name="line.301"></a> +<span class="sourceLineNo">302</span> }<a name="line.302"></a> +<span class="sourceLineNo">303</span> } else {<a name="line.303"></a> +<span class="sourceLineNo">304</span> throw new IllegalArgumentException("DeleteType is required for TDelete");<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> } else {<a name="line.307"></a> +<span class="sourceLineNo">308</span> if (in.isSetTimestamp()) {<a name="line.308"></a> +<span class="sourceLineNo">309</span> out = new Delete(in.getRow(), in.getTimestamp());<a name="line.309"></a> +<span class="sourceLineNo">310</span> } else {<a name="line.310"></a> +<span class="sourceLineNo">311</span> out = new Delete(in.getRow());<a name="line.311"></a> +<span class="sourceLineNo">312</span> }<a name="line.312"></a> +<span class="sourceLineNo">313</span> }<a name="line.313"></a> +<span class="sourceLineNo">314</span><a name="line.314"></a> +<span class="sourceLineNo">315</span> if (in.isSetAttributes()) {<a name="line.315"></a> +<span class="sourceLineNo">316</span> addAttributes(out,in.getAttributes());<a name="line.316"></a> +<span class="sourceLineNo">317</span> }<a name="line.317"></a> +<span class="sourceLineNo">318</span><a name="line.318"></a> +<span class="sourceLineNo">319</span> if (in.isSetDurability()) {<a name="line.319"></a> +<span class="sourceLineNo">320</span> out.setDurability(durabilityFromThrift(in.getDurability()));<a name="line.320"></a> +<span class="sourceLineNo">321</span> }<a name="line.321"></a> <span class="sourceLineNo">322</span><a name="line.322"></a> -<span class="sourceLineNo">323</span> public static List<Delete> deletesFromThrift(List<TDelete> in) {<a name="line.323"></a> -<span class="sourceLineNo">324</span> List<Delete> out = new ArrayList<>(in.size());<a name="line.324"></a> -<span class="sourceLineNo">325</span> for (TDelete delete : in) {<a name="line.325"></a> -<span class="sourceLineNo">326</span> out.add(deleteFromThrift(delete));<a name="line.326"></a> -<span class="sourceLineNo">327</span> }<a name="line.327"></a> -<span class="sourceLineNo">328</span> return out;<a name="line.328"></a> -<span class="sourceLineNo">329</span> }<a name="line.329"></a> -<span class="sourceLineNo">330</span><a name="line.330"></a> -<span class="sourceLineNo">331</span> public static TDelete deleteFromHBase(Delete in) {<a name="line.331"></a> -<span class="sourceLineNo">332</span> TDelete out = new TDelete(ByteBuffer.wrap(in.getRow()));<a name="line.332"></a> -<span class="sourceLineNo">333</span><a name="line.333"></a> -<span class="sourceLineNo">334</span> List<TColumn> columns = new ArrayList<>(in.getFamilyCellMap().entrySet().size());<a name="line.334"></a> -<span class="sourceLineNo">335</span> long rowTimestamp = in.getTimeStamp();<a name="line.335"></a> -<span class="sourceLineNo">336</span> if (rowTimestamp != HConstants.LATEST_TIMESTAMP) {<a name="line.336"></a> -<span class="sourceLineNo">337</span> out.setTimestamp(rowTimestamp);<a name="line.337"></a> -<span class="sourceLineNo">338</span> }<a name="line.338"></a> -<span class="sourceLineNo">339</span><a name="line.339"></a> -<span class="sourceLineNo">340</span> // Map<family, List<KeyValue>><a name="line.340"></a> -<span class="sourceLineNo">341</span> for (Map.Entry<byte[], List<org.apache.hadoop.hbase.Cell>> familyEntry:<a name="line.341"></a> -<span class="sourceLineNo">342</span> in.getFamilyCellMap().entrySet()) {<a name="line.342"></a> -<span class="sourceLineNo">343</span> TColumn column = new TColumn(ByteBuffer.wrap(familyEntry.getKey()));<a name="line.343"></a> -<span class="sourceLineNo">344</span> for (org.apache.hadoop.hbase.Cell cell: familyEntry.getValue()) {<a name="line.344"></a> -<span class="sourceLineNo">345</span> byte[] family = CellUtil.cloneFamily(cell);<a name="line.345"></a> -<span class="sourceLineNo">346</span> byte[] qualifier = CellUtil.cloneQualifier(cell);<a name="line.346"></a> -<span class="sourceLineNo">347</span> long timestamp = cell.getTimestamp();<a name="line.347"></a> -<span class="sourceLineNo">348</span> if (family != null) {<a name="line.348"></a> -<span class="sourceLineNo">349</span> column.setFamily(family);<a name="line.349"></a> -<span class="sourceLineNo">350</span> }<a name="line.350"></a> -<span class="sourceLineNo">351</span> if (qualifier != null) {<a name="line.351"></a> -<span class="sourceLineNo">352</span> column.setQualifier(qualifier);<a name="line.352"></a> -<span class="sourceLineNo">353</span> }<a name="line.353"></a> -<span class="sourceLineNo">354</span> if (timestamp != HConstants.LATEST_TIMESTAMP) {<a name="line.354"></a> -<span class="sourceLineNo">355</span> column.setTimestamp(timestamp);<a name="line.355"></a> -<span class="sourceLineNo">356</span> }<a name="line.356"></a> -<span class="sourceLineNo">357</span> }<a name="line.357"></a> -<span class="sourceLineNo">358</span> columns.add(column);<a name="line.358"></a> -<span class="sourceLineNo">359</span> }<a name="line.359"></a> -<span class="sourceLineNo">360</span> out.setColumns(columns);<a name="line.360"></a> -<span class="sourceLineNo">361</span><a name="line.361"></a> -<span class="sourceLineNo">362</span> return out;<a name="line.362"></a> -<span class="sourceLineNo">363</span> }<a name="line.363"></a> -<span class="sourceLineNo">364</span><a name="line.364"></a> -<span class="sourceLineNo">365</span> /**<a name="line.365"></a> -<span class="sourceLineNo">366</span> * Creates a {@link RowMutations} (HBase) from a {@link TRowMutations} (Thrift)<a name="line.366"></a> -<span class="sourceLineNo">367</span> *<a name="line.367"></a> -<span class="sourceLineNo">368</span> * @param in the <code>TRowMutations</code> to convert<a name="line.368"></a> -<span class="sourceLineNo">369</span> *<a name="line.369"></a> -<span class="sourceLineNo">370</span> * @return converted <code>RowMutations</code><a name="line.370"></a> -<span class="sourceLineNo">371</span> */<a name="line.371"></a> -<span class="sourceLineNo">372</span> public static RowMutations rowMutationsFromThrift(TRowMutations in) throws IOException {<a name="line.372"></a> -<span class="sourceLineNo">373</span> List<TMutation> mutations = in.getMutations();<a name="line.373"></a> -<span class="sourceLineNo">374</span> RowMutations out = new RowMutations(in.getRow(), mutations.size());<a name="line.374"></a> -<span class="sourceLineNo">375</span> for (TMutation mutation : mutations) {<a name="line.375"></a> -<span class="sourceLineNo">376</span> if (mutation.isSetPut()) {<a name="line.376"></a> -<span class="sourceLineNo">377</span> out.add(putFromThrift(mutation.getPut()));<a name="line.377"></a> -<span class="sourceLineNo">378</span> }<a name="line.378"></a> -<span class="sourceLineNo">379</span> if (mutation.isSetDeleteSingle()) {<a name="line.379"></a> -<span class="sourceLineNo">380</span> out.add(deleteFromThrift(mutation.getDeleteSingle()));<a name="line.380"></a> -<span class="sourceLineNo">381</span> }<a name="line.381"></a> -<span class="sourceLineNo">382</span> }<a name="line.382"></a> -<span class="sourceLineNo">383</span> return out;<a name="line.383"></a> -<span class="sourceLineNo">384</span> }<a name="line.384"></a> -<span class="sourceLineNo">385</span><a name="line.385"></a> -<span class="sourceLineNo">386</span> public static Scan scanFromThrift(TScan in) throws IOException {<a name="line.386"></a> -<span class="sourceLineNo">387</span> Scan out = new Scan();<a name="line.387"></a> -<span class="sourceLineNo">388</span><a name="line.388"></a> -<span class="sourceLineNo">389</span> if (in.isSetStartRow())<a name="line.389"></a> -<span class="sourceLineNo">390</span> out.setStartRow(in.getStartRow());<a name="line.390"></a> -<span class="sourceLineNo">391</span> if (in.isSetStopRow())<a name="line.391"></a> -<span class="sourceLineNo">392</span> out.setStopRow(in.getStopRow());<a name="line.392"></a> -<span class="sourceLineNo">393</span> if (in.isSetCaching())<a name="line.393"></a> -<span class="sourceLineNo">394</span> out.setCaching(in.getCaching());<a name="line.394"></a> -<span class="sourceLineNo">395</span> if (in.isSetMaxVersions()) {<a name="line.395"></a> -<span class="sourceLineNo">396</span> out.setMaxVersions(in.getMaxVersions());<a name="line.396"></a> -<span class="sourceLineNo">397</span> }<a name="line.397"></a> +<span class="sourceLineNo">323</span> return out;<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> * Converts multiple {@link TDelete}s (Thrift) into a list of {@link Delete}s (HBase).<a name="line.327"></a> +<span class="sourceLineNo">328</span> *<a name="line.328"></a> +<span class="sourceLineNo">329</span> * @param in list of <code>TDelete</code>s to convert<a name="line.329"></a> +<span class="sourceLineNo">330</span> *<a name="line.330"></a> +<span class="sourceLineNo">331</span> * @return list of converted <code>Delete</code>s<a name="line.331"></a> +<span class="sourceLineNo">332</span> *<a name="line.332"></a> +<span class="sourceLineNo">333</span> * @see #deleteFromThrift(TDelete)<a name="line.333"></a> +<span class="sourceLineNo">334</span> */<a name="line.334"></a> +<span class="sourceLineNo">335</span><a name="line.335"></a> +<span class="sourceLineNo">336</span> public static List<Delete> deletesFromThrift(List<TDelete> in) {<a name="line.336"></a> +<span class="sourceLineNo">337</span> List<Delete> out = new ArrayList<>(in.size());<a name="line.337"></a> +<span class="sourceLineNo">338</span> for (TDelete delete : in) {<a name="line.338"></a> +<span class="sourceLineNo">339</span> out.add(deleteFromThrift(delete));<a name="line.339"></a> +<span class="sourceLineNo">340</span> }<a name="line.340"></a> +<span class="sourceLineNo">341</span> return out;<a name="line.341"></a> +<span class="sourceLineNo">342</span> }<a name="line.342"></a> +<span class="sourceLineNo">343</span><a name="line.343"></a> +<span class="sourceLineNo">344</span> public static TDelete deleteFromHBase(Delete in) {<a name="line.344"></a> +<span class="sourceLineNo">345</span> TDelete out = new TDelete(ByteBuffer.wrap(in.getRow()));<a name="line.345"></a> +<span class="sourceLineNo">346</span><a name="line.346"></a> +<span class="sourceLineNo">347</span> List<TColumn> columns = new ArrayList<>(in.getFamilyCellMap().entrySet().size());<a name="line.347"></a> +<span class="sourceLineNo">348</span> long rowTimestamp = in.getTimeStamp();<a name="line.348"></a> +<span class="sourceLineNo">349</span> if (rowTimestamp != HConstants.LATEST_TIMESTAMP) {<a name="line.349"></a> +<span class="sourceLineNo">350</span> out.setTimestamp(rowTimestamp);<a name="line.350"></a> +<span class="sourceLineNo">351</span> }<a name="line.351"></a> +<span class="sourceLineNo">352</span><a name="line.352"></a> +<span class="sourceLineNo">353</span> // Map<family, List<KeyValue>><a name="line.353"></a> +<span class="sourceLineNo">354</span> for (Map.Entry<byte[], List<org.apache.hadoop.hbase.Cell>> familyEntry:<a name="line.354"></a> +<span class="sourceLineNo">355</span> in.getFamilyCellMap().entrySet()) {<a name="line.355"></a> +<span class="sourceLineNo">356</span> TColumn column = new TColumn(ByteBuffer.wrap(familyEntry.getKey()));<a name="line.356"></a> +<span class="sourceLineNo">357</span> for (org.apache.hadoop.hbase.Cell cell: familyEntry.getValue()) {<a name="line.357"></a> +<span class="sourceLineNo">358</span> byte[] family = CellUtil.cloneFamily(cell);<a name="line.358"></a> +<span class="sourceLineNo">359</span> byte[] qualifier = CellUtil.cloneQualifier(cell);<a name="line.359"></a> +<span class="sourceLineNo">360</span> long timestamp = cell.getTimestamp();<a name="line.360"></a> +<span class="sourceLineNo">361</span> if (family != null) {<a name="line.361"></a> +<span class="sourceLineNo">362</span> column.setFamily(family);<a name="line.362"></a> +<span class="sourceLineNo">363</span> }<a name="line.363"></a> +<span class="sourceLineNo">364</span> if (qualifier != null) {<a name="line.364"></a> +<span class="sourceLineNo">365</span> column.setQualifier(qualifier);<a name="line.365"></a> +<span class="sourceLineNo">366</span> }<a name="line.366"></a> +<span class="sourceLineNo">367</span> if (timestamp != HConstants.LATEST_TIMESTAMP) {<a name="line.367"></a> +<span class="sourceLineNo">368</span> column.setTimestamp(timestamp);<a name="line.368"></a> +<span class="sourceLineNo">369</span> }<a name="line.369"></a> +<span class="sourceLineNo">370</span> }<a name="line.370"></a> +<span class="sourceLineNo">371</span> columns.add(column);<a name="line.371"></a> +<span class="sourceLineNo">372</span> }<a name="line.372"></a> +<span class="sourceLineNo">373</span> out.setColumns(columns);<a name="line.373"></a> +<span class="sourceLineNo">374</span><a name="line.374"></a> +<span class="sourceLineNo">375</span> return out;<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> +<span class="sourceLineNo">379</span> * Creates a {@link RowMutations} (HBase) from a {@link TRowMutations} (Thrift)<a name="line.379"></a> +<span class="sourceLineNo">380</span> *<a name="line.380"></a> +<span class="sourceLineNo">381</span> * @param in the <code>TRowMutations</code> to convert<a name="line.381"></a> +<span class="sourceLineNo">382</span> *<a name="line.382"></a> +<span class="sourceLineNo">383</span> * @return converted <code>RowMutations</code><a name="line.383"></a> +<span class="sourceLineNo">384</span> */<a name="line.384"></a> +<span class="sourceLineNo">385</span> public static RowMutations rowMutationsFromThrift(TRowMutations in) throws IOException {<a name="line.385"></a> +<span class="sourceLineNo">386</span> List<TMutation> mutations = in.getMutations();<a name="line.386"></a> +<span class="sourceLineNo">387</span> RowMutations out = new RowMutations(in.getRow(), mutations.size());<a name="line.387"></a> +<span class="sourceLineNo">388</span> for (TMutation mutation : mutations) {<a name="line.388"></a> +<span class="sourceLineNo">389</span> if (mutation.isSetPut()) {<a name="line.389"></a> +<span class="sourceLineNo">390</span> out.add(putFromThrift(mutation.getPut()));<a name="line.390"></a> +<span class="sourceLineNo">391</span> }<a name="line.391"></a> +<span class="sourceLineNo">392</span> if (mutation.isSetDeleteSingle()) {<a name="line.392"></a> +<span class="sourceLineNo">393</span> out.add(deleteFromThrift(mutation.getDeleteSingle()));<a name="line.393"></a> +<span class="sourceLineNo">394</span> }<a name="line.394"></a> +<span class="sourceLineNo">395</span> }<a name="line.395"></a> +<span class="sourceLineNo">396</span> return out;<a name="line.396"></a> +<span class="sourceLineNo">397</span> }<a name="line.397"></a> <span class="sourceLineNo">398</span><a name="line.398"></a> -<span class="sourceLineNo">399</span> if (in.isSetColumns()) {<a name="line.399"></a> -<span class="sourceLineNo">400</span> for (TColumn column : in.getColumns()) {<a name="line.400"></a> -<span class="sourceLineNo">401</span> if (column.isSetQualifier()) {<a name="line.401"></a> -<span class="sourceLineNo">402</span> out.addColumn(column.getFamily(), column.getQualifier());<a name="line.402"></a> -<span class="sourceLineNo">403</span> } else {<a name="line.403"></a> -<span class="sourceLineNo">404</span> out.addFamily(column.getFamily());<a name="line.404"></a> -<span class="sourceLineNo">405</span> }<a name="line.405"></a> -<span class="sourceLineNo">406</span> }<a name="line.406"></a> -<span class="sourceLineNo">407</span> }<a name="line.407"></a> -<span class="sourceLineNo">408</span><a name="line.408"></a> -<span class="sourceLineNo">409</span> TTimeRange timeRange = in.getTimeRange();<a name="line.409"></a> -<span class="sourceLineNo">410</span> if (timeRange != null &&<a name="line.410"></a> -<span class="sourceLineNo">411</span> timeRange.isSetMinStamp() && timeRange.isSetMaxStamp()) {<a name="line.411"></a> -<span class="sourceLineNo">412</span> out.setTimeRange(timeRange.getMinStamp(), timeRange.getMaxStamp());<a name="line.412"></a> -<span class="sourceLineNo">413</span> }<a name="line.413"></a> -<span class="sourceLineNo">414</span><a name="line.414"></a> -<span class="sourceLineNo">415</span> if (in.isSetBatchSize()) {<a name="line.415"></a> -<span class="sourceLineNo">416</span> out.setBatch(in.getBatchSize());<a name="line.416"></a> -<span class="sourceLineNo">417</span> }<a name="line.417"></a> -<span class="sourceLineNo">418</span><a name="line.418"></a> -<span class="sourceLineNo">419</span> if (in.isSetFilterString()) {<a name="line.419"></a> -<span class="sourceLineNo">420</span> ParseFilter parseFilter = new ParseFilter();<a name="line.420"></a> -<span class="sourceLineNo">421</span> out.setFilter(parseFilter.parseFilterString(in.getFilterString()));<a name="line.421"></a> -<span class="sourceLineNo">422</span> }<a name="line.422"></a> -<span class="sourceLineNo">423</span><a name="line.423"></a> -<span class="sourceLineNo">424</span> if (in.isSetAttributes()) {<a name="line.424"></a> -<span class="sourceLineNo">425</span> addAttributes(out,in.getAttributes());<a name="line.425"></a> +<span class="sourceLineNo">399</span> public static Scan scanFromThrift(TScan in) throws IOException {<a name="line.399"></a> +<span class="sourceLineNo">400</span> Scan out = new Scan();<a name="line.400"></a> +<span class="sourceLineNo">401</span><a name="line.401"></a> +<span class="sourceLineNo">402</span> if (in.isSetStartRow())<a name="line.402"></a> +<span class="sourceLineNo">403</span> out.setStartRow(in.getStartRow());<a name="line.403"></a> +<span class="sourceLineNo">404</span> if (in.isSetStopRow())<a name="line.404"></a> +<span class="sourceLineNo">405</span> out.setStopRow(in.getStopRow());<a name="line.405"></a> +<span class="sourceLineNo">406</span> if (in.isSetCaching())<a name="line.406"></a> +<span class="sourceLineNo">407</span> out.setCaching(in.getCaching());<a name="line.407"></a> +<span class="sourceLineNo">408</span> if (in.isSetMaxVersions()) {<a name="line.408"></a> +<span class="sourceLineNo">409</span> out.setMaxVersions(in.getMaxVersions());<a name="line.409"></a> +<span class="sourceLineNo">410</span> }<a name="line.410"></a> +<span class="sourceLineNo">411</span><a name="line.411"></a> +<span class="sourceLineNo">412</span> if (in.isSetColumns()) {<a name="line.412"></a> +<span class="sourceLineNo">413</span> for (TColumn column : in.getColumns()) {<a name="line.413"></a> +<span class="sourceLineNo">414</span> if (column.isSetQualifier()) {<a name="line.414"></a> +<span class="sourceLineNo">415</span> out.addColumn(column.getFamily(), column.getQualifier());<a name="line.415"></a> +<span class="sourceLineNo">416</span> } else {<a name="line.416"></a> +<span class="sourceLineNo">417</span> out.addFamily(column.getFamily());<a name="line.417"></a> +<span class="sourceLineNo">418</span> }<a name="line.418"></a> +<span class="sourceLineNo">419</span> }<a name="line.419"></a> +<span class="sourceLineNo">420</span> }<a name="line.420"></a> +<span class="sourceLineNo">421</span><a name="line.421"></a> +<span class="sourceLineNo">422</span> TTimeRange timeRange = in.getTimeRange();<a name="line.422"></a> +<span class="sourceLineNo">423</span> if (timeRange != null &&<a name="line.423"></a> +<span class="sourceLineNo">424</span> timeRange.isSetMinStamp() && timeRange.isSetMaxStamp()) {<a name="line.424"></a> +<span class="sourceLineNo">425</span> out.setTimeRange(timeRange.getMinStamp(), timeRange.getMaxStamp());<a name="line.425"></a> <span class="sourceLineNo">426</span> }<a name="line.426"></a> -<span class="sourceLineNo">427</span> <a name="line.427"></a> -<span class="sourceLineNo">428</span> if (in.isSetAuthorizations()) {<a name="line.428"></a> -<span class="sourceLineNo">429</span> out.setAuthorizations(new Authorizations(in.getAuthorizations().getLabels()));<a name="line.429"></a> +<span class="sourceLineNo">427</span><a name="line.427"></a> +<span class="sourceLineNo">428</span> if (in.isSetBatchSize()) {<a name="line.428"></a> +<span class="sourceLineNo">429</span> out.setBatch(in.getBatchSize());<a name="line.429"></a> <span class="sourceLineNo">430</span> }<a name="line.430"></a> <span class="sourceLineNo">431</span><a name="line.431"></a> -<span class="sourceLineNo">432</span> if (in.isSetReversed()) {<a name="line.432"></a> -<span class="sourceLineNo">433</span> out.setReversed(in.isReversed());<a name="line.433"></a> -<span class="sourceLineNo">434</span> }<a name="line.434"></a> -<span class="sourceLineNo">435</span><a name="line.435"></a> -<span class="sourceLineNo">436</span> if (in.isSetCacheBlocks()) {<a name="line.436"></a> -<span class="sourceLineNo">437</span> out.setCacheBlocks(in.isCacheBlocks());<a name="line.437"></a> -<span class="sourceLineNo">438</span> }<a name="line.438"></a> -<span class="sourceLineNo">439</span><a name="line.439"></a> -<span class="sourceLineNo">440</span> if (in.isSetColFamTimeRangeMap()) {<a name="line.440"></a> -<span class="sourceLineNo">441</span> Map<ByteBuffer, TTimeRange> colFamTimeRangeMap = in.getColFamTimeRangeMap();<a name="line.441"></a> -<span class="sourceLineNo">442</span> if (MapUtils.isNotEmpty(colFamTimeRangeMap)) {<a name="line.442"></a> -<span class="sourceLineNo">443</span> for (Map.Entry<ByteBuffer, TTimeRange> entry : colFamTimeRangeMap.entrySet()) {<a name="line.443"></a> -<span class="sourceLineNo">444</span> out.setColumnFamilyTimeRange(Bytes.toBytes(entry.getKey()),<a name="line.444"></a> -<span class="sourceLineNo">445</span> entry.getValue().getMinStamp(), entry.getValue().getMaxStamp());<a name="line.445"></a> -<span class="sourceLineNo">446</span> }<a name="line.446"></a> -<span class="sourceLineNo">447</span> }<a name="line.447"></a> -<span class="sourceLineNo">448</span> }<a name="line.448"></a> -<span class="sourceLineNo">449</span><a name="line.449"></a> -<span class="sourceLineNo">450</span> if (in.isSetReadType()) {<a name="line.450"></a> -<span class="sourceLineNo">451</span> out.setReadType(readTypeFromThrift(in.getReadType()));<a name="line.451"></a> -<span class="sourceLineNo">452</span> }<a name="line.452"></a> -<span class="sourceLineNo">453</span><a name="line.453"></a> -<span class="sourceLineNo">454</span> if (in.isSetLimit()) {<a name="line.454"></a> -<span class="sourceLineNo">455</span> out.setLimit(in.getLimit());<a name="line.455"></a> -<span class="sourceLineNo">456</span> }<a name="line.456"></a> -<span class="sourceLineNo">457</span><a name="line.457"></a> -<span class="sourceLineNo">458</span> return out;<a name="line.458"></a> -<span class="sourceLineNo">459</span> }<a name="line.459"></a> -<span class="sourceLineNo">460</span><a name="line.460"></a> -<span class="sourceLineNo">461</span> public static Increment incrementFromThrift(TIncrement in) throws IOException {<a name="line.461"></a> -<span class="sourceLineNo">462</span> Increment out = new Increment(in.getRow());<a name="line.462"></a> -<span class="sourceLineNo">463</span> for (TColumnIncrement column : in.getColumns()) {<a name="line.463"></a> -<span class="sourceLineNo">464</span> out.addColumn(column.getFamily(), column.getQualifier(), column.getAmount());<a name="line.464"></a> +<span class="sourceLineNo">432</span> if (in.isSetFilterString()) {<a name="line.432"></a> +<span class="sourceLineNo">433</span> ParseFilter parseFilter = new ParseFilter();<a name="line.433"></a> +<span class="sourceLineNo">434</span> out.setFilter(parseFilter.parseFilterString(in.getFilterString()));<a name="line.434"></a> +<span class="sourceLineNo">435</span> }<a name="line.435"></a> +<span class="sourceLineNo">436</span><a name="line.436"></a> +<span class="sourceLineNo">437</span> if (in.isSetAttributes()) {<a name="line.437"></a> +<span class="sourceLineNo">438</span> addAttributes(out,in.getAttributes());<a name="line.438"></a> +<span class="sourceLineNo">439</span> }<a name="line.439"></a> +<span class="sourceLineNo">440</span> <a name="line.440"></a> +<span class="sourceLineNo">441</span> if (in.isSetAuthorizations()) {<a name="line.441"></a> +<span class="sourceLineNo">442</span> out.setAuthorizations(new Authorizations(in.getAuthorizations().getLabels()));<a name="line.442"></a> +<span class="sourceLineNo">443</span> }<a name="line.443"></a> +<span class="sourceLineNo">444</span><a name="line.444"></a> +<span class="sourceLineNo">445</span> if (in.isSetReversed()) {<a name="line.445"></a> +<span class="sourceLineNo">446</span> out.setReversed(in.isReversed());<a name="line.446"></a> +<span class="sourceLineNo">447</span> }<a name="line.447"></a> +<span class="sourceLineNo">448</span><a name="line.448"></a> +<span class="sourceLineNo">449</span> if (in.isSetCacheBlocks()) {<a name="line.449"></a> +<span class="sourceLineNo">450</span> out.setCacheBlocks(in.isCacheBlocks());<a name="line.450"></a> +<span class="sourceLineNo">451</span> }<a name="line.451"></a> +<span class="sourceLineNo">452</span><a name="line.452"></a> +<span class="sourceLineNo">453</span> if (in.isSetColFamTimeRangeMap()) {<a name="line.453"></a> +<span class="sourceLineNo">454</span> Map<ByteBuffer, TTimeRange> colFamTimeRangeMap = in.getColFamTimeRangeMap();<a name="line.454"></a> +<span class="sourceLineNo">455</span> if (MapUtils.isNotEmpty(colFamTimeRangeMap)) {<a name="line.455"></a> +<span class="sourceLineNo">456</span> for (Map.Entry<ByteBuffer, TTimeRange> entry : colFamTimeRangeMap.entrySet()) {<a name="line.456"></a> +<span class="sourceLineNo">457</span> out.setColumnFamilyTimeRange(Bytes.toBytes(entry.getKey()),<a name="line.457"></a> +<span class="sourceLineNo">458</span> entry.getValue().getMinStamp(), entry.getValue().getMaxStamp());<a name="line.458"></a> +<span class="sourceLineNo">459</span> }<a name="line.459"></a> +<span class="sourceLineNo">460</span> }<a name="line.460"></a> +<span class="sourceLineNo">461</span> }<a name="line.461"></a> +<span class="sourceLineNo">462</span><a name="line.462"></a> +<span class="sourceLineNo">463</span> if (in.isSetReadType()) {<a name="line.463"></a> +<span class="sourceLineNo">464</span> out.setReadType(readTypeFromThrift(in.getReadType()));<a name="line.464"></a> <span class="sourceLineNo">465</span> }<a name="line.465"></a> <span class="sourceLineNo">466</span><a name="line.466"></a> -<span class="sourceLineNo">467</span> if (in.isSetAttributes()) {<a name="line.467"></a> -<span class="sourceLineNo">468</span> addAttributes(out,in.getAttributes());<a name="line.468"></a> +<span class="sourceLineNo">467</span> if (in.isSetLimit()) {<a name="line.467"></a> +<span class="sourceLineNo">468</span> out.setLimit(in.getLimit());<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> if (in.isSetDurability()) {<a name="line.471"></a> -<span class="sourceLineNo">472</span> out.setDurability(durabilityFromThrift(in.getDurability()));<a name="line.472"></a> -<span class="sourceLineNo">473</span> }<a name="line.473"></a> -<span class="sourceLineNo">474</span> <a name="line.474"></a> -<span class="sourceLineNo">475</span> if(in.getCellVisibility() != null) {<a name="line.475"></a> -<span class="sourceLineNo">476</span> out.setCellVisibility(new CellVisibility(in.getCellVisibility().getExpression()));<a name="line.476"></a> -<span class="sourceLineNo">477</span> }<a name="line.477"></a> -<span class="sourceLineNo">478</span><a name="line.478"></a> -<span class="sourceLineNo">479</span> return 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> public static Append appendFromThrift(TAppend append) throws IOException {<a name="line.482"></a> -<span class="sourceLineNo">483</span> Append out = new Append(append.getRow());<a name="line.483"></a> -<span class="sourceLineNo">484</span> for (TColumnValue column : append.getColumns()) {<a name="line.484"></a> -<span class="sourceLineNo">485</span> out.addColumn(column.getFamily(), column.getQualifier(), column.getValue());<a name="line.485"></a> +<span class="sourceLineNo">471</span> return out;<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> public static Increment incrementFromThrift(TIncrement in) throws IOException {<a name="line.474"></a> +<span class="sourceLineNo">475</span> Increment out = new Increment(in.getRow());<a name="line.475"></a> +<span class="sourceLineNo">476</span> for (TColumnIncrement column : in.getColumns()) {<a name="line.476"></a> +<span class="sourceLineNo">477</span> out.addColumn(column.getFamily(), column.getQualifier(), column.getAmount());<a name="line.477"></a> +<span class="sourceLineNo">478</span> }<a name="line.478"></a> +<span class="sourceLineNo">479</span><a name="line.479"></a> +<span class="sourceLineNo">480</span> if (in.isSetAttributes()) {<a name="line.480"></a> +<span class="sourceLineNo">481</span> addAttributes(out,in.getAttributes());<a name="line.481"></a> +<span class="sourceLineNo">482</span> }<a name="line.482"></a> +<span class="sourceLineNo">483</span><a name="line.483"></a> +<span class="sourceLineNo">484</span> if (in.isSetDurability()) {<a name="line.484"></a> +<span class="sourceLineNo">485</span> out.setDurability(durabilityFromThrift(in.getDurability()));<a name="line.485"></a> <span class="sourceLineNo">486</span> }<a name="line.486"></a> -<span class="sourceLineNo">487</span><a name="line.487"></a> -<span class="sourceLineNo">488</span> if (append.isSetAttributes()) {<a name="line.488"></a> -<span class="sourceLineNo">489</span> addAttributes(out, append.getAttributes());<a name="line.489"></a> +<span class="sourceLineNo">487</span> <a name="line.487"></a> +<span class="sourceLineNo">488</span> if(in.getCellVisibility() != null) {<a name="line.488"></a> +<span class="sourceLineNo">489</span> out.setCellVisibility(new CellVisibility(in.getCellVisibility().getExpression()));<a name="line.489"></a> <span class="sourceLineNo">490</span> }<a name="line.490"></a> <span class="sourceLineNo">491</span><a name="line.491"></a> -<span class="sourceLineNo">492</span> if (append.isSetDurability()) {<a name="line.492"></a> -<span class="sourceLineNo">493</span> out.setDurability(durabilityFromThrift(append.getDurability()));<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> if(append.getCellVisibility() != null) {<a name="line.496"></a> -<span class="sourceLineNo">497</span> out.setCellVisibility(new CellVisibility(append.getCellVisibility().getExpression()));<a name="line.497"></a> -<span class="sourceLineNo">498</span> }<a name="line.498"></a> -<span class="sourceLineNo">499</span><a name="line.499"></a> -<span class="sourceLineNo">500</span> return out;<a name="line.500"></a> -<span class="sourceLineNo">501</span> }<a name="line.501"></a> -<span class="sourceLineNo">502</span><a name="line.502"></a> -<span class="sourceLineNo">503</span> public static THRegionLocation regionLocationFromHBase(HRegionLocation hrl) {<a name="line.503"></a> -<span class="sourceLineNo">504</span> HRegionInfo hri = hrl.getRegionInfo();<a name="line.504"></a> -<span class="sourceLineNo">505</span> ServerName serverName = hrl.getServerName();<a name="line.505"></a> -<span class="sourceLineNo">506</span><a name="line.506"></a> -<span class="sourceLineNo">507</span> THRegionInfo thRegionInfo = new THRegionInfo();<a name="line.507"></a> -<span class="sourceLineNo">508</span> THRegionLocation thRegionLocation = new THRegionLocation();<a name="line.508"></a> -<span class="sourceLineNo">509</span> TServerName tServerName = new TServerName();<a name="line.509"></a> -<span class="sourceLineNo">510</span><a name="line.510"></a> -<span class="sourceLineNo">511</span> tServerName.setHostName(serverName.getHostname());<a name="line.511"></a> -<span class="sourceLineNo">512</span> tServerName.setPort(serverName.getPort());<a name="line.512"></a> -<span class="sourceLineNo">513</span> tServerName.setStartCode(serverName.getStartcode());<a name="line.513"></a> -<span class="sourceLineNo">514</span><a name="line.514"></a> -<span class="sourceLineNo">515</span> thRegionInfo.setTableName(hri.getTable().getName());<a name="line.515"></a> -<span class="sourceLineNo">516</span> thRegionInfo.setEndKey(hri.getEndKey());<a name="line.516"></a> -<span class="sourceLineNo">517</span> thRegionInfo.setStartKey(hri.getStartKey());<a name="line.517"></a> -<span class="sourceLineNo">518</span> thRegionInfo.setOffline(hri.isOffline());<a name="line.518"></a> -<span class="sourceLineNo">519</span> thRegionInfo.setSplit(hri.isSplit());<a name="line.519"></a> -<span class="sourceLineNo">520</span> thRegionInfo.setReplicaId(hri.getReplicaId());<a name="line.520"></a> -<span class="sourceLineNo">521</span><a name="line.521"></a> -<span class="sourceLineNo">522</span> thRegionLocation.setRegionInfo(thRegionInfo);<a name="line.522"></a> -<span class="sourceLineNo">523</span> thRegionLocation.setServerName(tServerName);<a name="line.523"></a> -<span class="sourceLineNo">524</span><a name="line.524"></a> -<span class="sourceLineNo">525</span> return thRegionLocation;<a name="line.525"></a> -<span class="sourceLineNo">526</span> }<a name="line.526"></a> +<span class="sourceLineNo">492</span> return out;<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> public static Append appendFromThrift(TAppend append) throws IOException {<a name="line.495"></a> +<span class="sourceLineNo">496</span> Append out = new Append(append.getRow());<a name="line.496"></a> +<span class="sourceLineNo">497</span> for (TColumnValue column : append.getColumns()) {<a name="line.497"></a> +<span class="sourceLineNo">498</span> out.addColumn(column.getFamily(), column.getQualifier(), column.getValue());<a name="line.498"></a> +<span class="sourceLineNo">499</span> }<a name="line.499"></a> +<span class="sourceLineNo">500</span><a name="line.500"></a> +<span class="sourceLineNo">501</span> if (append.isSetAttributes()) {<a name="line.501"></a> +<span class="sourceLineNo">502</span> addAttributes(out, append.getAttributes());<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> if (append.isSetDurability()) {<a name="line.505"></a> +<span class="sourceLineNo">506</span> out.setDurability(durabilityFromThrift(append.getDurability()));<a name="line.506"></a> +<span class="sourceLineNo">507</span> }<a name="line.507"></a> +<span class="sourceLineNo">508</span> <a name="line.508"></a> +<span class="sourceLineNo">509</span> if(append.getCellVisibility() != null) {<a name="line.509"></a> +<span class="sourceLineNo">510</span> out.setCellVisibility(new CellVisibility(append.getCellVisibility().getExpression()));<a name="line.510"></a> +<span class="sourceLineNo">511</span> }<a name="line.511"></a> +<span class="sourceLineNo">512</span><a name="line.512"></a> +<span class="sourceLineNo">513</span> return out;<a name="line.513"></a> +<span class="sourceLineNo">514</span> }<a name="line.514"></a> +<span class="sourceLineNo">515</span><a name="line.515"></a> +<span class="sourceLineNo">516</span> public static THRegionLocation regionLocationFromHBase(HRegionLocation hrl) {<a name="line.516"></a> +<span class="sourceLineNo">517</span> HRegionInfo hri = hrl.getRegionInfo();<a name="line.517"></a> +<span class="sourceLineNo">518</span> ServerName serverName = hrl.getServerName();<a name="line.518"></a> +<span class="sourceLineNo">519</span><a name="line.519"></a> +<span class="sourceLineNo">520</span> THRegionInfo thRegionInfo = new THRegionInfo();<a name="line.520"></a> +<span class="sourceLineNo">521</span> THRegionLocation thRegionLocation = new THRegionLocation();<a name="line.521"></a> +<span class="sourceLineNo">522</span> TServerName tServerName = new TServerName();<a name="line.522"></a> +<span class="sourceLineNo">523</span><a name="line.523"></a> +<span class="sourceLineNo">524</span> tServerName.setHostName(serverName.getHostname());<a name="line.524"></a> +<span class="sourceLineNo">525</span> tServerName.setPort(serverName.getPort());<a name="line.525"></a> +<span class="sourceLineNo">526</span> tServerName.setStartCode(serverName.getStartcode());<a name="line.526"></a> <span class="sourceLineNo">527</span><a name="line.527"></a> -<span class="sourceLineNo">528</span> public static List<THRegionLocation> regionLocationsFromHBase(List<HRegionLocation> locations) {<a name="line.528"></a> -<span class="sourceLineNo">529</span> List<THRegionLocation> tlocations = new ArrayList<>(locations.size());<a name="line.529"></a> -<span class="sourceLineNo">530</span> for (HRegionLocation hrl:locations) {<a name="line.530"></a> -<span class="sourceLineNo">531</span> tlocations.add(regionLocationFromHBase(hrl));<a name="line.531"></a> -<span class="sourceLineNo">532</span> }<a name="line.532"></a> -<span class="sourceLineNo">533</span> return tlocations;<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> -<span class="sourceLineNo">537</span> * Adds all the attributes into the Operation object<a name="line.537"></a> -<span class="sourceLineNo">538</span> */<a name="line.538"></a> -<span class="sourceLineNo">539</span> private static void addAttributes(OperationWithAttributes op,<a name="line.539"></a> -<span class="sourceLineNo">540</span> Map<ByteBuffer, ByteBuffer> attributes) {<a name="line.540"></a> -<span class="sourceLineNo">541</span> if (attributes == null || attributes.isEmpty()) {<a name="line.541"></a> -<span class="sourceLineNo">542</span> return;<a name="line.542"></a> -<span class="sourceLineNo">543</span> }<a name="line.543"></a> -<span class="sourceLineNo">544</span> for (Map.Entry<ByteBuffer, ByteBuffer> entry : attributes.entrySet()) {<a name="line.544"></a> -<span class="sourceLineNo">545</span> String name = Bytes.toStringBinary(getBytes(entry.getKey()));<a name="line.545"></a> -<span class="sourceLineNo">546</span> byte[] value = getBytes(entry.getValue());<a name="line.546"></a> -<span class="sourceLineNo">547</span> op.setAttribute(name, value);<a name="line.547"></a> -<span class="sourceLineNo">548</span> }<a name="line.548"></a> -<span class="sourceLineNo">549</span> }<a name="line.549"></a> -<span class="sourceLineNo">550</span><a name="line.550"></a> -<span class="sourceLineNo">551</span> private static Durability durabilityFromThrift(TDurability tDurability) {<a name="line.551"></a> -<span class="sourceLineNo">552</span> switch (tDurability.getValue()) {<a name="line.552"></a> -<span class="sourceLineNo">553</span> case 1: return Durability.SKIP_WAL;<a name="line.553"></a> -<span class="sourceLineNo">554</span> case 2: return Durability.ASYNC_WAL;<a name="line.554"></a> -<span class="sourceLineNo">555</span> case 3: return Durability.SYNC_WAL;<a name="line.555"></a> -<span class="sourceLineNo">556</span> case 4: return Durability.FSYNC_WAL;<a name="line.556"></a> -<span class="sourceLineNo">557</span> default: return null;<a name="line.557"></a> -<span class="sourceLineNo">558</span> }<a name="line.558"></a> -<span class="sourceLineNo">559</span> }<a name="line.559"></a> -<span class="sourceLineNo">560</span><a name="line.560"></a> -<span class="sourceLineNo">561</span> public static CompareOp compareOpFromThrift(TCompareOp tCompareOp) {<a name="line.561"></a> -<span class="sourceLineNo">562</span> switch (tCompareOp.getValue()) {<a name="line.562"></a> -<span class="sourceLineNo">563</span> case 0: return CompareOp.LESS;<a name="line.563"></a> -<span class="sourceLineNo">564</span> case 1: return CompareOp.LESS_OR_EQUAL;<a name="line.564"></a> -<span class="sourceLineNo">565</span> case 2: return CompareOp.EQUAL;<a name="line.565"></a> -<span class="sourceLineNo">566</span> case 3: return CompareOp.NOT_EQUAL;<a name="line.566"></a> -<span class="sourceLineNo">567</span> case 4: return CompareOp.GREATER_OR_EQUAL;<a name="line.567"></a> -<span class="sourceLineNo">568</span> case 5: return CompareOp.GREATER;<a name="line.568"></a> -<span class="sourceLineNo">569</span> case 6: return CompareOp.NO_OP;<a name="line.569"></a> +<span class="sourceLineNo">528</span> thRegionInfo.setTableName(hri.getTable().getName());<a name="line.528"></a> +<span class="sourceLineNo">529</span> thRegionInfo.setEndKey(hri.getEndKey());<a name="line.529"></a> +<span class="sourceLineNo">530</span> thRegionInfo.setStartKey(hri.getStartKey());<a name="line.530"></a> +<span class="sourceLineNo">531</span> thRegionInfo.setOffline(hri.isOffline());<a name="line.531"></a> +<span class="sourceLineNo">532</span> thRegionInfo.setSplit(hri.isSplit());<a name="line.532"></a> +<span class="sourceLineNo">533</span> thRegionInfo.setReplicaId(hri.getReplicaId());<a name="line.533"></a> +<span class="sourceLineNo">534</span><a name="line.534"></a> +<span class="sourceLineNo">535</span> thRegionLocation.setRegionInfo(thRegionInfo);<a name="line.535"></a> +<span class="sourceLineNo">536</span> thRegionLocation.setServerName(tServerName);<a name="line.536"></a> +<span class="sourceLineNo">537</span><a name="line.537"></a> +<span class="sourceLineNo">538</span> return thRegionLocation;<a name="line.538"></a> +<span class="sourceLineNo">539</span> }<a name="line.539"></a> +<span class="sourceLineNo">540</span><a name="line.540"></a> +<span class="sourceLineNo">541</span> public static List<THRegionLocation> regionLocationsFromHBase(List<HRegionLocation> locations) {<a name="line.541"></a> +<span class="sourceLineNo">542</span> List<THRegionLocation> tlocations = new ArrayList<>(locations.size());<a name="line.542"></a> +<span class="sourceLineNo">543</span> for (HRegionLocation hrl:locations) {<a name="line.543"></a> +<span class="sourceLineNo">544</span> tlocations.add(regionLocationFromHBase(hrl));<a name="line.544"></a> +<span class="sourceLineNo">545</span> }<a name="line.545"></a> +<span class="sourceLineNo">546</span> return tlocations;<a name="line.546"></a> +<span class="sourceLineNo">547</span> }<a name="line.547"></a> +<span class="sourceLineNo">548</span><a name="line.548"></a> +<span class="sourceLineNo">549</span> /**<a name="line.549"></a> +<span class="sourceLineNo">550</span> * Adds all the attributes into the Operation object<a name="line.550"></a> +<span class="sourceLineNo">551</span> */<a name="line.551"></a> +<span class="sourceLineNo">552</span> private static void addAttributes(OperationWithAttributes op,<a name="line.552"></a> +<span class="sourceLineNo">553</span> Map<ByteBuffer, ByteBuffer> attributes) {<a name="line.553"></a> +<span class="sourceLineNo">554</span> if (attributes == null || attributes.isEmpty()) {<a name="line.554"></a> +<span class="sourceLineNo">555</span> return;<a name="line.555"></a> +<span class="sourceLineNo">556</span> }<a name="line.556"></a> +<span class="sourceLineNo">557</span> for (Map.Entry<ByteBuffer, ByteBuffer> entry : attributes.entrySet()) {<a name="line.557"></a> +<span class="sourceLineNo">558</span> String name = Bytes.toStringBinary(getBytes(entry.getKey()));<a name="line.558"></a> +<span class="sourceLineNo">559</span> byte[] value = getBytes(entry.getValue());<a name="line.559"></a> +<span class="sourceLineNo">560</span> op.setAttribute(name, value);<a name="line.560"></a> +<span class="sourceLineNo">561</span> }<a name="line.561"></a> +<span class="sourceLineNo">562</span> }<a name="line.562"></a> +<span class="sourceLineNo">563</span><a name="line.563"></a> +<span class="sourceLineNo">564</span> private static Durability durabilityFromThrift(TDurability tDurability) {<a name="line.564"></a> +<span class="sourceLineNo">565</span> switch (tDurability.getValue()) {<a name="line.565"></a> +<span class="sourceLineNo">566</span> case 1: return Durability.SKIP_WAL;<a name="line.566"></a> +<span class="sourceLineNo">567</span> case 2: return Durability.ASYNC_WAL;<a name="line.567"></a> +<span class="sourceLineNo">568</span> case 3: return Durability.SYNC_WAL;<a name="line.568"></a> +<span class="sourceLineNo">569</span> case 4: return Durability.FSYNC_WAL;<a name="line.569"></a> <span class="sourceLineNo">570</span> default: return null;<a name="line.570"></a> <span class="sourceLineNo">571</span> }<a name="line.571"></a> <span class="sourceLineNo">572</span> }<a name="line.572"></a> <span class="sourceLineNo">573</span><a name="line.573"></a> -<span class="sourceLineNo">574</span> private static ReadType readTypeFromThrift(TReadType tReadType) {<a name="line.574"></a> -<span class="sourceLineNo">575</span> switch (tReadType.getValue()) {<a name="line.575"></a> -<span class="sourceLineNo">576</span> case 1: return ReadType.DEFAULT;<a name="line.576"></a> -<span class="sourceLineNo">577</span> case 2: return ReadType.STREAM;<a name="line.577"></a> -<span class="sourceLineNo">578</span> case 3: return ReadType.PREAD;<a name="line.578"></a> -<span class="sourceLineNo">579</span> default: return null;<a name="line.579"></a> -<span class="sourceLineNo">580</span> }<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">574</span> public static CompareOp compareOpFromThrift(TCompareOp tCompareOp) {<a name="line.574"></a> +<span class="sourceLineNo">575</span> switch (tCompareOp.getValue()) {<a name="line.575"></a> +<span class="sourceLineNo">576</span> case 0: return CompareOp.LESS;<a name="line.576"></a> +<span class="sourceLineNo">577</span> case 1: return CompareOp.LESS_OR_EQUAL;<a name="line.577"></a> +<span class="sourceLineNo">578</span> case 2: return CompareOp.EQUAL;<a name="line.578"></a> +<span class="sourceLineNo">579</span> case 3: return CompareOp.NOT_EQUAL;<a name="line.579"></a> +<span class="sourceLineNo">580</span> case 4: return CompareOp.GREATER_OR_EQUAL;<a name="line.580"></a> +<span class="sourceLineNo">581</span> case 5: return CompareOp.GREATER;<a name="line.581"></a> +<span class="sourceLineNo">582</span> case 6: return CompareOp.NO_OP;<a name="line.582"></a> +<span class="sourceLineNo">583</span> default: return null;<a name="line.583"></a> +<span class="sourceLineNo">584</span> }<a name="line.584"></a> +<span class="sourceLineNo">585</span> }<a name="line.585"></a> +<span class="sourceLineNo">586</span><a name="line.586"></a> +<span class="sourceLineNo">587</span> private static ReadType readTypeFromThrift(TReadType tReadType) {<a name="line.587"></a> +<span class="sourceLineNo">588</span> switch (tReadType.getValue()) {<a name="line.588"></a> +<span class="sourceLineNo">589</span> case 1: return ReadType.DEFAULT;<a name="line.589"></a> +<span class="sourceLineNo">590</span> case 2: return ReadType.STREAM;<a name="line.590"></a> +<span class="sourceLineNo">591</span> case 3: return ReadType.PREAD;<a name="line.591"></a> +<span class="sourceLineNo">592</span> default: return null;<a name="line.592"></a> +<span class="sourceLineNo">593</span> }<a name="line.593"></a> +<span class="sourceLineNo">594</span> }<a name="line.594"></a> +<span class="sourceLineNo">595</span>}<a name="line.595"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.Load.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.Load.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.Load.html index c28cd5c..c26f82b 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.Load.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.Load.html @@ -435,7 +435,7 @@ <span class="sourceLineNo">427</span> moveRegionsPool.shutdown();<a name="line.427"></a> <span class="sourceLineNo">428</span> long timeoutInSeconds =<a name="line.428"></a> <span class="sourceLineNo">429</span> regionsToMove.size()<a name="line.429"></a> -<span class="sourceLineNo">430</span> * admin.getConfiguration().getInt(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.430"></a> +<span class="sourceLineNo">430</span> * admin.getConfiguration().getLong(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.430"></a> <span class="sourceLineNo">431</span> try {<a name="line.431"></a> <span class="sourceLineNo">432</span> if (!moveRegionsPool.awaitTermination(timeoutInSeconds, TimeUnit.SECONDS)) {<a name="line.432"></a> <span class="sourceLineNo">433</span> moveRegionsPool.shutdownNow();<a name="line.433"></a> @@ -509,7 +509,7 @@ <span class="sourceLineNo">501</span> moveRegionsPool.shutdown();<a name="line.501"></a> <span class="sourceLineNo">502</span> long timeoutInSeconds =<a name="line.502"></a> <span class="sourceLineNo">503</span> regionsToMove.size()<a name="line.503"></a> -<span class="sourceLineNo">504</span> * admin.getConfiguration().getInt(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.504"></a> +<span class="sourceLineNo">504</span> * admin.getConfiguration().getLong(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.504"></a> <span class="sourceLineNo">505</span> try {<a name="line.505"></a> <span class="sourceLineNo">506</span> if (!moveRegionsPool.awaitTermination(timeoutInSeconds, TimeUnit.SECONDS)) {<a name="line.506"></a> <span class="sourceLineNo">507</span> moveRegionsPool.shutdownNow();<a name="line.507"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithAck.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithAck.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithAck.html index c28cd5c..c26f82b 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithAck.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithAck.html @@ -435,7 +435,7 @@ <span class="sourceLineNo">427</span> moveRegionsPool.shutdown();<a name="line.427"></a> <span class="sourceLineNo">428</span> long timeoutInSeconds =<a name="line.428"></a> <span class="sourceLineNo">429</span> regionsToMove.size()<a name="line.429"></a> -<span class="sourceLineNo">430</span> * admin.getConfiguration().getInt(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.430"></a> +<span class="sourceLineNo">430</span> * admin.getConfiguration().getLong(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.430"></a> <span class="sourceLineNo">431</span> try {<a name="line.431"></a> <span class="sourceLineNo">432</span> if (!moveRegionsPool.awaitTermination(timeoutInSeconds, TimeUnit.SECONDS)) {<a name="line.432"></a> <span class="sourceLineNo">433</span> moveRegionsPool.shutdownNow();<a name="line.433"></a> @@ -509,7 +509,7 @@ <span class="sourceLineNo">501</span> moveRegionsPool.shutdown();<a name="line.501"></a> <span class="sourceLineNo">502</span> long timeoutInSeconds =<a name="line.502"></a> <span class="sourceLineNo">503</span> regionsToMove.size()<a name="line.503"></a> -<span class="sourceLineNo">504</span> * admin.getConfiguration().getInt(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.504"></a> +<span class="sourceLineNo">504</span> * admin.getConfiguration().getLong(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.504"></a> <span class="sourceLineNo">505</span> try {<a name="line.505"></a> <span class="sourceLineNo">506</span> if (!moveRegionsPool.awaitTermination(timeoutInSeconds, TimeUnit.SECONDS)) {<a name="line.506"></a> <span class="sourceLineNo">507</span> moveRegionsPool.shutdownNow();<a name="line.507"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/21766f4a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithoutAck.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithoutAck.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithoutAck.html index c28cd5c..c26f82b 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithoutAck.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/RegionMover.MoveWithoutAck.html @@ -435,7 +435,7 @@ <span class="sourceLineNo">427</span> moveRegionsPool.shutdown();<a name="line.427"></a> <span class="sourceLineNo">428</span> long timeoutInSeconds =<a name="line.428"></a> <span class="sourceLineNo">429</span> regionsToMove.size()<a name="line.429"></a> -<span class="sourceLineNo">430</span> * admin.getConfiguration().getInt(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.430"></a> +<span class="sourceLineNo">430</span> * admin.getConfiguration().getLong(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.430"></a> <span class="sourceLineNo">431</span> try {<a name="line.431"></a> <span class="sourceLineNo">432</span> if (!moveRegionsPool.awaitTermination(timeoutInSeconds, TimeUnit.SECONDS)) {<a name="line.432"></a> <span class="sourceLineNo">433</span> moveRegionsPool.shutdownNow();<a name="line.433"></a> @@ -509,7 +509,7 @@ <span class="sourceLineNo">501</span> moveRegionsPool.shutdown();<a name="line.501"></a> <span class="sourceLineNo">502</span> long timeoutInSeconds =<a name="line.502"></a> <span class="sourceLineNo">503</span> regionsToMove.size()<a name="line.503"></a> -<span class="sourceLineNo">504</span> * admin.getConfiguration().getInt(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.504"></a> +<span class="sourceLineNo">504</span> * admin.getConfiguration().getLong(MOVE_WAIT_MAX_KEY, DEFAULT_MOVE_WAIT_MAX);<a name="line.504"></a> <span class="sourceLineNo">505</span> try {<a name="line.505"></a> <span class="sourceLineNo">506</span> if (!moveRegionsPool.awaitTermination(timeoutInSeconds, TimeUnit.SECONDS)) {<a name="line.506"></a> <span class="sourceLineNo">507</span> moveRegionsPool.shutdownNow();<a name="line.507"></a>
