Merged V3.2 to HEAD

17163: org.alfresco.repo.domain.hibernate.AclDaoComponentImpl.updateAuthority() needs to flush/dirty the session in order to work
   17160: Fix HeartBeat
      - Lazy initialization in scheduled job needed its own transaction
   17146: Fix failing unit tests
      - HibernateNodeDaoServiceImpl.moveNodeToStore() must invalidate parentAssocsCache now that it contains NodeRefs
   17145: Fixes to patches for new CRC schema changes
      - Sequenced patch.fixNameCrcValues-2 before all other patches
      - Fixed typos in schema upgrade script and added CRCs for the repository descriptor nodes, so that the descriptor service and patch service can boot up
      - HeartBeat initializes lazily so that it doesn't try to load information before the patch service has bootstrapped
      - Made FixNameCrcValuesPatch industrial strength by using BatchProcessor to handle multi threading, progress reporting and transaction delineation
   17097: Removal of spurious logs directory accidentally introduced in 17096
   17096: Performance tuning for improved throughput during high volume import from LDAP directory
      - Lucene indexer will now no longer index and then reindex the same node in the same transaction
      - lucene.indexer.mergerTargetOverlaysBlockingFactor reduced to 1 (improves indexing performance and no excessive throttling observed during 10 hour test)
      - HomeFolderManager fixed so that it pays attention to the eager home folder creation flag
      - HibernateNodeDaoServiceImpl.parentAssocsCache 'upgraded' to hold information about root nodes and node refs so that recursive methods such as prependPaths can run entirely out of the cache
      - Boolean argument added to getChildAssocs() so that preloading of all child nodes is optional
      - qname_crc column added to alf_child_assoc to allow efficient lookup and indexing of child associations by QName. CRC of (qname_namespace, qname_localname).
      - idx_alf_cass_qnln on qname_localname replaced with idx_alf_cass_qncrc (qname_crc, type_qname_id, parent_node_id)
      - All node service lookup queries involving qname_localname modified to include qname_crc in WHERE clause
      - schema patch provided
      - existing org.alfresco.repo.admin.patch.impl.FixNameCrcValuesPatch extended to also fill in qname_crc column and forced to run on newer schemas
      - Optimized ChainingUserRegistrySynchronizer so that it doesn't have to look up the entire set of authorities during  an 'empty' incremental sync
      - ChainingUserRegistrySynchronizer no longer starts an outer transaction around all its smaller transactions (used to die due to timeout)
      - rule service disabled for LDAP batch processing threads
      - org.alfresco.cache.parentAssocsCache and org.alfresco.cache.storeAndNodeIdCache size increased to 80,000
      - Fixed case sensitivity issue with person caching in PersonServiceImpl
      - Cache the people container in PersonServiceImpl for faster person lookups
      - PersonDAO removed and replaced with now more efficient node service child assoc lookup methods


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

source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerAndSearcherFactory.java

@@ -179,7 +179,7 @@ public abstract class AbstractLuceneIndexerAndSearcherFactory implements LuceneI
 
     private int mergerTargetOverlayCount = 5;
 
-    private int mergerTargetOverlaysBlockingFactor = 2;
+    private int mergerTargetOverlaysBlockingFactor = 1;
 
     private int termIndexInterval =IndexWriter.DEFAULT_TERM_INDEX_INTERVAL;
 

source/java/org/alfresco/repo/search/impl/lucene/AbstractLuceneIndexerImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Alfresco Software Limited.
+ * Copyright (C) 2005-2009 Alfresco Software Limited.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -677,7 +677,7 @@ public abstract class AbstractLuceneIndexerImpl<T> extends AbstractLuceneBase
     {
         if (commandList.size() > 0)
         {
-            Command last = commandList.get(commandList.size() - 1);
+            Command<T> last = commandList.get(commandList.size() - 1);
             if ((last.action == command.action) && (last.ref.equals(command.ref)))
             {
                 return;
@@ -692,7 +692,7 @@ public abstract class AbstractLuceneIndexerImpl<T> extends AbstractLuceneBase
         }
     }
 
-    private void purgeCommandList(Command command)
+    private void purgeCommandList(Command<T> command)
     {
         if (command.action == Action.DELETE)
         {
@@ -712,17 +712,27 @@ public abstract class AbstractLuceneIndexerImpl<T> extends AbstractLuceneBase
         }
     }
 
-    private void removeFromCommandList(Command command, boolean matchExact)
+    private void removeFromCommandList(Command<T> command, boolean matchExact)
     {
         for (ListIterator<Command<T>> it = commandList.listIterator(commandList.size()); it.hasPrevious(); /**/)
         {
             Command<T> current = it.previous();
             if (matchExact)
             {
-                if ((current.action == command.action) && (current.ref.equals(command.ref)))
+                if (current.ref.equals(command.ref))
                 {
-                    it.remove();
-                    return;
+                    if ((current.action == command.action))
+                    {
+                        it.remove();
+                        return;
+                    }
+                    // If there is an INDEX in this same transaction and the current command is a reindex, remove it and
+                    // replace the current command with it
+                    else if (command.action != Action.DELETE && current.action == Action.INDEX)
+                    {
+                        it.remove();
+                        command.action = Action.INDEX;
+                    }
                 }
             }
             else
@@ -746,7 +756,7 @@ public abstract class AbstractLuceneIndexerImpl<T> extends AbstractLuceneBase
             mainReader = getReader();
             Set<String> forIndex = new LinkedHashSet<String>();
 
-            for (Command command : commandList)
+            for (Command<T> command : commandList)
             {
                 if (command.action == Action.INDEX)
                 {

source/java/org/alfresco/repo/search/impl/lucene/index/IndexInfo.java

@@ -323,7 +323,7 @@ public class IndexInfo implements IndexMonitor
 
     private int mergerTargetOverlays = 5;
 
-    private int mergerTargetOverlaysBlockingFactor = 2;
+    private int mergerTargetOverlaysBlockingFactor = 1;
 
     // Common properties for indexers