inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD (QNames)

Browse Source 
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
This commit is contained in:
Derek Hulley
2008-03-06 18:12:25 +00:00
parent a49bfd311d
commit 00e81c0d66
52 changed files with 2851 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/alfresco/avm-services-context.xml
View File

@@ -101,6 +101,9 @@
<property name="sessionFactory">
<ref bean="sessionFactory"/>
</property>
<property name="qnameDAO">
<ref bean="qnameDAO"/>
</property>
</bean>
<bean id="avmAspectNameDAO" class="org.alfresco.repo.avm.hibernate.AVMAspectNameDAOHibernate">
@@ -128,6 +131,9 @@
<property name="nodeDAO">
<ref bean="avmNodeDAO"/>
</property>
<property name="qnameDAO">
<ref bean="qnameDAO"/>
</property>
<property name="avmStoreDAO">
<ref bean="avmStoreDAO"/>
</property>
@@ -232,6 +238,9 @@
<property name="purgeVersionTxnListener">
<ref bean="purgeVersionTxnListener"/>
</property>
<property name="qnameDAO">
<ref bean="qnameDAO"/>
</property>
<property name="avmStoreDAO">
<ref bean="avmStoreDAO"/>
</property>

2
config/alfresco/bootstrap-context.xml
View File

@@ -36,7 +36,7 @@
<property name="postCreateScriptUrls">
<list>
<value>classpath:alfresco/dbscripts/create/2.1/${db.script.dialect}/AlfrescoPostCreate-2.1-FKIndexes.sql</value>
<value>classpath:alfresco/dbscripts/create/1.4/${db.script.dialect}/post-create-indexes-02.sql</value>
<value>classpath:alfresco/dbscripts/create/2.2/${db.script.dialect}/AlfrescoPostCreate-2.2-Constraints.sql</value>
</list>
</property>
<property name="validateUpdateScriptPatches">

39
config/alfresco/cache-context.xml
View File

@@ -27,6 +27,45 @@
<bean name="internalEHCacheManager" class="org.alfresco.repo.cache.InternalEhCacheManagerFactoryBean" />
<!-- ===================================== -->
<!-- ID lookup for QName entities -->
<!-- ===================================== -->
<!-- The cross-transaction shared cache for QName entities -->
<bean name="qnameEntitySharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
<property name="cache">
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
<property name="cacheManager">
<ref bean="internalEHCacheManager" />
</property>
<property name="cacheName">
<value>defaultCache</value>
<!--
<value>org.alfresco.cache.qnameEntityCache</value>
-->
</property>
</bean>
</property>
</bean>
<!-- The transactional cache for QName entities -->
<bean name="qnameEntityCache" class="org.alfresco.repo.cache.TransactionalCache">
<property name="sharedCache">
<ref bean="qnameEntitySharedCache" />
</property>
<property name="cacheManager" >
<ref bean="transactionalEHCacheManager" />
</property>
<property name="name">
<value>org.alfresco.cache.qnameEntityTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>100</value>
</property>
</bean>
<!-- ===================================== -->
<!-- Parent Associations lookup for nodes -->
<!-- ===================================== -->

2
config/alfresco/dbscripts/create/1.4/org.hibernate.dialect.Dialect/post-create-indexes-02.sql
View File

@@ -5,6 +5,4 @@
--
-- Association QNames
CREATE INDEX idx_ca_type_qname ON alf_child_assoc (type_qname);
CREATE INDEX idx_ca_qname ON alf_child_assoc (qname);
CREATE INDEX idx_na_type_qname ON alf_node_assoc (type_qname);

4
config/alfresco/dbscripts/create/2.1/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoPostCreate-2.1-FKIndexes.sql
View File

@@ -7,8 +7,4 @@
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
-- Remove pointless duplicated FK indexes
ALTER TABLE alf_global_attributes DROP INDEX FK64D0B9CF69B9F16A;
-- The MySQL dialects apply the FK indexes by default

20
config/alfresco/dbscripts/create/2.2/org.hibernate.dialect.Dialect/AlfrescoPostCreate-2.2-Constraints.sql Normal file
View File

@@ -0,0 +1,20 @@
--
-- Title: Post-Create Constraints
-- Database: Generic
-- Since: V2.2 Schema 82
-- Author: Derek Hulley
--
-- Please contact support@alfresco.com if you need assistance with the upgrade.
--
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_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 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_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);

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

@@ -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

274
config/alfresco/dbscripts/upgrade/2.2-QNames/upgrade-mysql-qnames.sql Normal file
View File

@@ -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;

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

@@ -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'
);

16
config/alfresco/hibernate-context.xml
View File

@@ -39,6 +39,7 @@
<!-- Alfresco Node Storage -->
<!-- -->
<value>org/alfresco/repo/domain/hibernate/QName.hbm.xml</value>
<value>org/alfresco/repo/domain/hibernate/Node.hbm.xml</value>
<value>org/alfresco/repo/domain/hibernate/Store.hbm.xml</value>
<value>org/alfresco/repo/domain/hibernate/Transaction.hbm.xml</value>
@@ -149,6 +150,8 @@
<property name="hibernateProperties" ref="hibernateConfigProperties" />
<property name="entityCacheStrategies" >
<props>
<prop key="org.alfresco.repo.domain.hibernate.NamespaceEntityImpl">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.QNameEntityImpl">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.NodeImpl">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.NodeStatusImpl">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.ChildAssocImpl">${cache.strategy}</prop>
@@ -192,6 +195,15 @@
</bean>
<!-- Hibernate-specific implementations of persistence components -->
<bean id="qnameDAO" class="org.alfresco.repo.domain.hibernate.HibernateQNameDAOImpl">
<property name="sessionFactory">
<ref bean="sessionFactory" />
</property>
<property name="qnameEntityCache">
<ref bean="qnameEntityCache"/>
</property>
</bean>
<bean id="versionCounterDaoComponent" class="org.alfresco.repo.domain.hibernate.VersionCounterDaoComponentImpl">
<property name="sessionFactory">
<ref bean="sessionFactory" />
@@ -275,6 +287,9 @@
</bean>
<bean id="nodeDaoServiceImpl" class="org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl">
<property name="qnameDAO">
<ref bean="qnameDAO" />
</property>
<property name="sessionFactory">
<ref bean="sessionFactory" />
</property>
@@ -309,7 +324,6 @@
</property>
</bean>
<bean id="auditDao" class="org.alfresco.repo.audit.hibernate.HibernateAuditDAO">
<property name="sessionFactory">
<ref bean="sessionFactory"/>

3
config/alfresco/node-services-context.xml
View File

@@ -159,6 +159,9 @@
</property>
</bean>
<bean id="dbNodeServiceImpl" class="org.alfresco.repo.node.db.DbNodeServiceImpl" init-method="init" >
<property name="qnameDAO">
<ref bean="qnameDAO" />
</property>
<property name="dictionaryService">
<ref bean="dictionaryService" />
</property>

6
config/alfresco/patch/patch-services-context.xml
View File

@@ -841,6 +841,9 @@
<property name="avmAspectNameDAO">
<ref bean="avmAspectNameDAO"/>
</property>
<property name="qnameDAO">
<ref bean="qnameDAO"/>
</property>
</bean>
<bean id="patch.AVMProperties" class="org.alfresco.repo.admin.patch.impl.AVMPropertiesPatch" parent="basePatch">
@@ -852,6 +855,9 @@
<property name="avmNodePropertyDAO">
<ref bean="avmNodePropertyDAO"/>
</property>
<property name="qnameDAO">
<ref bean="qnameDAO"/>
</property>
</bean>
<bean id="patch.db-V2.1-JBPMProcessKey" class="org.alfresco.repo.admin.patch.impl.SchemaUpgradeScriptPatch" parent="basePatch">