From 6a49dbf7ec1420bfdfdcd1b85410c53ceda36ef3 Mon Sep 17 00:00:00 2001 From: j2blake Date: Mon, 12 Jan 2015 15:15:37 -0500 Subject: [PATCH] VIVO-870 Implement UpdateStatementsTask. Also add the listener to support it and get rid of the last of the vestigial classes. --- .../indexing/AdditionalURIsForContextNodes.java | 14 ++++---------- .../indexing/AdditionalUrisForVCards.java | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodes.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodes.java index 6b1325fd..507dac17 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodes.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalURIsForContextNodes.java @@ -33,9 +33,8 @@ public class AdditionalURIsForContextNodes implements IndexingUriFinder, Context private static final List multiValuedQueriesForRole = new ArrayList(); private static final ListqueryList; - private RDFService rdfService; - private Set alreadyChecked; - private long accumulatedTime = 0; + private final Set alreadyChecked = Collections.synchronizedSet(new HashSet()); + private volatile RDFService rdfService; @Override @@ -47,8 +46,6 @@ public class AdditionalURIsForContextNodes implements IndexingUriFinder, Context public List findAdditionalURIsToIndex(Statement stmt) { if( stmt != null ){ - long start = System.currentTimeMillis(); - ListurisToIndex = new ArrayList(); if(stmt.getSubject() != null && stmt.getSubject().isURIResource() ){ String subjUri = stmt.getSubject().getURI(); @@ -66,7 +63,6 @@ public class AdditionalURIsForContextNodes implements IndexingUriFinder, Context } } - accumulatedTime += (System.currentTimeMillis() - start ) ; return urisToIndex; }else{ return Collections.emptyList(); @@ -75,14 +71,12 @@ public class AdditionalURIsForContextNodes implements IndexingUriFinder, Context @Override public void startIndexing() { - alreadyChecked = new HashSet(); - accumulatedTime = 0L; + alreadyChecked.clear(); } @Override public void endIndexing() { - log.debug( "Accumulated time for this run of the index: " + accumulatedTime + " msec"); - alreadyChecked = null; + // Nothing to clear } protected List findAdditionalURIsToIndex(String uri) { diff --git a/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUrisForVCards.java b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUrisForVCards.java index 8c08b781..69d4c30a 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUrisForVCards.java +++ b/src/edu/cornell/mannlib/vitro/webapp/searchindex/indexing/AdditionalUrisForVCards.java @@ -39,7 +39,7 @@ public class AdditionalUrisForVCards implements IndexingUriFinder, ContextModels + " ?uri obo:ARG_2000028 ?contactInfo . \n " // + "}"; - private RDFService rdfService; + private volatile RDFService rdfService; @Override public void setContextModels(ContextModelAccess models) {