Skip to content

Commit

Permalink
Merge pull request gitblit-org#1168 from lucamilanesio/bump-to-lucene…
Browse files Browse the repository at this point in the history
…-5.5.2

Bump to Lucene 5.5.2

The new code will create Lucene indices in a new directory named after codec and index version.
This provides for easy and safe up- and downgrades. But it also means that the old indices will
stick around on disk. What this version is missing is a kind of "garbage collection" deleting old, unused
indices when they are no longer needed. That task needs to be done manually currently. We should
at leas at some point provide a script for it.
  • Loading branch information
fzs committed Mar 18, 2017
2 parents 71211a8 + 63dbdfd commit 2f74123
Show file tree
Hide file tree
Showing 34 changed files with 961 additions and 271 deletions.
14 changes: 7 additions & 7 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
<classpathentry kind="lib" path="ext/wicket-1.4.22.jar" sourcepath="ext/src/wicket-1.4.22.jar" />
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.22.jar" sourcepath="ext/src/wicket-auth-roles-1.4.22.jar" />
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.22.jar" sourcepath="ext/src/wicket-extensions-1.4.22.jar" />
<classpathentry kind="lib" path="ext/lucene-core-4.10.4.jar" sourcepath="ext/src/lucene-core-4.10.4.jar" />
<classpathentry kind="lib" path="ext/lucene-analyzers-common-4.10.4.jar" sourcepath="ext/src/lucene-analyzers-common-4.10.4.jar" />
<classpathentry kind="lib" path="ext/lucene-highlighter-4.10.4.jar" sourcepath="ext/src/lucene-highlighter-4.10.4.jar" />
<classpathentry kind="lib" path="ext/lucene-memory-4.10.4.jar" sourcepath="ext/src/lucene-memory-4.10.4.jar" />
<classpathentry kind="lib" path="ext/lucene-queries-4.10.4.jar" sourcepath="ext/src/lucene-queries-4.10.4.jar" />
<classpathentry kind="lib" path="ext/lucene-queryparser-4.10.4.jar" sourcepath="ext/src/lucene-queryparser-4.10.4.jar" />
<classpathentry kind="lib" path="ext/lucene-sandbox-4.10.4.jar" sourcepath="ext/src/lucene-sandbox-4.10.4.jar" />
<classpathentry kind="lib" path="ext/lucene-core-5.5.2.jar" sourcepath="ext/src/lucene-core-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-analyzers-common-5.5.2.jar" sourcepath="ext/src/lucene-analyzers-common-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-highlighter-5.5.2.jar" sourcepath="ext/src/lucene-highlighter-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-memory-5.5.2.jar" sourcepath="ext/src/lucene-memory-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-queries-5.5.2.jar" sourcepath="ext/src/lucene-queries-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-queryparser-5.5.2.jar" sourcepath="ext/src/lucene-queryparser-5.5.2.jar" />
<classpathentry kind="lib" path="ext/lucene-sandbox-5.5.2.jar" sourcepath="ext/src/lucene-sandbox-5.5.2.jar" />
<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
<classpathentry kind="lib" path="ext/pegdown-1.5.0.jar" sourcepath="ext/src/pegdown-1.5.0.jar" />
<classpathentry kind="lib" path="ext/parboiled-java-1.1.7.jar" sourcepath="ext/src/parboiled-java-1.1.7.jar" />
Expand Down
6 changes: 3 additions & 3 deletions build.moxie
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ properties: {
jetty.version : 9.2.13.v20150730
slf4j.version : 1.7.12
wicket.version : 1.4.22
lucene.version : 4.10.4
lucene.version : 5.5.2
jgit.version : 4.1.1.201511131810-r
groovy.version : 2.4.4
bouncycastle.version : 1.52
Expand Down Expand Up @@ -146,9 +146,9 @@ dependencies:
- compile 'org.apache.wicket:wicket-extensions:${wicket.version}' :war !org.mockito
- 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-highlighter:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-join
- compile 'org.apache.lucene:lucene-memory:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient
- compile 'org.apache.lucene:lucene-queryparser:${lucene.version}' :war :fedclient !org.apache.lucene:lucene-spatial
- compile 'org.pegdown:pegdown:1.5.0' :war
- compile 'org.fusesource.wikitext:wikitext-core:${wikitext.version}' :war
- compile 'org.fusesource.wikitext:twiki-core:${wikitext.version}' :war
Expand Down
42 changes: 21 additions & 21 deletions gitblit.iml
Original file line number Diff line number Diff line change
Expand Up @@ -180,79 +180,79 @@
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lucene-core-4.10.4.jar">
<library name="lucene-core-5.5.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/lucene-core-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lucene-analyzers-common-4.10.4.jar">
<library name="lucene-analyzers-common-5.5.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lucene-highlighter-4.10.4.jar">
<library name="lucene-highlighter-5.5.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/lucene-highlighter-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lucene-memory-4.10.4.jar">
<library name="lucene-memory-5.5.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/lucene-memory-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lucene-queries-4.10.4.jar">
<library name="lucene-queries-5.5.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/lucene-queries-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lucene-queryparser-4.10.4.jar">
<library name="lucene-queryparser-5.5.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/lucene-queryparser-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library name="lucene-sandbox-4.10.4.jar">
<library name="lucene-sandbox-5.5.2.jar">
<CLASSES>
<root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/lucene-sandbox-5.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.4.jar!/" />
<root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-5.5.2.jar!/" />
</SOURCES>
</library>
</orderEntry>
Expand Down
55 changes: 55 additions & 0 deletions src/main/java/com/gitblit/service/LuceneRepoIndexStore.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Copyright 2017 gitblit.com.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.gitblit.service;

import java.io.File;

import com.gitblit.utils.LuceneIndexStore;

/**
* @author Florian Zschocke
*
* @since 1.9.0
*/
class LuceneRepoIndexStore extends LuceneIndexStore
{

private static final String LUCENE_DIR = "lucene";
private static final String CONF_FILE = "gb_lucene.conf";


/**
* @param repositoryFolder
* The directory of the repository for this index
* @param indexVersion
* Version of the index definition
*/
public LuceneRepoIndexStore(File repositoryFolder, int indexVersion) {
super(new File(repositoryFolder, LUCENE_DIR), indexVersion);
}


/**
* Get the index config File.
*
* @return The index config File
*/
public File getConfigFile() {
return new File(this.indexFolder, CONF_FILE);
}

}
Loading

0 comments on commit 2f74123

Please sign in to comment.