From db983266cea3b57193343cfbec2a6cbcce08b835 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Update to Lucene 4.6.0 (pull request #124)
---
.classpath | 11 ++-
releases.moxie | 2
build.moxie | 4 +
gitblit.iml | 57 +++++++++++++++----
src/main/java/com/gitblit/service/LuceneService.java | 85 ++++++++++++----------------
5 files changed, 93 insertions(+), 66 deletions(-)
diff --git a/.classpath b/.classpath
index 9d6a6d2..4122b8d 100644
--- a/.classpath
+++ b/.classpath
@@ -19,10 +19,13 @@
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.21.jar" sourcepath="ext/src/wicket-auth-roles-1.4.21.jar" />
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.21.jar" sourcepath="ext/src/wicket-extensions-1.4.21.jar" />
<classpathentry kind="lib" path="ext/googlecharts-1.4.21.jar" sourcepath="ext/src/googlecharts-1.4.21.jar" />
- <classpathentry kind="lib" path="ext/lucene-core-3.6.1.jar" sourcepath="ext/src/lucene-core-3.6.1.jar" />
- <classpathentry kind="lib" path="ext/lucene-highlighter-3.6.1.jar" sourcepath="ext/src/lucene-highlighter-3.6.1.jar" />
- <classpathentry kind="lib" path="ext/lucene-memory-3.6.1.jar" sourcepath="ext/src/lucene-memory-3.6.1.jar" />
- <classpathentry kind="lib" path="ext/lucene-queries-3.6.1.jar" sourcepath="ext/src/lucene-queries-3.6.1.jar" />
+ <classpathentry kind="lib" path="ext/lucene-core-4.6.0.jar" sourcepath="ext/src/lucene-core-4.6.0.jar" />
+ <classpathentry kind="lib" path="ext/lucene-analyzers-common-4.6.0.jar" sourcepath="ext/src/lucene-analyzers-common-4.6.0.jar" />
+ <classpathentry kind="lib" path="ext/lucene-highlighter-4.6.0.jar" sourcepath="ext/src/lucene-highlighter-4.6.0.jar" />
+ <classpathentry kind="lib" path="ext/lucene-memory-4.6.0.jar" sourcepath="ext/src/lucene-memory-4.6.0.jar" />
+ <classpathentry kind="lib" path="ext/lucene-queries-4.6.0.jar" sourcepath="ext/src/lucene-queries-4.6.0.jar" />
+ <classpathentry kind="lib" path="ext/lucene-queryparser-4.6.0.jar" sourcepath="ext/src/lucene-queryparser-4.6.0.jar" />
+ <classpathentry kind="lib" path="ext/lucene-sandbox-4.6.0.jar" sourcepath="ext/src/lucene-sandbox-4.6.0.jar" />
<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
<classpathentry kind="lib" path="ext/pegdown-1.4.1.jar" sourcepath="ext/src/pegdown-1.4.1.jar" />
<classpathentry kind="lib" path="ext/parboiled-java-1.1.5.jar" sourcepath="ext/src/parboiled-java-1.1.5.jar" />
diff --git a/build.moxie b/build.moxie
index b09c7a5..a328536 100644
--- a/build.moxie
+++ b/build.moxie
@@ -101,7 +101,7 @@
properties: {
jetty.version : 8.1.13.v20130916
wicket.version : 1.4.21
- lucene.version : 3.6.1
+ lucene.version : 4.6.0
jgit.version : 3.1.0.201310021548-r
groovy.version : 1.8.8
bouncycastle.version : 1.47
@@ -138,8 +138,10 @@
- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
- compile 'org.wicketstuff:googlecharts:${wicket.version}' :war
- compile 'org.apache.lucene:lucene-core:${lucene.version}' :war :fedclient
+- compile 'org.apache.lucene:lucene-analyzers-common:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-highlighter:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
+- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
- compile 'org.pegdown:pegdown:1.4.1' :war
- compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war
- compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war
diff --git a/gitblit.iml b/gitblit.iml
index 74b1e85..ffb736e 100644
--- a/gitblit.iml
+++ b/gitblit.iml
@@ -188,46 +188,79 @@
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-core-3.6.1.jar">
+ <library name="lucene-core-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-core-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-core-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-core-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-highlighter-3.6.1.jar">
+ <library name="lucene-analyzers-common-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-memory-3.6.1.jar">
+ <library name="lucene-highlighter-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-memory-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
- <library name="lucene-queries-3.6.1.jar">
+ <library name="lucene-memory-4.6.0.jar">
<CLASSES>
- <root url="jar://$MODULE_DIR$/ext/lucene-queries-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/lucene-memory-4.6.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
- <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-3.6.1.jar!/" />
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.6.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="lucene-queries-4.6.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/lucene-queries-4.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.6.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="lucene-queryparser-4.6.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.6.0.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="lucene-sandbox-4.6.0.jar">
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.6.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.6.0.jar!/" />
</SOURCES>
</library>
</orderEntry>
diff --git a/releases.moxie b/releases.moxie
index 3f9c074..c2ad4fc 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -53,6 +53,7 @@
dependencyChanges:
- updated to Jetty 8.1.13
- updated to JGit 3.1.0
+ - updated to Lucene 4.6.0
- replaced MarkdownPapers with pegdown 1.4.1
- added Eclipse WikiText libraries for processing confluence, mediawiki, textile, tracwiki, and twiki
settings:
@@ -78,6 +79,7 @@
- Chris Graham
- Guenter Dressel
- fpeters.fae
+ - David Ostrovsky
}
#
diff --git a/src/main/java/com/gitblit/service/LuceneService.java b/src/main/java/com/gitblit/service/LuceneService.java
index 97fe9e1..70e3b24 100644
--- a/src/main/java/com/gitblit/service/LuceneService.java
+++ b/src/main/java/com/gitblit/service/LuceneService.java
@@ -21,7 +21,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.Method;
import java.text.MessageFormat;
import java.text.ParseException;
import java.util.ArrayList;
@@ -42,15 +41,16 @@
import org.apache.lucene.document.DateTools.Resolution;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
+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.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.MultiReader;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.QueryParser;
+import org.apache.lucene.queryparser.classic.QueryParser;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.IndexSearcher;
@@ -125,7 +125,7 @@
private static final String CONF_ALIAS = "aliases";
private static final String CONF_BRANCH = "branches";
- private static final Version LUCENE_VERSION = Version.LUCENE_35;
+ private static final Version LUCENE_VERSION = Version.LUCENE_46;
private final Logger logger = LoggerFactory.getLogger(LuceneService.class);
@@ -552,13 +552,13 @@
Resolution.MINUTE);
Document doc = new Document();
- doc.add(new Field(FIELD_OBJECT_TYPE, SearchObjectType.blob.name(), Store.YES, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(FIELD_BRANCH, branchName, Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_COMMIT, commit.getName(), Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_PATH, path, Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_DATE, blobDate, Store.YES, Index.NO));
- doc.add(new Field(FIELD_AUTHOR, blobAuthor, Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_COMMITTER, blobCommitter, Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_OBJECT_TYPE, SearchObjectType.blob.name(), StringField.TYPE_STORED));
+ doc.add(new Field(FIELD_BRANCH, branchName, TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_COMMIT, commit.getName(), TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_PATH, path, TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_DATE, blobDate, StringField.TYPE_STORED));
+ doc.add(new Field(FIELD_AUTHOR, blobAuthor, TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_COMMITTER, blobCommitter, TextField.TYPE_STORED));
// determine extension to compare to the extension
// blacklist
@@ -579,7 +579,7 @@
in.close();
byte[] content = os.toByteArray();
String str = StringUtils.decodeString(content, encodings);
- doc.add(new Field(FIELD_CONTENT, str, Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_CONTENT, str, TextField.TYPE_STORED));
os.reset();
}
@@ -593,7 +593,7 @@
// index the tip commit object
if (indexedCommits.add(tipId)) {
Document doc = createDocument(tip, tags.get(tipId));
- doc.add(new Field(FIELD_BRANCH, branchName, Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_BRANCH, branchName, TextField.TYPE_STORED));
writer.addDocument(doc);
result.commitCount += 1;
result.branchCount += 1;
@@ -607,7 +607,7 @@
String hash = rev.getId().getName();
if (indexedCommits.add(hash)) {
Document doc = createDocument(rev, tags.get(hash));
- doc.add(new Field(FIELD_BRANCH, branchName, Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_BRANCH, branchName, TextField.TYPE_STORED));
writer.addDocument(doc);
result.commitCount += 1;
}
@@ -660,14 +660,13 @@
if (!ChangeType.DELETE.equals(path.changeType)) {
result.blobCount++;
Document doc = new Document();
- doc.add(new Field(FIELD_OBJECT_TYPE, SearchObjectType.blob.name(), Store.YES,
- Index.NOT_ANALYZED));
- doc.add(new Field(FIELD_BRANCH, branch, Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_COMMIT, commit.getName(), Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_PATH, path.path, Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_DATE, revDate, Store.YES, Index.NO));
- doc.add(new Field(FIELD_AUTHOR, getAuthor(commit), Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_COMMITTER, getCommitter(commit), Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_OBJECT_TYPE, SearchObjectType.blob.name(), StringField.TYPE_STORED));
+ doc.add(new Field(FIELD_BRANCH, branch, TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_COMMIT, commit.getName(), TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_PATH, path.path, TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_DATE, revDate, StringField.TYPE_STORED));
+ doc.add(new Field(FIELD_AUTHOR, getAuthor(commit), TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_COMMITTER, getCommitter(commit), TextField.TYPE_STORED));
// determine extension to compare to the extension
// blacklist
@@ -682,7 +681,7 @@
String str = JGitUtils.getStringContent(repository, commit.getTree(),
path.path, encodings);
if (str != null) {
- doc.add(new Field(FIELD_CONTENT, str, Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_CONTENT, str, TextField.TYPE_STORED));
writer.addDocument(doc);
}
}
@@ -700,7 +699,7 @@
// create and write the Lucene document
Document doc = createDocument(commit, commitTags);
- doc.add(new Field(FIELD_BRANCH, branch, Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_BRANCH, branch, TextField.TYPE_STORED));
result.commitCount++;
result.success = index(repositoryName, doc);
} catch (Exception e) {
@@ -880,17 +879,16 @@
*/
private Document createDocument(RevCommit commit, List<String> tags) {
Document doc = new Document();
- doc.add(new Field(FIELD_OBJECT_TYPE, SearchObjectType.commit.name(), Store.YES,
- Index.NOT_ANALYZED));
- doc.add(new Field(FIELD_COMMIT, commit.getName(), Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_OBJECT_TYPE, SearchObjectType.commit.name(), StringField.TYPE_STORED));
+ doc.add(new Field(FIELD_COMMIT, commit.getName(), TextField.TYPE_STORED));
doc.add(new Field(FIELD_DATE, DateTools.timeToString(commit.getCommitTime() * 1000L,
- Resolution.MINUTE), Store.YES, Index.NO));
- doc.add(new Field(FIELD_AUTHOR, getAuthor(commit), Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_COMMITTER, getCommitter(commit), Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_SUMMARY, commit.getShortMessage(), Store.YES, Index.ANALYZED));
- doc.add(new Field(FIELD_CONTENT, commit.getFullMessage(), Store.YES, Index.ANALYZED));
+ Resolution.MINUTE), StringField.TYPE_STORED));
+ doc.add(new Field(FIELD_AUTHOR, getAuthor(commit), TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_COMMITTER, getCommitter(commit), TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_SUMMARY, commit.getShortMessage(), TextField.TYPE_STORED));
+ doc.add(new Field(FIELD_CONTENT, commit.getFullMessage(), TextField.TYPE_STORED));
if (!ArrayUtils.isEmpty(tags)) {
- doc.add(new Field(FIELD_TAG, StringUtils.flattenStrings(tags), Store.YES, Index.ANALYZED));
+ doc.add(new Field(FIELD_TAG, StringUtils.flattenStrings(tags), TextField.TYPE_STORED));
}
return doc;
}
@@ -952,7 +950,7 @@
IndexSearcher searcher = searchers.get(repository);
if (searcher == null) {
IndexWriter writer = getIndexWriter(repository);
- searcher = new IndexSearcher(IndexReader.open(writer, true));
+ searcher = new IndexSearcher(DirectoryReader.open(writer, true));
searchers.put(repository, searcher);
}
return searcher;
@@ -1226,25 +1224,14 @@
*/
private class MultiSourceReader extends MultiReader {
- final Method method;
-
- MultiSourceReader(IndexReader[] subReaders) {
- super(subReaders);
- Method m = null;
- try {
- m = MultiReader.class.getDeclaredMethod("readerIndex", int.class);
- m.setAccessible(true);
- } catch (Exception e) {
- logger.error("Error getting readerIndex method", e);
- }
- method = m;
+ MultiSourceReader(IndexReader [] readers) {
+ super(readers, false);
}
int getSourceIndex(int docId) {
int index = -1;
try {
- Object o = method.invoke(this, docId);
- index = (Integer) o;
+ index = super.readerIndex(docId);
} catch (Exception e) {
logger.error("Error getting source index", e);
}
--
Gitblit v1.9.1