You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2014/07/14 11:54:35 UTC

git commit: HBASE-11437 Modify cell tag handling code to treat the length as unsigned. - Addendum

Repository: hbase
Updated Branches:
  refs/heads/master 01a7dda25 -> 470d00ea9


HBASE-11437 Modify cell tag handling code to treat the length as unsigned. - Addendum


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/470d00ea
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/470d00ea
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/470d00ea

Branch: refs/heads/master
Commit: 470d00ea9a56c1a6f9b872d35771d20d6fa06d48
Parents: 01a7dda
Author: anoopsjohn <an...@gmail.com>
Authored: Mon Jul 14 15:24:09 2014 +0530
Committer: anoopsjohn <an...@gmail.com>
Committed: Mon Jul 14 15:24:09 2014 +0530

----------------------------------------------------------------------
 .../hadoop/hbase/security/visibility/VisibilityConstants.java    | 4 ++--
 .../apache/hadoop/hbase/security/visibility/VisibilityUtils.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/470d00ea/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java
index bc84207..f98efec 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityConstants.java
@@ -46,7 +46,7 @@ public final class VisibilityConstants {
    **/
   public static final byte VISIBILITY_SERIALIZATION_VERSION = 1;
   /** Byte representation of the visibility_serialization_version **/
-  public static final byte[] SORTED_ORDINAL_SERIALIZATION_FORMAT = Bytes
-      .toBytes(VISIBILITY_SERIALIZATION_VERSION);
+  public static final byte[] SORTED_ORDINAL_SERIALIZATION_FORMAT =
+      new byte[] { VISIBILITY_SERIALIZATION_VERSION };
 
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/470d00ea/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java
index 33ccab6..35843ff 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityUtils.java
@@ -181,7 +181,7 @@ public class VisibilityUtils {
     while (tagsIterator.hasNext()) {
       Tag tag = tagsIterator.next();
       if (tag.getType() == VisibilityUtils.VISIBILITY_EXP_SERIALIZATION_TAG_TYPE) {
-        int serializationVersion = Bytes.toShort(tag.getBuffer());
+        int serializationVersion = tag.getBuffer()[tag.getTagOffset()];
         if (serializationVersion == VisibilityConstants.VISIBILITY_SERIALIZATION_VERSION) {
           sortedOrder = true;
           continue;