You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/08/27 02:04:35 UTC
svn commit: r1620762 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/
lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/
Author: rjernst
Date: Wed Aug 27 00:04:35 2014
New Revision: 1620762
URL: http://svn.apache.org/r1620762
Log:
LUCENE-5908: Backport to 4.10 (merged 1620760)
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java
lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1620762&r1=1620761&r2=1620762&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Wed Aug 27 00:04:35 2014
@@ -184,6 +184,8 @@ Bug Fixes
calling commit from the writer, then closing the NRT reader. This
case would remove the wrong files from the index leading to a
corrupt index. (Mike McCandless)
+
+* LUCENE-5908: Fix Lucene43NGramTokenizer to be final
Test Framework
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java?rev=1620762&r1=1620761&r2=1620762&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/Lucene43NGramTokenizer.java Wed Aug 27 00:04:35 2014
@@ -29,7 +29,7 @@ import org.apache.lucene.util.AttributeF
* Old broken version of {@link NGramTokenizer}.
*/
@Deprecated
-public class Lucene43NGramTokenizer extends Tokenizer {
+public final class Lucene43NGramTokenizer extends Tokenizer {
public static final int DEFAULT_MIN_NGRAM_SIZE = 1;
public static final int DEFAULT_MAX_NGRAM_SIZE = 2;
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java?rev=1620762&r1=1620761&r2=1620762&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java Wed Aug 27 00:04:35 2014
@@ -292,4 +292,8 @@ public class EdgeNGramTokenFilterTest ex
assertFalse(tk.incrementToken());
}
+ public void test43Tokenizer() {
+ new Lucene43EdgeNGramTokenizer(new StringReader("abc"), 1, 1);
+ }
+
}
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java?rev=1620762&r1=1620761&r2=1620762&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java Wed Aug 27 00:04:35 2014
@@ -242,4 +242,9 @@ public class NGramTokenizerTest extends
testNGrams(minGram, maxGram, s, "abcdef");
}
+ public void test43Tokenizer() {
+ // TODO: do more than instantiate (ie check the old broken behavior)
+ new Lucene43NGramTokenizer(input, 1, 1);
+ }
+
}