Merged V2.2 to HEAD (QNames)

7624: QName Refactor Merge 1 of 9
   7625: QName Refactor Merge 2 of 9
   7626: QName Refactor Merge 3 of 9
   7627: QName Refactor Merge 4 of 9
   7628: QName Refactor Merge 5 of 9


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

config/alfresco/dbscripts/upgrade/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.1-FKIndexes.sql

@@ -9,7 +9,9 @@
 -- The MySQL InnoDB Dialect has special support for foreign keys.
 
 -- Remove pointless duplicated FK indexes
-ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A;(optional)
+ALTER TABLE alf_global_attributes   DROP INDEX FK64D0B9CF69B9F16A;(optional)
+ALTER TABLE alf_node                DROP INDEX FK60EFB62696FBEE85;(optional)
+ALTER TABLE alf_child_assoc         DROP INDEX FKFFC5468E96FBEE85;(optional)
 
 --
 -- Record script finish

config/alfresco/dbscripts/upgrade/2.2-QNames/upgrade-mysql-qnames.sql

@@ -0,0 +1,274 @@
+-- Create static namespace and qname tables
+CREATE TABLE alf_namespace
+(
+   id BIGINT NOT NULL AUTO_INCREMENT,
+   version BIGINT NOT NULL,
+   uri VARCHAR(100) NOT NULL,
+   PRIMARY KEY (id),
+   UNIQUE (uri)
+) ENGINE=InnoDB;
+
+CREATE TABLE alf_qname
+(
+   id BIGINT NOT NULL AUTO_INCREMENT,
+   version BIGINT NOT NULL,
+   ns_id BIGINT NOT NULL,
+   local_name VARCHAR(200) NOT NULL,
+   PRIMARY KEY (id),
+   UNIQUE (ns_id, local_name)
+) ENGINE=InnoDB;
+
+create index fk_alf_qname_ns on alf_qname (ns_id);
+ALTER TABLE alf_qname
+   add constraint fk_alf_qname_ns foreign key (ns_id) references alf_namespace (id);
+
+-- Create temporary table for dynamic (child) QNames
+CREATE TABLE t_qnames_dyn
+(
+   qname varchar(255) NOT NULL,
+   namespace varchar(255)
+) ENGINE=InnoDB;
+ALTER TABLE t_qnames_dyn ADD INDEX TQND_IDX_QN (qname);
+ALTER TABLE t_qnames_dyn ADD INDEX TQND_IDX_NS (namespace);
+
+-- Populate the table with the child association paths
+INSERT INTO t_qnames_dyn (qname)
+(
+   SELECT qname FROM alf_CHILD_ASSOC
+);
+-- Extract the Namespace
+UPDATE t_qnames_dyn SET namespace = SUBSTR(SUBSTRING_INDEX(qname, '}', 1), 2);
+-- Move the namespaces to the their new home
+INSERT INTO alf_namespace (uri, version)
+(
+   SELECT
+      distinct(x.namespace), 1
+   FROM
+   (
+      SELECT t.namespace, n.uri FROM t_qnames_dyn t LEFT OUTER JOIN alf_namespace n ON (n.uri = t.namespace)
+   ) x
+   WHERE
+      x.uri IS NULL
+);
+-- We can get trash the temp table
+DROP TABLE t_qnames_dyn;
+
+-- Create temporary table to hold static QNames
+CREATE TABLE t_qnames
+(
+   qname varchar(255) NOT NULL,
+   namespace varchar(255),
+   localname varchar(255)
+) ENGINE=InnoDB;
+ALTER TABLE t_qnames ADD INDEX TQN_IDX_QN (qname);
+ALTER TABLE t_qnames ADD INDEX TQN_IDX_NS (namespace);
+ALTER TABLE t_qnames ADD INDEX TQN_IDX_LN (localname);
+
+-- Populate the table with all known static QNames
+INSERT INTO t_qnames (qname)
+(
+   SELECT type_qname FROM alf_node
+);
+INSERT INTO t_qnames (qname)
+(
+   SELECT qname FROM alf_node_aspects
+);
+INSERT INTO t_qnames (qname)
+(
+   SELECT qname FROM alf_node_properties
+);
+INSERT INTO t_qnames (qname)
+(
+   SELECT name FROM avm_aspects_new
+);
+INSERT INTO t_qnames (qname)
+(
+   SELECT qname FROM avm_node_properties_new
+);
+INSERT INTO t_qnames (qname)
+(
+   SELECT qname FROM avm_store_properties
+);
+INSERT INTO t_qnames (qname)
+(
+   SELECT type_qname FROM alf_node_assoc
+);
+INSERT INTO t_qnames (qname)
+(
+   SELECT type_qname FROM alf_child_assoc
+);
+-- Extract the namespace and localnames from the QNames
+UPDATE t_qnames SET namespace = SUBSTR(SUBSTRING_INDEX(qname, '}', 1), 2);
+UPDATE t_qnames SET localname = SUBSTRING_INDEX(qname, '}', -1);
+-- Move the Namespaces to their new home
+INSERT INTO alf_namespace (uri, version)
+(
+   SELECT
+      distinct(x.namespace), 1
+   FROM
+   (
+      SELECT t.namespace, n.uri FROM t_qnames t LEFT OUTER JOIN alf_namespace n ON (n.uri = t.namespace)
+   ) x
+   WHERE
+      x.uri IS NULL
+);
+-- Move the Localnames to their new home
+INSERT INTO alf_qname (ns_id, local_name, version)
+(
+   SELECT
+      x.ns_id, x.t_localname, 1
+   FROM
+   (
+      SELECT n.id AS ns_id, t.localname AS t_localname, q.local_name AS q_localname
+      FROM t_qnames t
+      JOIN alf_namespace n ON (n.uri = t.namespace)
+      LEFT OUTER JOIN alf_qname q ON (q.local_name = t.localname)
+   ) x
+   WHERE
+      q_localname IS NULL
+   GROUP BY x.ns_id, x.t_localname
+);
+-- We can get trash the temp table
+DROP TABLE t_qnames;
+
+--
+-- DATA REPLACEMENT: alf_node.type_qname
+--
+ALTER TABLE alf_node ADD COLUMN type_qname_id BIGINT NULL AFTER uuid;
+UPDATE alf_node n set n.type_qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = n.type_qname
+);
+ALTER TABLE alf_node DROP COLUMN type_qname;
+ALTER TABLE alf_node MODIFY COLUMN type_qname_id BIGINT NOT NULL AFTER uuid;
+ALTER TABLE alf_node ADD CONSTRAINT fk_alf_n_tqname FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id);
+CREATE INDEX fk_alf_n_tqname ON alf_node (type_qname_id);
+
+--
+-- DATA REPLACEMENT: alf_node_aspects.qname
+--
+-- ALTER TABLE alf_node_aspects DROP PRIMARY KEY;(optional)
+ALTER TABLE alf_node_aspects ADD COLUMN qname_id BIGINT NULL AFTER node_id;
+UPDATE alf_node_aspects na set na.qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = na.qname
+);
+ALTER TABLE alf_node_aspects DROP COLUMN qname;
+ALTER TABLE alf_node_aspects MODIFY COLUMN qname_id BIGINT NOT NULL AFTER node_id;
+ALTER TABLE alf_node_aspects ADD CONSTRAINT fk_alf_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+CREATE INDEX fk_alf_na_qn ON alf_node_aspects (qname_id);
+ALTER TABLE alf_node_aspects ADD PRIMARY KEY (node_id, qname_id);
+
+--
+-- DATA REPLACEMENT: alf_node_properties.qname
+--
+ALTER TABLE alf_node_properties DROP PRIMARY KEY;
+ALTER TABLE alf_node_properties ADD COLUMN qname_id BIGINT NULL AFTER node_id;
+UPDATE alf_node_properties np set np.qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = np.qname
+);
+ALTER TABLE alf_node_properties DROP COLUMN qname;
+ALTER TABLE alf_node_properties MODIFY COLUMN qname_id BIGINT NOT NULL AFTER node_id;
+ALTER TABLE alf_node_properties ADD CONSTRAINT fk_alf_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+CREATE INDEX fk_alf_np_qn ON alf_node_properties (qname_id);
+ALTER TABLE alf_node_properties ADD PRIMARY KEY (node_id, qname_id);
+
+--
+-- DATA REPLACEMENT: avm_aspects_new.name (aka qname)
+--
+ALTER TABLE avm_aspects_new DROP PRIMARY KEY;
+ALTER TABLE avm_aspects_new ADD COLUMN qname_id BIGINT NULL AFTER id;
+UPDATE avm_aspects_new na set na.qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = na.name
+);
+ALTER TABLE avm_aspects_new DROP COLUMN name;
+ALTER TABLE avm_aspects_new MODIFY COLUMN qname_id BIGINT NOT NULL AFTER id;
+ALTER TABLE avm_aspects_new ADD CONSTRAINT fk_avm_na_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+CREATE INDEX fk_avm_na_qn ON avm_aspects_new (qname_id);
+ALTER TABLE avm_aspects_new ADD PRIMARY KEY (id, qname_id);
+
+--
+-- DATA REPLACEMENT: avm_node_properties_new.qname
+--
+ALTER TABLE avm_node_properties_new DROP PRIMARY KEY;
+ALTER TABLE avm_node_properties_new ADD COLUMN qname_id BIGINT NULL AFTER node_id;
+UPDATE avm_node_properties_new np set np.qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = np.qname
+);
+ALTER TABLE avm_node_properties_new DROP COLUMN qname;
+ALTER TABLE avm_node_properties_new MODIFY COLUMN qname_id BIGINT NOT NULL AFTER node_id;
+ALTER TABLE avm_node_properties_new ADD CONSTRAINT fk_avm_np_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+CREATE INDEX fk_avm_np_qn ON avm_node_properties_new (qname_id);
+ALTER TABLE avm_node_properties_new ADD PRIMARY KEY (node_id, qname_id);
+
+--
+-- DATA REPLACEMENT: avm_store_properties.qname
+--
+ALTER TABLE avm_store_properties ADD COLUMN qname_id BIGINT NULL AFTER avm_store_id;
+UPDATE avm_store_properties np set np.qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = np.qname
+);
+ALTER TABLE avm_store_properties DROP COLUMN qname;
+ALTER TABLE avm_store_properties MODIFY COLUMN qname_id BIGINT NOT NULL AFTER avm_store_id;
+ALTER TABLE avm_store_properties ADD CONSTRAINT fk_avm_sp_qname FOREIGN KEY (qname_id) REFERENCES alf_qname (id);
+CREATE INDEX fk_avm_sp_qname ON avm_store_properties (qname_id);
+
+--
+-- DATA REPLACEMENT: alf_child_assoc.type_qname
+--
+ALTER TABLE alf_child_assoc ADD COLUMN type_qname_id BIGINT NULL AFTER child_node_id;
+UPDATE alf_child_assoc ca set ca.type_qname_id =
+(
+   SELECT q.id
+   FROM alf_qname q
+   JOIN alf_namespace ns ON (q.ns_id = ns.id)
+   WHERE CONCAT('{', ns.uri, '}', q.local_name) = ca.type_qname
+);
+ALTER TABLE alf_child_assoc DROP COLUMN type_qname;
+ALTER TABLE alf_child_assoc MODIFY COLUMN type_qname_id BIGINT NOT NULL AFTER child_node_id;
+ALTER TABLE alf_child_assoc ADD CONSTRAINT fk_alf_ca_tqn FOREIGN KEY (type_qname_id) REFERENCES alf_qname (id);
+CREATE INDEX fk_alf_ca_tqn ON alf_child_assoc (type_qname_id);
+
+--
+-- DATA REPLACEMENT: alf_child_assoc.qname
+--
+-- Namespace
+ALTER TABLE alf_child_assoc ADD COLUMN qname_ns_id BIGINT NULL AFTER type_qname_id;
+UPDATE alf_child_assoc ca set ca.qname_ns_id =
+(
+   SELECT ns.id
+   FROM alf_namespace ns
+   WHERE SUBSTR(SUBSTRING_INDEX(qname, '}', 1), 2) = ns.uri
+);
+ALTER TABLE alf_child_assoc MODIFY COLUMN qname_ns_id BIGINT NOT NULL AFTER type_qname_id;
+ALTER TABLE alf_child_assoc ADD CONSTRAINT fk_alf_ca_qn_ns FOREIGN KEY (qname_ns_id) REFERENCES alf_namespace (id);
+CREATE INDEX fk_alf_ca_qn_ns ON alf_child_assoc (qname_ns_id);
+-- LocalName
+ALTER TABLE alf_child_assoc ADD COLUMN qname_localname VARCHAR(200) NULL AFTER qname_ns_id;
+UPDATE alf_child_assoc ca set ca.qname_localname = SUBSTRING_INDEX(qname, '}', -1);
+ALTER TABLE alf_child_assoc MODIFY COLUMN qname_localname VARCHAR(200) NOT NULL AFTER qname_ns_id;
+CREATE INDEX idx_alf_ca_qn_ln ON alf_child_assoc (qname_localname);
+-- Drop old column
+ALTER TABLE alf_child_assoc DROP COLUMN qname;

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql

@@ -150,5 +150,5 @@ INSERT INTO alf_applied_patch
   VALUES
   (
     'patch.db-V2.2-ACL', 'Manually executed script upgrade V2.2: Update acl schema',
-    0, 76, -1, 77, null, 'UNKOWN', 1, 1, 'Script completed'
+    0, 84, -1, 85, null, 'UNKOWN', 1, 1, 'Script completed'
   );