Merge pull request msgpack#335 from msgpack/new-map-opt

xerial · xerial · commit c81941350bbf · 2016-01-22T10:58:14.000+09:00
slight optimization of ValueFactory.newMap
diff --git a/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java b/msgpack-core/src/main/java/org/msgpack/value/ValueFactory.java
@@ -233,11 +233,12 @@ public static ImmutableMapValue emptyMap()
 
     public static MapValue newMap(Map.Entry<? extends Value, ? extends Value>... pairs)
     {
-        MapBuilder b = new MapBuilder();
-        for (Map.Entry<? extends Value, ? extends Value> p : pairs) {
-            b.put(p);
+        Value[] kvs = new Value[pairs.length * 2];
+        for (int i=0; i < pairs.length; i += 2) {
+            kvs[i * 2] = pairs[i].getKey();
+            kvs[i * 2 + 1] = pairs[i].getValue();
         }
-        return b.build();
+        return newMap(kvs, true);
     }
 
     public static MapBuilder newMapBuilder()

Original file line number	Diff line number	Diff line change
`@@ -233,11 +233,12 @@ public static ImmutableMapValue emptyMap()`
`233`	`233`
`234`	`234`	`public static MapValue newMap(Map.Entry<? extends Value, ? extends Value>... pairs)`
`235`	`235`	`{`
`236`		`- MapBuilder b = new MapBuilder();`
`237`		`- for (Map.Entry<? extends Value, ? extends Value> p : pairs) {`
`238`		`- b.put(p);`
	`236`	`+ Value[] kvs = new Value[pairs.length * 2];`
	`237`	`+ for (int i=0; i < pairs.length; i += 2) {`
	`238`	`+ kvs[i * 2] = pairs[i].getKey();`
	`239`	`+ kvs[i * 2 + 1] = pairs[i].getValue();`
`239`	`240`	`}`
`240`		`- return b.build();`
	`241`	`+ return newMap(kvs, true);`
`241`	`242`	`}`
`242`	`243`
`243`	`244`	`public static MapBuilder newMapBuilder()`