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

Fix ALF-4291: PostgreSQL - AVM index/search

Browse Source 
- don't need re-index snapshots backwards
- increase aync test delay

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22318 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-09-08 09:32:02 +00:00
parent 8c10779861
commit 8c74b0eacf
5 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/search/AVMSnapShotTriggeredIndexingMethodInterceptor.java
View File

@@ -156,7 +156,7 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
{
if (logger.isDebugEnabled())
{
logger.debug("renameStore createIndex " + to, new Exception("Stack Trace"));
logger.debug("renameStore createIndex " + to + "(0, " + after + ")", new Exception("Stack Trace"));
}
avmIndexer.createIndex(to, IndexMode.SYNCHRONOUS);
avmIndexer.index(to, 0, after, getIndexMode(to));
@@ -274,11 +274,22 @@ public class AVMSnapShotTriggeredIndexingMethodInterceptor implements MethodInte
}
int from = before != -1 ? before : last;
if (logger.isDebugEnabled())
if (from > after)
{
logger.debug("indexSnapshotImpl " + store, new Exception("Stack Trace"));
if (logger.isTraceEnabled())
{
logger.trace("skip indexSnapshotImpl " + store + " (" + (before == -1 ? "-1, " : "") + from +", " + after +")", new Exception("Stack Trace"));
}
}
else
{
if (logger.isDebugEnabled())
{
logger.debug("indexSnapshotImpl " + store + " (" + (before == -1 ? "-1, " : "") + from +", " + after +")", new Exception("Stack Trace"));
}
avmIndexer.index(store, from, after, getIndexMode(store));
}
avmIndexer.index(store, from, after, getIndexMode(store));
}
}
}

7
source/java/org/alfresco/repo/search/impl/lucene/AVMLuceneIndexerImpl.java
View File

@@ -59,7 +59,6 @@ import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.service.cmr.avm.AVMException;
import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
import org.alfresco.service.cmr.avm.AVMService;
import org.alfresco.service.cmr.avm.VersionDescriptor;
import org.alfresco.service.cmr.avmsync.AVMDifference;
import org.alfresco.service.cmr.avmsync.AVMSyncException;
import org.alfresco.service.cmr.avmsync.AVMSyncService;
@@ -286,7 +285,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
{
s_logger.debug("new: ("+srcVersion+", "+dstVersion+") "+difference.getDestinationPath());
}
// AR-786
// ALF-786
reindex(difference.getDestinationPath(), dstDesc.isDirectory());
if (dstDesc.isDirectory())
{
@@ -310,7 +309,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
{
// We are back from the dead ...the node used to be deleted
// Treat as new
// AR-786
// ALF-786
if (s_logger.isDebugEnabled())
{
s_logger.debug("back: ("+srcVersion+", "+dstVersion+") "+difference.getDestinationPath());
@@ -420,7 +419,7 @@ public class AVMLuceneIndexerImpl extends AbstractLuceneIndexerImpl<String> impl
Map<String, AVMNodeDescriptor> children = avmService.getDirectoryListing(dir, false);
for (AVMNodeDescriptor child : children.values())
{
// AR-786
// ALF-786
reindex(child.getPath(), child.isDirectory());
reindexAllAncestors(child.getPath());
if (child.isDirectory())