Skip to content

Commit 26ccfce

Browse files
tarzanekVladimir Kotal
authored andcommitted
lucene 8.5
1 parent 63fceed commit 26ccfce

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

opengrok-web/src/main/java/org/opengrok/web/api/v1/suggester/query/SuggesterQueryParser.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.apache.lucene.queryparser.classic.ParseException;
3030
import org.apache.lucene.search.BooleanClause;
3131
import org.apache.lucene.search.BooleanQuery;
32+
import org.apache.lucene.search.BoostQuery;
3233
import org.apache.lucene.search.FuzzyQuery;
3334
import org.apache.lucene.search.MatchAllDocsQuery;
3435
import org.apache.lucene.search.Query;
@@ -52,6 +53,8 @@
5253
import java.util.logging.Logger;
5354
import java.util.regex.Pattern;
5455

56+
import static org.apache.lucene.search.BoostAttribute.DEFAULT_BOOST;
57+
5558
/**
5659
* Used for parsing the text of a query for which suggestions should be retrieved. Decouples the query into 2 parts:
5760
* {@link SuggesterQuery} for suggestions and ordinary {@link Query} which serves as a dependency of
@@ -93,14 +96,17 @@ public String getQueryTextWithPlaceholder() {
9396
}
9497

9598
@Override
96-
protected Query newTermQuery(final Term term) {
99+
protected Query newTermQuery(final Term term, float boost) {
97100
if (term.text().contains(identifier)) {
98-
SuggesterPrefixQuery q = new SuggesterPrefixQuery(replaceIdentifier(term, identifier));
99-
this.suggesterQuery = q;
101+
Query q = new SuggesterPrefixQuery(replaceIdentifier(term, identifier));
102+
this.suggesterQuery = (SuggesterPrefixQuery) q;
103+
if (boost != DEFAULT_BOOST) {
104+
q = new BoostQuery(q, boost);
105+
}
100106
return q;
101107
}
102108

103-
return super.newTermQuery(term);
109+
return super.newTermQuery(term, boost);
104110
}
105111

106112
private Term replaceIdentifier(final Term term, final String identifier) {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
6060
</scm>
6161

6262
<properties>
63-
<lucene.version>8.4.0</lucene.version>
63+
<lucene.version>8.5.1</lucene.version>
6464
<mavenjavadocplugin.version>3.0.1</mavenjavadocplugin.version>
6565
<compileSource>1.8</compileSource>
6666
<compileTarget>1.8</compileTarget>

0 commit comments

Comments
 (0)