Skip to content

Commit a7330da

Browse files
lucamilanesiolucamilanesio
committed
Bump to Lucene 5.5.2
1 parent 3d569f8 commit a7330da

File tree

5 files changed

+55
-55
lines changed

5 files changed

+55
-55
lines changed

‎.classpath‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<classpathentry kind="lib" path="ext/wicket-1.4.22.jar" sourcepath="ext/src/wicket-1.4.22.jar" />
2222
<classpathentry kind="lib" path="ext/wicket-auth-roles-1.4.22.jar" sourcepath="ext/src/wicket-auth-roles-1.4.22.jar" />
2323
<classpathentry kind="lib" path="ext/wicket-extensions-1.4.22.jar" sourcepath="ext/src/wicket-extensions-1.4.22.jar" />
24-
<classpathentry kind="lib" path="ext/lucene-core-4.10.4.jar" sourcepath="ext/src/lucene-core-4.10.4.jar" />
25-
<classpathentry kind="lib" path="ext/lucene-analyzers-common-4.10.4.jar" sourcepath="ext/src/lucene-analyzers-common-4.10.4.jar" />
26-
<classpathentry kind="lib" path="ext/lucene-highlighter-4.10.4.jar" sourcepath="ext/src/lucene-highlighter-4.10.4.jar" />
27-
<classpathentry kind="lib" path="ext/lucene-memory-4.10.4.jar" sourcepath="ext/src/lucene-memory-4.10.4.jar" />
28-
<classpathentry kind="lib" path="ext/lucene-queries-4.10.4.jar" sourcepath="ext/src/lucene-queries-4.10.4.jar" />
29-
<classpathentry kind="lib" path="ext/lucene-queryparser-4.10.4.jar" sourcepath="ext/src/lucene-queryparser-4.10.4.jar" />
30-
<classpathentry kind="lib" path="ext/lucene-sandbox-4.10.4.jar" sourcepath="ext/src/lucene-sandbox-4.10.4.jar" />
24+
<classpathentry kind="lib" path="ext/lucene-core-5.5.2.jar" sourcepath="ext/src/lucene-core-5.5.2.jar" />
25+
<classpathentry kind="lib" path="ext/lucene-analyzers-common-5.5.2.jar" sourcepath="ext/src/lucene-analyzers-common-5.5.2.jar" />
26+
<classpathentry kind="lib" path="ext/lucene-highlighter-5.5.2.jar" sourcepath="ext/src/lucene-highlighter-5.5.2.jar" />
27+
<classpathentry kind="lib" path="ext/lucene-queries-5.5.2.jar" sourcepath="ext/src/lucene-queries-5.5.2.jar" />
28+
<classpathentry kind="lib" path="ext/lucene-memory-5.5.2.jar" sourcepath="ext/src/lucene-memory-5.5.2.jar" />
29+
<classpathentry kind="lib" path="ext/lucene-queryparser-5.5.2.jar" sourcepath="ext/src/lucene-queryparser-5.5.2.jar" />
30+
<classpathentry kind="lib" path="ext/lucene-sandbox-5.5.2.jar" sourcepath="ext/src/lucene-sandbox-5.5.2.jar" />
3131
<classpathentry kind="lib" path="ext/jakarta-regexp-1.4.jar" />
3232
<classpathentry kind="lib" path="ext/pegdown-1.5.0.jar" sourcepath="ext/src/pegdown-1.5.0.jar" />
3333
<classpathentry kind="lib" path="ext/parboiled-java-1.1.7.jar" sourcepath="ext/src/parboiled-java-1.1.7.jar" />

‎build.moxie‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ properties: {
106106
jetty.version : 9.2.13.v20150730
107107
slf4j.version : 1.7.12
108108
wicket.version : 1.4.22
109-
lucene.version : 4.10.4
109+
lucene.version : 5.5.2
110110
jgit.version : 4.1.1.201511131810-r
111111
groovy.version : 2.4.4
112112
bouncycastle.version : 1.52

‎gitblit.iml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -180,79 +180,79 @@
180180
</library>
181181
</orderEntry>
182182
<orderEntry type="module-library">
183-
<library name="lucene-core-4.10.4.jar">
183+
<library name="lucene-core-5.5.2.jar">
184184
<CLASSES>
185-
<root url="jar://$MODULE_DIR$/ext/lucene-core-4.10.4.jar!/" />
185+
<root url="jar://$MODULE_DIR$/ext/lucene-core-5.5.2.jar!/" />
186186
</CLASSES>
187187
<JAVADOC />
188188
<SOURCES>
189-
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-4.10.4.jar!/" />
189+
<root url="jar://$MODULE_DIR$/ext/src/lucene-core-5.5.2.jar!/" />
190190
</SOURCES>
191191
</library>
192192
</orderEntry>
193193
<orderEntry type="module-library">
194-
<library name="lucene-analyzers-common-4.10.4.jar">
194+
<library name="lucene-analyzers-common-5.5.2.jar">
195195
<CLASSES>
196-
<root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-4.10.4.jar!/" />
196+
<root url="jar://$MODULE_DIR$/ext/lucene-analyzers-common-5.5.2.jar!/" />
197197
</CLASSES>
198198
<JAVADOC />
199199
<SOURCES>
200-
<root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-4.10.4.jar!/" />
200+
<root url="jar://$MODULE_DIR$/ext/src/lucene-analyzers-common-5.5.2.jar!/" />
201201
</SOURCES>
202202
</library>
203203
</orderEntry>
204204
<orderEntry type="module-library">
205-
<library name="lucene-highlighter-4.10.4.jar">
205+
<library name="lucene-highlighter-5.5.2.jar">
206206
<CLASSES>
207-
<root url="jar://$MODULE_DIR$/ext/lucene-highlighter-4.10.4.jar!/" />
207+
<root url="jar://$MODULE_DIR$/ext/lucene-highlighter-5.5.2.jar!/" />
208208
</CLASSES>
209209
<JAVADOC />
210210
<SOURCES>
211-
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-4.10.4.jar!/" />
211+
<root url="jar://$MODULE_DIR$/ext/src/lucene-highlighter-5.5.2.jar!/" />
212212
</SOURCES>
213213
</library>
214214
</orderEntry>
215215
<orderEntry type="module-library">
216-
<library name="lucene-memory-4.10.4.jar">
216+
<library name="lucene-join-5.5.2.jar">
217217
<CLASSES>
218-
<root url="jar://$MODULE_DIR$/ext/lucene-memory-4.10.4.jar!/" />
218+
<root url="jar://$MODULE_DIR$/ext/lucene-join-5.5.2.jar!/" />
219219
</CLASSES>
220220
<JAVADOC />
221221
<SOURCES>
222-
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-4.10.4.jar!/" />
222+
<root url="jar://$MODULE_DIR$/ext/src/lucene-join-5.5.2.jar!/" />
223223
</SOURCES>
224224
</library>
225225
</orderEntry>
226226
<orderEntry type="module-library">
227-
<library name="lucene-queries-4.10.4.jar">
227+
<library name="lucene-grouping-5.5.2.jar">
228228
<CLASSES>
229-
<root url="jar://$MODULE_DIR$/ext/lucene-queries-4.10.4.jar!/" />
229+
<root url="jar://$MODULE_DIR$/ext/lucene-grouping-5.5.2.jar!/" />
230230
</CLASSES>
231231
<JAVADOC />
232232
<SOURCES>
233-
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-4.10.4.jar!/" />
233+
<root url="jar://$MODULE_DIR$/ext/src/lucene-grouping-5.5.2.jar!/" />
234234
</SOURCES>
235235
</library>
236236
</orderEntry>
237237
<orderEntry type="module-library">
238-
<library name="lucene-queryparser-4.10.4.jar">
238+
<library name="lucene-queries-5.5.2.jar">
239239
<CLASSES>
240-
<root url="jar://$MODULE_DIR$/ext/lucene-queryparser-4.10.4.jar!/" />
240+
<root url="jar://$MODULE_DIR$/ext/lucene-queries-5.5.2.jar!/" />
241241
</CLASSES>
242242
<JAVADOC />
243243
<SOURCES>
244-
<root url="jar://$MODULE_DIR$/ext/src/lucene-queryparser-4.10.4.jar!/" />
244+
<root url="jar://$MODULE_DIR$/ext/src/lucene-queries-5.5.2.jar!/" />
245245
</SOURCES>
246246
</library>
247247
</orderEntry>
248248
<orderEntry type="module-library">
249-
<library name="lucene-sandbox-4.10.4.jar">
249+
<library name="lucene-memory-5.5.2.jar">
250250
<CLASSES>
251-
<root url="jar://$MODULE_DIR$/ext/lucene-sandbox-4.10.4.jar!/" />
251+
<root url="jar://$MODULE_DIR$/ext/lucene-memory-5.5.2.jar!/" />
252252
</CLASSES>
253253
<JAVADOC />
254254
<SOURCES>
255-
<root url="jar://$MODULE_DIR$/ext/src/lucene-sandbox-4.10.4.jar!/" />
255+
<root url="jar://$MODULE_DIR$/ext/src/lucene-memory-5.5.2.jar!/" />
256256
</SOURCES>
257257
</library>
258258
</orderEntry>

‎src/main/java/com/gitblit/service/LuceneService.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public synchronized void close() {
267267
// close all writers
268268
for (String writer : writers.keySet()) {
269269
try {
270-
writers.get(writer).close(true);
270+
writers.get(writer).close();
271271
} catch (Throwable t) {
272272
logger.error("Failed to close Lucene writer for " + writer, t);
273273
}
@@ -722,8 +722,8 @@ public boolean deleteBlob(String repositoryName, String branch, String path) thr
722722
String q = MessageFormat.format(pattern, SearchObjectType.blob.name(), branch, path);
723723

724724
BooleanQuery query = new BooleanQuery();
725-
StandardAnalyzer analyzer = new StandardAnalyzer(LUCENE_VERSION);
726-
QueryParser qp = new QueryParser(LUCENE_VERSION, FIELD_SUMMARY, analyzer);
725+
StandardAnalyzer analyzer = new StandardAnalyzer();
726+
QueryParser qp = new QueryParser(FIELD_SUMMARY, analyzer);
727727
query.add(qp.parse(q), Occur.MUST);
728728

729729
IndexWriter writer = getIndexWriter(repositoryName);
@@ -968,14 +968,14 @@ private IndexWriter getIndexWriter(String repository) throws IOException {
968968
IndexWriter indexWriter = writers.get(repository);
969969
File repositoryFolder = FileKey.resolve(new File(repositoriesFolder, repository), FS.DETECTED);
970970
File indexFolder = new File(repositoryFolder, LUCENE_DIR);
971-
Directory directory = FSDirectory.open(indexFolder);
971+
Directory directory = FSDirectory.open(indexFolder.toPath());
972972

973973
if (indexWriter == null) {
974974
if (!indexFolder.exists()) {
975975
indexFolder.mkdirs();
976976
}
977-
StandardAnalyzer analyzer = new StandardAnalyzer(LUCENE_VERSION);
978-
IndexWriterConfig config = new IndexWriterConfig(LUCENE_VERSION, analyzer);
977+
StandardAnalyzer analyzer = new StandardAnalyzer();
978+
IndexWriterConfig config = new IndexWriterConfig(analyzer);
979979
config.setOpenMode(OpenMode.CREATE_OR_APPEND);
980980
indexWriter = new IndexWriter(directory, config);
981981
writers.put(repository, indexWriter);
@@ -1028,16 +1028,16 @@ public List<SearchResult> search(String text, int page, int pageSize, String...
10281028
return null;
10291029
}
10301030
Set<SearchResult> results = new LinkedHashSet<SearchResult>();
1031-
StandardAnalyzer analyzer = new StandardAnalyzer(LUCENE_VERSION);
1031+
StandardAnalyzer analyzer = new StandardAnalyzer();
10321032
try {
10331033
// default search checks summary and content
10341034
BooleanQuery query = new BooleanQuery();
10351035
QueryParser qp;
1036-
qp = new QueryParser(LUCENE_VERSION, FIELD_SUMMARY, analyzer);
1036+
qp = new QueryParser(FIELD_SUMMARY, analyzer);
10371037
qp.setAllowLeadingWildcard(true);
10381038
query.add(qp.parse(text), Occur.SHOULD);
10391039

1040-
qp = new QueryParser(LUCENE_VERSION, FIELD_CONTENT, analyzer);
1040+
qp = new QueryParser(FIELD_CONTENT, analyzer);
10411041
qp.setAllowLeadingWildcard(true);
10421042
query.add(qp.parse(text), Occur.SHOULD);
10431043

@@ -1060,7 +1060,7 @@ public List<SearchResult> search(String text, int page, int pageSize, String...
10601060
Query rewrittenQuery = searcher.rewrite(query);
10611061
logger.debug(rewrittenQuery.toString());
10621062

1063-
TopScoreDocCollector collector = TopScoreDocCollector.create(5000, true);
1063+
TopScoreDocCollector collector = TopScoreDocCollector.create(5000);
10641064
searcher.search(rewrittenQuery, collector);
10651065
int offset = Math.max(0, (page - 1) * pageSize);
10661066
ScoreDoc[] hits = collector.topDocs(offset, pageSize).scoreDocs;
@@ -1225,7 +1225,7 @@ float duration() {
12251225
*/
12261226
private class MultiSourceReader extends MultiReader {
12271227

1228-
MultiSourceReader(IndexReader [] readers) {
1228+
MultiSourceReader(IndexReader [] readers) throws IOException {
12291229
super(readers, false);
12301230
}
12311231

‎src/main/java/com/gitblit/tickets/TicketIndexer.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public static Lucene fromString(String value) {
167167

168168
private final Logger log = LoggerFactory.getLogger(getClass());
169169

170-
private final Version luceneVersion = Version.LUCENE_46;
170+
private final Version luceneVersion = Version.LUCENE_5_5_2;
171171

172172
private final File luceneDir;
173173

@@ -201,8 +201,8 @@ public void deleteAll() {
201201
public boolean deleteAll(RepositoryModel repository) {
202202
try {
203203
IndexWriter writer = getWriter();
204-
StandardAnalyzer analyzer = new StandardAnalyzer(luceneVersion);
205-
QueryParser qp = new QueryParser(luceneVersion, Lucene.rid.name(), analyzer);
204+
StandardAnalyzer analyzer = new StandardAnalyzer();
205+
QueryParser qp = new QueryParser(Lucene.rid.name(), analyzer);
206206
BooleanQuery query = new BooleanQuery();
207207
query.add(qp.parse(repository.getRID()), Occur.MUST);
208208

@@ -287,8 +287,8 @@ public boolean delete(TicketModel ticket) {
287287
* @return true, if deleted, false if no record was deleted
288288
*/
289289
private boolean delete(String repository, long ticketId, IndexWriter writer) throws Exception {
290-
StandardAnalyzer analyzer = new StandardAnalyzer(luceneVersion);
291-
QueryParser qp = new QueryParser(luceneVersion, Lucene.did.name(), analyzer);
290+
StandardAnalyzer analyzer = new StandardAnalyzer();
291+
QueryParser qp = new QueryParser(Lucene.did.name(), analyzer);
292292
BooleanQuery query = new BooleanQuery();
293293
query.add(qp.parse(StringUtils.getSHA1(repository + ticketId)), Occur.MUST);
294294

@@ -331,21 +331,21 @@ public List<QueryResult> searchFor(RepositoryModel repository, String text, int
331331
return Collections.emptyList();
332332
}
333333
Set<QueryResult> results = new LinkedHashSet<QueryResult>();
334-
StandardAnalyzer analyzer = new StandardAnalyzer(luceneVersion);
334+
StandardAnalyzer analyzer = new StandardAnalyzer();
335335
try {
336336
// search the title, description and content
337337
BooleanQuery query = new BooleanQuery();
338338
QueryParser qp;
339339

340-
qp = new QueryParser(luceneVersion, Lucene.title.name(), analyzer);
340+
qp = new QueryParser(Lucene.title.name(), analyzer);
341341
qp.setAllowLeadingWildcard(true);
342342
query.add(qp.parse(text), Occur.SHOULD);
343343

344-
qp = new QueryParser(luceneVersion, Lucene.body.name(), analyzer);
344+
qp = new QueryParser(Lucene.body.name(), analyzer);
345345
qp.setAllowLeadingWildcard(true);
346346
query.add(qp.parse(text), Occur.SHOULD);
347347

348-
qp = new QueryParser(luceneVersion, Lucene.content.name(), analyzer);
348+
qp = new QueryParser(Lucene.content.name(), analyzer);
349349
qp.setAllowLeadingWildcard(true);
350350
query.add(qp.parse(text), Occur.SHOULD);
351351

@@ -354,7 +354,7 @@ public List<QueryResult> searchFor(RepositoryModel repository, String text, int
354354

355355
log.debug(rewrittenQuery.toString());
356356

357-
TopScoreDocCollector collector = TopScoreDocCollector.create(5000, true);
357+
TopScoreDocCollector collector = TopScoreDocCollector.create(5000);
358358
searcher.search(rewrittenQuery, collector);
359359
int offset = Math.max(0, (page - 1) * pageSize);
360360
ScoreDoc[] hits = collector.topDocs(offset, pageSize).scoreDocs;
@@ -392,9 +392,9 @@ public List<QueryResult> queryFor(String queryText, int page, int pageSize, Stri
392392
}
393393

394394
Set<QueryResult> results = new LinkedHashSet<QueryResult>();
395-
StandardAnalyzer analyzer = new StandardAnalyzer(luceneVersion);
395+
StandardAnalyzer analyzer = new StandardAnalyzer();
396396
try {
397-
QueryParser qp = new QueryParser(luceneVersion, Lucene.content.name(), analyzer);
397+
QueryParser qp = new QueryParser(Lucene.content.name(), analyzer);
398398
Query query = qp.parse(queryText);
399399

400400
IndexSearcher searcher = getSearcher();
@@ -443,14 +443,14 @@ public List<QueryResult> queryFor(String queryText, int page, int pageSize, Stri
443443

444444
private IndexWriter getWriter() throws IOException {
445445
if (writer == null) {
446-
Directory directory = FSDirectory.open(luceneDir);
446+
Directory directory = FSDirectory.open(luceneDir.toPath());
447447

448448
if (!luceneDir.exists()) {
449449
luceneDir.mkdirs();
450450
}
451451

452-
StandardAnalyzer analyzer = new StandardAnalyzer(luceneVersion);
453-
IndexWriterConfig config = new IndexWriterConfig(luceneVersion, analyzer);
452+
StandardAnalyzer analyzer = new StandardAnalyzer();
453+
IndexWriterConfig config = new IndexWriterConfig(analyzer);
454454
config.setOpenMode(OpenMode.CREATE_OR_APPEND);
455455
writer = new IndexWriter(directory, config);
456456
}

0 commit comments

Comments
 (0)