You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ch...@apache.org on 2011/08/26 06:16:19 UTC
svn commit: r1161986 - in /lucene/dev/trunk:
lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/
lucene/src/test/org/apache/lucene/index/
lucene/src/test/org/apache/lucene/search/spans/
modules/analysis/common/src/java/org/apa...
Author: chrism
Date: Fri Aug 26 04:16:19 2011
New Revision: 1161986
URL: http://svn.apache.org/viewvc?rev=1161986&view=rev
Log:
LUCENE-3397: Cleaned up remaining test TSs and PatterAnalyzer
Modified:
lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
Modified: lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java?rev=1161986&r1=1161985&r2=1161986&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java (original)
+++ lucene/dev/trunk/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java Fri Aug 26 04:16:19 2011
@@ -311,6 +311,12 @@ public class IndexTimeSynonymTest extend
tokens[p++].copyTo(reusableToken);
return true;
}
+
+ @Override
+ public void reset() throws IOException {
+ super.reset();
+ this.p = 0;
+ }
};
return ts;
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1161986&r1=1161985&r2=1161986&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Fri Aug 26 04:16:19 2011
@@ -447,6 +447,12 @@ public class TestIndexWriterExceptions e
}
return input.incrementToken();
}
+
+ @Override
+ public void reset() throws IOException {
+ super.reset();
+ this.count = 0;
+ }
};
}
Modified: lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java?rev=1161986&r1=1161985&r2=1161986&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java (original)
+++ lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/spans/TestPayloadSpans.java Fri Aug 26 04:16:19 2011
@@ -492,7 +492,6 @@ public class TestPayloadSpans extends Lu
final class PayloadFilter extends TokenFilter {
String fieldName;
- int numSeen = 0;
Set<String> entities = new HashSet<String>();
Set<String> nopayload = new HashSet<String>();
int pos;
@@ -530,6 +529,12 @@ public class TestPayloadSpans extends Lu
}
return false;
}
+
+ @Override
+ public void reset() throws IOException {
+ super.reset();
+ this.pos = 0;
+ }
}
public final class TestPayloadAnalyzer extends Analyzer {
Modified: lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java?rev=1161986&r1=1161985&r2=1161986&view=diff
==============================================================================
--- lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java (original)
+++ lucene/dev/trunk/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternAnalyzer.java Fri Aug 26 04:16:19 2011
@@ -28,6 +28,7 @@ import java.util.regex.Pattern;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.StopAnalyzer;
import org.apache.lucene.analysis.core.StopFilter;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -220,10 +221,6 @@ public final class PatternAnalyzer exten
*/
@Override
public TokenStream tokenStream(String fieldName, Reader reader) {
- if (reader instanceof FastStringReader) { // fast path
- return tokenStream(fieldName, ((FastStringReader)reader).getString());
- }
-
try {
String text = toString(reader);
return tokenStream(fieldName, text);
@@ -290,6 +287,10 @@ public final class PatternAnalyzer exten
* @throws IOException if an I/O error occurs while reading the stream
*/
private static String toString(Reader input) throws IOException {
+ if (input instanceof FastStringReader) { // fast path
+ return ((FastStringReader) input).getString();
+ }
+
try {
int len = 256;
char[] buffer = new char[len];
@@ -324,9 +325,9 @@ public final class PatternAnalyzer exten
* The work horse; performance isn't fantastic, but it's not nearly as bad
* as one might think - kudos to the Sun regex developers.
*/
- private static final class PatternTokenizer extends TokenStream {
+ private static final class PatternTokenizer extends Tokenizer {
- private final String str;
+ private String str;
private final boolean toLowerCase;
private Matcher matcher;
private int pos = 0;
@@ -372,8 +373,20 @@ public final class PatternAnalyzer exten
// set final offset
final int finalOffset = str.length();
this.offsetAtt.setOffset(finalOffset, finalOffset);
- }
- }
+ }
+
+ @Override
+ public void reset(Reader input) throws IOException {
+ super.reset(input);
+ this.str = PatternAnalyzer.toString(input);
+ }
+
+ @Override
+ public void reset() throws IOException {
+ super.reset();
+ this.pos = 0;
+ }
+ }
///////////////////////////////////////////////////////////////////////////////
@@ -383,9 +396,9 @@ public final class PatternAnalyzer exten
* Special-case class for best performance in common cases; this class is
* otherwise unnecessary.
*/
- private static final class FastStringTokenizer extends TokenStream {
+ private static final class FastStringTokenizer extends Tokenizer {
- private final String str;
+ private String str;
private int pos;
private final boolean isLetter;
private final boolean toLowerCase;
@@ -464,7 +477,17 @@ public final class PatternAnalyzer exten
private boolean isStopWord(String text) {
return stopWords != null && stopWords.contains(text);
}
-
+
+ @Override
+ public void reset(Reader input) throws IOException {
+ this.str = PatternAnalyzer.toString(input);
+ }
+
+ @Override
+ public void reset() throws IOException {
+ super.reset();
+ this.pos = 0;
+ }
}