You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/01/22 19:58:56 UTC
svn commit: r1234580 - in /lucene/dev/branches/branch_3x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/analysis/
solr/core/src/test-files/solr/conf/
solr/core/src/test/org/apache/solr/analysis/
Author: uschindler
Date: Sun Jan 22 18:58:55 2012
New Revision: 1234580
URL: http://svn.apache.org/viewvc?rev=1234580&view=rev
Log:
Merged revision(s) 1234579 from lucene/dev/trunk:
SOLR-3054, LUCENE-3121: Remove useless assureMatchVersion check
Added:
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java
- copied, changed from r1234573, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java
lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/stoptypes-1.txt
- copied unchanged from r1234573, lucene/dev/trunk/solr/core/src/test-files/solr/conf/stoptypes-1.txt
lucene/dev/branches/branch_3x/solr/core/src/test-files/solr/conf/stoptypes-2.txt
- copied unchanged from r1234573, lucene/dev/trunk/solr/core/src/test-files/solr/conf/stoptypes-2.txt
lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java
- copied unchanged from r1234573, lucene/dev/trunk/solr/core/src/test/org/apache/solr/analysis/TestTypeTokenFilterFactory.java
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/ (props changed)
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1234580&r1=1234579&r2=1234580&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Sun Jan 22 18:58:55 2012
@@ -69,6 +69,10 @@ New Features
* SOLR-1709: Distributed support for Date and Numeric Range Faceting
(Peter Sturge, David Smiley, hossman, Simon Willnauer)
+* SOLR-3054, LUCENE-3121: Add TypeTokenFilterFactory that creates TypeTokenFilter
+ that filters tokens based on their TypeAttribute. (Tommaso Teofili via
+ Uwe Schindler)
+
Optimizations
----------------------
* SOLR-1931: Speedup for LukeRequestHandler and admin/schema browser. New parameter
Copied: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java (from r1234573, lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java?p2=lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java&p1=lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java&r1=1234573&r2=1234580&rev=1234580&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/analysis/TypeTokenFilterFactory.java Sun Jan 22 18:58:55 2012
@@ -18,7 +18,7 @@ package org.apache.solr.analysis;
*/
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.core.TypeTokenFilter;
+import org.apache.lucene.analysis.TypeTokenFilter;
import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.StrUtils;
@@ -45,10 +45,9 @@ public class TypeTokenFilterFactory exte
@Override
public void init(Map<String, String> args) {
super.init(args);
- assureMatchVersion();
}
- @Override
+ // @Override
public void inform(ResourceLoader loader) {
String stopTypesFiles = args.get("types");
enablePositionIncrements = getBoolean("enablePositionIncrements", false);
@@ -82,7 +81,7 @@ public class TypeTokenFilterFactory exte
return stopTypes;
}
- @Override
+ // @Override
public TokenStream create(TokenStream input) {
return new TypeTokenFilter(enablePositionIncrements, input, stopTypes);
}