Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57059: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56540: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         55709: Merged DEV to BRANCHES/DEV/V4.1-BUG-FIX (4.1.7)
            55692: MNT-9516: BM-0002: Slow query detected during site creation action
                   In alf_node table replace index for foreign key with index on (type_qname_id, store_id, id) to speed up site creation
            Notes: Incremented version numbers and removed generic script as each DB had an implementation


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoCreate-RepoTables.sql

@@ -215,7 +215,7 @@ CREATE TABLE alf_node
     KEY idx_alf_node_txn_type (transaction_id, type_qname_id),
     KEY fk_alf_node_acl (acl_id),
     KEY fk_alf_node_store (store_id),
-    KEY fk_alf_node_tqn (type_qname_id),
+    KEY idx_alf_node_tqn (type_qname_id, store_id, id),
     KEY fk_alf_node_loc (locale_id),
     KEY idx_alf_node_mdq (store_id, type_qname_id),
     KEY idx_alf_node_cor (audit_creator, store_id, type_qname_id),

config/alfresco/dbscripts/create/org.hibernate.dialect.MySQLInnoDBDialect/Schema-Reference-ALF.xml

@@ -1503,9 +1503,11 @@
             <columnname>store_id</columnname>
           </columnnames>
         </index>
-        <index name="fk_alf_node_tqn" unique="false">
+        <index name="idx_alf_node_tqn" unique="false">
           <columnnames>
             <columnname>type_qname_id</columnname>
+            <columnname>store_id</columnname>
+            <columnname>id</columnname>
           </columnnames>
         </index>
         <index name="fk_alf_node_loc" unique="false">

config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/AlfrescoCreate-RepoTables.sql

@@ -241,7 +241,7 @@ CREATE INDEX idx_alf_node_mod ON alf_node (audit_modified, store_id, type_qname_
 CREATE INDEX idx_alf_node_txn_type ON alf_node (transaction_id, type_qname_id);
 CREATE INDEX fk_alf_node_acl ON alf_node (acl_id);
 CREATE INDEX fk_alf_node_store ON alf_node (store_id);
-CREATE INDEX fk_alf_node_tqn ON alf_node (type_qname_id);
+CREATE INDEX idx_alf_node_tqn ON alf_node (type_qname_id, store_id, id);
 CREATE INDEX fk_alf_node_loc ON alf_node (locale_id);
 
 CREATE INDEX fk_alf_store_root ON alf_store (root_node_id);

config/alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/Schema-Reference-ALF.xml

@@ -1553,9 +1553,11 @@
             <columnname>store_id</columnname>
           </columnnames>
         </index>
-        <index name="fk_alf_node_tqn" unique="false">
+        <index name="idx_alf_node_tqn" unique="false">
           <columnnames>
             <columnname>type_qname_id</columnname>
+            <columnname>store_id</columnname>
+            <columnname>id</columnname>
           </columnnames>
         </index>
         <index name="idx_alf_node_txn_type" unique="false">

config/alfresco/dbscripts/db-schema-context.xml

@@ -92,6 +92,7 @@
                 <ref bean="patch.db-V4.2-metadata-query-indexes" />
                 <ref bean="patch.db-V4.1-fix-Repo-seqs-order" />
                 <ref bean="patch.db-V4.1-ChildAssoc-OrderBy" />
+                <ref bean="patch.db-V4.1-createIdxAlfNodeTQN" />
             </list>
         </property>
     </bean>

config/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.MySQLInnoDBDialect/createIdxAlfNodeTQN.sql

@@ -0,0 +1,26 @@
+--
+-- Title:      Add new index to alf_node
+-- Database:   MySQL
+-- Since:      V4.1 Schema 5124
+-- Author:     Viachaslau Tsikhanovich
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+-- MNT-9516 : BM-0002: Slow query detected during site creation action
+
+ALTER TABLE alf_node DROP FOREIGN KEY fk_alf_node_tqn;
+DROP INDEX fk_alf_node_tqn ON alf_node;
+CREATE INDEX idx_alf_node_tqn ON alf_node (type_qname_id, store_id, id);
+ALTER TABLE alf_node ADD CONSTRAINT fk_alf_node_tqn FOREIGN KEY (`type_qname_id`) REFERENCES `alf_qname` (`id`);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.1-createIdxAlfNodeTQN';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V4.1-createIdxAlfNodeTQN', 'MNT-9516 : BM-0002: Slow query detected during site creation action',
+    0, 5124, -1, 5125, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+  );

config/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect/createIdxAlfNodeTQN.sql

@@ -0,0 +1,26 @@
+--
+-- Title:      Add new index to alf_node
+-- Database:   MySQL
+-- Since:      V4.1 Schema 5124
+-- Author:     Viachaslau Tsikhanovich
+--
+-- Please contact support@alfresco.com if you need assistance with the upgrade.
+--
+-- MNT-9516 : BM-0002: Slow query detected during site creation action
+
+ALTER TABLE alf_node DROP CONSTRAINT fk_alf_node_tqn;
+DROP INDEX fk_alf_node_tqn;
+CREATE INDEX idx_alf_node_tqn ON alf_node (type_qname_id, store_id, id);
+ALTER TABLE alf_node ADD CONSTRAINT fk_alf_node_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id);
+
+--
+-- Record script finish
+--
+DELETE FROM alf_applied_patch WHERE id = 'patch.db-V4.1-createIdxAlfNodeTQN';
+INSERT INTO alf_applied_patch
+  (id, description, fixes_from_schema, fixes_to_schema, applied_to_schema, target_schema, applied_on_date, applied_to_server, was_executed, succeeded, report)
+  VALUES
+  (
+    'patch.db-V4.1-createIdxAlfNodeTQN', 'MNT-9516 : BM-0002: Slow query detected during site creation action',
+    0, 5124, -1, 5125, null, 'UNKNOWN', ${TRUE}, ${TRUE}, 'Script completed'
+  );

config/alfresco/patch/patch-services-context.xml

@@ -3643,5 +3643,16 @@
             <value>classpath:alfresco/dbscripts/upgrade/4.1/${db.script.dialect}/ChildAssoc-OrderBy.sql</value>
         </property>
     </bean>
+    
+    <bean id="patch.db-V4.1-createIdxAlfNodeTQN" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">
+        <property name="id"><value>patch.db-V4.1-createIdxAlfNodeTQN</value></property>
+        <property name="description"><value>patch.schemaUpgradeScript.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>7000</value></property>
+        <property name="targetSchema"><value>7001</value></property>
+        <property name="scriptUrl">
+            <value>classpath:alfresco/dbscripts/upgrade/4.1/${db.script.dialect}/createIdxAlfNodeTQN.sql</value>
+        </property>
+    </bean>
 
 </beans>

config/alfresco/version.properties

@@ -23,4 +23,4 @@ version.build=r@scm-revision@-b@build-number@
 
 # Schema number
 
-version.schema=7000
+version.schema=7001