Skip to content

Commit 8a16fdd

Browse files
Lubos KoscoLubos Kosco
Lubos Kosco
authored and
Lubos Kosco
committed
lucene 4.6.0 + fix summarizer to follow proper tokenstream API
1 parent 1fd1ced commit 8a16fdd

File tree

11 files changed

+30
-17
lines changed

11 files changed

+30
-17
lines changed

‎nbproject/project.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jnlp.mixed.code=default
4444
jnlp.signing=
4545
jnlp.signing.alias=
4646
jnlp.signing.keystore=
47-
lucene.version=4.5.1
47+
lucene.version=4.6.0
4848
lucene-core.jar=lucene-core-${lucene.version}.jar
4949
lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
5050
lucene-queryparser.jar=lucene-queryparser-${lucene.version}.jar

‎opengrok-web-nbproject/nbproject/project.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ dist.javadoc.dir=${dist.dir}/javadoc
2525
dist.war=${dist.dir}/${war.name}
2626
endorsed.classpath=
2727
excludes=
28-
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-util.jar
29-
lucene.version=4.5.1
28+
j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.2.2.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat7-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar
29+
lucene.version=4.6.0
3030
lucene-core.jar=lucene-core-${lucene.version}.jar
3131
lucene-analyzers-common.jar=lucene-analyzers-common-${lucene.version}.jar
3232
lucene-queryparser.jar=lucene-queryparser-${lucene.version}.jar

‎platform/solaris/ips/create.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ PKGSEND add file doc/ctags.config mode=0444 owner=root group=sys path=/usr/openg
7777

7878

7979
# install libs
80-
LV=4.5.1
80+
LV=4.6.0
8181
for file in ant.jar bcel-5.2.jar \
8282
lucene-analyzers-common-${LV}.jar lucene-core-${LV}.jar lucene-queryparser-${LV}.jar lucene-suggest-${LV}.jar \
8383
jrcs.jar \

‎platform/solaris/pkgdef/prototype

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ f none usr/opengrok/doc/opengrok-agent.properties=platform/solaris/default/openg
6060
f none usr/opengrok/lib/opengrok.jar=dist/opengrok.jar 0444 root bin
6161
f none usr/opengrok/lib/ant.jar=dist/lib/ant.jar 0444 root bin
6262
f none usr/opengrok/lib/bcel-5.2.jar=lib/bcel-5.2.jar 0444 root bin
63-
f none usr/opengrok/lib/lucene-core-4.5.1.jar=lib/lucene-core-4.5.1.jar 0444 root bin
64-
f none usr/opengrok/lib/lucene-analyzers-common-4.5.1.jar=lib/lucene-analyzers-common-4.5.1.jar 0444 root bin
65-
f none usr/opengrok/lib/lucene-queryparser-4.5.1.jar=lib/lucene-queryparser-4.5.1.jar 0444 root bin
66-
f none usr/opengrok/lib/lucene-suggest-4.5.1.jar=lib/lucene-suggest-4.5.1.jar 0444 root bin
63+
f none usr/opengrok/lib/lucene-core-4.6.0.jar=lib/lucene-core-4.6.0.jar 0444 root bin
64+
f none usr/opengrok/lib/lucene-analyzers-common-4.6.0.jar=lib/lucene-analyzers-common-4.6.0.jar 0444 root bin
65+
f none usr/opengrok/lib/lucene-queryparser-4.6.0.jar=lib/lucene-queryparser-4.6.0.jar 0444 root bin
66+
f none usr/opengrok/lib/lucene-suggest-4.6.0.jar=lib/lucene-suggest-4.6.0.jar 0444 root bin
6767
f none usr/opengrok/lib/jrcs.jar=lib/jrcs.jar 0444 root bin
6868
f none usr/opengrok/lib/swing-layout-0.9.jar=lib/swing-layout-0.9.jar 0444 root bin
6969
f none usr/opengrok/lib/ogindexd=platform/solaris/smf/ogindexd 0555 root bin

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,22 @@
5555
<dependency>
5656
<groupId>org.apache.lucene</groupId>
5757
<artifactId>lucene-core</artifactId>
58-
<version>4.5.1</version>
58+
<version>4.6.0</version>
5959
</dependency>
6060
<dependency>
6161
<groupId>org.apache.lucene</groupId>
6262
<artifactId>lucene-analyzers-common</artifactId>
63-
<version>4.5.1</version>
63+
<version>4.6.0</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.apache.lucene</groupId>
6767
<artifactId>lucene-queryparser</artifactId>
68-
<version>4.5.1</version>
68+
<version>4.6.0</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.apache.lucene</groupId>
7272
<artifactId>lucene-suggest</artifactId>
73-
<version>4.5.1</version>
73+
<version>4.6.0</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>javax.servlet</groupId>

‎src/org/opensolaris/opengrok/analysis/JFlexTokenizer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public JFlexTokenizer(Reader input) {
6060

6161
/**
6262
* Reinitialize the tokenizer with new reader.
63+
* @throws java.io.IOException
6364
*/
6465
@Override
6566
public void reset() throws IOException {
@@ -70,6 +71,7 @@ public void reset() throws IOException {
7071

7172
@Override
7273
public final void close() throws IOException {
74+
super.close();
7375
this.yyclose();
7476
}
7577
protected CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);

‎src/org/opensolaris/opengrok/analysis/PathTokenizer.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,4 +121,9 @@ public void reset() throws IOException {
121121
charsRead = 0;
122122
startPosition = 0;
123123
}
124+
125+
@Override
126+
public final void close() throws IOException {
127+
super.close();
128+
}
124129
}

‎src/org/opensolaris/opengrok/search/SearchEngine.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class SearchEngine {
7474
/**
7575
* version of lucene index common for whole app
7676
*/
77-
public static final Version LUCENE_VERSION = Version.LUCENE_45;
77+
public static final Version LUCENE_VERSION = Version.LUCENE_46;
7878
/**
7979
* Holds value of property definition.
8080
*/

‎src/org/opensolaris/opengrok/search/Summarizer.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,13 +284,16 @@ private Token[] getTokens(String text) throws IOException {
284284
//FIXME somehow integrate below cycle to getSummary to save the cloning and memory,
285285
//also creating Tokens is suboptimal with 3.0.0 , this whole class could be replaced by highlighter
286286
ArrayList<Token> result = new ArrayList<Token>();
287-
TokenStream ts = analyzer.tokenStream("full", text);
287+
TokenStream ts = analyzer.tokenStream("full", text);
288288
CharTermAttribute term = ts.addAttribute(CharTermAttribute.class);
289-
OffsetAttribute offset = ts.addAttribute(OffsetAttribute.class);
289+
OffsetAttribute offset = ts.addAttribute(OffsetAttribute.class);
290+
ts.reset();
290291
while(ts.incrementToken()) {
291292
Token t=new Token(term.buffer(),0,term.length(),offset.startOffset(),offset.endOffset());
292293
result.add(t);
293294
}
295+
ts.end();
296+
ts.close();
294297
return result.toArray(new Token[result.size()]);
295298
}
296299

‎test/org/opensolaris/opengrok/analysis/PathTokenizerTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public void testIncrementToken() throws Exception {
4848

4949
int count = 0;
5050
int dots = 0;
51+
tokenizer.reset();
5152
while (tokenizer.incrementToken()) {
5253
if ( term.toString().equals(".") ) { dots++;break; }
5354
assertTrue("too many tokens", count < expectedTokens.length);
@@ -60,6 +61,8 @@ public void testIncrementToken() throws Exception {
6061
offset.endOffset());
6162
count++;
6263
}
64+
tokenizer.end();
65+
tokenizer.close();
6366
assertEquals("wrong number of tokens", expectedTokens.length, count+dots);
6467
}
6568
}

0 commit comments

Comments
 (0)