From edc7e96e6b4c82c3bb70af049fcd29b8cd9e73c0 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 2 Sep 2010 11:17:15 +0000 Subject: [PATCH] Merged BRANCHES/DEV/BELARUS/HEAD_2010_09_02 to HEAD: 22168: ALF-1962 : Port and patch additional index to alf_child_assoc - idx_alf_cass_pri - This merge does an early add of the index when upgrading directly from 2.1.7 or 2.2.1, avoiding unecessary table modification git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22170 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../upgrade-from-2.1.sql | 1 + .../upgrade-from-2.2SP1.sql | 1 + .../org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.1.sql | 1 + .../upgrade-from-2.2SP1.sql | 1 + 4 files changed, 4 insertions(+) diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql index b266a4ec22..cbdfe9c1fb 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql @@ -362,6 +362,7 @@ CREATE TABLE t_alf_child_assoc INDEX fk_alf_cass_cnode (child_node_id), INDEX fk_alf_cass_tqn (type_qname_id), INDEX fk_alf_cass_qnns (qname_ns_id), + INDEX idx_alf_cass_pri (parent_node_id, is_primary, child_node_id), CONSTRAINT fk_alf_cass_pnode foreign key (parent_node_id) REFERENCES t_alf_node (id), CONSTRAINT fk_alf_cass_cnode foreign key (child_node_id) REFERENCES t_alf_node (id), CONSTRAINT fk_alf_cass_tqn foreign key (type_qname_id) REFERENCES alf_qname (id), diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql index b0557526b8..0b41fcf587 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql @@ -153,6 +153,7 @@ CREATE TABLE t_alf_child_assoc INDEX fk_alf_cass_cnode (child_node_id), INDEX fk_alf_cass_tqn (type_qname_id), INDEX fk_alf_cass_qnns (qname_ns_id), + INDEX idx_alf_cass_pri (parent_node_id, is_primary, child_node_id), CONSTRAINT fk_alf_cass_pnode foreign key (parent_node_id) REFERENCES t_alf_node (id), CONSTRAINT fk_alf_cass_cnode foreign key (child_node_id) REFERENCES t_alf_node (id), CONSTRAINT fk_alf_cass_tqn foreign key (type_qname_id) REFERENCES alf_qname (id), diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.1.sql index 8a68746fc4..f98305af97 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.1.sql @@ -368,6 +368,7 @@ CREATE INDEX fk_alf_cass_pnode ON t_alf_child_assoc (parent_node_id); CREATE INDEX fk_alf_cass_cnode ON t_alf_child_assoc (child_node_id); CREATE INDEX fk_alf_cass_tqn ON t_alf_child_assoc (type_qname_id); CREATE INDEX fk_alf_cass_qnns ON t_alf_child_assoc (qname_ns_id); +CREATE INDEX idx_alf_cass_pri ON t_alf_child_assoc (parent_node_id, is_primary, child_node_id); INSERT INTO t_alf_child_assoc ( diff --git a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.2SP1.sql b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.2SP1.sql index e95a0a7fe5..4d5e70a3a1 100644 --- a/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.2SP1.sql +++ b/config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.PostgreSQLDialect/upgrade-from-2.2SP1.sql @@ -152,6 +152,7 @@ CREATE INDEX fk_alf_cass_pnode ON t_alf_child_assoc (parent_node_id); CREATE INDEX fk_alf_cass_cnode ON t_alf_child_assoc (child_node_id); CREATE INDEX fk_alf_cass_tqn ON t_alf_child_assoc (type_qname_id); CREATE INDEX fk_alf_cass_qnns ON t_alf_child_assoc (qname_ns_id); +CREATE INDEX idx_alf_cass_pri ON t_alf_child_assoc (parent_node_id, is_primary, child_node_id); INSERT INTO t_alf_child_assoc (