From 782254cf1f92794bbdaa91f473db07d8120c3d67 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 28 Sep 2016 22:01:04 +0100 Subject: [PATCH] rdbms: Lazy-init DatabaseDomain::getId() Follows-up 847b91b. Noticed that in Xenon profiles, about 25% of Database::__construct time is spent in array_map, via DatabaseDomain::convertToString. * Database::__construct * DatabaseDomain::__construct/convertToString/array_map * DatabaseDomain::newUnspecified * DatabaseDomain::__construct/convertToString/array_map * DatabaseMysqlBase::open * mysqli::* Change-Id: Ib5ae7d1d03b27df504a7e5f552e36a0ca6fcf97e --- includes/libs/rdbms/database/DatabaseDomain.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/libs/rdbms/database/DatabaseDomain.php b/includes/libs/rdbms/database/DatabaseDomain.php index 01b6b21f04..a3ae6f10a1 100644 --- a/includes/libs/rdbms/database/DatabaseDomain.php +++ b/includes/libs/rdbms/database/DatabaseDomain.php @@ -51,7 +51,6 @@ class DatabaseDomain { throw new InvalidArgumentException( "Prefix must be a string." ); } $this->prefix = $prefix; - $this->equivalentString = $this->convertToString(); } /** @@ -105,7 +104,7 @@ class DatabaseDomain { ); } - return ( $this->equivalentString === $other ); + return ( $this->getId() === $other ); } /** @@ -133,6 +132,10 @@ class DatabaseDomain { * @return string */ public function getId() { + if ( $this->equivalentString === null ) { + $this->equivalentString = $this->convertToString(); + } + return $this->equivalentString; } -- 2.20.1