You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/11/18 01:22:40 UTC
[12/30] hbase git commit: HBASE-19239 Fix findbugs and error-prone
issues
HBASE-19239 Fix findbugs and error-prone issues
Fixes for hbase-prefix-tree
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ca186f93
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ca186f93
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ca186f93
Branch: refs/heads/branch-1.4
Commit: ca186f9349a9b3095f179c8a406af33966a0ddd7
Parents: 1a5e95a
Author: Andrew Purtell <ap...@apache.org>
Authored: Wed Nov 15 18:47:45 2017 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Nov 17 17:12:10 2017 -0800
----------------------------------------------------------------------
.../hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java | 2 +-
.../hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ca186f93/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
index e61d45d..20ffa5c 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/row/RowSectionWriter.java
@@ -186,7 +186,7 @@ public class RowSectionWriter {
ArrayList<TokenizerNode> outs = Lists.newArrayList();
for (int i = ins.size() - 1; i >= 0; --i) {
TokenizerNode n = ins.get(i);
- if (n.isLeaf() && leaves || (!n.isLeaf() && !leaves)) {
+ if ((n.isLeaf() && leaves) || (!n.isLeaf() && !leaves)) {
outs.add(ins.get(i));
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/ca186f93/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
index 25bee1f..64653f9 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/codec/prefixtree/encode/tokenize/TokenizerNode.java
@@ -312,7 +312,7 @@ public class TokenizerNode{
public void appendNodesToExternalList(List<TokenizerNode> appendTo, boolean includeNonLeaves,
boolean includeLeaves) {
- if (includeNonLeaves && !isLeaf() || includeLeaves && isLeaf()) {
+ if ((includeNonLeaves && !isLeaf()) || (includeLeaves && isLeaf())) {
appendTo.add(this);
}
for (int i = 0; i < children.size(); ++i) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/ca186f93/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java
----------------------------------------------------------------------
diff --git a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java
index a3da9f0..a4eb64b 100644
--- a/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java
+++ b/hbase-prefix-tree/src/main/java/org/apache/hadoop/hbase/util/vint/UFIntTool.java
@@ -72,7 +72,7 @@ public class UFIntTool {
public static void writeBytes(int outputWidth, final long value, byte[] bytes, int offset) {
bytes[offset + outputWidth - 1] = (byte) value;
for (int i = outputWidth - 2; i >= 0; --i) {
- bytes[offset + i] = (byte) (value >>> (outputWidth - i - 1) * 8);
+ bytes[offset + i] = (byte) (value >>> ((outputWidth - i - 1) * 8));
}
}