Repository: kylin Updated Branches: refs/heads/shaofeng-hbasefuzzyfilter bc638a31b -> 13fc3e648
change to use hbase 1.1.2 api Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/13fc3e64 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/13fc3e64 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/13fc3e64 Branch: refs/heads/shaofeng-hbasefuzzyfilter Commit: 13fc3e648864c0804d753790893cedcc61051123 Parents: bc638a3 Author: shaofengshi <[email protected]> Authored: Tue Mar 7 16:46:20 2017 +0800 Committer: shaofengshi <[email protected]> Committed: Tue Mar 7 16:46:20 2017 +0800 ---------------------------------------------------------------------- pom.xml | 2 +- .../hadoop/hbase/filter/FuzzyRowFilter.java | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/13fc3e64/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0e38061..0ee5f03 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ <hive-hcatalog.version>1.2.1</hive-hcatalog.version> <!-- HBase versions --> - <hbase-hadoop2.version>1.1.3</hbase-hadoop2.version> + <hbase-hadoop2.version>1.1.2</hbase-hadoop2.version> <kafka.version>0.10.0.0</kafka.version> <!-- Hadoop deps, keep compatible with hadoop2.version --> http://git-wip-us.apache.org/repos/asf/kylin/blob/13fc3e64/storage-hbase/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java b/storage-hbase/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java index 00441ec..e34ebc4 100644 --- a/storage-hbase/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java +++ b/storage-hbase/src/main/java/org/apache/hadoop/hbase/filter/FuzzyRowFilter.java @@ -94,9 +94,9 @@ public class FuzzyRowFilter extends FilterBase { } private void preprocessSearchKey(Pair<byte[], byte[]> p) { - if (UnsafeAccess.unaligned() == false) { - return; - } +// if (UnsafeAccess.unaligned() == false) { +// return; +// } byte[] key = p.getFirst(); byte[] mask = p.getSecond(); for (int i = 0; i < mask.length; i++) { @@ -112,9 +112,9 @@ public class FuzzyRowFilter extends FilterBase { * @return mask array */ private byte[] preprocessMask(byte[] mask) { - if (UnsafeAccess.unaligned() == false) { - return mask; - } +// if (UnsafeAccess.unaligned() == false) { +// return mask; +// } if (isPreprocessedMask(mask)) return mask; for (int i = 0; i < mask.length; i++) { if (mask[i] == 0) { @@ -321,9 +321,9 @@ public class FuzzyRowFilter extends FilterBase { static SatisfiesCode satisfies(boolean reverse, byte[] row, int offset, int length, byte[] fuzzyKeyBytes, byte[] fuzzyKeyMeta) { - if (UnsafeAccess.unaligned() == false) { - return satisfiesNoUnsafe(reverse, row, offset, length, fuzzyKeyBytes, fuzzyKeyMeta); - } +// if (UnsafeAccess.unaligned() == false) { +// return satisfiesNoUnsafe(reverse, row, offset, length, fuzzyKeyBytes, fuzzyKeyMeta); +// } if (row == null) { // do nothing, let scan to proceed
