Merge pull request #758 from jgrzebyta/issues/#739-spin-lucene

Fix #739: spin lucene

Author: James Leigh

core/sail/fts/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailSpinTest.java

@@ -14,7 +14,7 @@
 
 
         <logger name="org.eclipse.rdf4j.sail.lucene.AbstractLuceneSailSpinTest">
-            <level value="warn"/>
+            <level value="info"/>
         </logger>
 
 

core/sail/fts/elasticsearch/src/test/java/org/eclipse/rdf4j/sail/elasticsearch/ElasticsearchSailTupleFunctionTest.java

@@ -41,6 +41,7 @@
 import org.eclipse.rdf4j.sail.SailException;
 import org.eclipse.rdf4j.sail.evaluation.TupleFunctionEvaluationMode;
 import org.eclipse.rdf4j.sail.helpers.NotifyingSailWrapper;
+import org.eclipse.rdf4j.sail.lucene.util.SearchIndexUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -196,9 +197,9 @@ public class LuceneSail extends NotifyingSailWrapper {
 	final private Logger logger = LoggerFactory.getLogger(this.getClass());
 
 	/**
-	 * Set the parameter "reindexQuery=" to configure the statements to index over. Default value is
-	 * "SELECT ?s ?p ?o ?c WHERE {{?s ?p ?o} UNION {GRAPH ?c {?s ?p ?o.}}} ORDER BY ?s" . NB: the query must
-	 * contain the bindings ?s, ?p, ?o and ?c and must be ordered by ?s.
+	 * Set the parameter "reindexQuery=" to configure the statements to index over. Default value is "SELECT
+	 * ?s ?p ?o ?c WHERE {{?s ?p ?o} UNION {GRAPH ?c {?s ?p ?o.}}} ORDER BY ?s" . NB: the query must contain
+	 * the bindings ?s, ?p, ?o and ?c and must be ordered by ?s.
 	 */
 	public static final String REINDEX_QUERY_KEY = "reindexQuery";
 
@@ -249,6 +250,12 @@ public class LuceneSail extends NotifyingSailWrapper {
 	 */
 	public static final String ANALYZER_CLASS_KEY = "analyzer";
 
+	/**
+	 * Set this key as sail parameter to configure {@link org.apache.lucene.search.similarities.Similarity}
+	 * class implementation to use for text analysis.
+	 */
+	public static final String SIMILARITY_CLASS_KEY = "similarity";
+
 	/**
 	 * Set this key as sail parameter to influence whether incomplete queries are treated as failure
 	 * (Malformed queries) or whether they are ignored. Set to either "true" or "false". When ommitted in the
@@ -387,19 +394,25 @@ public void initialize()
 		}
 	}
 
+	/**
+	 * The method is relocated to {@link SearchIndexUtils#createSearchIndex(java.util.Properties) }.
+	 * 
+	 * @param parameters
+	 * @return
+	 * @throws Exception
+	 * @deprecated
+	 */
+	@Deprecated
 	protected static SearchIndex createSearchIndex(Properties parameters)
 		throws Exception
 	{
-		String indexClassName = parameters.getProperty(INDEX_CLASS_KEY, DEFAULT_INDEX_CLASS);
-		SearchIndex index = (SearchIndex)Class.forName(indexClassName).newInstance();
-		index.initialize(parameters);
-		return index;
+		return SearchIndexUtils.createSearchIndex(parameters);
 	}
 
 	protected void initializeLuceneIndex()
 		throws Exception
 	{
-		SearchIndex index = createSearchIndex(parameters);
+		SearchIndex index = SearchIndexUtils.createSearchIndex(parameters);
 		setLuceneIndex(index);
 	}
 
@@ -598,8 +611,7 @@ public Statement mapStatement(Statement statement) {
 	}
 
 	protected Collection<SearchQueryInterpreter> getSearchQueryInterpreters() {
-		return Arrays.<SearchQueryInterpreter> asList(
-				new QuerySpecBuilder(incompleteQueryFails),
+		return Arrays.<SearchQueryInterpreter> asList(new QuerySpecBuilder(incompleteQueryFails),
 				new DistanceQuerySpecBuilder(luceneIndex), new GeoRelationQuerySpecBuilder(luceneIndex));
 	}
 }

core/sail/fts/elasticsearch/src/test/resources/logback-test.xml

@@ -99,8 +99,7 @@ public class LuceneSailConnection extends NotifyingSailConnectionWrapper {
 
 	@SuppressWarnings("unchecked")
 	private static final Set<Class<? extends QueryModelNode>> PROJECTION_TYPES = Sets.newHashSet(
-			Projection.class,
-			MultiProjection.class);
+			Projection.class, MultiProjection.class);
 
 	private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -184,10 +183,10 @@ public LuceneSailConnection(NotifyingSailConnection wrappedConnection, SearchInd
 	}
 
 	@Override
-	public synchronized void addStatement(Resource arg0, IRI arg1, Value arg2, Resource... arg3)
+	public synchronized void addStatement(Resource subj, IRI pred, Value obj, Resource... contexts)
 		throws SailException
 	{
-		super.addStatement(arg0, arg1, arg2, arg3);
+		super.addStatement(subj, pred, obj, contexts);
 	}
 
 	@Override
@@ -214,16 +213,16 @@ public void close()
 	// //////////////////////////////// Methods related to indexing
 
 	@Override
-	public synchronized void clear(Resource... arg0)
+	public synchronized void clear(Resource... contexts)
 		throws SailException
 	{
 		// remove the connection listener, this is safe as the changing methods
 		// are synchronized
 		// during the clear(), no other operation can be invoked
 		getWrappedConnection().removeConnectionListener(connectionListener);
 		try {
-			super.clear(arg0);
-			buffer.clear(arg0);
+			super.clear(contexts);
+			buffer.clear(contexts);
 		}
 		finally {
 			getWrappedConnection().addConnectionListener(connectionListener);
@@ -252,38 +251,37 @@ public void commit()
 
 		logger.debug("Committing Lucene transaction with {} operations.", buffer.operations().size());
 		try {
-			try {
-				// preprocess buffer
-				buffer.optimize();
-
-				// run operations and remove them from buffer
-				for (Iterator<Operation> i = buffer.operations().iterator(); i.hasNext();) {
-					Operation op = i.next();
-					if (op instanceof LuceneSailBuffer.AddRemoveOperation) {
-						AddRemoveOperation addremove = (AddRemoveOperation)op;
-						// add/remove in one call
-						addRemoveStatements(addremove.getAdded(), addremove.getRemoved());
-					}
-					else if (op instanceof LuceneSailBuffer.ClearContextOperation) {
-						// clear context
-						clearContexts(((ClearContextOperation)op).getContexts());
-					}
-					else if (op instanceof LuceneSailBuffer.ClearOperation) {
-						logger.debug("clearing index...");
-						luceneIndex.clear();
-					}
-					else
-						throw new RuntimeException(
-								"Cannot interpret operation " + op + " of type " + op.getClass().getName());
-					i.remove();
+			// preprocess buffer
+			buffer.optimize();
+
+			// run operations and remove them from buffer
+			for (Iterator<Operation> i = buffer.operations().iterator(); i.hasNext();) {
+				Operation op = i.next();
+				if (op instanceof LuceneSailBuffer.AddRemoveOperation) {
+					AddRemoveOperation addremove = (AddRemoveOperation)op;
+					// add/remove in one call
+					addRemoveStatements(addremove.getAdded(), addremove.getRemoved());
 				}
+				else if (op instanceof LuceneSailBuffer.ClearContextOperation) {
+					// clear context
+					clearContexts(((ClearContextOperation)op).getContexts());
+				}
+				else if (op instanceof LuceneSailBuffer.ClearOperation) {
+					logger.debug("clearing index...");
+					luceneIndex.clear();
+				}
+				else {
+					throw new SailException(
+							"Cannot interpret operation " + op + " of type " + op.getClass().getName());
+				}
+				i.remove();
 			}
-			catch (Exception e) {
-				logger.error("Committing operations in lucenesail, encountered exception " + e
-						+ ". Only some operations were stored, " + buffer.operations().size()
-						+ " operations are discarded. Lucene Index is now corrupt.", e);
-				throw new SailException(e);
-			}
+		}
+		catch (Exception e) {
+			logger.error("Committing operations in lucenesail, encountered exception " + e
+					+ ". Only some operations were stored, " + buffer.operations().size()
+					+ " operations are discarded. Lucene Index is now corrupt.", e);
+			throw new SailException(e);
 		}
 		finally {
 			buffer.reset();
@@ -610,10 +608,10 @@ private static int size(Iterable<?> iter, int defaultSize) {
 	}
 
 	@Override
-	public synchronized void removeStatements(Resource arg0, IRI arg1, Value arg2, Resource... arg3)
+	public synchronized void removeStatements(Resource subj, IRI pred, Value obj, Resource... contexts)
 		throws SailException
 	{
-		super.removeStatements(arg0, arg1, arg2, arg3);
+		super.removeStatements(subj, pred, obj, contexts);
 	}
 
 	@Override

core/sail/fts/lucene-api/src/main/java/org/eclipse/rdf4j/sail/lucene/LuceneSail.java

@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Eclipse RDF4J contributors, Aduna, and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Distribution License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/org/documents/edl-v10.php.
+ *******************************************************************************/
+package org.eclipse.rdf4j.sail.lucene.util;
+
+import java.util.Properties;
+import org.eclipse.rdf4j.sail.lucene.LuceneSail;
+import static org.eclipse.rdf4j.sail.lucene.LuceneSail.DEFAULT_INDEX_CLASS;
+import static org.eclipse.rdf4j.sail.lucene.LuceneSail.INDEX_CLASS_KEY;
+import org.eclipse.rdf4j.sail.lucene.SearchIndex;
+
+/**
+ * This is utility class with tool useful for manipulation on the {@link SearchIndex}.
+ * 
+ * @author jacek grzebyta
+ * @version 2.3
+ */
+public class SearchIndexUtils {
+
+	/**
+	 * The method creates instance of {@link SearchIndex}. The type of instantiated class depends on the value
+	 * of {@link LuceneSail#INDEX_CLASS_KEY} parameter. By default it is
+	 * <code>org.eclipse.rdf4j.sail.lucene.LuceneIndex</code>.
+	 *
+	 * @param parameters
+	 * @return
+	 * @throws Exception
+	 */
+	public static SearchIndex createSearchIndex(Properties parameters)
+		throws Exception
+	{
+		String indexClassName = parameters.getProperty(INDEX_CLASS_KEY, DEFAULT_INDEX_CLASS);
+		SearchIndex index = (SearchIndex)Class.forName(indexClassName).newInstance();
+		index.initialize(parameters);
+		return index;
+	}
+}