http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html ---------------------------------------------------------------------- diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html index c884004..61c2f25 100644 --- a/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html +++ b/devapidocs/src-html/org/apache/hadoop/hbase/security/visibility/VisibilityScanDeleteTracker.html @@ -28,311 +28,322 @@ <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.List;<a name="line.23"></a> -<span class="sourceLineNo">024</span><a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.commons.logging.Log;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.commons.logging.LogFactory;<a name="line.26"></a> -<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a> -<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.regionserver.querymatcher.ScanDeleteTracker;<a name="line.28"></a> -<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.Cell;<a name="line.29"></a> -<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.30"></a> -<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.31"></a> -<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.32"></a> -<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.KeyValue.Type;<a name="line.33"></a> -<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.Tag;<a name="line.34"></a> -<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a> -<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.36"></a> -<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.Triple;<a name="line.37"></a> -<span class="sourceLineNo">038</span><a name="line.38"></a> -<span class="sourceLineNo">039</span>/**<a name="line.39"></a> -<span class="sourceLineNo">040</span> * Similar to ScanDeletTracker but tracks the visibility expression also before<a name="line.40"></a> -<span class="sourceLineNo">041</span> * deciding if a Cell can be considered deleted<a name="line.41"></a> -<span class="sourceLineNo">042</span> */<a name="line.42"></a> -<span class="sourceLineNo">043</span>@InterfaceAudience.Private<a name="line.43"></a> -<span class="sourceLineNo">044</span>public class VisibilityScanDeleteTracker extends ScanDeleteTracker {<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(VisibilityScanDeleteTracker.class);<a name="line.46"></a> -<span class="sourceLineNo">047</span><a name="line.47"></a> -<span class="sourceLineNo">048</span> // Its better to track the visibility tags in delete based on each type. Create individual<a name="line.48"></a> -<span class="sourceLineNo">049</span> // data structures for tracking each of them. This would ensure that there is no tracking based<a name="line.49"></a> -<span class="sourceLineNo">050</span> // on time and also would handle all cases where deletefamily or deletecolumns is specified with<a name="line.50"></a> -<span class="sourceLineNo">051</span> // Latest_timestamp. In such cases the ts in the delete marker and the masking<a name="line.51"></a> -<span class="sourceLineNo">052</span> // put will not be same. So going with individual data structures for different delete<a name="line.52"></a> -<span class="sourceLineNo">053</span> // type would solve this problem and also ensure that the combination of different type<a name="line.53"></a> -<span class="sourceLineNo">054</span> // of deletes with diff ts would also work fine<a name="line.54"></a> -<span class="sourceLineNo">055</span> // Track per TS<a name="line.55"></a> -<span class="sourceLineNo">056</span> private List<Triple<List<Tag>, Byte, Long>> visibilityTagsDeleteFamily = new ArrayList<>();<a name="line.56"></a> -<span class="sourceLineNo">057</span> // Delete family version with different ts and different visibility expression could come.<a name="line.57"></a> -<span class="sourceLineNo">058</span> // Need to track it per ts.<a name="line.58"></a> -<span class="sourceLineNo">059</span> private List<Triple<List<Tag>, Byte, Long>> visibilityTagsDeleteFamilyVersion = new ArrayList<>();<a name="line.59"></a> -<span class="sourceLineNo">060</span> private List<Pair<List<Tag>, Byte>> visibilityTagsDeleteColumns;<a name="line.60"></a> -<span class="sourceLineNo">061</span> // Tracking as List<List> is to handle same ts cell but different visibility tag. <a name="line.61"></a> -<span class="sourceLineNo">062</span> // TODO : Need to handle puts with same ts but different vis tags.<a name="line.62"></a> -<span class="sourceLineNo">063</span> private List<Pair<List<Tag>, Byte>> visiblityTagsDeleteColumnVersion = new ArrayList<>();<a name="line.63"></a> -<span class="sourceLineNo">064</span><a name="line.64"></a> -<span class="sourceLineNo">065</span> public VisibilityScanDeleteTracker() {<a name="line.65"></a> -<span class="sourceLineNo">066</span> super();<a name="line.66"></a> -<span class="sourceLineNo">067</span> }<a name="line.67"></a> -<span class="sourceLineNo">068</span><a name="line.68"></a> -<span class="sourceLineNo">069</span> @Override<a name="line.69"></a> -<span class="sourceLineNo">070</span> public void add(Cell delCell) {<a name="line.70"></a> -<span class="sourceLineNo">071</span> //Cannot call super.add because need to find if the delete needs to be considered<a name="line.71"></a> -<span class="sourceLineNo">072</span> long timestamp = delCell.getTimestamp();<a name="line.72"></a> -<span class="sourceLineNo">073</span> byte type = delCell.getTypeByte();<a name="line.73"></a> -<span class="sourceLineNo">074</span> if (type == KeyValue.Type.DeleteFamily.getCode()) {<a name="line.74"></a> -<span class="sourceLineNo">075</span> hasFamilyStamp = true;<a name="line.75"></a> -<span class="sourceLineNo">076</span> boolean hasVisTag = extractDeleteCellVisTags(delCell, KeyValue.Type.DeleteFamily);<a name="line.76"></a> -<span class="sourceLineNo">077</span> if (!hasVisTag && timestamp > familyStamp) {<a name="line.77"></a> -<span class="sourceLineNo">078</span> familyStamp = timestamp;<a name="line.78"></a> -<span class="sourceLineNo">079</span> }<a name="line.79"></a> -<span class="sourceLineNo">080</span> return;<a name="line.80"></a> -<span class="sourceLineNo">081</span> } else if (type == KeyValue.Type.DeleteFamilyVersion.getCode()) {<a name="line.81"></a> -<span class="sourceLineNo">082</span> familyVersionStamps.add(timestamp);<a name="line.82"></a> -<span class="sourceLineNo">083</span> extractDeleteCellVisTags(delCell, KeyValue.Type.DeleteFamilyVersion);<a name="line.83"></a> -<span class="sourceLineNo">084</span> return;<a name="line.84"></a> -<span class="sourceLineNo">085</span> }<a name="line.85"></a> -<span class="sourceLineNo">086</span> // new column, or more general delete type<a name="line.86"></a> -<span class="sourceLineNo">087</span> if (deleteCell != null) {<a name="line.87"></a> -<span class="sourceLineNo">088</span> if (!(CellUtil.matchingQualifier(delCell, deleteCell))) {<a name="line.88"></a> -<span class="sourceLineNo">089</span> // A case where there are deletes for a column qualifier but there are<a name="line.89"></a> -<span class="sourceLineNo">090</span> // no corresponding puts for them. Rare case.<a name="line.90"></a> -<span class="sourceLineNo">091</span> visibilityTagsDeleteColumns = null;<a name="line.91"></a> -<span class="sourceLineNo">092</span> visiblityTagsDeleteColumnVersion = null;<a name="line.92"></a> -<span class="sourceLineNo">093</span> } else if (type == KeyValue.Type.Delete.getCode() && (deleteTimestamp != timestamp)) {<a name="line.93"></a> -<span class="sourceLineNo">094</span> // there is a timestamp change which means we could clear the list<a name="line.94"></a> -<span class="sourceLineNo">095</span> // when ts is same and the vis tags are different we need to collect<a name="line.95"></a> -<span class="sourceLineNo">096</span> // them all. Interesting part is that in the normal case of puts if<a name="line.96"></a> -<span class="sourceLineNo">097</span> // there are 2 cells with same ts and diff vis tags only one of them is<a name="line.97"></a> -<span class="sourceLineNo">098</span> // returned. Handling with a single List<Tag> would mean that only one<a name="line.98"></a> -<span class="sourceLineNo">099</span> // of the cell would be considered. Doing this as a precaution.<a name="line.99"></a> -<span class="sourceLineNo">100</span> // Rare cases.<a name="line.100"></a> -<span class="sourceLineNo">101</span> visiblityTagsDeleteColumnVersion = null;<a name="line.101"></a> -<span class="sourceLineNo">102</span> }<a name="line.102"></a> -<span class="sourceLineNo">103</span> }<a name="line.103"></a> -<span class="sourceLineNo">104</span> deleteCell = delCell;<a name="line.104"></a> -<span class="sourceLineNo">105</span> deleteType = type;<a name="line.105"></a> -<span class="sourceLineNo">106</span> deleteTimestamp = timestamp;<a name="line.106"></a> -<span class="sourceLineNo">107</span> extractDeleteCellVisTags(delCell, KeyValue.Type.codeToType(type));<a name="line.107"></a> -<span class="sourceLineNo">108</span> }<a name="line.108"></a> -<span class="sourceLineNo">109</span><a name="line.109"></a> -<span class="sourceLineNo">110</span> private boolean extractDeleteCellVisTags(Cell delCell, Type type) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> // If tag is present in the delete<a name="line.111"></a> -<span class="sourceLineNo">112</span> boolean hasVisTag = false;<a name="line.112"></a> -<span class="sourceLineNo">113</span> if (delCell.getTagsLength() > 0) {<a name="line.113"></a> -<span class="sourceLineNo">114</span> Byte deleteCellVisTagsFormat = null;<a name="line.114"></a> -<span class="sourceLineNo">115</span> switch (type) {<a name="line.115"></a> -<span class="sourceLineNo">116</span> case DeleteFamily:<a name="line.116"></a> -<span class="sourceLineNo">117</span> List<Tag> delTags = new ArrayList<>();<a name="line.117"></a> -<span class="sourceLineNo">118</span> if (visibilityTagsDeleteFamily == null) {<a name="line.118"></a> -<span class="sourceLineNo">119</span> visibilityTagsDeleteFamily = new ArrayList<>();<a name="line.119"></a> -<span class="sourceLineNo">120</span> }<a name="line.120"></a> -<span class="sourceLineNo">121</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.121"></a> -<span class="sourceLineNo">122</span> if (!delTags.isEmpty()) {<a name="line.122"></a> -<span class="sourceLineNo">123</span> visibilityTagsDeleteFamily.add(new Triple<>(delTags, deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.123"></a> -<span class="sourceLineNo">124</span> hasVisTag = true;<a name="line.124"></a> -<span class="sourceLineNo">125</span> }<a name="line.125"></a> -<span class="sourceLineNo">126</span> break;<a name="line.126"></a> -<span class="sourceLineNo">127</span> case DeleteFamilyVersion:<a name="line.127"></a> -<span class="sourceLineNo">128</span> if(visibilityTagsDeleteFamilyVersion == null) {<a name="line.128"></a> -<span class="sourceLineNo">129</span> visibilityTagsDeleteFamilyVersion = new ArrayList<>();<a name="line.129"></a> -<span class="sourceLineNo">130</span> }<a name="line.130"></a> -<span class="sourceLineNo">131</span> delTags = new ArrayList<>();<a name="line.131"></a> -<span class="sourceLineNo">132</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.132"></a> -<span class="sourceLineNo">133</span> if (!delTags.isEmpty()) {<a name="line.133"></a> -<span class="sourceLineNo">134</span> visibilityTagsDeleteFamilyVersion.add(new Triple<>(delTags, deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.134"></a> -<span class="sourceLineNo">135</span> hasVisTag = true;<a name="line.135"></a> +<span class="sourceLineNo">023</span>import java.util.Collections;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a> +<span class="sourceLineNo">025</span><a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.commons.logging.Log;<a name="line.26"></a> +<span class="sourceLineNo">027</span>import org.apache.commons.logging.LogFactory;<a name="line.27"></a> +<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.28"></a> +<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.regionserver.querymatcher.ScanDeleteTracker;<a name="line.29"></a> +<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.Cell;<a name="line.30"></a> +<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.31"></a> +<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.32"></a> +<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.33"></a> +<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.KeyValue.Type;<a name="line.34"></a> +<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.Tag;<a name="line.35"></a> +<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a> +<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.37"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Triple;<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 ScanDeletTracker 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>@InterfaceAudience.Private<a name="line.44"></a> +<span class="sourceLineNo">045</span>public class VisibilityScanDeleteTracker extends ScanDeleteTracker {<a name="line.45"></a> +<span class="sourceLineNo">046</span><a name="line.46"></a> +<span class="sourceLineNo">047</span> private static final Log LOG = LogFactory.getLog(VisibilityScanDeleteTracker.class);<a name="line.47"></a> +<span class="sourceLineNo">048</span><a name="line.48"></a> +<span class="sourceLineNo">049</span> /**<a name="line.49"></a> +<span class="sourceLineNo">050</span> * This tag is used for the DELETE cell which has no visibility label.<a name="line.50"></a> +<span class="sourceLineNo">051</span> */<a name="line.51"></a> +<span class="sourceLineNo">052</span> private static final List<Tag> EMPTY_TAG = Collections.EMPTY_LIST;<a name="line.52"></a> +<span class="sourceLineNo">053</span> // Its better to track the visibility tags in delete based on each type. Create individual<a name="line.53"></a> +<span class="sourceLineNo">054</span> // data structures for tracking each of them. This would ensure that there is no tracking based<a name="line.54"></a> +<span class="sourceLineNo">055</span> // on time and also would handle all cases where deletefamily or deletecolumns is specified with<a name="line.55"></a> +<span class="sourceLineNo">056</span> // Latest_timestamp. In such cases the ts in the delete marker and the masking<a name="line.56"></a> +<span class="sourceLineNo">057</span> // put will not be same. So going with individual data structures for different delete<a name="line.57"></a> +<span class="sourceLineNo">058</span> // type would solve this problem and also ensure that the combination of different type<a name="line.58"></a> +<span class="sourceLineNo">059</span> // of deletes with diff ts would also work fine<a name="line.59"></a> +<span class="sourceLineNo">060</span> // Track per TS<a name="line.60"></a> +<span class="sourceLineNo">061</span> private List<Triple<List<Tag>, Byte, Long>> visibilityTagsDeleteFamily = new ArrayList<>();<a name="line.61"></a> +<span class="sourceLineNo">062</span> // Delete family version with different ts and different visibility expression could come.<a name="line.62"></a> +<span class="sourceLineNo">063</span> // Need to track it per ts.<a name="line.63"></a> +<span class="sourceLineNo">064</span> private List<Triple<List<Tag>, Byte, Long>> visibilityTagsDeleteFamilyVersion = new ArrayList<>();<a name="line.64"></a> +<span class="sourceLineNo">065</span> private List<Pair<List<Tag>, Byte>> visibilityTagsDeleteColumns;<a name="line.65"></a> +<span class="sourceLineNo">066</span> // Tracking as List<List> is to handle same ts cell but different visibility tag. <a name="line.66"></a> +<span class="sourceLineNo">067</span> // TODO : Need to handle puts with same ts but different vis tags.<a name="line.67"></a> +<span class="sourceLineNo">068</span> private List<Pair<List<Tag>, Byte>> visiblityTagsDeleteColumnVersion = new ArrayList<>();<a name="line.68"></a> +<span class="sourceLineNo">069</span><a name="line.69"></a> +<span class="sourceLineNo">070</span> public VisibilityScanDeleteTracker() {<a name="line.70"></a> +<span class="sourceLineNo">071</span> super();<a name="line.71"></a> +<span class="sourceLineNo">072</span> }<a name="line.72"></a> +<span class="sourceLineNo">073</span><a name="line.73"></a> +<span class="sourceLineNo">074</span> @Override<a name="line.74"></a> +<span class="sourceLineNo">075</span> public void add(Cell delCell) {<a name="line.75"></a> +<span class="sourceLineNo">076</span> //Cannot call super.add because need to find if the delete needs to be considered<a name="line.76"></a> +<span class="sourceLineNo">077</span> long timestamp = delCell.getTimestamp();<a name="line.77"></a> +<span class="sourceLineNo">078</span> byte type = delCell.getTypeByte();<a name="line.78"></a> +<span class="sourceLineNo">079</span> if (type == KeyValue.Type.DeleteFamily.getCode()) {<a name="line.79"></a> +<span class="sourceLineNo">080</span> hasFamilyStamp = true;<a name="line.80"></a> +<span class="sourceLineNo">081</span> boolean hasVisTag = extractDeleteCellVisTags(delCell, KeyValue.Type.DeleteFamily);<a name="line.81"></a> +<span class="sourceLineNo">082</span> if (!hasVisTag && timestamp > familyStamp) {<a name="line.82"></a> +<span class="sourceLineNo">083</span> familyStamp = timestamp;<a name="line.83"></a> +<span class="sourceLineNo">084</span> }<a name="line.84"></a> +<span class="sourceLineNo">085</span> return;<a name="line.85"></a> +<span class="sourceLineNo">086</span> } else if (type == KeyValue.Type.DeleteFamilyVersion.getCode()) {<a name="line.86"></a> +<span class="sourceLineNo">087</span> familyVersionStamps.add(timestamp);<a name="line.87"></a> +<span class="sourceLineNo">088</span> extractDeleteCellVisTags(delCell, KeyValue.Type.DeleteFamilyVersion);<a name="line.88"></a> +<span class="sourceLineNo">089</span> return;<a name="line.89"></a> +<span class="sourceLineNo">090</span> }<a name="line.90"></a> +<span class="sourceLineNo">091</span> // new column, or more general delete type<a name="line.91"></a> +<span class="sourceLineNo">092</span> if (deleteCell != null) {<a name="line.92"></a> +<span class="sourceLineNo">093</span> if (!(CellUtil.matchingQualifier(delCell, deleteCell))) {<a name="line.93"></a> +<span class="sourceLineNo">094</span> // A case where there are deletes for a column qualifier but there are<a name="line.94"></a> +<span class="sourceLineNo">095</span> // no corresponding puts for them. Rare case.<a name="line.95"></a> +<span class="sourceLineNo">096</span> visibilityTagsDeleteColumns = null;<a name="line.96"></a> +<span class="sourceLineNo">097</span> visiblityTagsDeleteColumnVersion = null;<a name="line.97"></a> +<span class="sourceLineNo">098</span> } else if (type == KeyValue.Type.Delete.getCode() && (deleteTimestamp != timestamp)) {<a name="line.98"></a> +<span class="sourceLineNo">099</span> // there is a timestamp change which means we could clear the list<a name="line.99"></a> +<span class="sourceLineNo">100</span> // when ts is same and the vis tags are different we need to collect<a name="line.100"></a> +<span class="sourceLineNo">101</span> // them all. Interesting part is that in the normal case of puts if<a name="line.101"></a> +<span class="sourceLineNo">102</span> // there are 2 cells with same ts and diff vis tags only one of them is<a name="line.102"></a> +<span class="sourceLineNo">103</span> // returned. Handling with a single List<Tag> would mean that only one<a name="line.103"></a> +<span class="sourceLineNo">104</span> // of the cell would be considered. Doing this as a precaution.<a name="line.104"></a> +<span class="sourceLineNo">105</span> // Rare cases.<a name="line.105"></a> +<span class="sourceLineNo">106</span> visiblityTagsDeleteColumnVersion = null;<a name="line.106"></a> +<span class="sourceLineNo">107</span> }<a name="line.107"></a> +<span class="sourceLineNo">108</span> }<a name="line.108"></a> +<span class="sourceLineNo">109</span> deleteCell = delCell;<a name="line.109"></a> +<span class="sourceLineNo">110</span> deleteType = type;<a name="line.110"></a> +<span class="sourceLineNo">111</span> deleteTimestamp = timestamp;<a name="line.111"></a> +<span class="sourceLineNo">112</span> extractDeleteCellVisTags(delCell, KeyValue.Type.codeToType(type));<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> private boolean extractDeleteCellVisTags(Cell delCell, Type type) {<a name="line.115"></a> +<span class="sourceLineNo">116</span> // If tag is present in the delete<a name="line.116"></a> +<span class="sourceLineNo">117</span> boolean hasVisTag = false;<a name="line.117"></a> +<span class="sourceLineNo">118</span> Byte deleteCellVisTagsFormat = null;<a name="line.118"></a> +<span class="sourceLineNo">119</span> switch (type) {<a name="line.119"></a> +<span class="sourceLineNo">120</span> case DeleteFamily:<a name="line.120"></a> +<span class="sourceLineNo">121</span> List<Tag> delTags = new ArrayList<>();<a name="line.121"></a> +<span class="sourceLineNo">122</span> if (visibilityTagsDeleteFamily == null) {<a name="line.122"></a> +<span class="sourceLineNo">123</span> visibilityTagsDeleteFamily = new ArrayList<>();<a name="line.123"></a> +<span class="sourceLineNo">124</span> }<a name="line.124"></a> +<span class="sourceLineNo">125</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.125"></a> +<span class="sourceLineNo">126</span> if (!delTags.isEmpty()) {<a name="line.126"></a> +<span class="sourceLineNo">127</span> visibilityTagsDeleteFamily.add(new Triple<>(delTags, deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.127"></a> +<span class="sourceLineNo">128</span> hasVisTag = true;<a name="line.128"></a> +<span class="sourceLineNo">129</span> } else {<a name="line.129"></a> +<span class="sourceLineNo">130</span> visibilityTagsDeleteFamily.add(new Triple<>(EMPTY_TAG, deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.130"></a> +<span class="sourceLineNo">131</span> }<a name="line.131"></a> +<span class="sourceLineNo">132</span> break;<a name="line.132"></a> +<span class="sourceLineNo">133</span> case DeleteFamilyVersion:<a name="line.133"></a> +<span class="sourceLineNo">134</span> if(visibilityTagsDeleteFamilyVersion == null) {<a name="line.134"></a> +<span class="sourceLineNo">135</span> visibilityTagsDeleteFamilyVersion = new ArrayList<>();<a name="line.135"></a> <span class="sourceLineNo">136</span> }<a name="line.136"></a> -<span class="sourceLineNo">137</span> break;<a name="line.137"></a> -<span class="sourceLineNo">138</span> case DeleteColumn:<a name="line.138"></a> -<span class="sourceLineNo">139</span> if (visibilityTagsDeleteColumns == null) {<a name="line.139"></a> -<span class="sourceLineNo">140</span> visibilityTagsDeleteColumns = new ArrayList<>();<a name="line.140"></a> -<span class="sourceLineNo">141</span> }<a name="line.141"></a> -<span class="sourceLineNo">142</span> delTags = new ArrayList<>();<a name="line.142"></a> -<span class="sourceLineNo">143</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.143"></a> -<span class="sourceLineNo">144</span> if (!delTags.isEmpty()) {<a name="line.144"></a> -<span class="sourceLineNo">145</span> visibilityTagsDeleteColumns.add(new Pair<>(delTags, deleteCellVisTagsFormat));<a name="line.145"></a> -<span class="sourceLineNo">146</span> hasVisTag = true;<a name="line.146"></a> -<span class="sourceLineNo">147</span> }<a name="line.147"></a> -<span class="sourceLineNo">148</span> break;<a name="line.148"></a> -<span class="sourceLineNo">149</span> case Delete:<a name="line.149"></a> -<span class="sourceLineNo">150</span> if (visiblityTagsDeleteColumnVersion == null) {<a name="line.150"></a> -<span class="sourceLineNo">151</span> visiblityTagsDeleteColumnVersion = new ArrayList<>();<a name="line.151"></a> -<span class="sourceLineNo">152</span> }<a name="line.152"></a> -<span class="sourceLineNo">153</span> delTags = new ArrayList<>();<a name="line.153"></a> -<span class="sourceLineNo">154</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.154"></a> -<span class="sourceLineNo">155</span> if (!delTags.isEmpty()) {<a name="line.155"></a> -<span class="sourceLineNo">156</span> visiblityTagsDeleteColumnVersion.add(new Pair<>(delTags, deleteCellVisTagsFormat));<a name="line.156"></a> -<span class="sourceLineNo">157</span> hasVisTag = true;<a name="line.157"></a> -<span class="sourceLineNo">158</span> }<a name="line.158"></a> -<span class="sourceLineNo">159</span> break;<a name="line.159"></a> -<span class="sourceLineNo">160</span> default:<a name="line.160"></a> -<span class="sourceLineNo">161</span> throw new IllegalArgumentException("Invalid delete type");<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">164</span> return hasVisTag;<a name="line.164"></a> -<span class="sourceLineNo">165</span> }<a name="line.165"></a> -<span class="sourceLineNo">166</span><a name="line.166"></a> -<span class="sourceLineNo">167</span> @Override<a name="line.167"></a> -<span class="sourceLineNo">168</span> public DeleteResult isDeleted(Cell cell) {<a name="line.168"></a> -<span class="sourceLineNo">169</span> long timestamp = cell.getTimestamp();<a name="line.169"></a> -<span class="sourceLineNo">170</span> try {<a name="line.170"></a> -<span class="sourceLineNo">171</span> if (hasFamilyStamp) {<a name="line.171"></a> -<span class="sourceLineNo">172</span> if (visibilityTagsDeleteFamily != null) {<a name="line.172"></a> -<span class="sourceLineNo">173</span> if (!visibilityTagsDeleteFamily.isEmpty()) {<a name="line.173"></a> -<span class="sourceLineNo">174</span> for (int i = 0; i < visibilityTagsDeleteFamily.size(); i++) {<a name="line.174"></a> -<span class="sourceLineNo">175</span> // visibilityTagsDeleteFamily is ArrayList<a name="line.175"></a> -<span class="sourceLineNo">176</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamily.get(i);<a name="line.176"></a> -<span class="sourceLineNo">177</span> if (timestamp <= triple.getThird()) {<a name="line.177"></a> -<span class="sourceLineNo">178</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.178"></a> -<span class="sourceLineNo">179</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.179"></a> -<span class="sourceLineNo">180</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.180"></a> -<span class="sourceLineNo">181</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.181"></a> -<span class="sourceLineNo">182</span> triple.getFirst(), triple.getSecond());<a name="line.182"></a> -<span class="sourceLineNo">183</span> if (matchFound) {<a name="line.183"></a> -<span class="sourceLineNo">184</span> // A return type of FAMILY_DELETED will cause skip for all remaining cells from<a name="line.184"></a> -<span class="sourceLineNo">185</span> // this<a name="line.185"></a> -<span class="sourceLineNo">186</span> // family. We would like to match visibility expression on every put cells after<a name="line.186"></a> -<span class="sourceLineNo">187</span> // this and only remove those matching with the family delete visibility. So we<a name="line.187"></a> -<span class="sourceLineNo">188</span> // are<a name="line.188"></a> -<span class="sourceLineNo">189</span> // returning FAMILY_VERSION_DELETED from here.<a name="line.189"></a> -<span class="sourceLineNo">190</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.190"></a> -<span class="sourceLineNo">191</span> }<a name="line.191"></a> -<span class="sourceLineNo">192</span> }<a name="line.192"></a> -<span class="sourceLineNo">193</span> }<a name="line.193"></a> -<span class="sourceLineNo">194</span> } else {<a name="line.194"></a> -<span class="sourceLineNo">195</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell) && timestamp <= familyStamp) {<a name="line.195"></a> -<span class="sourceLineNo">196</span> // No tags<a name="line.196"></a> -<span class="sourceLineNo">197</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.197"></a> -<span class="sourceLineNo">198</span> }<a name="line.198"></a> -<span class="sourceLineNo">199</span> }<a name="line.199"></a> -<span class="sourceLineNo">200</span> } else {<a name="line.200"></a> -<span class="sourceLineNo">201</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell) && timestamp <= familyStamp) {<a name="line.201"></a> -<span class="sourceLineNo">202</span> // No tags<a name="line.202"></a> -<span class="sourceLineNo">203</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.203"></a> -<span class="sourceLineNo">204</span> }<a name="line.204"></a> -<span class="sourceLineNo">205</span> }<a name="line.205"></a> -<span class="sourceLineNo">206</span> }<a name="line.206"></a> -<span class="sourceLineNo">207</span> if (familyVersionStamps.contains(Long.valueOf(timestamp))) {<a name="line.207"></a> -<span class="sourceLineNo">208</span> if (visibilityTagsDeleteFamilyVersion != null) {<a name="line.208"></a> -<span class="sourceLineNo">209</span> if (!visibilityTagsDeleteFamilyVersion.isEmpty()) {<a name="line.209"></a> -<span class="sourceLineNo">210</span> for (int i = 0; i < visibilityTagsDeleteFamilyVersion.size(); i++) {<a name="line.210"></a> -<span class="sourceLineNo">211</span> // visibilityTagsDeleteFamilyVersion is ArrayList<a name="line.211"></a> -<span class="sourceLineNo">212</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamilyVersion.get(i);<a name="line.212"></a> -<span class="sourceLineNo">213</span> if (timestamp == triple.getThird()) {<a name="line.213"></a> -<span class="sourceLineNo">214</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.214"></a> -<span class="sourceLineNo">215</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.215"></a> -<span class="sourceLineNo">216</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.216"></a> -<span class="sourceLineNo">217</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.217"></a> -<span class="sourceLineNo">218</span> triple.getFirst(), triple.getSecond());<a name="line.218"></a> -<span class="sourceLineNo">219</span> if (matchFound) {<a name="line.219"></a> -<span class="sourceLineNo">220</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.220"></a> -<span class="sourceLineNo">221</span> }<a name="line.221"></a> -<span class="sourceLineNo">222</span> }<a name="line.222"></a> -<span class="sourceLineNo">223</span> }<a name="line.223"></a> -<span class="sourceLineNo">224</span> } else {<a name="line.224"></a> -<span class="sourceLineNo">225</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.225"></a> -<span class="sourceLineNo">226</span> // No tags<a name="line.226"></a> -<span class="sourceLineNo">227</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.227"></a> -<span class="sourceLineNo">228</span> }<a name="line.228"></a> -<span class="sourceLineNo">229</span> }<a name="line.229"></a> -<span class="sourceLineNo">230</span> } else {<a name="line.230"></a> -<span class="sourceLineNo">231</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.231"></a> -<span class="sourceLineNo">232</span> // No tags<a name="line.232"></a> -<span class="sourceLineNo">233</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.233"></a> -<span class="sourceLineNo">234</span> }<a name="line.234"></a> -<span class="sourceLineNo">235</span> }<a name="line.235"></a> -<span class="sourceLineNo">236</span> }<a name="line.236"></a> -<span class="sourceLineNo">237</span> if (deleteCell != null) {<a name="line.237"></a> -<span class="sourceLineNo">238</span> int ret = CellComparator.compareQualifiers(cell, deleteCell);<a name="line.238"></a> -<span class="sourceLineNo">239</span> if (ret == 0) {<a name="line.239"></a> -<span class="sourceLineNo">240</span> if (deleteType == KeyValue.Type.DeleteColumn.getCode()) {<a name="line.240"></a> -<span class="sourceLineNo">241</span> if (visibilityTagsDeleteColumns != null) {<a name="line.241"></a> -<span class="sourceLineNo">242</span> if (!visibilityTagsDeleteColumns.isEmpty()) {<a name="line.242"></a> -<span class="sourceLineNo">243</span> for (Pair<List<Tag>, Byte> tags : visibilityTagsDeleteColumns) {<a name="line.243"></a> -<span class="sourceLineNo">244</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.244"></a> -<span class="sourceLineNo">245</span> Byte putCellVisTagsFormat =<a name="line.245"></a> -<span class="sourceLineNo">246</span> VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.246"></a> -<span class="sourceLineNo">247</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.247"></a> -<span class="sourceLineNo">248</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.248"></a> -<span class="sourceLineNo">249</span> tags.getFirst(), tags.getSecond());<a name="line.249"></a> -<span class="sourceLineNo">250</span> if (matchFound) {<a name="line.250"></a> -<span class="sourceLineNo">251</span> return DeleteResult.VERSION_DELETED;<a name="line.251"></a> -<span class="sourceLineNo">252</span> }<a name="line.252"></a> -<span class="sourceLineNo">253</span> }<a name="line.253"></a> -<span class="sourceLineNo">254</span> } else {<a name="line.254"></a> -<span class="sourceLineNo">255</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.255"></a> -<span class="sourceLineNo">256</span> // No tags<a name="line.256"></a> -<span class="sourceLineNo">257</span> return DeleteResult.VERSION_DELETED;<a name="line.257"></a> -<span class="sourceLineNo">258</span> }<a name="line.258"></a> -<span class="sourceLineNo">259</span> }<a name="line.259"></a> -<span class="sourceLineNo">260</span> } else {<a name="line.260"></a> -<span class="sourceLineNo">261</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.261"></a> -<span class="sourceLineNo">262</span> // No tags<a name="line.262"></a> -<span class="sourceLineNo">263</span> return DeleteResult.VERSION_DELETED;<a name="line.263"></a> -<span class="sourceLineNo">264</span> }<a name="line.264"></a> -<span class="sourceLineNo">265</span> }<a name="line.265"></a> -<span class="sourceLineNo">266</span> }<a name="line.266"></a> -<span class="sourceLineNo">267</span> // Delete (aka DeleteVersion)<a name="line.267"></a> -<span class="sourceLineNo">268</span> // If the timestamp is the same, keep this one<a name="line.268"></a> -<span class="sourceLineNo">269</span> if (timestamp == deleteTimestamp) {<a name="line.269"></a> -<span class="sourceLineNo">270</span> if (visiblityTagsDeleteColumnVersion != null) {<a name="line.270"></a> -<span class="sourceLineNo">271</span> if (!visiblityTagsDeleteColumnVersion.isEmpty()) {<a name="line.271"></a> -<span class="sourceLineNo">272</span> for (Pair<List<Tag>, Byte> tags : visiblityTagsDeleteColumnVersion) {<a name="line.272"></a> -<span class="sourceLineNo">273</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.273"></a> -<span class="sourceLineNo">274</span> Byte putCellVisTagsFormat =<a name="line.274"></a> -<span class="sourceLineNo">275</span> VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.275"></a> -<span class="sourceLineNo">276</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.276"></a> -<span class="sourceLineNo">277</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.277"></a> -<span class="sourceLineNo">278</span> tags.getFirst(), tags.getSecond());<a name="line.278"></a> -<span class="sourceLineNo">279</span> if (matchFound) {<a name="line.279"></a> -<span class="sourceLineNo">280</span> return DeleteResult.VERSION_DELETED;<a name="line.280"></a> -<span class="sourceLineNo">281</span> }<a name="line.281"></a> -<span class="sourceLineNo">282</span> }<a name="line.282"></a> -<span class="sourceLineNo">283</span> } else {<a name="line.283"></a> -<span class="sourceLineNo">284</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.284"></a> -<span class="sourceLineNo">285</span> // No tags<a name="line.285"></a> -<span class="sourceLineNo">286</span> return DeleteResult.VERSION_DELETED;<a name="line.286"></a> -<span class="sourceLineNo">287</span> }<a name="line.287"></a> -<span class="sourceLineNo">288</span> }<a name="line.288"></a> -<span class="sourceLineNo">289</span> } else {<a name="line.289"></a> -<span class="sourceLineNo">290</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.290"></a> -<span class="sourceLineNo">291</span> // No tags<a name="line.291"></a> -<span class="sourceLineNo">292</span> return DeleteResult.VERSION_DELETED;<a name="line.292"></a> -<span class="sourceLineNo">293</span> }<a name="line.293"></a> -<span class="sourceLineNo">294</span> }<a name="line.294"></a> -<span class="sourceLineNo">295</span> }<a name="line.295"></a> -<span class="sourceLineNo">296</span> } else if (ret > 0) {<a name="line.296"></a> -<span class="sourceLineNo">297</span> // Next column case.<a name="line.297"></a> -<span class="sourceLineNo">298</span> deleteCell = null;<a name="line.298"></a> -<span class="sourceLineNo">299</span> // Can nullify this because we are moving to the next column<a name="line.299"></a> -<span class="sourceLineNo">300</span> visibilityTagsDeleteColumns = null;<a name="line.300"></a> -<span class="sourceLineNo">301</span> visiblityTagsDeleteColumnVersion = null;<a name="line.301"></a> -<span class="sourceLineNo">302</span> } else {<a name="line.302"></a> -<span class="sourceLineNo">303</span> throw new IllegalStateException("isDeleted failed: deleteBuffer="<a name="line.303"></a> -<span class="sourceLineNo">304</span> + Bytes.toStringBinary(deleteCell.getQualifierArray(),<a name="line.304"></a> -<span class="sourceLineNo">305</span> deleteCell.getQualifierOffset(), deleteCell.getQualifierLength())<a name="line.305"></a> -<span class="sourceLineNo">306</span> + ", qualifier="<a name="line.306"></a> -<span class="sourceLineNo">307</span> + Bytes.toStringBinary(cell.getQualifierArray(), cell.getQualifierOffset(),<a name="line.307"></a> -<span class="sourceLineNo">308</span> cell.getQualifierLength())<a name="line.308"></a> -<span class="sourceLineNo">309</span> + ", timestamp=" + timestamp + ", comparison result: " + ret);<a name="line.309"></a> -<span class="sourceLineNo">310</span> }<a name="line.310"></a> -<span class="sourceLineNo">311</span> }<a name="line.311"></a> -<span class="sourceLineNo">312</span> } catch (IOException e) {<a name="line.312"></a> -<span class="sourceLineNo">313</span> LOG.error("Error in isDeleted() check! Will treat cell as not deleted", e);<a name="line.313"></a> -<span class="sourceLineNo">314</span> }<a name="line.314"></a> -<span class="sourceLineNo">315</span> return DeleteResult.NOT_DELETED;<a name="line.315"></a> -<span class="sourceLineNo">316</span> }<a name="line.316"></a> -<span class="sourceLineNo">317</span><a name="line.317"></a> -<span class="sourceLineNo">318</span> @Override<a name="line.318"></a> -<span class="sourceLineNo">319</span> public void reset() {<a name="line.319"></a> -<span class="sourceLineNo">320</span> super.reset();<a name="line.320"></a> -<span class="sourceLineNo">321</span> // clear only here<a name="line.321"></a> -<span class="sourceLineNo">322</span> visibilityTagsDeleteColumns = null;<a name="line.322"></a> -<span class="sourceLineNo">323</span> visibilityTagsDeleteFamily = null;<a name="line.323"></a> -<span class="sourceLineNo">324</span> visibilityTagsDeleteFamilyVersion = null;<a name="line.324"></a> -<span class="sourceLineNo">325</span> visiblityTagsDeleteColumnVersion = null;<a name="line.325"></a> -<span class="sourceLineNo">326</span> }<a name="line.326"></a> -<span class="sourceLineNo">327</span>}<a name="line.327"></a> +<span class="sourceLineNo">137</span> delTags = new ArrayList<>();<a name="line.137"></a> +<span class="sourceLineNo">138</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.138"></a> +<span class="sourceLineNo">139</span> if (!delTags.isEmpty()) {<a name="line.139"></a> +<span class="sourceLineNo">140</span> visibilityTagsDeleteFamilyVersion.add(new Triple<>(delTags, deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.140"></a> +<span class="sourceLineNo">141</span> hasVisTag = true;<a name="line.141"></a> +<span class="sourceLineNo">142</span> } else {<a name="line.142"></a> +<span class="sourceLineNo">143</span> visibilityTagsDeleteFamilyVersion.add(new Triple<>(EMPTY_TAG, deleteCellVisTagsFormat, delCell.getTimestamp()));<a name="line.143"></a> +<span class="sourceLineNo">144</span> }<a name="line.144"></a> +<span class="sourceLineNo">145</span> break;<a name="line.145"></a> +<span class="sourceLineNo">146</span> case DeleteColumn:<a name="line.146"></a> +<span class="sourceLineNo">147</span> if (visibilityTagsDeleteColumns == null) {<a name="line.147"></a> +<span class="sourceLineNo">148</span> visibilityTagsDeleteColumns = new ArrayList<>();<a name="line.148"></a> +<span class="sourceLineNo">149</span> }<a name="line.149"></a> +<span class="sourceLineNo">150</span> delTags = new ArrayList<>();<a name="line.150"></a> +<span class="sourceLineNo">151</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.151"></a> +<span class="sourceLineNo">152</span> if (!delTags.isEmpty()) {<a name="line.152"></a> +<span class="sourceLineNo">153</span> visibilityTagsDeleteColumns.add(new Pair<>(delTags, deleteCellVisTagsFormat));<a name="line.153"></a> +<span class="sourceLineNo">154</span> hasVisTag = true;<a name="line.154"></a> +<span class="sourceLineNo">155</span> } else {<a name="line.155"></a> +<span class="sourceLineNo">156</span> visibilityTagsDeleteColumns.add(new Pair<>(EMPTY_TAG, deleteCellVisTagsFormat));<a name="line.156"></a> +<span class="sourceLineNo">157</span> }<a name="line.157"></a> +<span class="sourceLineNo">158</span> break;<a name="line.158"></a> +<span class="sourceLineNo">159</span> case Delete:<a name="line.159"></a> +<span class="sourceLineNo">160</span> if (visiblityTagsDeleteColumnVersion == null) {<a name="line.160"></a> +<span class="sourceLineNo">161</span> visiblityTagsDeleteColumnVersion = new ArrayList<>();<a name="line.161"></a> +<span class="sourceLineNo">162</span> }<a name="line.162"></a> +<span class="sourceLineNo">163</span> delTags = new ArrayList<>();<a name="line.163"></a> +<span class="sourceLineNo">164</span> deleteCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(delCell, delTags);<a name="line.164"></a> +<span class="sourceLineNo">165</span> if (!delTags.isEmpty()) {<a name="line.165"></a> +<span class="sourceLineNo">166</span> visiblityTagsDeleteColumnVersion.add(new Pair<>(delTags, deleteCellVisTagsFormat));<a name="line.166"></a> +<span class="sourceLineNo">167</span> hasVisTag = true;<a name="line.167"></a> +<span class="sourceLineNo">168</span> } else {<a name="line.168"></a> +<span class="sourceLineNo">169</span> visiblityTagsDeleteColumnVersion.add(new Pair<>(EMPTY_TAG, deleteCellVisTagsFormat));<a name="line.169"></a> +<span class="sourceLineNo">170</span> }<a name="line.170"></a> +<span class="sourceLineNo">171</span> break;<a name="line.171"></a> +<span class="sourceLineNo">172</span> default:<a name="line.172"></a> +<span class="sourceLineNo">173</span> throw new IllegalArgumentException("Invalid delete type");<a name="line.173"></a> +<span class="sourceLineNo">174</span> }<a name="line.174"></a> +<span class="sourceLineNo">175</span> return hasVisTag;<a name="line.175"></a> +<span class="sourceLineNo">176</span> }<a name="line.176"></a> +<span class="sourceLineNo">177</span><a name="line.177"></a> +<span class="sourceLineNo">178</span> @Override<a name="line.178"></a> +<span class="sourceLineNo">179</span> public DeleteResult isDeleted(Cell cell) {<a name="line.179"></a> +<span class="sourceLineNo">180</span> long timestamp = cell.getTimestamp();<a name="line.180"></a> +<span class="sourceLineNo">181</span> try {<a name="line.181"></a> +<span class="sourceLineNo">182</span> if (hasFamilyStamp) {<a name="line.182"></a> +<span class="sourceLineNo">183</span> if (visibilityTagsDeleteFamily != null) {<a name="line.183"></a> +<span class="sourceLineNo">184</span> if (!visibilityTagsDeleteFamily.isEmpty()) {<a name="line.184"></a> +<span class="sourceLineNo">185</span> for (int i = 0; i < visibilityTagsDeleteFamily.size(); i++) {<a name="line.185"></a> +<span class="sourceLineNo">186</span> // visibilityTagsDeleteFamily is ArrayList<a name="line.186"></a> +<span class="sourceLineNo">187</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamily.get(i);<a name="line.187"></a> +<span class="sourceLineNo">188</span> if (timestamp <= triple.getThird()) {<a name="line.188"></a> +<span class="sourceLineNo">189</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.189"></a> +<span class="sourceLineNo">190</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.190"></a> +<span class="sourceLineNo">191</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.191"></a> +<span class="sourceLineNo">192</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.192"></a> +<span class="sourceLineNo">193</span> triple.getFirst(), triple.getSecond());<a name="line.193"></a> +<span class="sourceLineNo">194</span> if (matchFound) {<a name="line.194"></a> +<span class="sourceLineNo">195</span> // A return type of FAMILY_DELETED will cause skip for all remaining cells from<a name="line.195"></a> +<span class="sourceLineNo">196</span> // this<a name="line.196"></a> +<span class="sourceLineNo">197</span> // family. We would like to match visibility expression on every put cells after<a name="line.197"></a> +<span class="sourceLineNo">198</span> // this and only remove those matching with the family delete visibility. So we<a name="line.198"></a> +<span class="sourceLineNo">199</span> // are<a name="line.199"></a> +<span class="sourceLineNo">200</span> // returning FAMILY_VERSION_DELETED from here.<a name="line.200"></a> +<span class="sourceLineNo">201</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.201"></a> +<span class="sourceLineNo">202</span> }<a name="line.202"></a> +<span class="sourceLineNo">203</span> }<a name="line.203"></a> +<span class="sourceLineNo">204</span> }<a name="line.204"></a> +<span class="sourceLineNo">205</span> } else {<a name="line.205"></a> +<span class="sourceLineNo">206</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell) && timestamp <= familyStamp) {<a name="line.206"></a> +<span class="sourceLineNo">207</span> // No tags<a name="line.207"></a> +<span class="sourceLineNo">208</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.208"></a> +<span class="sourceLineNo">209</span> }<a name="line.209"></a> +<span class="sourceLineNo">210</span> }<a name="line.210"></a> +<span class="sourceLineNo">211</span> } else {<a name="line.211"></a> +<span class="sourceLineNo">212</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell) && timestamp <= familyStamp) {<a name="line.212"></a> +<span class="sourceLineNo">213</span> // No tags<a name="line.213"></a> +<span class="sourceLineNo">214</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.214"></a> +<span class="sourceLineNo">215</span> }<a name="line.215"></a> +<span class="sourceLineNo">216</span> }<a name="line.216"></a> +<span class="sourceLineNo">217</span> }<a name="line.217"></a> +<span class="sourceLineNo">218</span> if (familyVersionStamps.contains(Long.valueOf(timestamp))) {<a name="line.218"></a> +<span class="sourceLineNo">219</span> if (visibilityTagsDeleteFamilyVersion != null) {<a name="line.219"></a> +<span class="sourceLineNo">220</span> if (!visibilityTagsDeleteFamilyVersion.isEmpty()) {<a name="line.220"></a> +<span class="sourceLineNo">221</span> for (int i = 0; i < visibilityTagsDeleteFamilyVersion.size(); i++) {<a name="line.221"></a> +<span class="sourceLineNo">222</span> // visibilityTagsDeleteFamilyVersion is ArrayList<a name="line.222"></a> +<span class="sourceLineNo">223</span> Triple<List<Tag>, Byte, Long> triple = visibilityTagsDeleteFamilyVersion.get(i);<a name="line.223"></a> +<span class="sourceLineNo">224</span> if (timestamp == triple.getThird()) {<a name="line.224"></a> +<span class="sourceLineNo">225</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.225"></a> +<span class="sourceLineNo">226</span> Byte putCellVisTagsFormat = VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.226"></a> +<span class="sourceLineNo">227</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.227"></a> +<span class="sourceLineNo">228</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.228"></a> +<span class="sourceLineNo">229</span> triple.getFirst(), triple.getSecond());<a name="line.229"></a> +<span class="sourceLineNo">230</span> if (matchFound) {<a name="line.230"></a> +<span class="sourceLineNo">231</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.231"></a> +<span class="sourceLineNo">232</span> }<a name="line.232"></a> +<span class="sourceLineNo">233</span> }<a name="line.233"></a> +<span class="sourceLineNo">234</span> }<a name="line.234"></a> +<span class="sourceLineNo">235</span> } else {<a name="line.235"></a> +<span class="sourceLineNo">236</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.236"></a> +<span class="sourceLineNo">237</span> // No tags<a name="line.237"></a> +<span class="sourceLineNo">238</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.238"></a> +<span class="sourceLineNo">239</span> }<a name="line.239"></a> +<span class="sourceLineNo">240</span> }<a name="line.240"></a> +<span class="sourceLineNo">241</span> } else {<a name="line.241"></a> +<span class="sourceLineNo">242</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.242"></a> +<span class="sourceLineNo">243</span> // No tags<a name="line.243"></a> +<span class="sourceLineNo">244</span> return DeleteResult.FAMILY_VERSION_DELETED;<a name="line.244"></a> +<span class="sourceLineNo">245</span> }<a name="line.245"></a> +<span class="sourceLineNo">246</span> }<a name="line.246"></a> +<span class="sourceLineNo">247</span> }<a name="line.247"></a> +<span class="sourceLineNo">248</span> if (deleteCell != null) {<a name="line.248"></a> +<span class="sourceLineNo">249</span> int ret = CellComparator.compareQualifiers(cell, deleteCell);<a name="line.249"></a> +<span class="sourceLineNo">250</span> if (ret == 0) {<a name="line.250"></a> +<span class="sourceLineNo">251</span> if (deleteType == KeyValue.Type.DeleteColumn.getCode()) {<a name="line.251"></a> +<span class="sourceLineNo">252</span> if (visibilityTagsDeleteColumns != null) {<a name="line.252"></a> +<span class="sourceLineNo">253</span> if (!visibilityTagsDeleteColumns.isEmpty()) {<a name="line.253"></a> +<span class="sourceLineNo">254</span> for (Pair<List<Tag>, Byte> tags : visibilityTagsDeleteColumns) {<a name="line.254"></a> +<span class="sourceLineNo">255</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.255"></a> +<span class="sourceLineNo">256</span> Byte putCellVisTagsFormat =<a name="line.256"></a> +<span class="sourceLineNo">257</span> VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.257"></a> +<span class="sourceLineNo">258</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.258"></a> +<span class="sourceLineNo">259</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.259"></a> +<span class="sourceLineNo">260</span> tags.getFirst(), tags.getSecond());<a name="line.260"></a> +<span class="sourceLineNo">261</span> if (matchFound) {<a name="line.261"></a> +<span class="sourceLineNo">262</span> return DeleteResult.VERSION_DELETED;<a name="line.262"></a> +<span class="sourceLineNo">263</span> }<a name="line.263"></a> +<span class="sourceLineNo">264</span> }<a name="line.264"></a> +<span class="sourceLineNo">265</span> } else {<a name="line.265"></a> +<span class="sourceLineNo">266</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.266"></a> +<span class="sourceLineNo">267</span> // No tags<a name="line.267"></a> +<span class="sourceLineNo">268</span> return DeleteResult.VERSION_DELETED;<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> } else {<a name="line.271"></a> +<span class="sourceLineNo">272</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.272"></a> +<span class="sourceLineNo">273</span> // No tags<a name="line.273"></a> +<span class="sourceLineNo">274</span> return DeleteResult.VERSION_DELETED;<a name="line.274"></a> +<span class="sourceLineNo">275</span> }<a name="line.275"></a> +<span class="sourceLineNo">276</span> }<a name="line.276"></a> +<span class="sourceLineNo">277</span> }<a name="line.277"></a> +<span class="sourceLineNo">278</span> // Delete (aka DeleteVersion)<a name="line.278"></a> +<span class="sourceLineNo">279</span> // If the timestamp is the same, keep this one<a name="line.279"></a> +<span class="sourceLineNo">280</span> if (timestamp == deleteTimestamp) {<a name="line.280"></a> +<span class="sourceLineNo">281</span> if (visiblityTagsDeleteColumnVersion != null) {<a name="line.281"></a> +<span class="sourceLineNo">282</span> if (!visiblityTagsDeleteColumnVersion.isEmpty()) {<a name="line.282"></a> +<span class="sourceLineNo">283</span> for (Pair<List<Tag>, Byte> tags : visiblityTagsDeleteColumnVersion) {<a name="line.283"></a> +<span class="sourceLineNo">284</span> List<Tag> putVisTags = new ArrayList<>();<a name="line.284"></a> +<span class="sourceLineNo">285</span> Byte putCellVisTagsFormat =<a name="line.285"></a> +<span class="sourceLineNo">286</span> VisibilityUtils.extractVisibilityTags(cell, putVisTags);<a name="line.286"></a> +<span class="sourceLineNo">287</span> boolean matchFound = VisibilityLabelServiceManager.getInstance()<a name="line.287"></a> +<span class="sourceLineNo">288</span> .getVisibilityLabelService().matchVisibility(putVisTags, putCellVisTagsFormat,<a name="line.288"></a> +<span class="sourceLineNo">289</span> tags.getFirst(), tags.getSecond());<a name="line.289"></a> +<span class="sourceLineNo">290</span> if (matchFound) {<a name="line.290"></a> +<span class="sourceLineNo">291</span> return DeleteResult.VERSION_DELETED;<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 (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.295"></a> +<span class="sourceLineNo">296</span> // No tags<a name="line.296"></a> +<span class="sourceLineNo">297</span> return DeleteResult.VERSION_DELETED;<a name="line.297"></a> +<span class="sourceLineNo">298</span> }<a name="line.298"></a> +<span class="sourceLineNo">299</span> }<a name="line.299"></a> +<span class="sourceLineNo">300</span> } else {<a name="line.300"></a> +<span class="sourceLineNo">301</span> if (!VisibilityUtils.isVisibilityTagsPresent(cell)) {<a name="line.301"></a> +<span class="sourceLineNo">302</span> // No tags<a name="line.302"></a> +<span class="sourceLineNo">303</span> return DeleteResult.VERSION_DELETED;<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> }<a name="line.306"></a> +<span class="sourceLineNo">307</span> } else if (ret > 0) {<a name="line.307"></a> +<span class="sourceLineNo">308</span> // Next column case.<a name="line.308"></a> +<span class="sourceLineNo">309</span> deleteCell = null;<a name="line.309"></a> +<span class="sourceLineNo">310</span> // Can nullify this because we are moving to the next column<a name="line.310"></a> +<span class="sourceLineNo">311</span> visibilityTagsDeleteColumns = null;<a name="line.311"></a> +<span class="sourceLineNo">312</span> visiblityTagsDeleteColumnVersion = null;<a name="line.312"></a> +<span class="sourceLineNo">313</span> } else {<a name="line.313"></a> +<span class="sourceLineNo">314</span> throw new IllegalStateException("isDeleted failed: deleteBuffer="<a name="line.314"></a> +<span class="sourceLineNo">315</span> + Bytes.toStringBinary(deleteCell.getQualifierArray(),<a name="line.315"></a> +<span class="sourceLineNo">316</span> deleteCell.getQualifierOffset(), deleteCell.getQualifierLength())<a name="line.316"></a> +<span class="sourceLineNo">317</span> + ", qualifier="<a name="line.317"></a> +<span class="sourceLineNo">318</span> + Bytes.toStringBinary(cell.getQualifierArray(), cell.getQualifierOffset(),<a name="line.318"></a> +<span class="sourceLineNo">319</span> cell.getQualifierLength())<a name="line.319"></a> +<span class="sourceLineNo">320</span> + ", timestamp=" + timestamp + ", comparison result: " + ret);<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> } catch (IOException e) {<a name="line.323"></a> +<span class="sourceLineNo">324</span> LOG.error("Error in isDeleted() check! Will treat cell as not deleted", e);<a name="line.324"></a> +<span class="sourceLineNo">325</span> }<a name="line.325"></a> +<span class="sourceLineNo">326</span> return DeleteResult.NOT_DELETED;<a name="line.326"></a> +<span class="sourceLineNo">327</span> }<a name="line.327"></a> +<span class="sourceLineNo">328</span><a name="line.328"></a> +<span class="sourceLineNo">329</span> @Override<a name="line.329"></a> +<span class="sourceLineNo">330</span> public void reset() {<a name="line.330"></a> +<span class="sourceLineNo">331</span> super.reset();<a name="line.331"></a> +<span class="sourceLineNo">332</span> // clear only here<a name="line.332"></a> +<span class="sourceLineNo">333</span> visibilityTagsDeleteColumns = null;<a name="line.333"></a> +<span class="sourceLineNo">334</span> visibilityTagsDeleteFamily = null;<a name="line.334"></a> +<span class="sourceLineNo">335</span> visibilityTagsDeleteFamilyVersion = null;<a name="line.335"></a> +<span class="sourceLineNo">336</span> visiblityTagsDeleteColumnVersion = null;<a name="line.336"></a> +<span class="sourceLineNo">337</span> }<a name="line.337"></a> +<span class="sourceLineNo">338</span>}<a name="line.338"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/export_control.html ---------------------------------------------------------------------- diff --git a/export_control.html b/export_control.html index 85d6ce8..30d0c82 100644 --- a/export_control.html +++ b/export_control.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase – Export Control @@ -336,7 +336,7 @@ for more details.</p> <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/checkstyle.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/checkstyle.html b/hbase-annotations/checkstyle.html index 51fe9fa..329d837 100644 --- a/hbase-annotations/checkstyle.html +++ b/hbase-annotations/checkstyle.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Checkstyle Results</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -273,7 +273,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/dependencies.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/dependencies.html b/hbase-annotations/dependencies.html index 6bcbb27..d41699f 100644 --- a/hbase-annotations/dependencies.html +++ b/hbase-annotations/dependencies.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Dependencies</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -377,7 +377,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/dependency-convergence.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/dependency-convergence.html b/hbase-annotations/dependency-convergence.html index 0abd050..2a506c5 100644 --- a/hbase-annotations/dependency-convergence.html +++ b/hbase-annotations/dependency-convergence.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Reactor Dependency Convergence</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -571,7 +571,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/dependency-info.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/dependency-info.html b/hbase-annotations/dependency-info.html index 7f94f47..b6f11ee 100644 --- a/hbase-annotations/dependency-info.html +++ b/hbase-annotations/dependency-info.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Dependency Information</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -147,7 +147,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/dependency-management.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/dependency-management.html b/hbase-annotations/dependency-management.html index 2f3e8b0..fdec3c1 100644 --- a/hbase-annotations/dependency-management.html +++ b/hbase-annotations/dependency-management.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Dependency Management</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -736,7 +736,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/index.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/index.html b/hbase-annotations/index.html index 65336e9..21d37ff 100644 --- a/hbase-annotations/index.html +++ b/hbase-annotations/index.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – About</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -119,7 +119,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/integration.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/integration.html b/hbase-annotations/integration.html index bb51a4e..a9eeb5e 100644 --- a/hbase-annotations/integration.html +++ b/hbase-annotations/integration.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – CI Management</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -126,7 +126,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/issue-tracking.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/issue-tracking.html b/hbase-annotations/issue-tracking.html index 46abacd..85a552b 100644 --- a/hbase-annotations/issue-tracking.html +++ b/hbase-annotations/issue-tracking.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Issue Management</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -123,7 +123,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/license.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/license.html b/hbase-annotations/license.html index 48e392c..9d115be 100644 --- a/hbase-annotations/license.html +++ b/hbase-annotations/license.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Licenses</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -326,7 +326,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/mail-lists.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/mail-lists.html b/hbase-annotations/mail-lists.html index 9470eb8..c016869 100644 --- a/hbase-annotations/mail-lists.html +++ b/hbase-annotations/mail-lists.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Mailing Lists</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -176,7 +176,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/plugin-management.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/plugin-management.html b/hbase-annotations/plugin-management.html index 2ac2bc4..bc0ef20 100644 --- a/hbase-annotations/plugin-management.html +++ b/hbase-annotations/plugin-management.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Plugin Management</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -271,7 +271,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/plugins.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/plugins.html b/hbase-annotations/plugins.html index cdf7ca6..c93d280 100644 --- a/hbase-annotations/plugins.html +++ b/hbase-annotations/plugins.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Plugins</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -222,7 +222,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/project-info.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/project-info.html b/hbase-annotations/project-info.html index fff33a6..65b2933 100644 --- a/hbase-annotations/project-info.html +++ b/hbase-annotations/project-info.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Information</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -167,7 +167,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/project-reports.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/project-reports.html b/hbase-annotations/project-reports.html index a701704..3f5d67a 100644 --- a/hbase-annotations/project-reports.html +++ b/hbase-annotations/project-reports.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Generated Reports</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -128,7 +128,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/project-summary.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/project-summary.html b/hbase-annotations/project-summary.html index e7f7577..24c77dd 100644 --- a/hbase-annotations/project-summary.html +++ b/hbase-annotations/project-summary.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Summary</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -166,7 +166,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/source-repository.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/source-repository.html b/hbase-annotations/source-repository.html index 829d017..20db55d 100644 --- a/hbase-annotations/source-repository.html +++ b/hbase-annotations/source-repository.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Source Code Management</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -134,7 +134,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/495ddb86/hbase-annotations/team-list.html ---------------------------------------------------------------------- diff --git a/hbase-annotations/team-list.html b/hbase-annotations/team-list.html index b6a2e50..1090fbb 100644 --- a/hbase-annotations/team-list.html +++ b/hbase-annotations/team-list.html @@ -7,7 +7,7 @@ <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20170818" /> + <meta name="Date-Revision-yyyymmdd" content="20170819" /> <meta http-equiv="Content-Language" content="en" /> <title>Apache HBase - Annotations – Project Team</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" /> @@ -523,7 +523,7 @@ <a href="https://www.apache.org/";>The Apache Software Foundation</a>. All rights reserved. - <li id="publishDate" class="pull-right">Last Published: 2017-08-18</li> + <li id="publishDate" class="pull-right">Last Published: 2017-08-19</li> </p> </div>
