Optimize StructuredMapExtension

Author: rybakit

examples/MessagePack/StructuredMap.php

@@ -13,12 +13,12 @@
 
 final class StructuredMap
 {
+    public $items;
     public $schema;
-    public $map;
 
-    public function __construct(array $schema, array $map)
+    public function __construct(array $items, array $schema)
     {
+        $this->items = $items;
         $this->schema = $schema;
-        $this->map = $map;
     }
 }

examples/MessagePack/StructuredMapExtension.php

@@ -35,13 +35,16 @@ public function pack(Packer $packer, $value) : ?string
             return null;
         }
 
+        $size = \count($value->items);
+        if ($size < 2) {
+            return $packer->packArray($value->items);
+        }
+
         $data = '';
-        $size = 0;
-        foreach ($value->map as $item) {
+        foreach ($value->items as $item) {
             foreach ($value->schema as $key => $type) {
                 $data .= $packer->{'pack'.$type}($item[$key]);
             }
-            ++$size;
         }
 
         return $packer->packExt($this->type,

examples/structured_map.php

@@ -23,7 +23,7 @@
 ];
 
 $profiles = [];
-for ($i = 1; $i <= 1000; ++$i) {
+for ($i = 1; $i <= 100; ++$i) {
     $profiles[] = [
         'id' => $i,
         'first_name' => "First name $i",
@@ -36,7 +36,7 @@
 $unpacker = new BufferUnpacker('', null, [$extension]);
 
 $packedMap = $packer->pack($profiles);
-$packedStructuredMap = $packer->pack(new StructuredMap($profileSchema, $profiles));
+$packedStructuredMap = $packer->pack(new StructuredMap($profiles, $profileSchema));
 
 $unpackedMap = $unpacker->reset($packedMap)->unpack();
 $unpackedStructuredMap = $unpacker->reset($packedStructuredMap)->unpack();
@@ -51,8 +51,8 @@
 printf("Percentage saved:           %d%%\n", round(1 - strlen($packedStructuredMap) / strlen($packedMap), 2) * 100);
 
 /* OUTPUT
-Packed map size:            56407B
-Packed structured map size: 31448B
-Space saved:                24959B
-Percentage saved:           44%
+Packed map size:            5287B
+Packed structured map size: 2828B
+Space saved:                2459B
+Percentage saved:           47%
 */