Merged V3.3-BUG-FIX to HEAD

21242: ALF-2879: XAM Connector changes
      - Fixed setting of store name
      - Added properties:
         - xam.archive.retentionPeriodDays=0
         - xam.archive.addLock=true
   21244: ALF-2879: Updated readme.txt
   21262: ALF-3611 - tweak AVM orphan reaper test (PurgeTestP)
   21277: Fix ALF-889 - WCM/AVM folder disappears when cut-and-paste into itself
      - fixed cycle check before rename/move
      - added -ve unit test
      - externalized existing cycle error messages
   21284: ALF-2879: XAM Connector changes
      - Listen to store selector policies (incl. workaround for policy listening)
      - Set XAM retention (code is setting the value, but not successfully tested against test servers)
   21285: StoreSelectorPolicies.OnContentMovedPolicy is deprecated. Use StoreSelectorPolicies.AfterMoveContentPolicy.
      - Deprecated so old policy still exists and works
      - Will remove for 3.4 (maybe)
   21293: Fix ALF-3245: stream not closed in DictionaryBootstrap.onDictionaryInit()
   21303: ALF-2879: XAM Connector changes
      - Throw ContentIOException if setBaseRetention fails
   21313: ALF-2879: XAM Connector changes
      - Round ms to nearest second
      - Log actual ms value being set for retention
   21322: Fix AVMNodeService.createNode to close output stream and avoid "Too many open files" (also add example AVMFileFolderPerformanceTester)
   21331: ALF-2879: XAM Connector changes
      - Removed duplicate setting of base retention
      - Left code hooks for setting of other metadata
   21368: Merged V3.3 to V3.3-BUG-FIX
      21213: Merged DEV/TEMPORARY to V3.3
         21200: ALF-2978: IMAP cannot bind to all the interfaces (0.0.0.0)
            “imap.server.host” property can be used for setting IP address / network adapter to listen on for IMAP protocol.
      21219: Merged PATCHES/V3.2.1 to V3.3
         21216: ALF-3779: A few bug fixes to --FOREACH handling in SchemaBootstrap
            - New system.upgrade.default.batchsize property to control overall default batch size
            - Added in a few more missed --FOREACH markers
         21211: ALF-3779: Remaining scripts converted to use --FOREACH (as logs finally provided by test prove that they need it too!)
         21210: (RECORD ONLY) Incremented version label
         21209: ALF-3779: Solution to allow batching of mass updates in upgrade scripts into smaller transactions
            - A special preceding comment in this format specifies a numeric table column to control the batching and a global property specifying the batch size
               --FOREACH table.column batch.size.property
            - If the property isn't specified in alfresco-global.properties, the default batch size is 10,000
            - INSERT / UPDATE / DELETE statements can then tack on extra conditions on ${LOWERBOUND} and ${UPPERBOUND} variables. E.g.
               WHERE n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
            - The statements are substituted and executed for each batch range up to the maximum value of the column
            - 2.1 and 2.2 MySQL upgrades reimplemented this way
         21207: Extra debug logging to track index triggering activity
      21295: Merged HEAD to V3.3
         21255: Parameter encoding
      21298: Merged V3.2 to V3.3
         21297: ALF-3889: JBPMDeployProcessServlet is now disabled by default and enabled with this in alfresco-global.properties
            system.workflow.deployservlet.enabled=true
      21317: dod5015: Parameter encoding
      21363: Merged PATCHES/V3.2.1 to V3.3
         21338: (RECORD ONLY) Incremented version label
         21335: ALF-3779: Correction to error in --FOREACH range restriction for UPDATE statement
         21290: ALF-3960: ArrayIndexOutOfBoundsException when we set mergerMergeFactor > mergerTargetOverlays
         21278: (RECORD ONLY) Merged PATCHES/V3.1.2 to PATCHES/V3.2.1
            21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
               - Should only be enabled in development environment
      21364: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
         21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
            - Should only be enabled in development environment
      21365: Merged PATCHES/V3.2.0 to V3.3 (RECORD ONLY)
         21276: Merged PATCHES/V3.1.2 to PATCHES/V3.2.0
            21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
               - Should only be enabled in development environment
      21366: Merged PATCHES/V3.2.r to V3.3 (RECORD ONLY)
         21279: Merged PATCHES/V3.1.2 to PATCHES/V3.2.r
            21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
               - Should only be enabled in development environment
      21367: Merged PATCHES/V3.3.1 to V3.3 (RECORD ONLY)
         21343: Incremented version label
         21342: ALF-3997: Merged V3.3-BUG-FIX to PATCHES/V3.3.1
            20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS
         21282: Merged PATCHES/V3.1.2 to PATCHES/V3.3.1
            21264: ALF-3889: JBPMDeployProcessServlet not accessible by default
               - Should only be enabled in development environment
         21239: Created hotfix branch off ENTERPRISE/V3.3.1


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

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

@@ -29,8 +29,11 @@ ALTER TABLE alf_access_control_list
    ADD CONSTRAINT fk_alf_acl_acs FOREIGN KEY (acl_change_set) REFERENCES alf_acl_change_set (id),
    ADD INDEX idx_alf_acl_inh (inherits, inherits_from);
 
+--FOREACH alf_access_control_list.id system.upgrade.alf_access_control_list.batchsize
 UPDATE alf_access_control_list acl
-   set acl_id = (acl.id);
+   set acl_id = (acl.id)
+   WHERE acl.id >= ${LOWERBOUND} AND acl.id <= ${UPPERBOUND};
+   
 
 ALTER TABLE alf_access_control_list
    ADD UNIQUE (acl_id, latest, acl_version);
@@ -85,8 +88,11 @@ ALTER TABLE alf_access_control_entry DROP INDEX FKFFF41F99B25A50BF, DROP FOREIGN
 
 
 -- migrate data - build equivalent ACL entries
+--FOREACH alf_access_control_list.id system.upgrade.alf_acl_member.batchsize
 INSERT INTO alf_acl_member (version, acl_id, ace_id, pos)
-   select 1, ace.acl_id, ace.id, 0 from alf_access_control_entry ace join alf_access_control_list acl on acl.id = ace.acl_id;
+   select 1, ace.acl_id, ace.id, 0
+   from alf_access_control_entry ace join alf_access_control_list acl on acl.id = ace.acl_id
+   where acl.id >= ${LOWERBOUND} AND acl.id <= ${UPPERBOUND};
 
 -- Create ACE context
 CREATE TABLE alf_ace_context (
@@ -141,6 +147,7 @@ CREATE TABLE alf_tmp_min_ace (
   UNIQUE (permission_id, authority_id, allowed, applies)
 ) ENGINE=InnoDB;
 
+--FOREACH alf_access_control_entry.authority_id system.upgrade.alf_tmp_min_ace.batchsize
 INSERT INTO alf_tmp_min_ace (min, permission_id, authority_id, allowed, applies)
     SELECT
        min(ace1.id),
@@ -150,21 +157,24 @@ INSERT INTO alf_tmp_min_ace (min, permission_id, authority_id, allowed, applies)
        ace1.applies
     FROM
        alf_access_control_entry ace1
+    WHERE
+       ace1.authority_id >= ${LOWERBOUND} AND ace1.authority_id <= ${UPPERBOUND}
     GROUP BY
        ace1.permission_id, ace1.authority_id, ace1.allowed, ace1.applies
 ;
 
 
 -- Update members to point to the first use of an access control entry
+--FOREACH alf_acl_member.id system.upgrade.alf_acl_member.batchsize
 UPDATE alf_acl_member mem
    SET ace_id = (SELECT help.min FROM alf_access_control_entry ace
                      JOIN alf_tmp_min_ace help
                      ON		help.permission_id = ace.permission_id AND
-                                help.authority_id = ace.authority_id AND
-                                help.allowed = ace.allowed AND
-                                help.applies = ace.applies
-                     WHERE ace.id = mem.ace_id  );
-
+                                help.authority_id = ace.authority_id AND 
+                                help.allowed = ace.allowed AND 
+                                help.applies = ace.applies 
+                     WHERE ace.id = mem.ace_id  )
+   WHERE mem.id >= ${LOWERBOUND} AND mem.id <= ${UPPERBOUND};
 DROP TABLE alf_tmp_min_ace;
 
 -- Remove duplicate aces the mysql way (as you can not use the deleted table in the where clause ...)

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

@@ -29,8 +29,11 @@ ALTER TABLE alf_access_control_list
    ADD CONSTRAINT fk_alf_acl_acs FOREIGN KEY (acl_change_set) REFERENCES alf_acl_change_set (id),
    ADD INDEX idx_alf_acl_inh (inherits, inherits_from);
 
+--FOREACH alf_access_control_list.id system.upgrade.alf_access_control_list.batchsize
 UPDATE alf_access_control_list acl
-   set acl_id = (acl.id);
+   set acl_id = (acl.id)
+   WHERE acl.id >= ${LOWERBOUND} AND acl.id <= ${UPPERBOUND};
+   
 
 ALTER TABLE alf_access_control_list
    ADD UNIQUE (acl_id, latest, acl_version);
@@ -75,13 +78,18 @@ ALTER TABLE alf_authority
    ADD UNIQUE (authority, crc);
 
 -- migrate data - fix up FK refs to authority
+--FOREACH alf_access_control_entry.id system.upgrade.alf_access_control_entry.batchsize
 UPDATE alf_access_control_entry ace
-   set auth_id = (select id from alf_authority a where a.authority = ace.authority_id);
+   set auth_id = (select id from alf_authority a where a.authority = ace.authority_id)
+   WHERE ace.id >= ${LOWERBOUND} AND ace.id <= ${UPPERBOUND};
 
 
 -- migrate data - build equivalent ACL entries
+--FOREACH alf_access_control_list.id system.upgrade.alf_acl_member.batchsize
 INSERT INTO alf_acl_member (version, acl_id, ace_id, pos)
-   select 1, ace.acl_id, ace.id, 0 from alf_access_control_entry ace join alf_access_control_list acl on acl.id = ace.acl_id;
+   select 1, ace.acl_id, ace.id, 0
+   from alf_access_control_entry ace join alf_access_control_list acl on acl.id = ace.acl_id
+   where acl.id >= ${LOWERBOUND} AND acl.id <= ${UPPERBOUND};
 
 -- Create ACE context
 CREATE TABLE alf_ace_context (
@@ -134,6 +142,7 @@ CREATE TABLE alf_tmp_min_ace (
   UNIQUE (permission_id, authority_id, allowed, applies)
 ) ENGINE=InnoDB;
 
+--FOREACH alf_access_control_entry.authority_id system.upgrade.alf_tmp_min_ace.batchsize
 INSERT INTO alf_tmp_min_ace (min, permission_id, authority_id, allowed, applies)
     SELECT
        min(ace1.id),
@@ -143,12 +152,15 @@ INSERT INTO alf_tmp_min_ace (min, permission_id, authority_id, allowed, applies)
        ace1.applies
     FROM
        alf_access_control_entry ace1
+    WHERE
+       ace1.authority_id >= ${LOWERBOUND} AND ace1.authority_id <= ${UPPERBOUND}
     GROUP BY
        ace1.permission_id, ace1.authority_id, ace1.allowed, ace1.applies
 ;
    
 
 -- Update members to point to the first use of an access control entry
+--FOREACH alf_acl_member.id system.upgrade.alf_acl_member.batchsize
 UPDATE alf_acl_member mem
    SET ace_id = (SELECT help.min FROM alf_access_control_entry ace 
                      JOIN alf_tmp_min_ace help
@@ -156,8 +168,8 @@ UPDATE alf_acl_member mem
                                 help.authority_id = ace.authority_id AND 
                                 help.allowed = ace.allowed AND 
                                 help.applies = ace.applies 
-                     WHERE ace.id = mem.ace_id  );
-
+                     WHERE ace.id = mem.ace_id  )
+   WHERE mem.id >= ${LOWERBOUND} AND mem.id <= ${UPPERBOUND};
 DROP TABLE alf_tmp_min_ace;
 
 -- Remove duplicate aces the mysql way (as you can not use the deleted table in the where clause ...)

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

@@ -15,35 +15,53 @@ CREATE TABLE t_node_status
    transaction_id BIGINT(20) NOT NULL,
    PRIMARY KEY (node_id)
 );
+--FOREACH alf_node_status.node_id system.upgrade.t_node_status.batchsize
 INSERT INTO t_node_status
 (
    SELECT c.node_id, c.transaction_id FROM
    (
-      SELECT COUNT(node_id) x, ns.node_id, ns.transaction_id FROM alf_node_status ns GROUP BY node_id
+      SELECT COUNT(node_id) x, ns.node_id, ns.transaction_id FROM alf_node_status ns
+      WHERE node_id >= ${LOWERBOUND} AND node_id <= ${UPPERBOUND}
+      GROUP BY node_id
    ) c
    WHERE c.x > 1
 );
-DELETE FROM alf_node_status WHERE node_id IN (SELECT node_id FROM t_node_status);
+--FOREACH alf_node_status.node_id system.upgrade.alf_node_status.batchsize
+DELETE FROM alf_node_status
+WHERE node_id IN (SELECT node_id FROM t_node_status)
+AND node_id >= ${LOWERBOUND} AND node_id <= ${UPPERBOUND};
+
+--FOREACH t_node_status.node_id system.upgrade.alf_node_status.batchsize
 INSERT INTO alf_node_status (protocol, identifier, guid, node_id, transaction_id, version)
 (
-  SELECT n.protocol, n.identifier, n.uuid, n.id, tns.transaction_id, 0 FROM t_node_status tns JOIN alf_node n ON (n.id = tns.node_id)
+  SELECT n.protocol, n.identifier, n.uuid, n.id, tns.transaction_id, 0
+  FROM t_node_status tns JOIN alf_node n ON (n.id = tns.node_id)
+  WHERE tns.node_id >= ${LOWERBOUND} AND tns.node_id <= ${UPPERBOUND}  
 );
 DROP TABLE t_node_status;
 
-DELETE FROM alf_node_status WHERE node_id IS NULL;
+--FOREACH alf_node_status.node_id system.upgrade.alf_node_status.batchsize
+DELETE FROM alf_node_status
+WHERE node_id IS NULL
+AND node_id >= ${LOWERBOUND} AND node_id <= ${UPPERBOUND};
 
+--FOREACH alf_node_status.node_id system.upgrade.alf_node_status.batchsize
 UPDATE alf_node_status ns SET ns.protocol =
   (
-    SELECT n.protocol FROM alf_node n WHERE n.id = ns.node_id
-  );
+    SELECT n.protocol FROM alf_node n
+    WHERE n.id = ns.node_id
+  )
+WHERE ns.node_id >= ${LOWERBOUND} AND ns.node_id <= ${UPPERBOUND};
 
+--FOREACH alf_transaction.id system.upgrade.alf_transaction.batchsize
 DELETE 
       alf_transaction 
    FROM 
       alf_transaction 
       LEFT JOIN alf_node_status ON (alf_node_status.transaction_id = alf_transaction.id) 
    WHERE 
-      alf_node_status.node_id is null; 
+      alf_node_status.node_id is null 
+      AND alf_transaction.id >= ${LOWERBOUND} AND alf_transaction.id <= ${UPPERBOUND};
 
 --
 -- Record script finish

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.1.sql

@@ -282,14 +282,7 @@ INSERT INTO t_summary_nstat (node_id, transaction_id)
   SELECT node_id, transaction_id FROM alf_node_status WHERE node_id IS NOT NULL;
 
 -- Copy data over
---BEGIN TXN
-LOCK TABLES
-   t_alf_node WRITE,
-   alf_node AS n READ,
-   t_summary_nstat AS nstat READ,
-   t_alf_store AS s READ,
-   t_qnames AS q READ
-;
+--FOREACH alf_node.id system.upgrade.t_alf_node.batchsize
 INSERT INTO t_alf_node
    (
       id, version, store_id, uuid, transaction_id, node_deleted, type_qname_id, acl_id,
@@ -303,9 +296,9 @@ INSERT INTO t_alf_node
       JOIN t_qnames q ON (q.qname = n.type_qname)
       JOIN t_summary_nstat nstat ON (nstat.node_id = n.id)
       JOIN t_alf_store s ON (s.protocol = n.protocol AND s.identifier = n.identifier)
+   WHERE
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 DROP TABLE t_summary_nstat;
 
 -- Hook the store up to the root node
@@ -373,13 +366,7 @@ CREATE TABLE t_alf_child_assoc
    UNIQUE (parent_node_id, type_qname_id, child_node_name_crc, child_node_name)
 ) TYPE=InnoDB;
 
---BEGIN TXN
-LOCK TABLES
-   t_alf_child_assoc WRITE,
-   alf_child_assoc AS ca READ,
-   t_qnames_dyn AS tqndyn READ,
-   t_qnames AS tqn READ
-;
+--FOREACH alf_child_assoc.id system.upgrade.t_alf_child_assoc.batchsize
 INSERT INTO t_alf_child_assoc
    (
       id, version,
@@ -402,9 +389,9 @@ INSERT INTO t_alf_child_assoc
       alf_child_assoc ca
       JOIN t_qnames_dyn tqndyn ON (ca.qname = tqndyn.qname)
       JOIN t_qnames tqn ON (ca.type_qname = tqn.qname)
+   WHERE
+      ca.id >= ${LOWERBOUND} AND ca.id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Clean up
 DROP TABLE t_qnames_dyn;
@@ -432,12 +419,7 @@ CREATE TABLE t_alf_node_assoc
    UNIQUE (source_node_id, target_node_id, type_qname_id)
 ) TYPE=InnoDB;
 
---BEGIN TXN
-LOCK TABLES
-   t_alf_node_assoc WRITE,
-   alf_node_assoc AS na READ,
-   t_qnames AS tqn READ
-;
+--FOREACH alf_node_assoc.id system.upgrade.t_alf_node_assoc.batchsize
 INSERT INTO t_alf_node_assoc
    (
       id, version,
@@ -451,9 +433,9 @@ INSERT INTO t_alf_node_assoc
    FROM
       alf_node_assoc na
       JOIN t_qnames tqn ON (na.type_qname = tqn.qname)
+   WHERE
+      na.id >= ${LOWERBOUND} AND na.id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Clean up
 DROP TABLE alf_node_assoc;
@@ -507,12 +489,7 @@ CREATE TABLE t_alf_node_aspects
    PRIMARY KEY (node_id, qname_id)
 ) TYPE=InnoDB;
 
---BEGIN TXN
-LOCK TABLES
-   t_alf_node_aspects WRITE,
-   alf_node_aspects AS na READ,
-   t_qnames AS tqn READ
-;
+--FOREACH alf_node_aspects.node_id system.upgrade.t_alf_node_aspects.batchsize
 -- Note the omission of sys:referencable.  This is implicit.
 INSERT INTO t_alf_node_aspects
    (
@@ -526,9 +503,8 @@ INSERT INTO t_alf_node_aspects
       JOIN t_qnames tqn ON (na.qname = tqn.qname)
    WHERE
       tqn.qname != '{http://www.alfresco.org/model/system/1.0}referenceable'
+      AND na.node_id >= ${LOWERBOUND} AND na.node_id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Clean up
 DROP TABLE alf_node_aspects;
@@ -549,6 +525,7 @@ CREATE TABLE t_avm_aspects
    PRIMARY KEY (node_id, qname_id)
 ) TYPE=InnoDB;
 
+--FOREACH avm_aspects.node_id system.upgrade.t_avm_aspects.batchsize
 INSERT INTO t_avm_aspects
    (
       node_id, qname_id
@@ -559,7 +536,10 @@ INSERT INTO t_avm_aspects
    FROM
       avm_aspects aspects_old
       JOIN t_qnames tqn ON (aspects_old.qname = tqn.qname)
+   WHERE
+      aspects_old.node_id >= ${LOWERBOUND} AND aspects_old.node_id <= ${UPPERBOUND}
 ;
+--FOREACH avm_aspects_new.id system.upgrade.t_avm_aspects.batchsize
 INSERT INTO t_avm_aspects
    (
       node_id, qname_id
@@ -573,6 +553,7 @@ INSERT INTO t_avm_aspects
       LEFT JOIN avm_aspects aold ON (anew.id = aold.node_id AND anew.name = aold.qname)
    WHERE
       aold.id IS NULL
+      AND anew.id >= ${LOWERBOUND} AND anew.id <= ${UPPERBOUND}
 ;
 
 -- Clean up
@@ -632,6 +613,7 @@ CREATE TABLE t_avm_store_properties
    CONSTRAINT fk_avm_sprop_qname FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
    PRIMARY KEY (id)
 ) TYPE=InnoDB;
+--FOREACH avm_store_properties.avm_store_id system.upgrade.t_avm_store_properties.batchsize
 INSERT INTO t_avm_store_properties
    (
       avm_store_id,
@@ -649,6 +631,8 @@ INSERT INTO t_avm_store_properties
       JOIN t_qnames tqn ON (p.qname = tqn.qname)
       JOIN t_prop_types ptypes_actual ON (ptypes_actual.type_name = p.actual_type)
       JOIN t_prop_types ptypes_persisted ON (ptypes_persisted.type_name = p.persisted_type)
+   WHERE
+      p.avm_store_id >= ${LOWERBOUND} AND p.avm_store_id <= ${UPPERBOUND}
 ;
 DROP TABLE avm_store_properties;
 ALTER TABLE t_avm_store_properties RENAME TO avm_store_properties;
@@ -673,6 +657,7 @@ CREATE TABLE t_avm_node_properties
    CONSTRAINT fk_avm_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
    PRIMARY KEY (node_id, qname_id)
 ) TYPE=InnoDB;
+--FOREACH avm_node_properties_new.node_id system.upgrade.t_avm_node_properties.batchsize
 INSERT INTO t_avm_node_properties
    (
       node_id,
@@ -690,7 +675,10 @@ INSERT INTO t_avm_node_properties
       JOIN t_qnames tqn ON (p.qname = tqn.qname)
       JOIN t_prop_types ptypes_actual ON (ptypes_actual.type_name = p.actual_type)
       JOIN t_prop_types ptypes_persisted ON (ptypes_persisted.type_name = p.persisted_type)
+   WHERE
+      p.node_id >= ${LOWERBOUND} AND p.node_id <= ${UPPERBOUND}   
 ;
+--FOREACH avm_node_properties.node_id system.upgrade.t_avm_node_properties.batchsize
 INSERT INTO t_avm_node_properties
    (
       node_id,
@@ -711,6 +699,7 @@ INSERT INTO t_avm_node_properties
       LEFT OUTER JOIN t_avm_node_properties tanp ON (tqn.qname_id = tanp.qname_id)
    WHERE
       tanp.qname_id IS NULL
+      AND p.node_id >= ${LOWERBOUND} AND p.node_id <= ${UPPERBOUND}   
 ;
 
 DROP TABLE avm_node_properties_new;
@@ -771,13 +760,7 @@ CREATE TABLE t_alf_node_properties
 
 --BEGIN TXN
 -- Copy values over
-LOCK TABLES
-   t_alf_node_properties WRITE,
-   alf_node_properties AS np READ,
-   t_prop_types AS ptypes_actual READ,
-   t_prop_types AS ptypes_persisted READ,
-   t_qnames AS tqn READ
-;
+--FOREACH alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 INSERT INTO t_alf_node_properties
    (
       node_id, qname_id, locale_id, list_index,
@@ -799,11 +782,11 @@ INSERT INTO t_alf_node_properties
       JOIN t_prop_types ptypes_persisted ON (ptypes_persisted.type_name = np.persisted_type)
    WHERE
       np.attribute_value IS NULL
+      AND np.node_id >= ${LOWERBOUND} AND np.node_id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Update cm:auditable properties on the nodes
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_creator =
 (
    SELECT
@@ -815,8 +798,10 @@ UPDATE t_alf_node n SET audit_creator =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'creator'
+      qn.local_name = 'creator' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_created =
 (
    SELECT
@@ -828,8 +813,10 @@ UPDATE t_alf_node n SET audit_created =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'created'
+      qn.local_name = 'created' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_modifier =
 (
    SELECT
@@ -841,8 +828,10 @@ UPDATE t_alf_node n SET audit_modifier =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'modifier'
+      qn.local_name = 'modifier' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_modified =
 (
    SELECT
@@ -854,7 +843,8 @@ UPDATE t_alf_node n SET audit_modified =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'modified'
+      qn.local_name = 'modified' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
 -- Remove the unused cm:auditable properties
 -- SHORTCUT:
@@ -870,16 +860,19 @@ UPDATE t_alf_node n SET audit_modified =
 --    FROM t_alf_node_properties
 --    WHERE
 --       qname_id IN (13, 14, 23, 24);
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 DELETE t_alf_node_properties
    FROM t_alf_node_properties
    JOIN alf_qname ON (t_alf_node_properties.qname_id = alf_qname.id)
    JOIN alf_namespace ON (alf_qname.ns_id = alf_namespace.id)
    WHERE
       alf_namespace.uri = 'FILLER-http://www.alfresco.org/model/content/1.0' AND
-      alf_qname.local_name IN ('creator', 'created', 'modifier', 'modified')
+      alf_qname.local_name IN ('creator', 'created', 'modifier', 'modified') AND
+      t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
 ;
 
 -- Copy all MLText values over
+--FOREACH alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 INSERT INTO t_alf_node_properties
    (
       node_id, qname_id, locale_id, list_index,
@@ -901,16 +894,26 @@ INSERT INTO t_alf_node_properties
       JOIN alf_map_attribute_entries ma ON (ma.map_id = a1.id)
       JOIN alf_locale loc ON (ma.mkey = loc.locale_str)
       JOIN alf_attributes a2 ON (ma.attribute_id = a2.id)
+   WHERE
+      np.node_id >= ${LOWERBOUND} AND np.node_id <= ${UPPERBOUND}
 ;  -- (OPTIONAL)
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 UPDATE t_alf_node_properties
    SET actual_type_n = 6, persisted_type_n = 6, serializable_value = NULL
    WHERE actual_type_n = -1 AND string_value IS NOT NULL
+   AND t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
 ;
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 UPDATE t_alf_node_properties
    SET actual_type_n = 9, persisted_type_n = 9
    WHERE actual_type_n = -1 AND serializable_value IS NOT NULL
+   AND t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
+;
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
+DELETE FROM t_alf_node_properties
+   WHERE actual_type_n = -1
+   AND t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
 ;
-DELETE FROM t_alf_node_properties WHERE actual_type_n = -1;
 
 -- Delete the node properties and move the fixed values over
 DROP TABLE alf_node_properties;

config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/upgrade-from-2.2SP1.sql

@@ -73,14 +73,8 @@ CREATE TABLE t_summary_nstat
 INSERT INTO t_summary_nstat (node_id, transaction_id) 
   SELECT node_id, transaction_id FROM alf_node_status WHERE node_id IS NOT NULL;
 
---BEGIN TXN
 -- Copy data over
-LOCK TABLES
-   t_alf_node WRITE,
-   alf_node AS n READ,
-   t_summary_nstat AS nstat READ,
-   t_alf_store AS s READ
-;
+--FOREACH alf_node.id system.upgrade.t_alf_node.batchsize
 INSERT INTO t_alf_node
    (
       id, version, store_id, uuid, transaction_id, node_deleted, type_qname_id, acl_id,
@@ -93,9 +87,9 @@ INSERT INTO t_alf_node
       alf_node n
       JOIN t_summary_nstat nstat ON (nstat.node_id = n.id)
       JOIN t_alf_store s ON (s.protocol = n.protocol AND s.identifier = n.identifier)
+   WHERE
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 DROP TABLE t_summary_nstat;
 
 -- Hook the store up to the root node
@@ -163,11 +157,7 @@ CREATE TABLE t_alf_child_assoc
    UNIQUE (parent_node_id, type_qname_id, child_node_name_crc, child_node_name)
 ) TYPE=InnoDB;
 
---BEGIN TXN
-LOCK TABLES
-   t_alf_child_assoc WRITE,
-   alf_child_assoc AS ca READ
-;
+--FOREACH alf_child_assoc.id system.upgrade.t_alf_child_assoc.batchsize
 INSERT INTO t_alf_child_assoc
    (
       id, version,
@@ -188,9 +178,9 @@ INSERT INTO t_alf_child_assoc
       ca.is_primary, ca.assoc_index
    FROM
       alf_child_assoc ca
+   WHERE
+      ca.id >= ${LOWERBOUND} AND ca.id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Clean up
 DROP TABLE alf_child_assoc;
@@ -217,11 +207,7 @@ CREATE TABLE t_alf_node_assoc
    UNIQUE (source_node_id, target_node_id, type_qname_id)
 ) TYPE=InnoDB;
 
---BEGIN TXN
-LOCK TABLES
-   t_alf_node_assoc WRITE,
-   alf_node_assoc AS na READ
-;
+--FOREACH alf_node_assoc.id system.upgrade.t_alf_node_assoc.batchsize
 INSERT INTO t_alf_node_assoc
    (
       id, version,
@@ -234,9 +220,9 @@ INSERT INTO t_alf_node_assoc
       na.type_qname_id
    FROM
       alf_node_assoc na
+   WHERE
+      na.id >= ${LOWERBOUND} AND na.id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Clean up
 DROP TABLE alf_node_assoc;
@@ -290,13 +276,7 @@ CREATE TABLE t_alf_node_aspects
    PRIMARY KEY (node_id, qname_id)
 ) TYPE=InnoDB;
 
---BEGIN TXN
-LOCK TABLES
-   t_alf_node_aspects WRITE,
-   alf_node_aspects AS na READ,
-   alf_qname AS qn READ,
-   alf_namespace AS ns READ
-;
+--FOREACH alf_node_aspects.node_id system.upgrade.t_alf_node_aspects.batchsize
 -- Note the omission of sys:referencable.  This is implicit.
 INSERT INTO t_alf_node_aspects
    (
@@ -312,9 +292,8 @@ INSERT INTO t_alf_node_aspects
    WHERE
       ns.uri != 'http://www.alfresco.org/model/system/1.0' OR
       qn.local_name != 'referenceable'
+      AND na.node_id >= ${LOWERBOUND} AND na.node_id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Clean up
 DROP TABLE alf_node_aspects;
@@ -335,6 +314,7 @@ CREATE TABLE t_avm_aspects
    PRIMARY KEY (node_id, qname_id)
 ) TYPE=InnoDB;
 
+--FOREACH avm_aspects_new.id system.upgrade.t_avm_aspects.batchsize
 INSERT INTO t_avm_aspects
    (
       node_id, qname_id
@@ -344,6 +324,8 @@ INSERT INTO t_avm_aspects
       anew.qname_id
    FROM
       avm_aspects_new anew
+   WHERE
+      anew.id >= ${LOWERBOUND} AND anew.id <= ${UPPERBOUND}
 ;
 
 -- Clean up
@@ -376,6 +358,7 @@ CREATE TABLE t_avm_store_properties
    CONSTRAINT fk_avm_sprop_qname FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
    PRIMARY KEY (id)
 ) TYPE=InnoDB;
+--FOREACH avm_store_properties.avm_store_id system.upgrade.t_avm_store_properties.batchsize
 INSERT INTO t_avm_store_properties
    (
       avm_store_id,
@@ -390,6 +373,8 @@ INSERT INTO t_avm_store_properties
       p.multi_valued, p.boolean_value, p.long_value, p.float_value, p.double_value, p.string_value, p.serializable_value
    FROM
       avm_store_properties p
+   WHERE
+      p.avm_store_id >= ${LOWERBOUND} AND p.avm_store_id <= ${UPPERBOUND}
 ;
 DROP TABLE avm_store_properties;
 ALTER TABLE t_avm_store_properties RENAME TO avm_store_properties;
@@ -414,6 +399,7 @@ CREATE TABLE t_avm_node_properties
    CONSTRAINT fk_avm_nprop_qn FOREIGN KEY (qname_id) REFERENCES alf_qname (id),
    PRIMARY KEY (node_id, qname_id)
 ) TYPE=InnoDB;
+--FOREACH avm_node_properties_new.node_id system.upgrade.t_avm_node_properties.batchsize
 INSERT INTO t_avm_node_properties
    (
       node_id,
@@ -428,6 +414,8 @@ INSERT INTO t_avm_node_properties
       p.multi_valued, p.boolean_value, p.long_value, p.float_value, p.double_value, p.string_value, p.serializable_value
    FROM
       avm_node_properties_new p
+   WHERE
+      p.node_id >= ${LOWERBOUND} AND p.node_id <= ${UPPERBOUND}   
 ;
 
 DROP TABLE avm_node_properties_new;
@@ -487,10 +475,7 @@ CREATE TABLE t_alf_node_properties
 
 --BEGIN TXN
 -- Copy values over
-LOCK TABLES
-   t_alf_node_properties WRITE,
-   alf_node_properties AS np READ
-;
+--FOREACH alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 INSERT INTO t_alf_node_properties
    (
       node_id, qname_id, locale_id, list_index,
@@ -509,11 +494,11 @@ INSERT INTO t_alf_node_properties
       alf_node_properties np
    WHERE
       np.attribute_value IS NULL
+      AND np.node_id >= ${LOWERBOUND} AND np.node_id <= ${UPPERBOUND}
 ;
---END TXN
-UNLOCK TABLES;
 
 -- Update cm:auditable properties on the nodes
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_creator =
 (
    SELECT
@@ -525,8 +510,10 @@ UPDATE t_alf_node n SET audit_creator =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'creator'
+      qn.local_name = 'creator' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_created =
 (
    SELECT
@@ -538,8 +525,10 @@ UPDATE t_alf_node n SET audit_created =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'created'
+      qn.local_name = 'created' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_modifier =
 (
    SELECT
@@ -551,8 +540,10 @@ UPDATE t_alf_node n SET audit_modifier =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'modifier'
+      qn.local_name = 'modifier' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
+--FOREACH t_alf_node.id system.upgrade.t_alf_node.batchsize
 UPDATE t_alf_node n SET audit_modified =
 (
    SELECT
@@ -564,19 +555,23 @@ UPDATE t_alf_node n SET audit_modified =
    WHERE
       np.node_id = n.id AND
       ns.uri = 'http://www.alfresco.org/model/content/1.0' AND
-      qn.local_name = 'modified'
+      qn.local_name = 'modified' AND
+      n.id >= ${LOWERBOUND} AND n.id <= ${UPPERBOUND}
 );
 -- Remove the unused cm:auditable properties
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 DELETE t_alf_node_properties
    FROM t_alf_node_properties
    JOIN alf_qname ON (t_alf_node_properties.qname_id = alf_qname.id)
    JOIN alf_namespace ON (alf_qname.ns_id = alf_namespace.id)
    WHERE
       alf_namespace.uri = 'http://www.alfresco.org/model/content/1.0' AND
-      alf_qname.local_name IN ('creator', 'created', 'modifier', 'modified')
+      alf_qname.local_name IN ('creator', 'created', 'modifier', 'modified') AND
+      t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
 ;
 
 -- Copy all MLText values over
+--FOREACH alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 INSERT INTO t_alf_node_properties
    (
       node_id, qname_id, list_index, locale_id,
@@ -597,16 +592,26 @@ INSERT INTO t_alf_node_properties
       JOIN alf_map_attribute_entries ma ON (ma.map_id = a1.id)
       JOIN alf_locale loc ON (ma.mkey = loc.locale_str)
       JOIN alf_attributes a2 ON (ma.attribute_id = a2.id)
+   WHERE
+      np.node_id >= ${LOWERBOUND} AND np.node_id <= ${UPPERBOUND}
 ;  -- (OPTIONAL)
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 UPDATE t_alf_node_properties
    SET actual_type_n = 6, persisted_type_n = 6, serializable_value = NULL
    WHERE actual_type_n = -1 AND string_value IS NOT NULL
+   AND t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
 ;
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
 UPDATE t_alf_node_properties
    SET actual_type_n = 9, persisted_type_n = 9
    WHERE actual_type_n = -1 AND serializable_value IS NOT NULL
+   AND t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
+;
+--FOREACH t_alf_node_properties.node_id system.upgrade.t_alf_node_properties.batchsize
+DELETE FROM t_alf_node_properties
+   WHERE actual_type_n = -1
+   AND t_alf_node_properties.node_id >= ${LOWERBOUND} AND t_alf_node_properties.node_id <= ${UPPERBOUND}
 ;
-DELETE FROM t_alf_node_properties WHERE actual_type_n = -1;
 
 -- Delete the node properties and move the fixed values over
 DROP TABLE alf_node_properties;