Add ValueType bit mask to improve type check performance

xerial · xerial · commit d1807a5dc68b · 2015-06-13T23:35:35.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java b/msgpack-core/src/main/java/org/msgpack/core/MessageFormat.java
@@ -95,7 +95,7 @@ public static MessageFormat valueOf(final byte b) {
      * @return
      */
     @VisibleForTesting
-    static MessageFormat toMessageFormat(final byte b) {
+    public static MessageFormat toMessageFormat(final byte b) {
         if (Code.isPosFixInt(b)) {
             return POSFIXINT;
         }
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java b/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java
@@ -103,6 +103,11 @@ public static ImmutableArrayValue newArray(Value[] array) {
         return new ImmutableArrayValueImpl(Arrays.copyOf(array, array.length));
     }
 
+    public static ImmutableArrayValue newArrayOf(Value... elem) {
+        return newArray(elem);
+    }
+
+
     public static ImmutableArrayValue emptyArray() {
         return ImmutableArrayValueImpl.empty();
     }
@@ -130,6 +135,11 @@ public static ImmutableMapValue newMap(Value[] kvs) {
         return new ImmutableMapValueImpl(Arrays.copyOf(kvs, kvs.length));
     }
 
+    public static ImmutableMapValue emptyMap() {
+        return ImmutableMapValueImpl.empty();
+    }
+
+
     public static class MapEntry {
         public final Value key;
         public final Value value;
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueType.java b/msgpack-core/src/main/java/org/msgpack/value/ValueType.java
@@ -15,6 +15,8 @@
 //
 package org.msgpack.value;
 
+import org.msgpack.core.MessageFormat;
+
 /**
  * MessageTypeFamily is a group of {@link org.msgpack.core.MessageFormat}s
  */
@@ -32,10 +34,30 @@ public enum ValueType {
 
     private final boolean numberType;
     private final boolean rawType;
+    private final int bitMask;
 
     private ValueType(boolean numberType, boolean rawType) {
         this.numberType = numberType;
         this.rawType = rawType;
+        this.bitMask = 1 << this.ordinal();
+    }
+
+    /**
+     * Returns a bit mask representing this value type for quickly cheking
+     * this value type
+     * @return bit mask representing this value type
+     */
+    public int getBitMask() {
+        return bitMask;
+    }
+
+    /**
+     * Check whether the given bit mask represents this value type
+     * @param bitMask
+     * @return
+     */
+    public boolean isTypeOf(int bitMask) {
+        return (this.bitMask & bitMask) != 0;
     }
 
     public boolean isNilType() {
@@ -81,4 +103,12 @@ public boolean isMapType() {
     public boolean isExtensionType() {
         return this == EXTENSION;
     }
+
+    public static ValueType valueOf(byte b) {
+        return MessageFormat.valueOf(b).getValueType();
+    }
+
+    public String toTypeName() {
+        return this.name().substring(0, 1) + this.name().substring(1).toLowerCase();
+    }
 }
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/CursorTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/CursorTest.scala
diff --git a/msgpack-core/src/test/scala/org/msgpack/value/ValueFactoryTest.scala b/msgpack-core/src/test/scala/org/msgpack/value/ValueFactoryTest.scala
@@ -21,25 +21,25 @@ class ValueFactoryTest extends MessagePackSpec {
               isRaw : Boolean = false,
               isNumber : Boolean = false
                ) {
-    v.isNil shouldBe isNil
-    v.isBoolean shouldBe isBoolean
-    v.isInteger shouldBe isInteger
-    v.isFloat shouldBe isFloat
-    v.isString shouldBe isString
-    v.isBinary shouldBe isBinary
-    v.isArray shouldBe isArray
-    v.isMap shouldBe isMap
-    v.isExtension shouldBe isExtension
-    v.isRaw shouldBe isRaw
-    v.isNumber shouldBe isNumber
+    v.isNilValue shouldBe isNil
+    v.isBooleanValue shouldBe isBoolean
+    v.isIntegerValue shouldBe isInteger
+    v.isFloatValue shouldBe isFloat
+    v.isStringValue shouldBe isString
+    v.isBinaryValue shouldBe isBinary
+    v.isArrayValue shouldBe isArray
+    v.isMapValue shouldBe isMap
+    v.isExtensionValue shouldBe isExtension
+    v.isRawValue shouldBe isRaw
+    v.isNumberValue shouldBe isNumber
   }
 
   "ValueFactory" should {
 
     "create valid type values" in {
-      isValid(ValueFactory.nilValue(), expected=ValueType.NIL, isNil = true)
+      isValid(ValueFactory.nil(), expected=ValueType.NIL, isNil = true)
       forAll{(v:Boolean) => isValid(ValueFactory.newBoolean(v), expected=ValueType.BOOLEAN, isBoolean = true)}
-      forAll{(v:Int) => isValid(ValueFactory.newInt(v), expected=ValueType.INTEGER, isInteger = true, isNumber = true)}
+      forAll{(v:Int) => isValid(ValueFactory.newInteger(v), expected=ValueType.INTEGER, isInteger = true, isNumber = true)}
       forAll{(v:Float) => isValid(ValueFactory.newFloat(v), expected=ValueType.FLOAT, isFloat = true, isNumber = true)}
       forAll{(v:String) => isValid(ValueFactory.newString(v), expected=ValueType.STRING, isString = true, isRaw = true)}
       forAll{(v:Array[Byte]) => isValid(ValueFactory.newBinary(v), expected=ValueType.BINARY, isBinary = true, isRaw = true)}

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public static MessageFormat valueOf(final byte b) {`
`95`	`95`	`* @return`
`96`	`96`	`*/`
`97`	`97`	`@VisibleForTesting`
`98`		`- static MessageFormat toMessageFormat(final byte b) {`
	`98`	`+ public static MessageFormat toMessageFormat(final byte b) {`
`99`	`99`	`if (Code.isPosFixInt(b)) {`
`100`	`100`	`return POSFIXINT;`
`101`	`101`	`}`