You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/07/27 04:45:01 UTC
svn commit: r1507563 - in /roller/trunk/app: ./
src/main/java/org/apache/roller/weblogger/business/search/
src/main/java/org/apache/roller/weblogger/business/search/operations/
Author: gmazza
Date: Sat Jul 27 02:45:00 2013
New Revision: 1507563
URL: http://svn.apache.org/r1507563
Log:
Upgraded from Lucene 3.6.0 to 4.3.1 (4.4, released three days ago, is apparently not in Central yet.)
Modified:
roller/trunk/app/pom.xml
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
Modified: roller/trunk/app/pom.xml
URL: http://svn.apache.org/viewvc/roller/trunk/app/pom.xml?rev=1507563&r1=1507562&r2=1507563&view=diff
==============================================================================
--- roller/trunk/app/pom.xml (original)
+++ roller/trunk/app/pom.xml Sat Jul 27 02:45:00 2013
@@ -118,9 +118,16 @@
<dependency>
<groupId>org.apache.lucene</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
<scope>compile</scope>
- <version>3.6.0</version>
+ <version>4.3.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <scope>compile</scope>
+ <version>4.3.1</version>
</dependency>
<dependency>
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java?rev=1507563&r1=1507562&r2=1507563&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexManagerImpl.java Sat Jul 27 02:45:00 2013
@@ -26,13 +26,15 @@ import java.util.concurrent.locks.Reentr
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.LimitTokenCountAnalyzer;
+import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.RAMDirectory;
import org.apache.roller.weblogger.WebloggerException;
import org.apache.roller.weblogger.business.InitializationException;
@@ -92,8 +94,7 @@ public class IndexManagerImpl implements
* errors. The preferred way of getting an index is through the
* RollerContext.
*
- * @param indexDir
- * - the path to the index directory
+ * @param roller - the weblogger instance
*/
@com.google.inject.Inject
protected IndexManagerImpl(Weblogger roller) {
@@ -152,7 +153,7 @@ public class IndexManagerImpl implements
if (useRAMIndex) {
Directory filesystem = getFSDirectory(false);
try {
- fRAMindex = new RAMDirectory(filesystem);
+ fRAMindex = new RAMDirectory(filesystem, IOContext.DEFAULT);
} catch (IOException e) {
mLogger.error("Error creating in-memory index", e);
}
@@ -251,7 +252,7 @@ public class IndexManagerImpl implements
}
/**
- * @param search
+ * @param op
*/
public void executeIndexOperationNow(final IndexOperation op) {
try {
@@ -273,7 +274,7 @@ public class IndexManagerImpl implements
public synchronized IndexReader getSharedIndexReader() {
if (reader == null) {
try {
- reader = IndexReader.open(getIndexDirectory());
+ reader = DirectoryReader.open(getIndexDirectory());
} catch (IOException e) {
}
}
@@ -297,7 +298,7 @@ public class IndexManagerImpl implements
private boolean indexExists() {
try {
- return IndexReader.indexExists(getIndexDirectory());
+ return DirectoryReader.indexExists(getIndexDirectory());
} catch (IOException e) {
mLogger.error("Problem accessing index directory", e);
}
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java?rev=1507563&r1=1507562&r2=1507563&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/IndexUtil.java Sat Jul 27 02:45:00 2013
@@ -48,18 +48,18 @@ public class IndexUtil {
if (input == null || field == null)
return null;
- Analyzer analyer = IndexManagerImpl.getAnalyzer();
-
- TokenStream tokens = analyer
- .tokenStream(field, new StringReader(input));
-
- CharTermAttribute termAtt = (CharTermAttribute) tokens
- .addAttribute(CharTermAttribute.class);
+ Analyzer analyzer = IndexManagerImpl.getAnalyzer();
Term term = null;
try {
+ TokenStream tokens = analyzer
+ .tokenStream(field, new StringReader(input));
+
+ CharTermAttribute termAtt = (CharTermAttribute) tokens
+ .addAttribute(CharTermAttribute.class);
+
tokens.reset();
if (tokens.incrementToken()) {
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java?rev=1507563&r1=1507562&r2=1507563&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/IndexOperation.java Sat Jul 27 02:45:00 2013
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.lucene.analysis.LimitTokenCountAnalyzer;
+import org.apache.lucene.analysis.miscellaneous.LimitTokenCountAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexWriter;
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java?rev=1507563&r1=1507562&r2=1507563&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/business/search/operations/SearchOperation.java Sat Jul 27 02:45:00 2013
@@ -24,8 +24,8 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.MultiFieldQueryParser;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
@@ -62,7 +62,7 @@ public class SearchOperation extends Rea
// BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD };
private static Sort SORTER = new Sort(new SortField(
- FieldConstants.PUBLISHED, SortField.STRING, true));
+ FieldConstants.PUBLISHED, SortField.Type.STRING, true));
// ~ Instance fields
// ========================================================