From a04809a44c235bed854adc3bd49ca75b9673bf1f Mon Sep 17 00:00:00 2001

From: Milian Wolff <mail@milianw.de>

Date: Wed, 26 Nov 2014 13:20:05 +0100

Subject: [PATCH 13/30] Intern entity strings for table and column names.

This should drastically cut down on the amount of allocations done

by the AkonadiServer. Currently, the getters will do the conversion

from QLatin1String to QString on every call. By reusing the data

via a function-local static const QString object, we can eliminate

all of these allocations and increase the cache locality as well.

REVIEW: 121255

---

 server/src/storage/entities-source.xsl | 56 +++++++++++++++++++++-------------

 server/src/storage/entities.xsl        |  4 +--

 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/server/src/storage/entities-source.xsl b/server/src/storage/entities-source.xsl

index 174cf4f..7090c31 100644

--- a/server/src/storage/entities-source.xsl

+++ b/server/src/storage/entities-source.xsl

@@ -214,36 +214,41 @@ void <xsl:value-of select="$className"/>::

 // SQL table information

 <xsl:text>QString </xsl:text><xsl:value-of select="$className"/>::tableName()

 {

-  return QLatin1String( "<xsl:value-of select="$tableName"/>" );

+  static const QString tableName = QLatin1String( "<xsl:value-of select="$tableName"/>" );

+  return tableName;

 }

 QStringList <xsl:value-of select="$className"/>::columnNames()

 {

-  QStringList rv;

+  static const QStringList columns = QStringList()

   <xsl:for-each select="column">

-  rv.append( QLatin1String( "<xsl:value-of select="@name"/>" ) );

+    << <xsl:value-of select="@name"/>Column()

   </xsl:for-each>

-  return rv;

+  ;

+  return columns;

 }

 QStringList <xsl:value-of select="$className"/>::fullColumnNames()

 {

-  QStringList rv;

+  static const QStringList columns = QStringList()

   <xsl:for-each select="column">

-  rv.append( QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@name"/>" ) );

+    << <xsl:value-of select="@name"/>FullColumnName()

   </xsl:for-each>

-  return rv;

+  ;

+  return columns;

 }

 <xsl:for-each select="column">

 QString <xsl:value-of select="$className"/>::<xsl:value-of select="@name"/>Column()

 {

-  return QLatin1String( "<xsl:value-of select="@name"/>" );

+  static const QString column = QLatin1String( "<xsl:value-of select="@name"/>" );

+  return column;

 }

 QString <xsl:value-of select="$className"/>::<xsl:value-of select="@name"/>FullColumnName()

 {

-  return tableName() + QLatin1String( ".<xsl:value-of select="@name"/>" );

+  static const QString column = QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@name"/>" );

+  return column;

 }

 </xsl:for-each>

@@ -399,7 +404,6 @@ QVector<<xsl:value-of select="@table"/>> 

 <xsl:variable name="relationName"><xsl:value-of select="@table1"/><xsl:value-of select="@table2"/>Relation</xsl:variable>

 <xsl:variable name="rightSideClass"><xsl:value-of select="@table2"/></xsl:variable>

 <xsl:variable name="rightSideEntity"><xsl:value-of select="@table2"/></xsl:variable>

-<xsl:variable name="rightSideTable"><xsl:value-of select="@table2"/>Table</xsl:variable>

 // data retrieval for n:m relations

 QVector<<xsl:value-of select="$rightSideClass"/>> <xsl:value-of select="$className"/>::<xsl:value-of select="concat(translate(substring(@table2,1,1),'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz'), substring(@table2,2))"/>s() const

@@ -408,14 +412,17 @@ QVector<<xsl:value-of select="$rightSideClass"/>> 

   if ( !db.isOpen() )

     return QVector<<xsl:value-of select="$rightSideClass"/>>();

-  QueryBuilder qb( QLatin1String("<xsl:value-of select="$rightSideTable"/>"), QueryBuilder::Select );

+  QueryBuilder qb( <xsl:value-of select="$rightSideClass"/>::tableName(), QueryBuilder::Select );

+  static const QStringList columns = QStringList()

   <xsl:for-each select="/database/table[@name = $rightSideEntity]/column">

-    qb.addColumn( QLatin1String("<xsl:value-of select="$rightSideTable"/>.<xsl:value-of select="@name"/>" ) );

+    << <xsl:value-of select="$rightSideClass"/>::<xsl:value-of select="@name"/>FullColumnName()

   </xsl:for-each>

-  qb.addJoin( QueryBuilder::InnerJoin, QLatin1String("<xsl:value-of select="$relationName"/>"),

-              QLatin1String("<xsl:value-of select="$relationName"/>.<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>"),

-              QLatin1String("<xsl:value-of select="$rightSideTable"/>.<xsl:value-of select="@column2"/>") );

-  qb.addValueCondition( QLatin1String("<xsl:value-of select="$relationName"/>.<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>"), Query::Equals, id() );

+  ;

+  qb.addColumns(columns);

+  qb.addJoin( QueryBuilder::InnerJoin, <xsl:value-of select="$relationName"/>::tableName(),

+              <xsl:value-of select="$relationName"/>::rightFullColumnName(),

+              <xsl:value-of select="$rightSideClass"/>::<xsl:value-of select="@column2"/>FullColumnName() );

+  qb.addValueCondition( <xsl:value-of select="$relationName"/>::leftFullColumnName(), Query::Equals, id() );

   if ( !qb.exec() ) {

     akDebug() << "Error during selection of records from table <xsl:value-of select="@table1"/><xsl:value-of select="@table2"/>Relation"

@@ -546,7 +553,7 @@ bool <xsl:value-of select="$className"/>::update()

   </xsl:for-each>

   <xsl:if test="column[@name = 'id']">

-  qb.addValueCondition( QLatin1String("id"), Query::Equals, id() );

+  qb.addValueCondition( idColumn(), Query::Equals, id() );

   </xsl:if>

   if ( !qb.exec() ) {

@@ -622,27 +629,32 @@ void <xsl:value-of select="$className"/>::enableCache( bool enable )

 // SQL table information

 QString <xsl:value-of select="$className"/>::tableName()

 {

-  return QLatin1String( "<xsl:value-of select="$tableName"/>" );

+  static const QString table = QLatin1String( "<xsl:value-of select="$tableName"/>" );

+  return table;

 }

 QString <xsl:value-of select="$className"/>::leftColumn()

 {

-  return QLatin1String( "<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>" );

+  static const QString column = QLatin1String( "<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>" );

+  return column;

 }

 QString <xsl:value-of select="$className"/>::leftFullColumnName()

 {

-  return tableName() + QLatin1String( "." ) + leftColumn();

+  static const QString column = QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@table1"/>_<xsl:value-of select="@column1"/>" );

+  return column;

 }

 QString <xsl:value-of select="$className"/>::rightColumn()

 {

-  return QLatin1String( "<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>" );

+  static const QString column = QLatin1String( "<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>" );

+  return column;

 }

 QString <xsl:value-of select="$className"/>::rightFullColumnName()

 {

-  return tableName() + QLatin1String( "." ) + rightColumn();

+  static const QString column = QLatin1String( "<xsl:value-of select="$tableName"/>.<xsl:value-of select="@table2"/>_<xsl:value-of select="@column2"/>" );

+  return column;

 }

 </xsl:template>

diff --git a/server/src/storage/entities.xsl b/server/src/storage/entities.xsl

index 033e292..8b0ed03 100644

--- a/server/src/storage/entities.xsl

+++ b/server/src/storage/entities.xsl

@@ -114,7 +114,7 @@ using namespace Akonadi::Server;

 QVector<QString> Akonadi::Server::allDatabaseTables()

 {

-  static QVector<QString> allTables = QVector<QString>()

+  static const QVector<QString> allTables = QVector<QString>()

   <xsl:for-each select="database/table">

     << QLatin1String( "<xsl:value-of select="@name"/>Table" )

   </xsl:for-each>

@@ -182,7 +182,7 @@ set<xsl:value-of select="$methodName"/>( <xsl:call-template name="argument"/> )

   QueryBuilder qb( tableName(), QueryBuilder::Select );

   qb.addColumns( columnNames() );

-  qb.addValueCondition( QLatin1String("<xsl:value-of select="$key"/>"), Query::Equals, <xsl:value-of select="$key"/> );

+  qb.addValueCondition( <xsl:value-of select="$key"/>Column(), Query::Equals, <xsl:value-of select="$key"/> );

   if ( !qb.exec() ) {

     akDebug() << "Error during selection of record with <xsl:value-of select="$key"/>"

       << <xsl:value-of select="$key"/> << "from table" << tableName()

-- 

2.1.0