bug #28889 [Serializer] Reduce class discriminator overhead (fbourigault)

nicolas-grekas · nicolas-grekas · commit f1795c07e60b · 2018-10-20T23:23:03.000+02:00
This PR was merged into the 4.1 branch. Discussion ---------- [Serializer] Reduce class discriminator overhead | Q | A | ------------- | --- | Branch? | 4.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #28537 | License | MIT | Doc PR | N/A This try to fix the overhead added by class discriminator feature. Here is a 4.1 vs this PR comparison: https://blackfire.io/profiles/compare/20ead249-0e98-430f-9b8d-906f464b1854/graph And a 3.4 vs this PR comparison: https://blackfire.io/profiles/compare/7e402dde-4a54-4053-a12e-d3d6891afc02/graph Commits ------- 326c267 [Serializer] Reduce class discriminator overhead
diff --git a/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php
@@ -30,6 +30,8 @@ class ObjectNormalizer extends AbstractObjectNormalizer
 {
     protected $propertyAccessor;
 
+    private $discriminatorCache = array();
+
     public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null)
     {
         if (!\class_exists(PropertyAccess::class)) {
@@ -110,15 +112,16 @@ protected function extractAttributes($object, $format = null, array $context = a
      */
     protected function getAttributeValue($object, $attribute, $format = null, array $context = array())
     {
-        if (null !== $this->classDiscriminatorResolver) {
-            $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object);
-
-            if (null !== $mapping && $attribute == $mapping->getTypeProperty()) {
-                return $this->classDiscriminatorResolver->getTypeForMappedObject($object);
+        $cacheKey = \get_class($object);
+        if (!array_key_exists($cacheKey, $this->discriminatorCache)) {
+            $this->discriminatorCache[$cacheKey] = null;
+            if (null !== $this->classDiscriminatorResolver) {
+                $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object);
+                $this->discriminatorCache[$cacheKey] = null === $mapping ? null : $mapping->getTypeProperty();
             }
         }
 
-        return $this->propertyAccessor->getValue($object, $attribute);
+        return $attribute === $this->discriminatorCache[$cacheKey] ? $this->classDiscriminatorResolver->getTypeForMappedObject($object) : $this->propertyAccessor->getValue($object, $attribute);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ class ObjectNormalizer extends AbstractObjectNormalizer`
`30`	`30`	`{`
`31`	`31`	`protected $propertyAccessor;`
`32`	`32`
	`33`	`+ private $discriminatorCache = array();`
	`34`	`+`
`33`	`35`	`public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null, PropertyAccessorInterface $propertyAccessor = null, PropertyTypeExtractorInterface $propertyTypeExtractor = null, ClassDiscriminatorResolverInterface $classDiscriminatorResolver = null)`
`34`	`36`	`{`
`35`	`37`	`if (!\class_exists(PropertyAccess::class)) {`
`@@ -110,15 +112,16 @@ protected function extractAttributes($object, $format = null, array $context = a`
`110`	`112`	`*/`
`111`	`113`	`protected function getAttributeValue($object, $attribute, $format = null, array $context = array())`
`112`	`114`	`{`
`113`		`- if (null !== $this->classDiscriminatorResolver) {`
`114`		`- $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object);`
`115`		`-`
`116`		`- if (null !== $mapping && $attribute == $mapping->getTypeProperty()) {`
`117`		`- return $this->classDiscriminatorResolver->getTypeForMappedObject($object);`
	`115`	`+ $cacheKey = \get_class($object);`
	`116`	`+ if (!array_key_exists($cacheKey, $this->discriminatorCache)) {`
	`117`	`+ $this->discriminatorCache[$cacheKey] = null;`
	`118`	`+ if (null !== $this->classDiscriminatorResolver) {`
	`119`	`+ $mapping = $this->classDiscriminatorResolver->getMappingForMappedObject($object);`
	`120`	`+ $this->discriminatorCache[$cacheKey] = null === $mapping ? null : $mapping->getTypeProperty();`
`118`	`121`	`}`
`119`	`122`	`}`
`120`	`123`
`121`		`- return $this->propertyAccessor->getValue($object, $attribute);`
	`124`	`+ return $attribute === $this->discriminatorCache[$cacheKey] ? $this->classDiscriminatorResolver->getTypeForMappedObject($object) : $this->propertyAccessor->getValue($object, $attribute);`
`122`	`125`	`}`
`123`	`126`
`124`	`127`	`/**`