You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by bu...@apache.org on 2011/02/25 08:18:11 UTC
svn commit: r1074415 - in /lucene/dev/branches/realtime_search: ./
dev-tools/idea/ dev-tools/idea/.idea/ lucene/
lucene/src/java/org/apache/lucene/search/
lucene/src/java/org/apache/lucene/store/
lucene/src/java/org/apache/lucene/util/automaton/fst/ lu...
Author: buschmi
Date: Fri Feb 25 07:18:09 2011
New Revision: 1074415
URL: http://svn.apache.org/viewvc?rev=1074415&view=rev
Log:
Merging r1074015 through r1074414 into realtime branch
Added:
lucene/dev/branches/realtime_search/dev-tools/idea/.idea/projectCodeStyle.xml
- copied unchanged from r1074414, lucene/dev/trunk/dev-tools/idea/.idea/projectCodeStyle.xml
Removed:
lucene/dev/branches/realtime_search/dev-tools/idea/Intellij-Lucene-Codestyle.xml
Modified:
lucene/dev/branches/realtime_search/ (props changed)
lucene/dev/branches/realtime_search/build.xml
lucene/dev/branches/realtime_search/lucene/ (props changed)
lucene/dev/branches/realtime_search/lucene/CHANGES.txt
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/store/DataOutput.java
lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/util/automaton/fst/FST.java
lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/search/CheckHits.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestExplanations.java
lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java
lucene/dev/branches/realtime_search/modules/ (props changed)
lucene/dev/branches/realtime_search/solr/ (props changed)
lucene/dev/branches/realtime_search/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/realtime_search/solr/KEYS (props changed)
lucene/dev/branches/realtime_search/solr/LICENSE.txt (props changed)
lucene/dev/branches/realtime_search/solr/NOTICE.txt (props changed)
lucene/dev/branches/realtime_search/solr/README.txt (props changed)
lucene/dev/branches/realtime_search/solr/build.xml (props changed)
lucene/dev/branches/realtime_search/solr/client/ (props changed)
lucene/dev/branches/realtime_search/solr/common-build.xml (props changed)
lucene/dev/branches/realtime_search/solr/contrib/ (props changed)
lucene/dev/branches/realtime_search/solr/example/ (props changed)
lucene/dev/branches/realtime_search/solr/lib/ (props changed)
lucene/dev/branches/realtime_search/solr/site/ (props changed)
lucene/dev/branches/realtime_search/solr/src/ (props changed)
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java
lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/branches/realtime_search/solr/testlogging.properties (props changed)
Modified: lucene/dev/branches/realtime_search/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/build.xml?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/build.xml (original)
+++ lucene/dev/branches/realtime_search/build.xml Fri Feb 25 07:18:09 2011
@@ -83,19 +83,9 @@
</echo>
</target>
- <condition property="isMac"><os family="mac"/></condition>
- <condition property="isUnix"><os family="unix"/></condition>
- <condition property="isWindows"><os family="windows"/></condition>
- <property environment="env"/>
- <target name="idea" depends="copy-idea-files,finish-idea-setup-windows,
- finish-idea-setup-mac,
- finish-idea-setup-unix"
- description="Setup IntelliJ IDEA configuration files"/>
- <target name="copy-idea-files">
+ <target name="idea" description="Setup IntelliJ IDEA configuration">
<copy todir=".">
- <fileset dir="dev-tools/idea">
- <exclude name="Intellij-Lucene-Codestyle.xml"/>
- </fileset>
+ <fileset dir="dev-tools/idea"/>
</copy>
<echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
<subant target="get-je-jar">
@@ -105,57 +95,18 @@
<subant target="get-db-jar">
<fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
</subant>
- </target>
- <target name="finish-idea-setup-windows" if="isWindows">
<echo>
- To install the Lucene/Solr codestyle file, copy
- dev-tools\idea\Intellij-Lucene-Codestyle.xml to
- ${env.HOMEDRIVE}${env.HOMEPATH}\.IntelliJIdeaXX\config\codestyles\
- where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
- After restarting IntelliJ, select "Lucene"
- from the dropdown list at:
- Settings | Code Style | Use global settings | Scheme name
-
To complete IntelliJ IDEA setup, you must manually configure
Project Structure | Project | Project SDK.
</echo>
</target>
- <target name="finish-idea-setup-mac" if="isMac">
- <echo>
- To install the Lucene/Solr codestyle file, copy
- dev-tools/idea/Intellij-Lucene-Codestyle.xml to
- ~/Library/Preferences/IntelliJXX/codestyles/
- where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
- After restarting IntelliJ, select "Lucene"
- from the dropdown list at:
- Settings | Code Style | Use global settings | Scheme name
-
- To complete IntelliJ IDEA setup, you must manually configure
- Project Structure | Project | Project SDK.
- </echo>
- </target>
- <target name="finish-idea-setup-unix" if="isUnix">
- <echo>
- To install the Lucene/Solr codestyle file, copy
- dev-tools/idea/Intellij-Lucene-Codestyle.xml to
- ~/.IntelliJIdeaXX/config/codestyles/
- where "XX" is "90" for IntelliJ 9.0.X, "10" for 10.0.X, etc.
- After restarting IntelliJ, select "Lucene"
- from the dropdown list at:
- Settings | Code Style | Use global settings | Scheme name
-
- To complete IntelliJ IDEA setup, you must manually configure
- Project Structure | Project | Project SDK.
- </echo>
- </target>
- <target name="clean-idea"
+ <target name="clean-idea"
description="Removes all IntelliJ IDEA configuration files">
<delete dir=".idea" failonerror="true"/>
<delete failonerror="true">
<fileset dir="." includes="*.iml,*.ipr,*.iws"/>
<fileset dir="solr" includes="**/*.iml"/>
<fileset dir="lucene" includes="**/*.iml"/>
- <fileset dir="modules" includes="**/*.iml"/>
</delete>
</target>
Modified: lucene/dev/branches/realtime_search/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/CHANGES.txt?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/realtime_search/lucene/CHANGES.txt Fri Feb 25 07:18:09 2011
@@ -355,6 +355,9 @@ Bug fixes
with more document deletions is requested before a reader with fewer
deletions, provided they share some segments. (yonik)
+* LUCENE-2936: PhraseQuery score explanations were not correctly
+ identifying matches vs non-matches. (hossman)
+
======================= Lucene 3.x (not yet released) =======================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/IndexSearcher.java Fri Feb 25 07:18:09 2011
@@ -429,7 +429,7 @@ public class IndexSearcher {
* <p>NOTE: this does not compute scores by default. If you
* need scores, create a {@link TopFieldCollector}
* instance by calling {@link TopFieldCollector#create} and
- * then pass that to {@link #search(Weight, Filter,
+ * then pass that to {@link #search(IndexReader.AtomicReaderContext[], Weight, Filter,
* Collector)}.</p>
*/
protected TopFieldDocs search(Weight weight, Filter filter, int nDocs,
@@ -475,7 +475,7 @@ public class IndexSearcher {
* <p>NOTE: this does not compute scores by default. If you
* need scores, create a {@link TopFieldCollector}
* instance by calling {@link TopFieldCollector#create} and
- * then pass that to {@link #search(Weight, Filter,
+ * then pass that to {@link #search(IndexReader.AtomicReaderContext[], Weight, Filter,
* Collector)}.</p>
*/
protected TopFieldDocs search(AtomicReaderContext[] leaves, Weight weight, Filter filter, int nDocs,
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/PhraseQuery.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/search/PhraseQuery.java Fri Feb 25 07:18:09 2011
@@ -224,7 +224,7 @@ public class PhraseQuery extends Query {
public Explanation explain(AtomicReaderContext context, int doc)
throws IOException {
- Explanation result = new Explanation();
+ ComplexExplanation result = new ComplexExplanation();
result.setDescription("weight("+getQuery()+" in "+doc+"), product of:");
StringBuilder docFreqs = new StringBuilder();
@@ -303,10 +303,7 @@ public class PhraseQuery extends Query {
// combine them
result.setValue(queryExpl.getValue() * fieldExpl.getValue());
-
- if (queryExpl.getValue() == 1.0f)
- return fieldExpl;
-
+ result.setMatch(tfExplanation.isMatch());
return result;
}
}
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/store/DataOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/store/DataOutput.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/store/DataOutput.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/store/DataOutput.java Fri Feb 25 07:18:09 2011
@@ -82,7 +82,7 @@ public abstract class DataOutput {
writeInt((int) i);
}
- /** Writes an long in a variable-length format. Writes between one and five
+ /** Writes an long in a variable-length format. Writes between one and nine
* bytes. Smaller values take fewer bytes. Negative numbers are not
* supported.
* @see DataInput#readVLong()
Modified: lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/util/automaton/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/util/automaton/fst/FST.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/util/automaton/fst/FST.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/java/org/apache/lucene/util/automaton/fst/FST.java Fri Feb 25 07:18:09 2011
@@ -483,7 +483,7 @@ public class FST<T> {
* this changes the provided <code>arc</code> (2nd arg) in-place and returns
* it.
*
- * @returns Returns the second argument (<code>arc</code>).
+ * @return Returns the second argument (<code>arc</code>).
*/
public Arc<T> readFirstTargetArc(Arc<T> follow, Arc<T> arc) throws IOException {
//int pos = address;
Modified: lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/search/CheckHits.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/test-framework/org/apache/lucene/search/CheckHits.java Fri Feb 25 07:18:09 2011
@@ -39,8 +39,8 @@ public class CheckHits {
/**
* Tests that all documents up to maxDoc which are *not* in the
- * expected result set, have an explanation which indicates no match
- * (ie: Explanation value of 0.0f)
+ * expected result set, have an explanation which indicates that
+ * the document does not match
*/
public static void checkNoMatchExplanations(Query q, String defaultFieldName,
IndexSearcher searcher, int[] results)
@@ -59,9 +59,9 @@ public class CheckHits {
Explanation exp = searcher.explain(q, doc);
Assert.assertNotNull("Explanation of [["+d+"]] for #"+doc+" is null",
exp);
- Assert.assertEquals("Explanation of [["+d+"]] for #"+doc+
- " doesn't indicate non-match: " + exp.toString(),
- 0.0f, exp.getValue(), 0.0f);
+ Assert.assertFalse("Explanation of [["+d+"]] for #"+doc+
+ " doesn't indicate non-match: " + exp.toString(),
+ exp.isMatch());
}
}
@@ -484,6 +484,9 @@ public class CheckHits {
Assert.assertNotNull("Explanation of [["+d+"]] for #"+doc+" is null", exp);
verifyExplanation(d,doc,scorer.score(),deep,exp);
+ Assert.assertTrue("Explanation of [["+d+"]] for #"+ doc +
+ " does not indicate match: " + exp.toString(),
+ exp.isMatch());
}
@Override
public void setNextReader(AtomicReaderContext context) {
Modified: lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestExplanations.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestExplanations.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestExplanations.java Fri Feb 25 07:18:09 2011
@@ -52,7 +52,10 @@ public class TestExplanations extends Lu
protected Directory directory;
public static final String KEY = "KEY";
+ // boost on this field is the same as the iterator for the doc
public static final String FIELD = "field";
+ // same contents, but no field boost
+ public static final String ALTFIELD = "alt";
public static final QueryParser qp =
new QueryParser(TEST_VERSION_CURRENT, FIELD, new MockAnalyzer());
@@ -72,7 +75,10 @@ public class TestExplanations extends Lu
for (int i = 0; i < docFields.length; i++) {
Document doc = new Document();
doc.add(newField(KEY, ""+i, Field.Store.NO, Field.Index.NOT_ANALYZED));
- doc.add(newField(FIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
+ Field f = newField(FIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED);
+ f.setBoost(i);
+ doc.add(f);
+ doc.add(newField(ALTFIELD, docFields[i], Field.Store.NO, Field.Index.ANALYZED));
writer.addDocument(doc);
}
reader = writer.getReader();
Modified: lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java (original)
+++ lucene/dev/branches/realtime_search/lucene/src/test/org/apache/lucene/search/TestSimpleExplanations.java Fri Feb 25 07:18:09 2011
@@ -289,4 +289,62 @@ public class TestSimpleExplanations exte
qtest(q, new int[] { 0,3 });
}
+
+ /* BQ of TQ: using alt so some fields have zero boost and some don't */
+
+ public void testMultiFieldBQ1() throws Exception {
+ qtest("+w1 +alt:w2", new int[] { 0,1,2,3 });
+ }
+ public void testMultiFieldBQ2() throws Exception {
+ qtest("+yy +alt:w3", new int[] { 2,3 });
+ }
+ public void testMultiFieldBQ3() throws Exception {
+ qtest("yy +alt:w3", new int[] { 0,1,2,3 });
+ }
+ public void testMultiFieldBQ4() throws Exception {
+ qtest("w1 (-xx alt:w2)", new int[] { 0,1,2,3 });
+ }
+ public void testMultiFieldBQ5() throws Exception {
+ qtest("w1 (+alt:qq alt:w2)", new int[] { 0,1,2,3 });
+ }
+ public void testMultiFieldBQ6() throws Exception {
+ qtest("w1 -(-alt:qq alt:w5)", new int[] { 1,2,3 });
+ }
+ public void testMultiFieldBQ7() throws Exception {
+ qtest("+w1 +(alt:qq (alt:xx -alt:w2) (+alt:w3 +alt:w4))", new int[] { 0 });
+ }
+ public void testMultiFieldBQ8() throws Exception {
+ qtest("+alt:w1 (qq (alt:xx -w2) (+alt:w3 +w4))", new int[] { 0,1,2,3 });
+ }
+ public void testMultiFieldBQ9() throws Exception {
+ qtest("+w1 (alt:qq (-xx w2) -(+alt:w3 +w4))", new int[] { 0,1,2,3 });
+ }
+ public void testMultiFieldBQ10() throws Exception {
+ qtest("+w1 +(alt:qq (-xx alt:w2) -(+alt:w3 +w4))", new int[] { 1 });
+ }
+
+ /* BQ of PQ: using alt so some fields have zero boost and some don't */
+
+ public void testMultiFieldBQofPQ1() throws Exception {
+ qtest("\"w1 w2\" alt:\"w1 w2\"", new int[] { 0 });
+ }
+ public void testMultiFieldBQofPQ2() throws Exception {
+ qtest("\"w1 w3\" alt:\"w1 w3\"", new int[] { 1,3 });
+ }
+ public void testMultiFieldBQofPQ3() throws Exception {
+ qtest("\"w1 w2\"~1 alt:\"w1 w2\"~1", new int[] { 0,1,2 });
+ }
+ public void testMultiFieldBQofPQ4() throws Exception {
+ qtest("\"w2 w3\"~1 alt:\"w2 w3\"~1", new int[] { 0,1,2,3 });
+ }
+ public void testMultiFieldBQofPQ5() throws Exception {
+ qtest("\"w3 w2\"~1 alt:\"w3 w2\"~1", new int[] { 1,3 });
+ }
+ public void testMultiFieldBQofPQ6() throws Exception {
+ qtest("\"w3 w2\"~2 alt:\"w3 w2\"~2", new int[] { 0,1,3 });
+ }
+ public void testMultiFieldBQofPQ7() throws Exception {
+ qtest("\"w3 w2\"~3 alt:\"w3 w2\"~3", new int[] { 0,1,2,3 });
+ }
+
}
Modified: lucene/dev/branches/realtime_search/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/CHANGES.txt?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/CHANGES.txt (original)
+++ lucene/dev/branches/realtime_search/solr/CHANGES.txt Fri Feb 25 07:18:09 2011
@@ -693,6 +693,10 @@ Bug Fixes
useful error reporting when no match found (previously failed with a
NullPointerException in log and no clear user feedback). (gthb via yonik)
+* SOLR-2380: Distributed faceting could miss values when facet.sort=index
+ and when facet.offset was greater than 0. (yonik)
+
+
Other Changes
----------------------
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicNormalizationFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.ar.Ara
* <pre class="prettyprint" >
* <fieldType name="text_arnormal" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.ArabicNormalizationFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ArabicStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.ar.Ara
* <pre class="prettyprint" >
* <fieldType name="text_arstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.ArabicNormalizationFilterFactory"/>
* <filter class="solr.ArabicStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BrazilianStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -26,7 +26,8 @@ import org.apache.lucene.analysis.br.Bra
* <pre class="prettyprint" >
* <fieldType name="text_brstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.BrazilianStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/BulgarianStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.bg.Bul
* <pre class="prettyprint" >
* <fieldType name="text_bgstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.BulgarianStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ClassicFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.standa
* <pre class="prettyprint" >
* <fieldType name="text_clssc" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.ClassicTokenizerFactory"/>
* <filter class="solr.ClassicFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CollationKeyFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -60,7 +60,7 @@ import org.apache.solr.util.plugin.Resou
* <pre class="prettyprint" >
* <fieldType name="text_clltnky" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.KeywordTokenizerFactory"/>
* <filter class="solr.CollationKeyFilterFactory" language="ja" country="JP"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/CzechStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.cz.Cze
* <pre class="prettyprint" >
* <fieldType name="text_czstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.CzechStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ElisionFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -32,7 +32,8 @@ import org.apache.lucene.analysis.TokenS
* <pre class="prettyprint" >
* <fieldType name="text_elsn" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.ElisionFilterFactory" articles="stopwordarticles.txt"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishMinimalStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.en.Eng
* <pre class="prettyprint" >
* <fieldType name="text_enminstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.EnglishMinimalStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/EnglishPossessiveFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.en.Eng
* <pre class="prettyprint" >
* <fieldType name="text_enpossessive" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.EnglishPossessiveFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FinnishLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.fi.Fin
* <pre class="prettyprint" >
* <fieldType name="text_filgtstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.FinnishLightStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,9 @@ import org.apache.lucene.analysis.fr.Fre
* <pre class="prettyprint" >
* <fieldType name="text_frlgtstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * <filter class="solr.ElisionFilterFactory"/>
* <filter class="solr.FrenchLightStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/FrenchMinimalStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,9 @@ import org.apache.lucene.analysis.fr.Fre
* <pre class="prettyprint" >
* <fieldType name="text_frminstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * <filter class="solr.ElisionFilterFactory"/>
* <filter class="solr.FrenchMinimalStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GalicianStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.gl.Gal
* <pre class="prettyprint" >
* <fieldType name="text_glstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.GalicianStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.de.Ger
* <pre class="prettyprint" >
* <fieldType name="text_delgtstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.GermanLightStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanMinimalStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.de.Ger
* <pre class="prettyprint" >
* <fieldType name="text_deminstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.GermanMinimalStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GermanStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -27,7 +27,8 @@ import org.apache.lucene.analysis.TokenS
* <pre class="prettyprint" >
* <fieldType name="text_destem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.GermanStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekLowerCaseFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -31,7 +31,7 @@ import org.apache.solr.common.SolrExcept
* <pre class="prettyprint" >
* <fieldType name="text_glc" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.GreekLowerCaseFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/GreekStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.el.Gre
* <pre class="prettyprint" >
* <fieldType name="text_gstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.GreekLowerCaseFilterFactory"/>
* <filter class="solr.GreekStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiNormalizationFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.hi.Hin
* <pre class="prettyprint" >
* <fieldType name="text_hinormal" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.HindiNormalizationFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HindiStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.hi.Hin
* <pre class="prettyprint" >
* <fieldType name="text_histem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.HindiStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/HungarianLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.hu.Hun
* <pre class="prettyprint" >
* <fieldType name="text_hulgtstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.HungarianLightStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndicNormalizationFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.in.Ind
* <pre class="prettyprint" >
* <fieldType name="text_innormal" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.IndicNormalizationFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/IndonesianStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -27,7 +27,8 @@ import org.apache.lucene.analysis.id.Ind
* <pre class="prettyprint" >
* <fieldType name="text_idstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.IndonesianStemFilterFactory" stemDerivational="true"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ItalianLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.it.Ita
* <pre class="prettyprint" >
* <fieldType name="text_itlgtstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.ItalianLightStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PathHierarchyTokenizerFactory.java Fri Feb 25 07:18:09 2011
@@ -24,6 +24,13 @@ import org.apache.lucene.analysis.path.P
/**
+ * Factory for {@link PathHierarchyTokenizer}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_path" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="\" replace="/"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class PathHierarchyTokenizerFactory extends BaseTokenizerFactory {
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceCharFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,9 +25,18 @@ import org.apache.lucene.analysis.CharSt
import org.apache.lucene.analysis.pattern.PatternReplaceCharFilter;
/**
+ * Factory for {@link PatternReplaceCharFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ptnreplace" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="([^a-z])" replacement=""
+ * maxBlockChars="10000" blockDelimiters="|"/>
+ * <tokenizer class="solr.KeywordTokenizerFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
*
* @version $Id$
- * @since Solr 1.5
+ * @since Solr 3.1
*/
public class PatternReplaceCharFilterFactory extends BaseCharFilterFactory {
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternReplaceFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -24,6 +24,15 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
/**
+ * Factory for {@link PatternReplaceFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ptnreplace" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.KeywordTokenizerFactory"/>
+ * <filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z])" replacement=""
+ * replace="all"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
* @see PatternReplaceFilter
*/
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PatternTokenizerFactory.java Fri Feb 25 07:18:09 2011
@@ -28,6 +28,7 @@ import org.apache.solr.common.SolrExcept
/**
+ * Factory for {@link PatternTokenizer}.
* This tokenizer uses regex pattern matching to construct distinct tokens
* for the input stream. It takes two arguments: "pattern" and "group".
* <p/>
@@ -52,6 +53,13 @@ import org.apache.solr.common.SolrExcept
* </p>
* <p>NOTE: This Tokenizer does not output tokens that are of zero length.</p>
*
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ptn" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.PatternTokenizerFactory" pattern="\'([^\']+)\'" group="1"/>
+ * </analyzer>
+ * </fieldType></pre>
+ *
* @see PatternTokenizer
* @since solr1.2
* @version $Id$
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianCharFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -21,7 +21,15 @@ import org.apache.lucene.analysis.CharSt
import org.apache.lucene.analysis.fa.PersianCharFilter;
/**
- * Factory for {@link PersianCharFilter}
+ * Factory for {@link PersianCharFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_fa" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <charFilter class="solr.PersianCharFilterFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
*/
public class PersianCharFilterFactory extends BaseCharFilterFactory {
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PersianNormalizationFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -22,7 +22,18 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.fa.PersianNormalizationFilter;
import org.apache.lucene.analysis.TokenStream;
-/** Factory for {@link PersianNormalizationFilter} */
+/**
+ * Factory for {@link PersianNormalizationFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_fanormal" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <charFilter class="solr.PersianCharFilterFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.PersianNormalizationFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class PersianNormalizationFilterFactory extends BaseTokenFilterFactory {
public PersianNormalizationFilter create(TokenStream input) {
return new PersianNormalizationFilter(input);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -33,6 +33,8 @@ import org.apache.lucene.analysis.phonet
import org.apache.solr.common.SolrException;
/**
+ * Factory for {@link PhoneticFilter}.
+ *
* Create tokens based on phonetic encoders
*
* http://jakarta.apache.org/commons/codec/api-release/org/apache/commons/codec/language/package-summary.html
@@ -41,6 +43,14 @@ import org.apache.solr.common.SolrExcept
* "encoder" required, one of "DoubleMetaphone", "Metaphone", "Soundex", "RefinedSoundex"
*
* "inject" (default=true) add tokens to the stream with the offset=0
+ *
+ * <pre class="prettyprint" >
+ * <fieldType name="text_phonetic" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.PhoneticFilterFactory" encoder="DoubleMetaphone" inject="true"/>
+ * </analyzer>
+ * </fieldType></pre>
*
* @version $Id$
* @see PhoneticFilter
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PorterStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -21,6 +21,15 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.en.PorterStemFilter;
/**
+ * Factory for {@link PorterStemFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_porterstem" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * <filter class="solr.PorterStemFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class PorterStemFilterFactory extends BaseTokenFilterFactory {
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -20,7 +20,18 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.pt.PortugueseLightStemFilter;
-/** Factory for {@link PortugueseLightStemFilter} */
+/**
+ * Factory for {@link PortugueseLightStemFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ptlgtstem" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * <filter class="solr.PortugueseLightStemFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class PortugueseLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
return new PortugueseLightStemFilter(input);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseMinimalStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -20,7 +20,18 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.pt.PortugueseMinimalStemFilter;
-/** Factory for {@link PortugueseMinimalStemFilter} */
+/**
+ * Factory for {@link PortugueseMinimalStemFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ptminstem" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * <filter class="solr.PortugueseMinimalStemFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class PortugueseMinimalStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
return new PortugueseMinimalStemFilter(input);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PortugueseStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -20,7 +20,18 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.pt.PortugueseStemFilter;
-/** Factory for {@link PortugueseStemFilter} */
+/**
+ * Factory for {@link PortugueseStemFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_ptstem" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * <filter class="solr.PortugueseStemFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class PortugueseStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
return new PortugueseStemFilter(input);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/PositionFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -23,8 +23,16 @@ import org.apache.lucene.analysis.positi
import java.util.Map;
/**
+ * Factory for {@link PositionFilter}.
* Set the positionIncrement of all tokens to the "positionIncrement", except the first return token which retains its
* original positionIncrement value. The default positionIncrement value is zero.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_position" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.PositionFilterFactory" positionIncrement="0"/>
+ * </analyzer>
+ * </fieldType></pre>
*
* @version $Id$
* @see org.apache.lucene.analysis.position.PositionFilter
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RemoveDuplicatesTokenFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -21,6 +21,14 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.miscellaneous.RemoveDuplicatesTokenFilter;
/**
+ * Factory for {@link RemoveDuplicatesTokenFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_rmdup" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
* @version $Id$
*/
public class RemoveDuplicatesTokenFilterFactory extends BaseTokenFilterFactory {
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReverseStringFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -21,7 +21,14 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.reverse.ReverseStringFilter;
/**
- * A FilterFactory which reverses the input.
+ * Factory for {@link ReverseStringFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_rvsstr" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.ReverseStringFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
*
* @version $Id$
* @since solr 1.4
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -48,6 +48,18 @@ import org.apache.lucene.analysis.revers
* </ul>
* Note 1: This filter always reverses input tokens during indexing.
* Note 2: Query tokens without wildcard characters will never be reversed.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_rvswc" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer type="index">
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <filter class="solr.ReversedWildcardFilterFactory" withOriginal="true"
+ * maxPosAsterisk="2" maxPosQuestion="1" minTrailing="2" maxFractionAsterisk="0"/>
+ * </analyzer>
+ * <analyzer type="query">
+ * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
*/
public class ReversedWildcardFilterFactory extends BaseTokenFilterFactory {
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/RussianLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -20,7 +20,18 @@ package org.apache.solr.analysis;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.ru.RussianLightStemFilter;
-/** Factory for {@link RussianLightStemFilter} */
+/**
+ * Factory for {@link RussianLightStemFilter}.
+ * <pre class="prettyprint" >
+ * <fieldType name="text_rulgtstem" class="solr.TextField" positionIncrementGap="100">
+ * <analyzer>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
+ * <filter class="solr.RussianLightStemFilterFactory"/>
+ * </analyzer>
+ * </fieldType></pre>
+ * @version $Id$
+ */
public class RussianLightStemFilterFactory extends BaseTokenFilterFactory {
public TokenStream create(TokenStream input) {
return new RussianLightStemFilter(input);
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SnowballPorterFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -35,7 +35,8 @@ import org.tartarus.snowball.SnowballPro
* <pre class="prettyprint" >
* <fieldType name="text_snowballstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.SnowballPorterFilterFactory" protected="protectedkeyword.txt" language="English"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SpanishLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.es.Spa
* <pre class="prettyprint" >
* <fieldType name="text_eslgtstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.SpanishLightStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/StandardFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -27,7 +27,7 @@ import org.apache.lucene.analysis.standa
* <pre class="prettyprint" >
* <fieldType name="text_stndrd" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.StandardFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/SwedishLightStemFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,8 @@ import org.apache.lucene.analysis.sv.Swe
* <pre class="prettyprint" >
* <fieldType name="text_svlgtstem" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
+ * <filter class="solr.LowerCaseFilterFactory"/>
* <filter class="solr.SwedishLightStemFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/ThaiWordFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -27,7 +27,7 @@ import org.apache.lucene.analysis.TokenS
* <pre class="prettyprint" >
* <fieldType name="text_thai" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.NGramTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.ThaiWordFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/analysis/TurkishLowerCaseFilterFactory.java Fri Feb 25 07:18:09 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.analysis.tr.Tur
* <pre class="prettyprint" >
* <fieldType name="text_trlwr" class="solr.TextField" positionIncrementGap="100">
* <analyzer>
- * <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+ * <tokenizer class="solr.StandardTokenizerFactory"/>
* <filter class="solr.TurkishLowerCaseFilterFactory"/>
* </analyzer>
* </fieldType></pre>
Modified: lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/handler/component/FacetComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/handler/component/FacetComponent.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/handler/component/FacetComponent.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/java/org/apache/solr/handler/component/FacetComponent.java Fri Feb 25 07:18:09 2011
@@ -222,12 +222,11 @@ public class FacetComponent extends Sear
sreq.params.remove(paramStart + FacetParams.FACET_MINCOUNT);
sreq.params.remove(paramStart + FacetParams.FACET_OFFSET);
+ dff.initialLimit = dff.offset + dff.limit;
+
if(dff.sort.equals(FacetParams.FACET_SORT_COUNT) && dff.limit > 0) {
// set the initial limit higher to increase accuracy
- dff.initialLimit = dff.offset + dff.limit;
dff.initialLimit = (int)(dff.initialLimit * 1.5) + 10;
- } else {
- dff.initialLimit = dff.limit;
}
// Currently this is for testing only and allows overriding of the
Modified: lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/TestDistributedSearch.java?rev=1074415&r1=1074414&r2=1074415&view=diff
==============================================================================
--- lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/branches/realtime_search/solr/src/test/org/apache/solr/TestDistributedSearch.java Fri Feb 25 07:18:09 2011
@@ -137,6 +137,7 @@ public class TestDistributedSearch exten
query("q","*:*", "rows",100, "facet","true", "facet.field",t1, "facet.limit",-1, "facet.sort","count", "facet.mincount",2);
query("q","*:*", "rows",100, "facet","true", "facet.field",t1, "facet.limit",-1, "facet.sort","index");
query("q","*:*", "rows",100, "facet","true", "facet.field",t1, "facet.limit",-1, "facet.sort","index", "facet.mincount",2);
+ query("q","*:*", "rows",100, "facet","true", "facet.field",t1, "facet.offset",10, "facet.limit",1, "facet.sort","index");
query("q","*:*", "rows",100, "facet","true", "facet.field",t1,"facet.limit",1);
query("q","*:*", "rows",100, "facet","true", "facet.query","quick", "facet.query","all", "facet.query","*:*");
query("q","*:*", "rows",100, "facet","true", "facet.field",t1, "facet.offset",1);