litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-3209 Simplify logic in IndexBuilder; don't expose intermediate results as instance variables, where they could be subject to concurrency issues.

Browse source
This commit is contained in:
j2blake 2011-10-10 19:09:10 +00:00
parent 9f95c3fbc7
commit be06b68871
1 changed files with 32 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

76
webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
View file

@ -58,17 +58,6 @@ public class IndexBuilder extends Thread {
* updated in the search index when a statement changes. */
protected List<StatementToURIsToUpdate> stmtToURIsToIndexFunctions;
/**
* updatedUris will only be accessed from the IndexBuilder thread
* so it doesn't need to be synchronized.
*/
private List<String> updatedUris = null;
/**
* deletedUris will only be accessed from the IndexBuilder thread
* so it doesn't need to be synchronized.
*/
private List<String> deletedUris = null;
/**
* Indicates that a full index re-build has been requested.
*/
@ -101,8 +90,8 @@ public class IndexBuilder extends Thread {
super("IndexBuilder");
this.indexer = indexer;
this.wdf = wdf;
this.wdf = wdf;
if( stmtToURIsToIndexFunctions != null )
this.stmtToURIsToIndexFunctions = stmtToURIsToIndexFunctions;
else
@ -248,32 +237,29 @@ public class IndexBuilder extends Thread {
}
/**
* Sets updatedUris and deletedUris lists from the changedStmtQueue.
* updatedUris and deletedUris will only be accessed from the IndexBuilder thread
* so they don't need to be synchronized.
* Take the URIs that we got from the changedStmtQueue, and create the lists
* of updated URIs and deleted URIs.
*/
private void makeAddAndDeleteLists( Collection<String> uris){
IndividualDao indDao = wdf.getIndividualDao();
/* clear updateInds and deletedUris. This is the only method that should set these. */
this.updatedUris = new LinkedList<String>();
this.deletedUris = new LinkedList<String>();
for( String uri: uris){
if( uri != null ){
try{
Individual ind = indDao.getIndividualByURI(uri);
if( ind != null)
this.updatedUris.add(uri);
else{
log.debug("found delete in changed uris");
this.deletedUris.add(uri);
}
} catch(QueryParseException ex){
log.error("could not get Individual "+ uri,ex);
}
}
}
private UriLists makeAddAndDeleteLists(Collection<String> uris) {
IndividualDao indDao = wdf.getIndividualDao();
UriLists uriLists = new UriLists();
for (String uri : uris) {
if (uri != null) {
try {
Individual ind = indDao.getIndividualByURI(uri);
if (ind != null) {
uriLists.updatedUris.add(uri);
} else {
log.debug("found delete in changed uris");
uriLists.deletedUris.add(uri);
}
} catch (QueryParseException ex) {
log.error("could not get Individual " + uri, ex);
}
}
}
return uriLists;
}
/**
@ -298,13 +284,10 @@ public class IndexBuilder extends Thread {
protected void updatedIndex() {
log.debug("Starting updateIndex()");
makeAddAndDeleteLists( statementsToUris(getAndEmptyChangedStatements()) );
UriLists uriLists = makeAddAndDeleteLists( statementsToUris(getAndEmptyChangedStatements()) );
this.numberOfThreads = Math.max( MAX_UPDATE_THREADS, updatedUris.size() / 20);
doBuild( updatedUris.iterator(), deletedUris );
this.updatedUris = null;
this.deletedUris = null;
this.numberOfThreads = Math.max( MAX_UPDATE_THREADS, uriLists.updatedUris.size() / 20);
doBuild( uriLists.updatedUris.iterator(), uriLists.deletedUris );
log.debug("Ending updateIndex()");
}
@ -453,6 +436,11 @@ public class IndexBuilder extends Thread {
synchronized( changedStmtQueue ){
return reindexRequested || ! changedStmtQueue.isEmpty() ;
}
}
}
private static class UriLists {
private final List<String> updatedUris = new ArrayList<String>();
private final List<String> deletedUris = new ArrayList<String>();
}
}