http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html index ae3605c..3179892 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html @@ -75,95 +75,97 @@ <span class="sourceLineNo">067</span> /**<a name="line.67"></a> <span class="sourceLineNo">068</span> * @return The comparator serialized using pb<a name="line.68"></a> <span class="sourceLineNo">069</span> */<a name="line.69"></a> -<span class="sourceLineNo">070</span> public byte [] toByteArray() {<a name="line.70"></a> -<span class="sourceLineNo">071</span> ComparatorProtos.BitComparator.Builder builder =<a name="line.71"></a> -<span class="sourceLineNo">072</span> ComparatorProtos.BitComparator.newBuilder();<a name="line.72"></a> -<span class="sourceLineNo">073</span> builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a name="line.73"></a> -<span class="sourceLineNo">074</span> ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.74"></a> -<span class="sourceLineNo">075</span> ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a name="line.75"></a> -<span class="sourceLineNo">076</span> builder.setBitwiseOp(bitwiseOpPb);<a name="line.76"></a> -<span class="sourceLineNo">077</span> return builder.build().toByteArray();<a name="line.77"></a> -<span class="sourceLineNo">078</span> }<a name="line.78"></a> -<span class="sourceLineNo">079</span><a name="line.79"></a> -<span class="sourceLineNo">080</span> /**<a name="line.80"></a> -<span class="sourceLineNo">081</span> * @param pbBytes A pb serialized {@link BitComparator} instance<a name="line.81"></a> -<span class="sourceLineNo">082</span> * @return An instance of {@link BitComparator} made from <code>bytes</code><a name="line.82"></a> -<span class="sourceLineNo">083</span> * @throws DeserializationException<a name="line.83"></a> -<span class="sourceLineNo">084</span> * @see #toByteArray<a name="line.84"></a> -<span class="sourceLineNo">085</span> */<a name="line.85"></a> -<span class="sourceLineNo">086</span> public static BitComparator parseFrom(final byte [] pbBytes)<a name="line.86"></a> -<span class="sourceLineNo">087</span> throws DeserializationException {<a name="line.87"></a> -<span class="sourceLineNo">088</span> ComparatorProtos.BitComparator proto;<a name="line.88"></a> -<span class="sourceLineNo">089</span> try {<a name="line.89"></a> -<span class="sourceLineNo">090</span> proto = ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.90"></a> -<span class="sourceLineNo">091</span> } catch (InvalidProtocolBufferException e) {<a name="line.91"></a> -<span class="sourceLineNo">092</span> throw new DeserializationException(e);<a name="line.92"></a> -<span class="sourceLineNo">093</span> }<a name="line.93"></a> -<span class="sourceLineNo">094</span> BitwiseOp bitwiseOp = BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.94"></a> -<span class="sourceLineNo">095</span> return new BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a name="line.95"></a> -<span class="sourceLineNo">096</span> }<a name="line.96"></a> -<span class="sourceLineNo">097</span><a name="line.97"></a> -<span class="sourceLineNo">098</span> /**<a name="line.98"></a> -<span class="sourceLineNo">099</span> * @param other<a name="line.99"></a> -<span class="sourceLineNo">100</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.100"></a> -<span class="sourceLineNo">101</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.101"></a> -<span class="sourceLineNo">102</span> */<a name="line.102"></a> -<span class="sourceLineNo">103</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.103"></a> -<span class="sourceLineNo">104</span> if (other == this) return true;<a name="line.104"></a> -<span class="sourceLineNo">105</span> if (!(other instanceof BitComparator)) return false;<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> BitComparator comparator = (BitComparator)other;<a name="line.107"></a> -<span class="sourceLineNo">108</span> return super.areSerializedFieldsEqual(other)<a name="line.108"></a> -<span class="sourceLineNo">109</span> && this.getOperator().equals(comparator.getOperator());<a name="line.109"></a> -<span class="sourceLineNo">110</span> }<a name="line.110"></a> -<span class="sourceLineNo">111</span><a name="line.111"></a> -<span class="sourceLineNo">112</span> @Override<a name="line.112"></a> -<span class="sourceLineNo">113</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.113"></a> -<span class="sourceLineNo">114</span> if (length != this.value.length) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> return 1;<a name="line.115"></a> -<span class="sourceLineNo">116</span> }<a name="line.116"></a> -<span class="sourceLineNo">117</span> int b = 0;<a name="line.117"></a> -<span class="sourceLineNo">118</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.118"></a> -<span class="sourceLineNo">119</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.119"></a> -<span class="sourceLineNo">120</span> switch (bitOperator) {<a name="line.120"></a> -<span class="sourceLineNo">121</span> case AND:<a name="line.121"></a> -<span class="sourceLineNo">122</span> b = (this.value[i] & value[i+offset]) & 0xff;<a name="line.122"></a> -<span class="sourceLineNo">123</span> break;<a name="line.123"></a> -<span class="sourceLineNo">124</span> case OR:<a name="line.124"></a> -<span class="sourceLineNo">125</span> b = (this.value[i] | value[i+offset]) & 0xff;<a name="line.125"></a> -<span class="sourceLineNo">126</span> break;<a name="line.126"></a> -<span class="sourceLineNo">127</span> case XOR:<a name="line.127"></a> -<span class="sourceLineNo">128</span> b = (this.value[i] ^ value[i+offset]) & 0xff;<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> }<a name="line.131"></a> -<span class="sourceLineNo">132</span> return b == 0 ? 1 : 0;<a name="line.132"></a> -<span class="sourceLineNo">133</span> }<a name="line.133"></a> -<span class="sourceLineNo">134</span><a name="line.134"></a> -<span class="sourceLineNo">135</span> @Override<a name="line.135"></a> -<span class="sourceLineNo">136</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.136"></a> -<span class="sourceLineNo">137</span> if (length != this.value.length) {<a name="line.137"></a> -<span class="sourceLineNo">138</span> return 1;<a name="line.138"></a> -<span class="sourceLineNo">139</span> }<a name="line.139"></a> -<span class="sourceLineNo">140</span> int b = 0;<a name="line.140"></a> -<span class="sourceLineNo">141</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.141"></a> -<span class="sourceLineNo">142</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.142"></a> -<span class="sourceLineNo">143</span> switch (bitOperator) {<a name="line.143"></a> -<span class="sourceLineNo">144</span> case AND:<a name="line.144"></a> -<span class="sourceLineNo">145</span> b = (this.value[i] & value.get(i + offset)) & 0xff;<a name="line.145"></a> -<span class="sourceLineNo">146</span> break;<a name="line.146"></a> -<span class="sourceLineNo">147</span> case OR:<a name="line.147"></a> -<span class="sourceLineNo">148</span> b = (this.value[i] | value.get(i + offset)) & 0xff;<a name="line.148"></a> -<span class="sourceLineNo">149</span> break;<a name="line.149"></a> -<span class="sourceLineNo">150</span> case XOR:<a name="line.150"></a> -<span class="sourceLineNo">151</span> b = (this.value[i] ^ value.get(i + offset)) & 0xff;<a name="line.151"></a> -<span class="sourceLineNo">152</span> break;<a name="line.152"></a> -<span class="sourceLineNo">153</span> }<a name="line.153"></a> -<span class="sourceLineNo">154</span> }<a name="line.154"></a> -<span class="sourceLineNo">155</span> return b == 0 ? 1 : 0;<a name="line.155"></a> -<span class="sourceLineNo">156</span> }<a name="line.156"></a> -<span class="sourceLineNo">157</span>}<a name="line.157"></a> -<span class="sourceLineNo">158</span><a name="line.158"></a> +<span class="sourceLineNo">070</span> @Override<a name="line.70"></a> +<span class="sourceLineNo">071</span> public byte [] toByteArray() {<a name="line.71"></a> +<span class="sourceLineNo">072</span> ComparatorProtos.BitComparator.Builder builder =<a name="line.72"></a> +<span class="sourceLineNo">073</span> ComparatorProtos.BitComparator.newBuilder();<a name="line.73"></a> +<span class="sourceLineNo">074</span> builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a name="line.74"></a> +<span class="sourceLineNo">075</span> ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.75"></a> +<span class="sourceLineNo">076</span> ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a name="line.76"></a> +<span class="sourceLineNo">077</span> builder.setBitwiseOp(bitwiseOpPb);<a name="line.77"></a> +<span class="sourceLineNo">078</span> return builder.build().toByteArray();<a name="line.78"></a> +<span class="sourceLineNo">079</span> }<a name="line.79"></a> +<span class="sourceLineNo">080</span><a name="line.80"></a> +<span class="sourceLineNo">081</span> /**<a name="line.81"></a> +<span class="sourceLineNo">082</span> * @param pbBytes A pb serialized {@link BitComparator} instance<a name="line.82"></a> +<span class="sourceLineNo">083</span> * @return An instance of {@link BitComparator} made from <code>bytes</code><a name="line.83"></a> +<span class="sourceLineNo">084</span> * @throws DeserializationException<a name="line.84"></a> +<span class="sourceLineNo">085</span> * @see #toByteArray<a name="line.85"></a> +<span class="sourceLineNo">086</span> */<a name="line.86"></a> +<span class="sourceLineNo">087</span> public static BitComparator parseFrom(final byte [] pbBytes)<a name="line.87"></a> +<span class="sourceLineNo">088</span> throws DeserializationException {<a name="line.88"></a> +<span class="sourceLineNo">089</span> ComparatorProtos.BitComparator proto;<a name="line.89"></a> +<span class="sourceLineNo">090</span> try {<a name="line.90"></a> +<span class="sourceLineNo">091</span> proto = ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.91"></a> +<span class="sourceLineNo">092</span> } catch (InvalidProtocolBufferException e) {<a name="line.92"></a> +<span class="sourceLineNo">093</span> throw new DeserializationException(e);<a name="line.93"></a> +<span class="sourceLineNo">094</span> }<a name="line.94"></a> +<span class="sourceLineNo">095</span> BitwiseOp bitwiseOp = BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.95"></a> +<span class="sourceLineNo">096</span> return new BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a name="line.96"></a> +<span class="sourceLineNo">097</span> }<a name="line.97"></a> +<span class="sourceLineNo">098</span><a name="line.98"></a> +<span class="sourceLineNo">099</span> /**<a name="line.99"></a> +<span class="sourceLineNo">100</span> * @param other<a name="line.100"></a> +<span class="sourceLineNo">101</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.101"></a> +<span class="sourceLineNo">102</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.102"></a> +<span class="sourceLineNo">103</span> */<a name="line.103"></a> +<span class="sourceLineNo">104</span> @Override<a name="line.104"></a> +<span class="sourceLineNo">105</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.105"></a> +<span class="sourceLineNo">106</span> if (other == this) return true;<a name="line.106"></a> +<span class="sourceLineNo">107</span> if (!(other instanceof BitComparator)) return false;<a name="line.107"></a> +<span class="sourceLineNo">108</span><a name="line.108"></a> +<span class="sourceLineNo">109</span> BitComparator comparator = (BitComparator)other;<a name="line.109"></a> +<span class="sourceLineNo">110</span> return super.areSerializedFieldsEqual(other)<a name="line.110"></a> +<span class="sourceLineNo">111</span> && this.getOperator().equals(comparator.getOperator());<a name="line.111"></a> +<span class="sourceLineNo">112</span> }<a name="line.112"></a> +<span class="sourceLineNo">113</span><a name="line.113"></a> +<span class="sourceLineNo">114</span> @Override<a name="line.114"></a> +<span class="sourceLineNo">115</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.115"></a> +<span class="sourceLineNo">116</span> if (length != this.value.length) {<a name="line.116"></a> +<span class="sourceLineNo">117</span> return 1;<a name="line.117"></a> +<span class="sourceLineNo">118</span> }<a name="line.118"></a> +<span class="sourceLineNo">119</span> int b = 0;<a name="line.119"></a> +<span class="sourceLineNo">120</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.120"></a> +<span class="sourceLineNo">121</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.121"></a> +<span class="sourceLineNo">122</span> switch (bitOperator) {<a name="line.122"></a> +<span class="sourceLineNo">123</span> case AND:<a name="line.123"></a> +<span class="sourceLineNo">124</span> b = (this.value[i] & value[i+offset]) & 0xff;<a name="line.124"></a> +<span class="sourceLineNo">125</span> break;<a name="line.125"></a> +<span class="sourceLineNo">126</span> case OR:<a name="line.126"></a> +<span class="sourceLineNo">127</span> b = (this.value[i] | value[i+offset]) & 0xff;<a name="line.127"></a> +<span class="sourceLineNo">128</span> break;<a name="line.128"></a> +<span class="sourceLineNo">129</span> case XOR:<a name="line.129"></a> +<span class="sourceLineNo">130</span> b = (this.value[i] ^ value[i+offset]) & 0xff;<a name="line.130"></a> +<span class="sourceLineNo">131</span> break;<a name="line.131"></a> +<span class="sourceLineNo">132</span> }<a name="line.132"></a> +<span class="sourceLineNo">133</span> }<a name="line.133"></a> +<span class="sourceLineNo">134</span> return b == 0 ? 1 : 0;<a name="line.134"></a> +<span class="sourceLineNo">135</span> }<a name="line.135"></a> +<span class="sourceLineNo">136</span><a name="line.136"></a> +<span class="sourceLineNo">137</span> @Override<a name="line.137"></a> +<span class="sourceLineNo">138</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.138"></a> +<span class="sourceLineNo">139</span> if (length != this.value.length) {<a name="line.139"></a> +<span class="sourceLineNo">140</span> return 1;<a name="line.140"></a> +<span class="sourceLineNo">141</span> }<a name="line.141"></a> +<span class="sourceLineNo">142</span> int b = 0;<a name="line.142"></a> +<span class="sourceLineNo">143</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.143"></a> +<span class="sourceLineNo">144</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.144"></a> +<span class="sourceLineNo">145</span> switch (bitOperator) {<a name="line.145"></a> +<span class="sourceLineNo">146</span> case AND:<a name="line.146"></a> +<span class="sourceLineNo">147</span> b = (this.value[i] & value.get(i + offset)) & 0xff;<a name="line.147"></a> +<span class="sourceLineNo">148</span> break;<a name="line.148"></a> +<span class="sourceLineNo">149</span> case OR:<a name="line.149"></a> +<span class="sourceLineNo">150</span> b = (this.value[i] | value.get(i + offset)) & 0xff;<a name="line.150"></a> +<span class="sourceLineNo">151</span> break;<a name="line.151"></a> +<span class="sourceLineNo">152</span> case XOR:<a name="line.152"></a> +<span class="sourceLineNo">153</span> b = (this.value[i] ^ value.get(i + offset)) & 0xff;<a name="line.153"></a> +<span class="sourceLineNo">154</span> break;<a name="line.154"></a> +<span class="sourceLineNo">155</span> }<a name="line.155"></a> +<span class="sourceLineNo">156</span> }<a name="line.156"></a> +<span class="sourceLineNo">157</span> return b == 0 ? 1 : 0;<a name="line.157"></a> +<span class="sourceLineNo">158</span> }<a name="line.158"></a> +<span class="sourceLineNo">159</span>}<a name="line.159"></a> +<span class="sourceLineNo">160</span><a name="line.160"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html index ae3605c..3179892 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/BitComparator.html @@ -75,95 +75,97 @@ <span class="sourceLineNo">067</span> /**<a name="line.67"></a> <span class="sourceLineNo">068</span> * @return The comparator serialized using pb<a name="line.68"></a> <span class="sourceLineNo">069</span> */<a name="line.69"></a> -<span class="sourceLineNo">070</span> public byte [] toByteArray() {<a name="line.70"></a> -<span class="sourceLineNo">071</span> ComparatorProtos.BitComparator.Builder builder =<a name="line.71"></a> -<span class="sourceLineNo">072</span> ComparatorProtos.BitComparator.newBuilder();<a name="line.72"></a> -<span class="sourceLineNo">073</span> builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a name="line.73"></a> -<span class="sourceLineNo">074</span> ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.74"></a> -<span class="sourceLineNo">075</span> ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a name="line.75"></a> -<span class="sourceLineNo">076</span> builder.setBitwiseOp(bitwiseOpPb);<a name="line.76"></a> -<span class="sourceLineNo">077</span> return builder.build().toByteArray();<a name="line.77"></a> -<span class="sourceLineNo">078</span> }<a name="line.78"></a> -<span class="sourceLineNo">079</span><a name="line.79"></a> -<span class="sourceLineNo">080</span> /**<a name="line.80"></a> -<span class="sourceLineNo">081</span> * @param pbBytes A pb serialized {@link BitComparator} instance<a name="line.81"></a> -<span class="sourceLineNo">082</span> * @return An instance of {@link BitComparator} made from <code>bytes</code><a name="line.82"></a> -<span class="sourceLineNo">083</span> * @throws DeserializationException<a name="line.83"></a> -<span class="sourceLineNo">084</span> * @see #toByteArray<a name="line.84"></a> -<span class="sourceLineNo">085</span> */<a name="line.85"></a> -<span class="sourceLineNo">086</span> public static BitComparator parseFrom(final byte [] pbBytes)<a name="line.86"></a> -<span class="sourceLineNo">087</span> throws DeserializationException {<a name="line.87"></a> -<span class="sourceLineNo">088</span> ComparatorProtos.BitComparator proto;<a name="line.88"></a> -<span class="sourceLineNo">089</span> try {<a name="line.89"></a> -<span class="sourceLineNo">090</span> proto = ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.90"></a> -<span class="sourceLineNo">091</span> } catch (InvalidProtocolBufferException e) {<a name="line.91"></a> -<span class="sourceLineNo">092</span> throw new DeserializationException(e);<a name="line.92"></a> -<span class="sourceLineNo">093</span> }<a name="line.93"></a> -<span class="sourceLineNo">094</span> BitwiseOp bitwiseOp = BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.94"></a> -<span class="sourceLineNo">095</span> return new BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a name="line.95"></a> -<span class="sourceLineNo">096</span> }<a name="line.96"></a> -<span class="sourceLineNo">097</span><a name="line.97"></a> -<span class="sourceLineNo">098</span> /**<a name="line.98"></a> -<span class="sourceLineNo">099</span> * @param other<a name="line.99"></a> -<span class="sourceLineNo">100</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.100"></a> -<span class="sourceLineNo">101</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.101"></a> -<span class="sourceLineNo">102</span> */<a name="line.102"></a> -<span class="sourceLineNo">103</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.103"></a> -<span class="sourceLineNo">104</span> if (other == this) return true;<a name="line.104"></a> -<span class="sourceLineNo">105</span> if (!(other instanceof BitComparator)) return false;<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> BitComparator comparator = (BitComparator)other;<a name="line.107"></a> -<span class="sourceLineNo">108</span> return super.areSerializedFieldsEqual(other)<a name="line.108"></a> -<span class="sourceLineNo">109</span> && this.getOperator().equals(comparator.getOperator());<a name="line.109"></a> -<span class="sourceLineNo">110</span> }<a name="line.110"></a> -<span class="sourceLineNo">111</span><a name="line.111"></a> -<span class="sourceLineNo">112</span> @Override<a name="line.112"></a> -<span class="sourceLineNo">113</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.113"></a> -<span class="sourceLineNo">114</span> if (length != this.value.length) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> return 1;<a name="line.115"></a> -<span class="sourceLineNo">116</span> }<a name="line.116"></a> -<span class="sourceLineNo">117</span> int b = 0;<a name="line.117"></a> -<span class="sourceLineNo">118</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.118"></a> -<span class="sourceLineNo">119</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.119"></a> -<span class="sourceLineNo">120</span> switch (bitOperator) {<a name="line.120"></a> -<span class="sourceLineNo">121</span> case AND:<a name="line.121"></a> -<span class="sourceLineNo">122</span> b = (this.value[i] & value[i+offset]) & 0xff;<a name="line.122"></a> -<span class="sourceLineNo">123</span> break;<a name="line.123"></a> -<span class="sourceLineNo">124</span> case OR:<a name="line.124"></a> -<span class="sourceLineNo">125</span> b = (this.value[i] | value[i+offset]) & 0xff;<a name="line.125"></a> -<span class="sourceLineNo">126</span> break;<a name="line.126"></a> -<span class="sourceLineNo">127</span> case XOR:<a name="line.127"></a> -<span class="sourceLineNo">128</span> b = (this.value[i] ^ value[i+offset]) & 0xff;<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> }<a name="line.131"></a> -<span class="sourceLineNo">132</span> return b == 0 ? 1 : 0;<a name="line.132"></a> -<span class="sourceLineNo">133</span> }<a name="line.133"></a> -<span class="sourceLineNo">134</span><a name="line.134"></a> -<span class="sourceLineNo">135</span> @Override<a name="line.135"></a> -<span class="sourceLineNo">136</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.136"></a> -<span class="sourceLineNo">137</span> if (length != this.value.length) {<a name="line.137"></a> -<span class="sourceLineNo">138</span> return 1;<a name="line.138"></a> -<span class="sourceLineNo">139</span> }<a name="line.139"></a> -<span class="sourceLineNo">140</span> int b = 0;<a name="line.140"></a> -<span class="sourceLineNo">141</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.141"></a> -<span class="sourceLineNo">142</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.142"></a> -<span class="sourceLineNo">143</span> switch (bitOperator) {<a name="line.143"></a> -<span class="sourceLineNo">144</span> case AND:<a name="line.144"></a> -<span class="sourceLineNo">145</span> b = (this.value[i] & value.get(i + offset)) & 0xff;<a name="line.145"></a> -<span class="sourceLineNo">146</span> break;<a name="line.146"></a> -<span class="sourceLineNo">147</span> case OR:<a name="line.147"></a> -<span class="sourceLineNo">148</span> b = (this.value[i] | value.get(i + offset)) & 0xff;<a name="line.148"></a> -<span class="sourceLineNo">149</span> break;<a name="line.149"></a> -<span class="sourceLineNo">150</span> case XOR:<a name="line.150"></a> -<span class="sourceLineNo">151</span> b = (this.value[i] ^ value.get(i + offset)) & 0xff;<a name="line.151"></a> -<span class="sourceLineNo">152</span> break;<a name="line.152"></a> -<span class="sourceLineNo">153</span> }<a name="line.153"></a> -<span class="sourceLineNo">154</span> }<a name="line.154"></a> -<span class="sourceLineNo">155</span> return b == 0 ? 1 : 0;<a name="line.155"></a> -<span class="sourceLineNo">156</span> }<a name="line.156"></a> -<span class="sourceLineNo">157</span>}<a name="line.157"></a> -<span class="sourceLineNo">158</span><a name="line.158"></a> +<span class="sourceLineNo">070</span> @Override<a name="line.70"></a> +<span class="sourceLineNo">071</span> public byte [] toByteArray() {<a name="line.71"></a> +<span class="sourceLineNo">072</span> ComparatorProtos.BitComparator.Builder builder =<a name="line.72"></a> +<span class="sourceLineNo">073</span> ComparatorProtos.BitComparator.newBuilder();<a name="line.73"></a> +<span class="sourceLineNo">074</span> builder.setComparable(ProtobufUtil.toByteArrayComparable(this.value));<a name="line.74"></a> +<span class="sourceLineNo">075</span> ComparatorProtos.BitComparator.BitwiseOp bitwiseOpPb =<a name="line.75"></a> +<span class="sourceLineNo">076</span> ComparatorProtos.BitComparator.BitwiseOp.valueOf(bitOperator.name());<a name="line.76"></a> +<span class="sourceLineNo">077</span> builder.setBitwiseOp(bitwiseOpPb);<a name="line.77"></a> +<span class="sourceLineNo">078</span> return builder.build().toByteArray();<a name="line.78"></a> +<span class="sourceLineNo">079</span> }<a name="line.79"></a> +<span class="sourceLineNo">080</span><a name="line.80"></a> +<span class="sourceLineNo">081</span> /**<a name="line.81"></a> +<span class="sourceLineNo">082</span> * @param pbBytes A pb serialized {@link BitComparator} instance<a name="line.82"></a> +<span class="sourceLineNo">083</span> * @return An instance of {@link BitComparator} made from <code>bytes</code><a name="line.83"></a> +<span class="sourceLineNo">084</span> * @throws DeserializationException<a name="line.84"></a> +<span class="sourceLineNo">085</span> * @see #toByteArray<a name="line.85"></a> +<span class="sourceLineNo">086</span> */<a name="line.86"></a> +<span class="sourceLineNo">087</span> public static BitComparator parseFrom(final byte [] pbBytes)<a name="line.87"></a> +<span class="sourceLineNo">088</span> throws DeserializationException {<a name="line.88"></a> +<span class="sourceLineNo">089</span> ComparatorProtos.BitComparator proto;<a name="line.89"></a> +<span class="sourceLineNo">090</span> try {<a name="line.90"></a> +<span class="sourceLineNo">091</span> proto = ComparatorProtos.BitComparator.parseFrom(pbBytes);<a name="line.91"></a> +<span class="sourceLineNo">092</span> } catch (InvalidProtocolBufferException e) {<a name="line.92"></a> +<span class="sourceLineNo">093</span> throw new DeserializationException(e);<a name="line.93"></a> +<span class="sourceLineNo">094</span> }<a name="line.94"></a> +<span class="sourceLineNo">095</span> BitwiseOp bitwiseOp = BitwiseOp.valueOf(proto.getBitwiseOp().name());<a name="line.95"></a> +<span class="sourceLineNo">096</span> return new BitComparator(proto.getComparable().getValue().toByteArray(),bitwiseOp);<a name="line.96"></a> +<span class="sourceLineNo">097</span> }<a name="line.97"></a> +<span class="sourceLineNo">098</span><a name="line.98"></a> +<span class="sourceLineNo">099</span> /**<a name="line.99"></a> +<span class="sourceLineNo">100</span> * @param other<a name="line.100"></a> +<span class="sourceLineNo">101</span> * @return true if and only if the fields of the comparator that are serialized<a name="line.101"></a> +<span class="sourceLineNo">102</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.102"></a> +<span class="sourceLineNo">103</span> */<a name="line.103"></a> +<span class="sourceLineNo">104</span> @Override<a name="line.104"></a> +<span class="sourceLineNo">105</span> boolean areSerializedFieldsEqual(ByteArrayComparable other) {<a name="line.105"></a> +<span class="sourceLineNo">106</span> if (other == this) return true;<a name="line.106"></a> +<span class="sourceLineNo">107</span> if (!(other instanceof BitComparator)) return false;<a name="line.107"></a> +<span class="sourceLineNo">108</span><a name="line.108"></a> +<span class="sourceLineNo">109</span> BitComparator comparator = (BitComparator)other;<a name="line.109"></a> +<span class="sourceLineNo">110</span> return super.areSerializedFieldsEqual(other)<a name="line.110"></a> +<span class="sourceLineNo">111</span> && this.getOperator().equals(comparator.getOperator());<a name="line.111"></a> +<span class="sourceLineNo">112</span> }<a name="line.112"></a> +<span class="sourceLineNo">113</span><a name="line.113"></a> +<span class="sourceLineNo">114</span> @Override<a name="line.114"></a> +<span class="sourceLineNo">115</span> public int compareTo(byte[] value, int offset, int length) {<a name="line.115"></a> +<span class="sourceLineNo">116</span> if (length != this.value.length) {<a name="line.116"></a> +<span class="sourceLineNo">117</span> return 1;<a name="line.117"></a> +<span class="sourceLineNo">118</span> }<a name="line.118"></a> +<span class="sourceLineNo">119</span> int b = 0;<a name="line.119"></a> +<span class="sourceLineNo">120</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.120"></a> +<span class="sourceLineNo">121</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.121"></a> +<span class="sourceLineNo">122</span> switch (bitOperator) {<a name="line.122"></a> +<span class="sourceLineNo">123</span> case AND:<a name="line.123"></a> +<span class="sourceLineNo">124</span> b = (this.value[i] & value[i+offset]) & 0xff;<a name="line.124"></a> +<span class="sourceLineNo">125</span> break;<a name="line.125"></a> +<span class="sourceLineNo">126</span> case OR:<a name="line.126"></a> +<span class="sourceLineNo">127</span> b = (this.value[i] | value[i+offset]) & 0xff;<a name="line.127"></a> +<span class="sourceLineNo">128</span> break;<a name="line.128"></a> +<span class="sourceLineNo">129</span> case XOR:<a name="line.129"></a> +<span class="sourceLineNo">130</span> b = (this.value[i] ^ value[i+offset]) & 0xff;<a name="line.130"></a> +<span class="sourceLineNo">131</span> break;<a name="line.131"></a> +<span class="sourceLineNo">132</span> }<a name="line.132"></a> +<span class="sourceLineNo">133</span> }<a name="line.133"></a> +<span class="sourceLineNo">134</span> return b == 0 ? 1 : 0;<a name="line.134"></a> +<span class="sourceLineNo">135</span> }<a name="line.135"></a> +<span class="sourceLineNo">136</span><a name="line.136"></a> +<span class="sourceLineNo">137</span> @Override<a name="line.137"></a> +<span class="sourceLineNo">138</span> public int compareTo(ByteBuffer value, int offset, int length) {<a name="line.138"></a> +<span class="sourceLineNo">139</span> if (length != this.value.length) {<a name="line.139"></a> +<span class="sourceLineNo">140</span> return 1;<a name="line.140"></a> +<span class="sourceLineNo">141</span> }<a name="line.141"></a> +<span class="sourceLineNo">142</span> int b = 0;<a name="line.142"></a> +<span class="sourceLineNo">143</span> //Iterating backwards is faster because we can quit after one non-zero byte.<a name="line.143"></a> +<span class="sourceLineNo">144</span> for (int i = length - 1; i >= 0 && b == 0; i--) {<a name="line.144"></a> +<span class="sourceLineNo">145</span> switch (bitOperator) {<a name="line.145"></a> +<span class="sourceLineNo">146</span> case AND:<a name="line.146"></a> +<span class="sourceLineNo">147</span> b = (this.value[i] & value.get(i + offset)) & 0xff;<a name="line.147"></a> +<span class="sourceLineNo">148</span> break;<a name="line.148"></a> +<span class="sourceLineNo">149</span> case OR:<a name="line.149"></a> +<span class="sourceLineNo">150</span> b = (this.value[i] | value.get(i + offset)) & 0xff;<a name="line.150"></a> +<span class="sourceLineNo">151</span> break;<a name="line.151"></a> +<span class="sourceLineNo">152</span> case XOR:<a name="line.152"></a> +<span class="sourceLineNo">153</span> b = (this.value[i] ^ value.get(i + offset)) & 0xff;<a name="line.153"></a> +<span class="sourceLineNo">154</span> break;<a name="line.154"></a> +<span class="sourceLineNo">155</span> }<a name="line.155"></a> +<span class="sourceLineNo">156</span> }<a name="line.156"></a> +<span class="sourceLineNo">157</span> return b == 0 ? 1 : 0;<a name="line.157"></a> +<span class="sourceLineNo">158</span> }<a name="line.158"></a> +<span class="sourceLineNo">159</span>}<a name="line.159"></a> +<span class="sourceLineNo">160</span><a name="line.160"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html index 32d2b8e..da5d73e 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ByteArrayComparable.html @@ -28,10 +28,10 @@ <span class="sourceLineNo">020</span><a name="line.20"></a> <span class="sourceLineNo">021</span>import java.nio.ByteBuffer;<a name="line.21"></a> <span class="sourceLineNo">022</span><a name="line.22"></a> -<span class="sourceLineNo">023</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.23"></a> -<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.24"></a> -<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.util.ByteBufferUtils;<a name="line.25"></a> -<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.26"></a> +<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.23"></a> +<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.util.ByteBufferUtils;<a name="line.24"></a> +<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.25"></a> +<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a> <span class="sourceLineNo">027</span><a name="line.27"></a> <span class="sourceLineNo">028</span><a name="line.28"></a> <span class="sourceLineNo">029</span>/** Base class for byte array comparators */<a name="line.29"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.html index e098e72..f808da9 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnCountGetFilter.html @@ -97,48 +97,50 @@ <span class="sourceLineNo">089</span> /**<a name="line.89"></a> <span class="sourceLineNo">090</span> * @return The filter serialized using pb<a name="line.90"></a> <span class="sourceLineNo">091</span> */<a name="line.91"></a> -<span class="sourceLineNo">092</span> public byte [] toByteArray() {<a name="line.92"></a> -<span class="sourceLineNo">093</span> FilterProtos.ColumnCountGetFilter.Builder builder =<a name="line.93"></a> -<span class="sourceLineNo">094</span> FilterProtos.ColumnCountGetFilter.newBuilder();<a name="line.94"></a> -<span class="sourceLineNo">095</span> builder.setLimit(this.limit);<a name="line.95"></a> -<span class="sourceLineNo">096</span> return builder.build().toByteArray();<a name="line.96"></a> -<span class="sourceLineNo">097</span> }<a name="line.97"></a> -<span class="sourceLineNo">098</span><a name="line.98"></a> -<span class="sourceLineNo">099</span> /**<a name="line.99"></a> -<span class="sourceLineNo">100</span> * @param pbBytes A pb serialized {@link ColumnCountGetFilter} instance<a name="line.100"></a> -<span class="sourceLineNo">101</span> * @return An instance of {@link ColumnCountGetFilter} made from <code>bytes</code><a name="line.101"></a> -<span class="sourceLineNo">102</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.102"></a> -<span class="sourceLineNo">103</span> * @see #toByteArray<a name="line.103"></a> -<span class="sourceLineNo">104</span> */<a name="line.104"></a> -<span class="sourceLineNo">105</span> public static ColumnCountGetFilter parseFrom(final byte [] pbBytes)<a name="line.105"></a> -<span class="sourceLineNo">106</span> throws DeserializationException {<a name="line.106"></a> -<span class="sourceLineNo">107</span> FilterProtos.ColumnCountGetFilter proto;<a name="line.107"></a> -<span class="sourceLineNo">108</span> try {<a name="line.108"></a> -<span class="sourceLineNo">109</span> proto = FilterProtos.ColumnCountGetFilter.parseFrom(pbBytes);<a name="line.109"></a> -<span class="sourceLineNo">110</span> } catch (InvalidProtocolBufferException e) {<a name="line.110"></a> -<span class="sourceLineNo">111</span> throw new DeserializationException(e);<a name="line.111"></a> -<span class="sourceLineNo">112</span> }<a name="line.112"></a> -<span class="sourceLineNo">113</span> return new ColumnCountGetFilter(proto.getLimit());<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> /**<a name="line.116"></a> -<span class="sourceLineNo">117</span> * @param o the other filter to compare with<a name="line.117"></a> -<span class="sourceLineNo">118</span> * @return true if and only if the fields of the filter that are serialized<a name="line.118"></a> -<span class="sourceLineNo">119</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.119"></a> -<span class="sourceLineNo">120</span> */<a name="line.120"></a> -<span class="sourceLineNo">121</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.121"></a> -<span class="sourceLineNo">122</span> if (o == this) return true;<a name="line.122"></a> -<span class="sourceLineNo">123</span> if (!(o instanceof ColumnCountGetFilter)) return false;<a name="line.123"></a> -<span class="sourceLineNo">124</span><a name="line.124"></a> -<span class="sourceLineNo">125</span> ColumnCountGetFilter other = (ColumnCountGetFilter)o;<a name="line.125"></a> -<span class="sourceLineNo">126</span> return this.getLimit() == other.getLimit();<a name="line.126"></a> -<span class="sourceLineNo">127</span> }<a name="line.127"></a> -<span class="sourceLineNo">128</span><a name="line.128"></a> -<span class="sourceLineNo">129</span> @Override<a name="line.129"></a> -<span class="sourceLineNo">130</span> public String toString() {<a name="line.130"></a> -<span class="sourceLineNo">131</span> return this.getClass().getSimpleName() + " " + this.limit;<a name="line.131"></a> -<span class="sourceLineNo">132</span> }<a name="line.132"></a> -<span class="sourceLineNo">133</span>}<a name="line.133"></a> +<span class="sourceLineNo">092</span> @Override<a name="line.92"></a> +<span class="sourceLineNo">093</span> public byte [] toByteArray() {<a name="line.93"></a> +<span class="sourceLineNo">094</span> FilterProtos.ColumnCountGetFilter.Builder builder =<a name="line.94"></a> +<span class="sourceLineNo">095</span> FilterProtos.ColumnCountGetFilter.newBuilder();<a name="line.95"></a> +<span class="sourceLineNo">096</span> builder.setLimit(this.limit);<a name="line.96"></a> +<span class="sourceLineNo">097</span> return builder.build().toByteArray();<a name="line.97"></a> +<span class="sourceLineNo">098</span> }<a name="line.98"></a> +<span class="sourceLineNo">099</span><a name="line.99"></a> +<span class="sourceLineNo">100</span> /**<a name="line.100"></a> +<span class="sourceLineNo">101</span> * @param pbBytes A pb serialized {@link ColumnCountGetFilter} instance<a name="line.101"></a> +<span class="sourceLineNo">102</span> * @return An instance of {@link ColumnCountGetFilter} made from <code>bytes</code><a name="line.102"></a> +<span class="sourceLineNo">103</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.103"></a> +<span class="sourceLineNo">104</span> * @see #toByteArray<a name="line.104"></a> +<span class="sourceLineNo">105</span> */<a name="line.105"></a> +<span class="sourceLineNo">106</span> public static ColumnCountGetFilter parseFrom(final byte [] pbBytes)<a name="line.106"></a> +<span class="sourceLineNo">107</span> throws DeserializationException {<a name="line.107"></a> +<span class="sourceLineNo">108</span> FilterProtos.ColumnCountGetFilter proto;<a name="line.108"></a> +<span class="sourceLineNo">109</span> try {<a name="line.109"></a> +<span class="sourceLineNo">110</span> proto = FilterProtos.ColumnCountGetFilter.parseFrom(pbBytes);<a name="line.110"></a> +<span class="sourceLineNo">111</span> } catch (InvalidProtocolBufferException e) {<a name="line.111"></a> +<span class="sourceLineNo">112</span> throw new DeserializationException(e);<a name="line.112"></a> +<span class="sourceLineNo">113</span> }<a name="line.113"></a> +<span class="sourceLineNo">114</span> return new ColumnCountGetFilter(proto.getLimit());<a name="line.114"></a> +<span class="sourceLineNo">115</span> }<a name="line.115"></a> +<span class="sourceLineNo">116</span><a name="line.116"></a> +<span class="sourceLineNo">117</span> /**<a name="line.117"></a> +<span class="sourceLineNo">118</span> * @param o the other filter to compare with<a name="line.118"></a> +<span class="sourceLineNo">119</span> * @return true if and only if the fields of the filter that are serialized<a name="line.119"></a> +<span class="sourceLineNo">120</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.120"></a> +<span class="sourceLineNo">121</span> */<a name="line.121"></a> +<span class="sourceLineNo">122</span> @Override<a name="line.122"></a> +<span class="sourceLineNo">123</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.123"></a> +<span class="sourceLineNo">124</span> if (o == this) return true;<a name="line.124"></a> +<span class="sourceLineNo">125</span> if (!(o instanceof ColumnCountGetFilter)) return false;<a name="line.125"></a> +<span class="sourceLineNo">126</span><a name="line.126"></a> +<span class="sourceLineNo">127</span> ColumnCountGetFilter other = (ColumnCountGetFilter)o;<a name="line.127"></a> +<span class="sourceLineNo">128</span> return this.getLimit() == other.getLimit();<a name="line.128"></a> +<span class="sourceLineNo">129</span> }<a name="line.129"></a> +<span class="sourceLineNo">130</span><a name="line.130"></a> +<span class="sourceLineNo">131</span> @Override<a name="line.131"></a> +<span class="sourceLineNo">132</span> public String toString() {<a name="line.132"></a> +<span class="sourceLineNo">133</span> return this.getClass().getSimpleName() + " " + this.limit;<a name="line.133"></a> +<span class="sourceLineNo">134</span> }<a name="line.134"></a> +<span class="sourceLineNo">135</span>}<a name="line.135"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html index 4a1db0d..c0a7090 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPaginationFilter.html @@ -176,67 +176,69 @@ <span class="sourceLineNo">168</span> /**<a name="line.168"></a> <span class="sourceLineNo">169</span> * @return The filter serialized using pb<a name="line.169"></a> <span class="sourceLineNo">170</span> */<a name="line.170"></a> -<span class="sourceLineNo">171</span> public byte [] toByteArray() {<a name="line.171"></a> -<span class="sourceLineNo">172</span> FilterProtos.ColumnPaginationFilter.Builder builder =<a name="line.172"></a> -<span class="sourceLineNo">173</span> FilterProtos.ColumnPaginationFilter.newBuilder();<a name="line.173"></a> -<span class="sourceLineNo">174</span> builder.setLimit(this.limit);<a name="line.174"></a> -<span class="sourceLineNo">175</span> if (this.offset >= 0) {<a name="line.175"></a> -<span class="sourceLineNo">176</span> builder.setOffset(this.offset);<a name="line.176"></a> -<span class="sourceLineNo">177</span> }<a name="line.177"></a> -<span class="sourceLineNo">178</span> if (this.columnOffset != null) {<a name="line.178"></a> -<span class="sourceLineNo">179</span> builder.setColumnOffset(UnsafeByteOperations.unsafeWrap(this.columnOffset));<a name="line.179"></a> -<span class="sourceLineNo">180</span> }<a name="line.180"></a> -<span class="sourceLineNo">181</span> return builder.build().toByteArray();<a name="line.181"></a> -<span class="sourceLineNo">182</span> }<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> * @param pbBytes A pb serialized {@link ColumnPaginationFilter} instance<a name="line.185"></a> -<span class="sourceLineNo">186</span> * @return An instance of {@link ColumnPaginationFilter} made from <code>bytes</code><a name="line.186"></a> -<span class="sourceLineNo">187</span> * @throws DeserializationException<a name="line.187"></a> -<span class="sourceLineNo">188</span> * @see #toByteArray<a name="line.188"></a> -<span class="sourceLineNo">189</span> */<a name="line.189"></a> -<span class="sourceLineNo">190</span> public static ColumnPaginationFilter parseFrom(final byte [] pbBytes)<a name="line.190"></a> -<span class="sourceLineNo">191</span> throws DeserializationException {<a name="line.191"></a> -<span class="sourceLineNo">192</span> FilterProtos.ColumnPaginationFilter proto;<a name="line.192"></a> -<span class="sourceLineNo">193</span> try {<a name="line.193"></a> -<span class="sourceLineNo">194</span> proto = FilterProtos.ColumnPaginationFilter.parseFrom(pbBytes);<a name="line.194"></a> -<span class="sourceLineNo">195</span> } catch (InvalidProtocolBufferException e) {<a name="line.195"></a> -<span class="sourceLineNo">196</span> throw new DeserializationException(e);<a name="line.196"></a> -<span class="sourceLineNo">197</span> }<a name="line.197"></a> -<span class="sourceLineNo">198</span> if (proto.hasColumnOffset()) {<a name="line.198"></a> -<span class="sourceLineNo">199</span> return new ColumnPaginationFilter(proto.getLimit(),<a name="line.199"></a> -<span class="sourceLineNo">200</span> proto.getColumnOffset().toByteArray());<a name="line.200"></a> -<span class="sourceLineNo">201</span> }<a name="line.201"></a> -<span class="sourceLineNo">202</span> return new ColumnPaginationFilter(proto.getLimit(),proto.getOffset());<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> /**<a name="line.205"></a> -<span class="sourceLineNo">206</span> * @param o the other filter to compare with<a name="line.206"></a> -<span class="sourceLineNo">207</span> * @return true if and only if the fields of the filter that are serialized<a name="line.207"></a> -<span class="sourceLineNo">208</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.208"></a> -<span class="sourceLineNo">209</span> */<a name="line.209"></a> -<span class="sourceLineNo">210</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.210"></a> -<span class="sourceLineNo">211</span> if (o == this) return true;<a name="line.211"></a> -<span class="sourceLineNo">212</span> if (!(o instanceof ColumnPaginationFilter)) return false;<a name="line.212"></a> -<span class="sourceLineNo">213</span><a name="line.213"></a> -<span class="sourceLineNo">214</span> ColumnPaginationFilter other = (ColumnPaginationFilter)o;<a name="line.214"></a> -<span class="sourceLineNo">215</span> if (this.columnOffset != null) {<a name="line.215"></a> -<span class="sourceLineNo">216</span> return this.getLimit() == other.getLimit() &&<a name="line.216"></a> -<span class="sourceLineNo">217</span> Bytes.equals(this.getColumnOffset(), other.getColumnOffset());<a name="line.217"></a> -<span class="sourceLineNo">218</span> }<a name="line.218"></a> -<span class="sourceLineNo">219</span> return this.getLimit() == other.getLimit() && this.getOffset() == other.getOffset();<a name="line.219"></a> -<span class="sourceLineNo">220</span> }<a name="line.220"></a> -<span class="sourceLineNo">221</span><a name="line.221"></a> -<span class="sourceLineNo">222</span> @Override<a name="line.222"></a> -<span class="sourceLineNo">223</span> public String toString() {<a name="line.223"></a> -<span class="sourceLineNo">224</span> if (this.columnOffset != null) {<a name="line.224"></a> -<span class="sourceLineNo">225</span> return (this.getClass().getSimpleName() + "(" + this.limit + ", " +<a name="line.225"></a> -<span class="sourceLineNo">226</span> Bytes.toStringBinary(this.columnOffset) + ")");<a name="line.226"></a> -<span class="sourceLineNo">227</span> }<a name="line.227"></a> -<span class="sourceLineNo">228</span> return String.format("%s (%d, %d)", this.getClass().getSimpleName(),<a name="line.228"></a> -<span class="sourceLineNo">229</span> this.limit, this.offset);<a name="line.229"></a> -<span class="sourceLineNo">230</span> }<a name="line.230"></a> -<span class="sourceLineNo">231</span>}<a name="line.231"></a> +<span class="sourceLineNo">171</span> @Override<a name="line.171"></a> +<span class="sourceLineNo">172</span> public byte [] toByteArray() {<a name="line.172"></a> +<span class="sourceLineNo">173</span> FilterProtos.ColumnPaginationFilter.Builder builder =<a name="line.173"></a> +<span class="sourceLineNo">174</span> FilterProtos.ColumnPaginationFilter.newBuilder();<a name="line.174"></a> +<span class="sourceLineNo">175</span> builder.setLimit(this.limit);<a name="line.175"></a> +<span class="sourceLineNo">176</span> if (this.offset >= 0) {<a name="line.176"></a> +<span class="sourceLineNo">177</span> builder.setOffset(this.offset);<a name="line.177"></a> +<span class="sourceLineNo">178</span> }<a name="line.178"></a> +<span class="sourceLineNo">179</span> if (this.columnOffset != null) {<a name="line.179"></a> +<span class="sourceLineNo">180</span> builder.setColumnOffset(UnsafeByteOperations.unsafeWrap(this.columnOffset));<a name="line.180"></a> +<span class="sourceLineNo">181</span> }<a name="line.181"></a> +<span class="sourceLineNo">182</span> return builder.build().toByteArray();<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> /**<a name="line.185"></a> +<span class="sourceLineNo">186</span> * @param pbBytes A pb serialized {@link ColumnPaginationFilter} instance<a name="line.186"></a> +<span class="sourceLineNo">187</span> * @return An instance of {@link ColumnPaginationFilter} made from <code>bytes</code><a name="line.187"></a> +<span class="sourceLineNo">188</span> * @throws DeserializationException<a name="line.188"></a> +<span class="sourceLineNo">189</span> * @see #toByteArray<a name="line.189"></a> +<span class="sourceLineNo">190</span> */<a name="line.190"></a> +<span class="sourceLineNo">191</span> public static ColumnPaginationFilter parseFrom(final byte [] pbBytes)<a name="line.191"></a> +<span class="sourceLineNo">192</span> throws DeserializationException {<a name="line.192"></a> +<span class="sourceLineNo">193</span> FilterProtos.ColumnPaginationFilter proto;<a name="line.193"></a> +<span class="sourceLineNo">194</span> try {<a name="line.194"></a> +<span class="sourceLineNo">195</span> proto = FilterProtos.ColumnPaginationFilter.parseFrom(pbBytes);<a name="line.195"></a> +<span class="sourceLineNo">196</span> } catch (InvalidProtocolBufferException e) {<a name="line.196"></a> +<span class="sourceLineNo">197</span> throw new DeserializationException(e);<a name="line.197"></a> +<span class="sourceLineNo">198</span> }<a name="line.198"></a> +<span class="sourceLineNo">199</span> if (proto.hasColumnOffset()) {<a name="line.199"></a> +<span class="sourceLineNo">200</span> return new ColumnPaginationFilter(proto.getLimit(),<a name="line.200"></a> +<span class="sourceLineNo">201</span> proto.getColumnOffset().toByteArray());<a name="line.201"></a> +<span class="sourceLineNo">202</span> }<a name="line.202"></a> +<span class="sourceLineNo">203</span> return new ColumnPaginationFilter(proto.getLimit(),proto.getOffset());<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> * @param o the other filter to compare with<a name="line.207"></a> +<span class="sourceLineNo">208</span> * @return true if and only if the fields of the filter that are serialized<a name="line.208"></a> +<span class="sourceLineNo">209</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.209"></a> +<span class="sourceLineNo">210</span> */<a name="line.210"></a> +<span class="sourceLineNo">211</span> @Override<a name="line.211"></a> +<span class="sourceLineNo">212</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.212"></a> +<span class="sourceLineNo">213</span> if (o == this) return true;<a name="line.213"></a> +<span class="sourceLineNo">214</span> if (!(o instanceof ColumnPaginationFilter)) return false;<a name="line.214"></a> +<span class="sourceLineNo">215</span><a name="line.215"></a> +<span class="sourceLineNo">216</span> ColumnPaginationFilter other = (ColumnPaginationFilter)o;<a name="line.216"></a> +<span class="sourceLineNo">217</span> if (this.columnOffset != null) {<a name="line.217"></a> +<span class="sourceLineNo">218</span> return this.getLimit() == other.getLimit() &&<a name="line.218"></a> +<span class="sourceLineNo">219</span> Bytes.equals(this.getColumnOffset(), other.getColumnOffset());<a name="line.219"></a> +<span class="sourceLineNo">220</span> }<a name="line.220"></a> +<span class="sourceLineNo">221</span> return this.getLimit() == other.getLimit() && this.getOffset() == other.getOffset();<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> @Override<a name="line.224"></a> +<span class="sourceLineNo">225</span> public String toString() {<a name="line.225"></a> +<span class="sourceLineNo">226</span> if (this.columnOffset != null) {<a name="line.226"></a> +<span class="sourceLineNo">227</span> return (this.getClass().getSimpleName() + "(" + this.limit + ", " +<a name="line.227"></a> +<span class="sourceLineNo">228</span> Bytes.toStringBinary(this.columnOffset) + ")");<a name="line.228"></a> +<span class="sourceLineNo">229</span> }<a name="line.229"></a> +<span class="sourceLineNo">230</span> return String.format("%s (%d, %d)", this.getClass().getSimpleName(),<a name="line.230"></a> +<span class="sourceLineNo">231</span> this.limit, this.offset);<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> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html index c79fdd2..27fc329 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnPrefixFilter.html @@ -121,53 +121,55 @@ <span class="sourceLineNo">113</span> /**<a name="line.113"></a> <span class="sourceLineNo">114</span> * @return The filter serialized using pb<a name="line.114"></a> <span class="sourceLineNo">115</span> */<a name="line.115"></a> -<span class="sourceLineNo">116</span> public byte [] toByteArray() {<a name="line.116"></a> -<span class="sourceLineNo">117</span> FilterProtos.ColumnPrefixFilter.Builder builder =<a name="line.117"></a> -<span class="sourceLineNo">118</span> FilterProtos.ColumnPrefixFilter.newBuilder();<a name="line.118"></a> -<span class="sourceLineNo">119</span> if (this.prefix != null) builder.setPrefix(UnsafeByteOperations.unsafeWrap(this.prefix));<a name="line.119"></a> -<span class="sourceLineNo">120</span> return builder.build().toByteArray();<a name="line.120"></a> -<span class="sourceLineNo">121</span> }<a name="line.121"></a> -<span class="sourceLineNo">122</span><a name="line.122"></a> -<span class="sourceLineNo">123</span> /**<a name="line.123"></a> -<span class="sourceLineNo">124</span> * @param pbBytes A pb serialized {@link ColumnPrefixFilter} instance<a name="line.124"></a> -<span class="sourceLineNo">125</span> * @return An instance of {@link ColumnPrefixFilter} made from <code>bytes</code><a name="line.125"></a> -<span class="sourceLineNo">126</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.126"></a> -<span class="sourceLineNo">127</span> * @see #toByteArray<a name="line.127"></a> -<span class="sourceLineNo">128</span> */<a name="line.128"></a> -<span class="sourceLineNo">129</span> public static ColumnPrefixFilter parseFrom(final byte [] pbBytes)<a name="line.129"></a> -<span class="sourceLineNo">130</span> throws DeserializationException {<a name="line.130"></a> -<span class="sourceLineNo">131</span> FilterProtos.ColumnPrefixFilter proto;<a name="line.131"></a> -<span class="sourceLineNo">132</span> try {<a name="line.132"></a> -<span class="sourceLineNo">133</span> proto = FilterProtos.ColumnPrefixFilter.parseFrom(pbBytes);<a name="line.133"></a> -<span class="sourceLineNo">134</span> } catch (InvalidProtocolBufferException e) {<a name="line.134"></a> -<span class="sourceLineNo">135</span> throw new DeserializationException(e);<a name="line.135"></a> -<span class="sourceLineNo">136</span> }<a name="line.136"></a> -<span class="sourceLineNo">137</span> return new ColumnPrefixFilter(proto.getPrefix().toByteArray());<a name="line.137"></a> -<span class="sourceLineNo">138</span> }<a name="line.138"></a> -<span class="sourceLineNo">139</span><a name="line.139"></a> -<span class="sourceLineNo">140</span> /**<a name="line.140"></a> -<span class="sourceLineNo">141</span> * @param o the other filter to compare with<a name="line.141"></a> -<span class="sourceLineNo">142</span> * @return true if and only if the fields of the filter that are serialized<a name="line.142"></a> -<span class="sourceLineNo">143</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.143"></a> -<span class="sourceLineNo">144</span> */<a name="line.144"></a> -<span class="sourceLineNo">145</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.145"></a> -<span class="sourceLineNo">146</span> if (o == this) return true;<a name="line.146"></a> -<span class="sourceLineNo">147</span> if (!(o instanceof ColumnPrefixFilter)) return false;<a name="line.147"></a> -<span class="sourceLineNo">148</span><a name="line.148"></a> -<span class="sourceLineNo">149</span> ColumnPrefixFilter other = (ColumnPrefixFilter)o;<a name="line.149"></a> -<span class="sourceLineNo">150</span> return Bytes.equals(this.getPrefix(), other.getPrefix());<a name="line.150"></a> -<span class="sourceLineNo">151</span> }<a name="line.151"></a> -<span class="sourceLineNo">152</span><a name="line.152"></a> -<span class="sourceLineNo">153</span> @Override<a name="line.153"></a> -<span class="sourceLineNo">154</span> public Cell getNextCellHint(Cell cell) {<a name="line.154"></a> -<span class="sourceLineNo">155</span> return PrivateCellUtil.createFirstOnRowCol(cell, prefix, 0, prefix.length);<a name="line.155"></a> -<span class="sourceLineNo">156</span> }<a name="line.156"></a> -<span class="sourceLineNo">157</span><a name="line.157"></a> -<span class="sourceLineNo">158</span> @Override<a name="line.158"></a> -<span class="sourceLineNo">159</span> public String toString() {<a name="line.159"></a> -<span class="sourceLineNo">160</span> return this.getClass().getSimpleName() + " " + Bytes.toStringBinary(this.prefix);<a name="line.160"></a> -<span class="sourceLineNo">161</span> }<a name="line.161"></a> -<span class="sourceLineNo">162</span>}<a name="line.162"></a> +<span class="sourceLineNo">116</span> @Override<a name="line.116"></a> +<span class="sourceLineNo">117</span> public byte [] toByteArray() {<a name="line.117"></a> +<span class="sourceLineNo">118</span> FilterProtos.ColumnPrefixFilter.Builder builder =<a name="line.118"></a> +<span class="sourceLineNo">119</span> FilterProtos.ColumnPrefixFilter.newBuilder();<a name="line.119"></a> +<span class="sourceLineNo">120</span> if (this.prefix != null) builder.setPrefix(UnsafeByteOperations.unsafeWrap(this.prefix));<a name="line.120"></a> +<span class="sourceLineNo">121</span> return builder.build().toByteArray();<a name="line.121"></a> +<span class="sourceLineNo">122</span> }<a name="line.122"></a> +<span class="sourceLineNo">123</span><a name="line.123"></a> +<span class="sourceLineNo">124</span> /**<a name="line.124"></a> +<span class="sourceLineNo">125</span> * @param pbBytes A pb serialized {@link ColumnPrefixFilter} instance<a name="line.125"></a> +<span class="sourceLineNo">126</span> * @return An instance of {@link ColumnPrefixFilter} made from <code>bytes</code><a name="line.126"></a> +<span class="sourceLineNo">127</span> * @throws org.apache.hadoop.hbase.exceptions.DeserializationException<a name="line.127"></a> +<span class="sourceLineNo">128</span> * @see #toByteArray<a name="line.128"></a> +<span class="sourceLineNo">129</span> */<a name="line.129"></a> +<span class="sourceLineNo">130</span> public static ColumnPrefixFilter parseFrom(final byte [] pbBytes)<a name="line.130"></a> +<span class="sourceLineNo">131</span> throws DeserializationException {<a name="line.131"></a> +<span class="sourceLineNo">132</span> FilterProtos.ColumnPrefixFilter proto;<a name="line.132"></a> +<span class="sourceLineNo">133</span> try {<a name="line.133"></a> +<span class="sourceLineNo">134</span> proto = FilterProtos.ColumnPrefixFilter.parseFrom(pbBytes);<a name="line.134"></a> +<span class="sourceLineNo">135</span> } catch (InvalidProtocolBufferException e) {<a name="line.135"></a> +<span class="sourceLineNo">136</span> throw new DeserializationException(e);<a name="line.136"></a> +<span class="sourceLineNo">137</span> }<a name="line.137"></a> +<span class="sourceLineNo">138</span> return new ColumnPrefixFilter(proto.getPrefix().toByteArray());<a name="line.138"></a> +<span class="sourceLineNo">139</span> }<a name="line.139"></a> +<span class="sourceLineNo">140</span><a name="line.140"></a> +<span class="sourceLineNo">141</span> /**<a name="line.141"></a> +<span class="sourceLineNo">142</span> * @param o the other filter to compare with<a name="line.142"></a> +<span class="sourceLineNo">143</span> * @return true if and only if the fields of the filter that are serialized<a name="line.143"></a> +<span class="sourceLineNo">144</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.144"></a> +<span class="sourceLineNo">145</span> */<a name="line.145"></a> +<span class="sourceLineNo">146</span> @Override<a name="line.146"></a> +<span class="sourceLineNo">147</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.147"></a> +<span class="sourceLineNo">148</span> if (o == this) return true;<a name="line.148"></a> +<span class="sourceLineNo">149</span> if (!(o instanceof ColumnPrefixFilter)) return false;<a name="line.149"></a> +<span class="sourceLineNo">150</span><a name="line.150"></a> +<span class="sourceLineNo">151</span> ColumnPrefixFilter other = (ColumnPrefixFilter)o;<a name="line.151"></a> +<span class="sourceLineNo">152</span> return Bytes.equals(this.getPrefix(), other.getPrefix());<a name="line.152"></a> +<span class="sourceLineNo">153</span> }<a name="line.153"></a> +<span class="sourceLineNo">154</span><a name="line.154"></a> +<span class="sourceLineNo">155</span> @Override<a name="line.155"></a> +<span class="sourceLineNo">156</span> public Cell getNextCellHint(Cell cell) {<a name="line.156"></a> +<span class="sourceLineNo">157</span> return PrivateCellUtil.createFirstOnRowCol(cell, prefix, 0, prefix.length);<a name="line.157"></a> +<span class="sourceLineNo">158</span> }<a name="line.158"></a> +<span class="sourceLineNo">159</span><a name="line.159"></a> +<span class="sourceLineNo">160</span> @Override<a name="line.160"></a> +<span class="sourceLineNo">161</span> public String toString() {<a name="line.161"></a> +<span class="sourceLineNo">162</span> return this.getClass().getSimpleName() + " " + Bytes.toStringBinary(this.prefix);<a name="line.162"></a> +<span class="sourceLineNo">163</span> }<a name="line.163"></a> +<span class="sourceLineNo">164</span>}<a name="line.164"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html index 32b72a0..771b19c 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ColumnRangeFilter.html @@ -157,33 +157,33 @@ <span class="sourceLineNo">149</span><a name="line.149"></a> <span class="sourceLineNo">150</span> int cmpMax = CellUtil.compareQualifiers(c, this.maxColumn, 0, this.maxColumn.length);<a name="line.150"></a> <span class="sourceLineNo">151</span><a name="line.151"></a> -<span class="sourceLineNo">152</span> if (this.maxColumnInclusive && cmpMax <= 0 ||<a name="line.152"></a> -<span class="sourceLineNo">153</span> !this.maxColumnInclusive && cmpMax < 0) {<a name="line.153"></a> -<span class="sourceLineNo">154</span> return ReturnCode.INCLUDE;<a name="line.154"></a> -<span class="sourceLineNo">155</span> }<a name="line.155"></a> -<span class="sourceLineNo">156</span><a name="line.156"></a> -<span class="sourceLineNo">157</span> return ReturnCode.NEXT_ROW;<a name="line.157"></a> -<span class="sourceLineNo">158</span> }<a name="line.158"></a> -<span class="sourceLineNo">159</span><a name="line.159"></a> -<span class="sourceLineNo">160</span> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.160"></a> -<span class="sourceLineNo">161</span> Preconditions.checkArgument(filterArguments.size() == 4,<a name="line.161"></a> -<span class="sourceLineNo">162</span> "Expected 4 but got: %s", filterArguments.size());<a name="line.162"></a> -<span class="sourceLineNo">163</span> byte [] minColumn = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.163"></a> -<span class="sourceLineNo">164</span> boolean minColumnInclusive = ParseFilter.convertByteArrayToBoolean(filterArguments.get(1));<a name="line.164"></a> -<span class="sourceLineNo">165</span> byte [] maxColumn = ParseFilter.removeQuotesFromByteArray(filterArguments.get(2));<a name="line.165"></a> -<span class="sourceLineNo">166</span> boolean maxColumnInclusive = ParseFilter.convertByteArrayToBoolean(filterArguments.get(3));<a name="line.166"></a> -<span class="sourceLineNo">167</span><a name="line.167"></a> -<span class="sourceLineNo">168</span> if (minColumn.length == 0)<a name="line.168"></a> -<span class="sourceLineNo">169</span> minColumn = null;<a name="line.169"></a> -<span class="sourceLineNo">170</span> if (maxColumn.length == 0)<a name="line.170"></a> -<span class="sourceLineNo">171</span> maxColumn = null;<a name="line.171"></a> -<span class="sourceLineNo">172</span> return new ColumnRangeFilter(minColumn, minColumnInclusive,<a name="line.172"></a> -<span class="sourceLineNo">173</span> maxColumn, maxColumnInclusive);<a name="line.173"></a> -<span class="sourceLineNo">174</span> }<a name="line.174"></a> -<span class="sourceLineNo">175</span><a name="line.175"></a> -<span class="sourceLineNo">176</span> /**<a name="line.176"></a> -<span class="sourceLineNo">177</span> * @return The filter serialized using pb<a name="line.177"></a> -<span class="sourceLineNo">178</span> */<a name="line.178"></a> +<span class="sourceLineNo">152</span> if ((this.maxColumnInclusive && cmpMax <= 0) || (!this.maxColumnInclusive && cmpMax < 0)) {<a name="line.152"></a> +<span class="sourceLineNo">153</span> return ReturnCode.INCLUDE;<a name="line.153"></a> +<span class="sourceLineNo">154</span> }<a name="line.154"></a> +<span class="sourceLineNo">155</span><a name="line.155"></a> +<span class="sourceLineNo">156</span> return ReturnCode.NEXT_ROW;<a name="line.156"></a> +<span class="sourceLineNo">157</span> }<a name="line.157"></a> +<span class="sourceLineNo">158</span><a name="line.158"></a> +<span class="sourceLineNo">159</span> public static Filter createFilterFromArguments(ArrayList<byte []> filterArguments) {<a name="line.159"></a> +<span class="sourceLineNo">160</span> Preconditions.checkArgument(filterArguments.size() == 4,<a name="line.160"></a> +<span class="sourceLineNo">161</span> "Expected 4 but got: %s", filterArguments.size());<a name="line.161"></a> +<span class="sourceLineNo">162</span> byte [] minColumn = ParseFilter.removeQuotesFromByteArray(filterArguments.get(0));<a name="line.162"></a> +<span class="sourceLineNo">163</span> boolean minColumnInclusive = ParseFilter.convertByteArrayToBoolean(filterArguments.get(1));<a name="line.163"></a> +<span class="sourceLineNo">164</span> byte [] maxColumn = ParseFilter.removeQuotesFromByteArray(filterArguments.get(2));<a name="line.164"></a> +<span class="sourceLineNo">165</span> boolean maxColumnInclusive = ParseFilter.convertByteArrayToBoolean(filterArguments.get(3));<a name="line.165"></a> +<span class="sourceLineNo">166</span><a name="line.166"></a> +<span class="sourceLineNo">167</span> if (minColumn.length == 0)<a name="line.167"></a> +<span class="sourceLineNo">168</span> minColumn = null;<a name="line.168"></a> +<span class="sourceLineNo">169</span> if (maxColumn.length == 0)<a name="line.169"></a> +<span class="sourceLineNo">170</span> maxColumn = null;<a name="line.170"></a> +<span class="sourceLineNo">171</span> return new ColumnRangeFilter(minColumn, minColumnInclusive,<a name="line.171"></a> +<span class="sourceLineNo">172</span> maxColumn, maxColumnInclusive);<a name="line.172"></a> +<span class="sourceLineNo">173</span> }<a name="line.173"></a> +<span class="sourceLineNo">174</span><a name="line.174"></a> +<span class="sourceLineNo">175</span> /**<a name="line.175"></a> +<span class="sourceLineNo">176</span> * @return The filter serialized using pb<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 byte [] toByteArray() {<a name="line.179"></a> <span class="sourceLineNo">180</span> FilterProtos.ColumnRangeFilter.Builder builder =<a name="line.180"></a> <span class="sourceLineNo">181</span> FilterProtos.ColumnRangeFilter.newBuilder();<a name="line.181"></a> @@ -220,30 +220,31 @@ <span class="sourceLineNo">212</span> * @return true if and only if the fields of the filter that are serialized<a name="line.212"></a> <span class="sourceLineNo">213</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.213"></a> <span class="sourceLineNo">214</span> */<a name="line.214"></a> -<span class="sourceLineNo">215</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.215"></a> -<span class="sourceLineNo">216</span> if (o == this) return true;<a name="line.216"></a> -<span class="sourceLineNo">217</span> if (!(o instanceof ColumnRangeFilter)) return false;<a name="line.217"></a> -<span class="sourceLineNo">218</span><a name="line.218"></a> -<span class="sourceLineNo">219</span> ColumnRangeFilter other = (ColumnRangeFilter)o;<a name="line.219"></a> -<span class="sourceLineNo">220</span> return Bytes.equals(this.getMinColumn(),other.getMinColumn())<a name="line.220"></a> -<span class="sourceLineNo">221</span> && this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.221"></a> -<span class="sourceLineNo">222</span> && Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.222"></a> -<span class="sourceLineNo">223</span> && this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.223"></a> -<span class="sourceLineNo">224</span> }<a name="line.224"></a> -<span class="sourceLineNo">225</span><a name="line.225"></a> -<span class="sourceLineNo">226</span> @Override<a name="line.226"></a> -<span class="sourceLineNo">227</span> public Cell getNextCellHint(Cell cell) {<a name="line.227"></a> -<span class="sourceLineNo">228</span> return PrivateCellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.228"></a> -<span class="sourceLineNo">229</span> }<a name="line.229"></a> -<span class="sourceLineNo">230</span><a name="line.230"></a> -<span class="sourceLineNo">231</span> @Override<a name="line.231"></a> -<span class="sourceLineNo">232</span> public String toString() {<a name="line.232"></a> -<span class="sourceLineNo">233</span> return this.getClass().getSimpleName() + " "<a name="line.233"></a> -<span class="sourceLineNo">234</span> + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.234"></a> -<span class="sourceLineNo">235</span> + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.235"></a> -<span class="sourceLineNo">236</span> + (this.maxColumnInclusive ? "]" : ")");<a name="line.236"></a> -<span class="sourceLineNo">237</span> }<a name="line.237"></a> -<span class="sourceLineNo">238</span>}<a name="line.238"></a> +<span class="sourceLineNo">215</span> @Override<a name="line.215"></a> +<span class="sourceLineNo">216</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.216"></a> +<span class="sourceLineNo">217</span> if (o == this) return true;<a name="line.217"></a> +<span class="sourceLineNo">218</span> if (!(o instanceof ColumnRangeFilter)) return false;<a name="line.218"></a> +<span class="sourceLineNo">219</span><a name="line.219"></a> +<span class="sourceLineNo">220</span> ColumnRangeFilter other = (ColumnRangeFilter)o;<a name="line.220"></a> +<span class="sourceLineNo">221</span> return Bytes.equals(this.getMinColumn(),other.getMinColumn())<a name="line.221"></a> +<span class="sourceLineNo">222</span> && this.getMinColumnInclusive() == other.getMinColumnInclusive()<a name="line.222"></a> +<span class="sourceLineNo">223</span> && Bytes.equals(this.getMaxColumn(), other.getMaxColumn())<a name="line.223"></a> +<span class="sourceLineNo">224</span> && this.getMaxColumnInclusive() == other.getMaxColumnInclusive();<a name="line.224"></a> +<span class="sourceLineNo">225</span> }<a name="line.225"></a> +<span class="sourceLineNo">226</span><a name="line.226"></a> +<span class="sourceLineNo">227</span> @Override<a name="line.227"></a> +<span class="sourceLineNo">228</span> public Cell getNextCellHint(Cell cell) {<a name="line.228"></a> +<span class="sourceLineNo">229</span> return PrivateCellUtil.createFirstOnRowCol(cell, this.minColumn, 0, len(this.minColumn));<a name="line.229"></a> +<span class="sourceLineNo">230</span> }<a name="line.230"></a> +<span class="sourceLineNo">231</span><a name="line.231"></a> +<span class="sourceLineNo">232</span> @Override<a name="line.232"></a> +<span class="sourceLineNo">233</span> public String toString() {<a name="line.233"></a> +<span class="sourceLineNo">234</span> return this.getClass().getSimpleName() + " "<a name="line.234"></a> +<span class="sourceLineNo">235</span> + (this.minColumnInclusive ? "[" : "(") + Bytes.toStringBinary(this.minColumn)<a name="line.235"></a> +<span class="sourceLineNo">236</span> + ", " + Bytes.toStringBinary(this.maxColumn)<a name="line.236"></a> +<span class="sourceLineNo">237</span> + (this.maxColumnInclusive ? "]" : ")");<a name="line.237"></a> +<span class="sourceLineNo">238</span> }<a name="line.238"></a> +<span class="sourceLineNo">239</span>}<a name="line.239"></a> http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c4c0cfa5/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html ---------------------------------------------------------------------- diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html index 722c776..d9bde07 100644 --- a/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html +++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/CompareFilter.CompareOp.html @@ -308,23 +308,24 @@ <span class="sourceLineNo">300</span> * @return true if and only if the fields of the filter that are serialized<a name="line.300"></a> <span class="sourceLineNo">301</span> * are equal to the corresponding fields in other. Used for testing.<a name="line.301"></a> <span class="sourceLineNo">302</span> */<a name="line.302"></a> -<span class="sourceLineNo">303</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.303"></a> -<span class="sourceLineNo">304</span> if (o == this) return true;<a name="line.304"></a> -<span class="sourceLineNo">305</span> if (!(o instanceof CompareFilter)) return false;<a name="line.305"></a> -<span class="sourceLineNo">306</span> CompareFilter other = (CompareFilter)o;<a name="line.306"></a> -<span class="sourceLineNo">307</span> return this.getCompareOperator().equals(other.getCompareOperator()) &&<a name="line.307"></a> -<span class="sourceLineNo">308</span> (this.getComparator() == other.getComparator()<a name="line.308"></a> -<span class="sourceLineNo">309</span> || this.getComparator().areSerializedFieldsEqual(other.getComparator()));<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> @Override<a name="line.312"></a> -<span class="sourceLineNo">313</span> public String toString() {<a name="line.313"></a> -<span class="sourceLineNo">314</span> return String.format("%s (%s, %s)",<a name="line.314"></a> -<span class="sourceLineNo">315</span> this.getClass().getSimpleName(),<a name="line.315"></a> -<span class="sourceLineNo">316</span> this.op.name(),<a name="line.316"></a> -<span class="sourceLineNo">317</span> Bytes.toStringBinary(this.comparator.getValue()));<a name="line.317"></a> -<span class="sourceLineNo">318</span> }<a name="line.318"></a> -<span class="sourceLineNo">319</span>}<a name="line.319"></a> +<span class="sourceLineNo">303</span> @Override<a name="line.303"></a> +<span class="sourceLineNo">304</span> boolean areSerializedFieldsEqual(Filter o) {<a name="line.304"></a> +<span class="sourceLineNo">305</span> if (o == this) return true;<a name="line.305"></a> +<span class="sourceLineNo">306</span> if (!(o instanceof CompareFilter)) return false;<a name="line.306"></a> +<span class="sourceLineNo">307</span> CompareFilter other = (CompareFilter)o;<a name="line.307"></a> +<span class="sourceLineNo">308</span> return this.getCompareOperator().equals(other.getCompareOperator()) &&<a name="line.308"></a> +<span class="sourceLineNo">309</span> (this.getComparator() == other.getComparator()<a name="line.309"></a> +<span class="sourceLineNo">310</span> || this.getComparator().areSerializedFieldsEqual(other.getComparator()));<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> @Override<a name="line.313"></a> +<span class="sourceLineNo">314</span> public String toString() {<a name="line.314"></a> +<span class="sourceLineNo">315</span> return String.format("%s (%s, %s)",<a name="line.315"></a> +<span class="sourceLineNo">316</span> this.getClass().getSimpleName(),<a name="line.316"></a> +<span class="sourceLineNo">317</span> this.op.name(),<a name="line.317"></a> +<span class="sourceLineNo">318</span> Bytes.toStringBinary(this.comparator.getValue()));<a name="line.318"></a> +<span class="sourceLineNo">319</span> }<a name="line.319"></a> +<span class="sourceLineNo">320</span>}<a name="line.320"></a>
