You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/05/07 13:21:14 UTC
svn commit: r1479862 [35/38] - in /lucene/dev/branches/lucene4258: ./
dev-tools/ dev-tools/idea/.idea/ dev-tools/idea/.idea/libraries/
dev-tools/maven/ dev-tools/maven/solr/ dev-tools/maven/solr/core/src/java/
dev-tools/maven/solr/solrj/src/java/ dev-t...
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java Tue May 7 11:20:55 2013
@@ -17,8 +17,11 @@ package org.apache.solr.handler.componen
* limitations under the License.
*/
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.BaseDistributedSearchTestCase;
@@ -39,11 +42,9 @@ import org.junit.BeforeClass;
@Slow
public class DistributedSpellCheckComponentTest extends BaseDistributedSearchTestCase {
- private String requestHandlerName;
- private String reqHandlerWithWordbreak;
-
public DistributedSpellCheckComponentTest()
{
+ //Helpful for debugging
//fixShardCount=true;
//shardCount=2;
//stress=0;
@@ -56,13 +57,6 @@ public class DistributedSpellCheckCompon
@Override
public void setUp() throws Exception {
- if(random().nextBoolean()) {
- requestHandlerName = "spellCheckCompRH";
- reqHandlerWithWordbreak = "spellCheckWithWordbreak";
- } else {
- requestHandlerName = "spellCheckCompRH_Direct";
- reqHandlerWithWordbreak = "spellCheckWithWordbreak_Direct";
- }
super.setUp();
}
@@ -90,9 +84,11 @@ public class DistributedSpellCheckCompon
@Override
public void validateControlData(QueryResponse control) throws Exception
{
- NamedList nl = control.getResponse();
- NamedList sc = (NamedList) nl.get("spellcheck");
- NamedList sug = (NamedList) sc.get("suggestions");
+ NamedList<Object> nl = control.getResponse();
+ @SuppressWarnings("unchecked")
+ NamedList<Object> sc = (NamedList<Object>) nl.get("spellcheck");
+ @SuppressWarnings("unchecked")
+ NamedList<Object> sug = (NamedList<Object>) sc.get("suggestions");
if(sug.size()==0) {
Assert.fail("Control data did not return any suggestions.");
}
@@ -133,21 +129,98 @@ public class DistributedSpellCheckCompon
handle.put("maxScore", SKIPVAL);
// we care only about the spellcheck results
handle.put("response", SKIP);
-
- q("q", "*:*", "spellcheck", "true", SpellingParams.SPELLCHECK_BUILD, "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH");
+ handle.put("grouped", SKIP);
- query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","toyata", "spellcheck", "true", "qt", requestHandlerName, "shards.qt", requestHandlerName);
- query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","toyata", "spellcheck", "true", "qt", requestHandlerName, "shards.qt", requestHandlerName, SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true");
- query("q", "*:*", "fl", "id,lowerfilt", "spellcheck.q","bluo", "spellcheck", "true", "qt", requestHandlerName, "shards.qt", requestHandlerName, SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_COUNT, "4");
- query("q", "The quick reb fox jumped over the lazy brown dogs", "fl", "id,lowerfilt", "spellcheck", "true", "qt", requestHandlerName, "shards.qt", requestHandlerName, SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_COUNT, "4", SpellingParams.SPELLCHECK_COLLATE, "true");
-
- query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", requestHandlerName, "shards.qt", requestHandlerName, SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_COUNT, "10", SpellingParams.SPELLCHECK_COLLATE, "true", SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellingParams.SPELLCHECK_MAX_COLLATIONS, "10", SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true");
- query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", requestHandlerName, "shards.qt", requestHandlerName, SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_COUNT, "10", SpellingParams.SPELLCHECK_COLLATE, "true", SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellingParams.SPELLCHECK_MAX_COLLATIONS, "10", SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "false");
- query("q", "lowerfilt:(+quock +reb)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", requestHandlerName, "shards.qt", requestHandlerName, SpellingParams.SPELLCHECK_EXTENDED_RESULTS, "true", SpellingParams.SPELLCHECK_COUNT, "10", SpellingParams.SPELLCHECK_COLLATE, "true", SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES, "0", SpellingParams.SPELLCHECK_MAX_COLLATIONS, "1", SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "false");
-
- query("q", "lowerfilt:(\"quote red fox\")", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "1", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_ALTERNATIVE_TERM_COUNT, "5", SpellCheckComponent.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, "10");
- query("q", "lowerfilt:(\"rod fix\")", "fl", "id,lowerfilt", "spellcheck", "true", "qt", "spellCheckCompRH", "shards.qt", "spellCheckCompRH", SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "10", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "1", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_ALTERNATIVE_TERM_COUNT, "5", SpellCheckComponent.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, "10");
-
- query("q", "lowerfilt:(+quock +redfox +jum +ped)", "fl", "id,lowerfilt", "spellcheck", "true", "qt", reqHandlerWithWordbreak, "shards.qt", reqHandlerWithWordbreak, SpellCheckComponent.SPELLCHECK_EXTENDED_RESULTS, "true", SpellCheckComponent.SPELLCHECK_COUNT, "10", SpellCheckComponent.SPELLCHECK_COLLATE, "true", SpellCheckComponent.SPELLCHECK_MAX_COLLATION_TRIES, "0", SpellCheckComponent.SPELLCHECK_MAX_COLLATIONS, "1", SpellCheckComponent.SPELLCHECK_COLLATE_EXTENDED_RESULTS, "true");
+ //Randomly select either IndexBasedSpellChecker or DirectSolrSpellChecker
+ String requestHandlerName = "spellCheckCompRH_Direct";
+ String reqHandlerWithWordbreak = "spellCheckWithWordbreak_Direct";
+ if(random().nextBoolean()) {
+ requestHandlerName = "spellCheckCompRH";
+ reqHandlerWithWordbreak = "spellCheckWithWordbreak";
+ }
+
+ //Shortcut names
+ String build = SpellingParams.SPELLCHECK_BUILD;
+ String extended = SpellingParams.SPELLCHECK_EXTENDED_RESULTS;
+ String count = SpellingParams.SPELLCHECK_COUNT;
+ String collate = SpellingParams.SPELLCHECK_COLLATE;
+ String collateExtended = SpellingParams.SPELLCHECK_COLLATE_EXTENDED_RESULTS;
+ String maxCollationTries = SpellingParams.SPELLCHECK_MAX_COLLATION_TRIES;
+ String maxCollations = SpellingParams.SPELLCHECK_MAX_COLLATIONS;
+ String altTermCount = SpellingParams.SPELLCHECK_ALTERNATIVE_TERM_COUNT;
+ String maxResults = SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST;
+
+ //Build the dictionary for IndexBasedSpellChecker
+ q(buildRequest("*:*", false, "spellCheckCompRH", false, build, "true"));
+
+ //Test Basic Functionality
+ query(buildRequest("toyata", true, requestHandlerName, random().nextBoolean(), (String[]) null));
+ query(buildRequest("toyata", true, requestHandlerName, random().nextBoolean(), extended, "true"));
+ query(buildRequest("bluo", true, requestHandlerName, random().nextBoolean(), extended, "true", count, "4"));
+
+ //Test Collate functionality
+ query(buildRequest("The quick reb fox jumped over the lazy brown dogs",
+ false, requestHandlerName, random().nextBoolean(), extended, "true", count, "4", collate, "true"));
+ query(buildRequest("lowerfilt:(+quock +reb)",
+ false, requestHandlerName, random().nextBoolean(), extended, "true", count, "10",
+ collate, "true", maxCollationTries, "10", maxCollations, "10", collateExtended, "true"));
+ query(buildRequest("lowerfilt:(+quock +reb)",
+ false, requestHandlerName, random().nextBoolean(), extended, "true", count, "10",
+ collate, "true", maxCollationTries, "10", maxCollations, "10", collateExtended, "false"));
+ query(buildRequest("lowerfilt:(+quock +reb)",
+ false, requestHandlerName, random().nextBoolean(), extended, "true", count, "10",
+ collate, "true", maxCollationTries, "0", maxCollations, "1", collateExtended, "false"));
+
+ //Test context-sensitive collate
+ query(buildRequest("lowerfilt:(\"quote red fox\")",
+ false, requestHandlerName, random().nextBoolean(), extended, "true", count, "10",
+ collate, "true", maxCollationTries, "10", maxCollations, "1", collateExtended, "false",
+ altTermCount, "5", maxResults, "10"));
+ query(buildRequest("lowerfilt:(\"rod fix\")",
+ false, requestHandlerName, random().nextBoolean(), extended, "true", count, "10",
+ collate, "true", maxCollationTries, "10", maxCollations, "1", collateExtended, "false",
+ altTermCount, "5", maxResults, "10"));
+
+ //Test word-break spellchecker
+ query(buildRequest("lowerfilt:(+quock +redfox +jum +ped)",
+ false, reqHandlerWithWordbreak, random().nextBoolean(), extended, "true", count, "10",
+ collate, "true", maxCollationTries, "0", maxCollations, "1", collateExtended, "true"));
}
+ private Object[] buildRequest(String q, boolean useSpellcheckQ, String handlerName, boolean useGrouping, String... addlParams) {
+ List<Object> params = new ArrayList<Object>();
+
+ params.add("q");
+ params.add(useSpellcheckQ ? "*:*" : q);
+
+ if(useSpellcheckQ) {
+ params.add("spellcheck.q");
+ params.add(q);
+ }
+
+ params.add("fl");
+ params.add("id,lowerfilt");
+
+ params.add("qt");
+ params.add(handlerName);
+
+ params.add("shards.qt");
+ params.add(handlerName);
+
+ params.add("spellcheck");
+ params.add("true");
+
+ if(useGrouping) {
+ params.add("group");
+ params.add("true");
+
+ params.add("group.field");
+ params.add("id");
+ }
+
+ if(addlParams!=null) {
+ params.addAll(Arrays.asList(addlParams));
+ }
+ return params.toArray(new Object[params.size()]);
+ }
+
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java Tue May 7 11:20:55 2013
@@ -351,7 +351,7 @@ public class StatsComponentTest extends
public void testStatsFacetMultivaluedErrorHandling() throws Exception {
SolrCore core = h.getCore();
- SchemaField foo_ss = core.getSchema().getField("foo_ss");
+ SchemaField foo_ss = core.getLatestSchema().getField("foo_ss");
assertU(adoc("id", "1", "active_i", "1", "foo_ss", "aa" ));
assertU(commit());
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java Tue May 7 11:20:55 2013
@@ -201,12 +201,12 @@ public class TermVectorComponentTest ext
public void testOptions() throws Exception {
assertJQ(req("json.nl","map", "qt",tv, "q", "id:0", TermVectorComponent.COMPONENT_NAME, "true"
, TermVectorParams.TF, "true", TermVectorParams.DF, "true", TermVectorParams.OFFSETS, "true", TermVectorParams.POSITIONS, "true", TermVectorParams.TF_IDF, "true")
- ,"/termVectors/0/test_posofftv/anoth=={'tf':1, 'offsets':{'start':20, 'end':27}, 'positions':{'position':1}, 'df':2, 'tf-idf':0.5}"
+ ,"/termVectors/0/test_posofftv/anoth=={'tf':1, 'offsets':{'start':20, 'end':27}, 'positions':{'position':5}, 'df':2, 'tf-idf':0.5}"
);
assertJQ(req("json.nl","map", "qt",tv, "q", "id:0", TermVectorComponent.COMPONENT_NAME, "true"
, TermVectorParams.ALL, "true")
- ,"/termVectors/0/test_posofftv/anoth=={'tf':1, 'offsets':{'start':20, 'end':27}, 'positions':{'position':1}, 'df':2, 'tf-idf':0.5}"
+ ,"/termVectors/0/test_posofftv/anoth=={'tf':1, 'offsets':{'start':20, 'end':27}, 'positions':{'position':5}, 'df':2, 'tf-idf':0.5}"
);
// test each combination at random
@@ -214,7 +214,7 @@ public class TermVectorComponentTest ext
list.addAll(Arrays.asList("json.nl","map", "qt",tv, "q", "id:0", TermVectorComponent.COMPONENT_NAME, "true"));
String[][] options = new String[][] { { TermVectorParams.TF, "'tf':1" },
{ TermVectorParams.OFFSETS, "'offsets':{'start':20, 'end':27}" },
- { TermVectorParams.POSITIONS, "'positions':{'position':1}" },
+ { TermVectorParams.POSITIONS, "'positions':{'position':5}" },
{ TermVectorParams.DF, "'df':2" },
{ TermVectorParams.TF_IDF, "'tf-idf':0.5" } };
StringBuilder expected = new StringBuilder("/termVectors/0/test_posofftv/anoth=={");
@@ -249,7 +249,7 @@ public class TermVectorComponentTest ext
,"f.test_basictv." + TermVectorParams.TF_IDF, "false"
)
,"/termVectors/0/test_basictv=={'anoth':{},'titl':{}}"
- ,"/termVectors/0/test_postv/anoth=={'tf':1, 'positions':{'position':1}, 'df':2, 'tf-idf':0.5}"
+ ,"/termVectors/0/test_postv/anoth=={'tf':1, 'positions':{'position':5}, 'df':2, 'tf-idf':0.5}"
,"/termVectors/0/test_offtv/anoth=={'tf':1, 'df':2, 'tf-idf':0.5}"
,"/termVectors/warnings=={ 'noTermVectors':['test_notv'], 'noPositions':['test_basictv', 'test_offtv'], 'noOffsets':['test_basictv', 'test_postv']}"
);
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java Tue May 7 11:20:55 2013
@@ -34,7 +34,7 @@ public class FastVectorHighlighterTest e
@Test
public void testConfig(){
- SolrHighlighter highlighter = HighlightComponent.getHighlighter(h.getCore());
+ DefaultSolrHighlighter highlighter = (DefaultSolrHighlighter) HighlightComponent.getHighlighter(h.getCore());
// Make sure we loaded one fragListBuilder
SolrFragListBuilder solrFlbNull = highlighter.fragListBuilders.get( null );
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java Tue May 7 11:20:55 2013
@@ -22,6 +22,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.handler.component.HighlightComponent;
+import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.*;
import org.apache.solr.common.params.HighlightParams;
@@ -63,7 +64,7 @@ public class HighlighterTest extends Sol
@Test
public void testConfig()
{
- SolrHighlighter highlighter = HighlightComponent.getHighlighter(h.getCore());
+ DefaultSolrHighlighter highlighter = (DefaultSolrHighlighter) HighlightComponent.getHighlighter(h.getCore());
// Make sure we loaded the one formatter
SolrFormatter fmt1 = highlighter.formatters.get( null );
@@ -849,4 +850,175 @@ public class HighlighterTest extends Sol
"//lst[@name='highlighting']/lst[@name='1']" +
"/arr[@name='title']/str='Apache Software <em>Foundation</em>'");
}
+
+ @Test
+ public void testMaxMvParams() {
+ assertU(adoc("title", "Apache Software Foundation", "id", "1000",
+ "lower", "gap1 target",
+ "lower", "gap2 target",
+ "lower", "gap3 nothing",
+ "lower", "gap4 nothing",
+ "lower", "gap5 target",
+ "lower", "gap6 target",
+ "lower", "gap7 nothing",
+ "lower", "gap8 nothing",
+ "lower", "gap9 target",
+ "lower", "gap10 target" ));
+
+ assertU(commit());
+
+ // First insure we can count all six
+ assertQ("Counting all MV pairs failed",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=6]"
+ );
+
+ // NOTE: These tests seem repeated, but we're testing for off-by-one errors
+ // Now we should see exactly 2 by limiting the number of values searched to 4
+ assertQ("Off by one by going too far",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_EXAMINE, "4"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=2]"
+ );
+
+
+ // Does 0 work?
+ assertQ("Off by one by going too far",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_EXAMINE, "0"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000' and count(child::*) = 0]"
+ );
+
+
+ // Now we should see exactly 2 by limiting the number of values searched to 2
+ assertQ("Off by one by not going far enough",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_EXAMINE, "2"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=2]"
+ );
+
+
+ // Now we should see exactly 1 by limiting the number of values searched to 1
+ assertQ("Not counting exactly 1",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_EXAMINE, "1"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=1]"
+ );
+
+
+ // Now we should see exactly 4 by limiting the number of values found to 4
+ assertQ("Matching 4 should exactly match 4",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_MATCH, "4"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=4]"
+ );
+
+
+ // Now we should see exactly 2 by limiting the number of values found to 2
+ assertQ("Matching 6 should exactly search them all",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_MATCH, "6"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=6]"
+ );
+
+
+ // Now we should see exactly 1 by limiting the number of values found to 1
+ assertQ("Matching 6 should exactly match them all",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_MATCH, "1"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=1]"
+ );
+
+ // Now we should see exactly 0 by limiting the number of values found to 0
+ assertQ("Matching 6 should exactly match them all",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_MATCH, "0"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000' and count(child::*) = 0]"
+ );
+
+
+
+ // Should bail at the first parameter matched.
+ assertQ("Matching 6 should exactly match them all",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_MATCH, "2",
+ HighlightParams.MAX_MULTIVALUED_TO_EXAMINE, "10"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=2]"
+ );
+
+ // Should bail at the first parameter matched.
+ assertQ("Matching 6 should exactly match them all",
+ req(
+ "q", "id:1000",
+ HighlightParams.HIGHLIGHT, "true",
+ HighlightParams.FIELDS, "lower",
+ HighlightParams.Q, "target",
+ HighlightParams.SNIPPETS, "100",
+ HighlightParams.MAX_MULTIVALUED_TO_MATCH, "10",
+ HighlightParams.MAX_MULTIVALUED_TO_EXAMINE, "2"
+ ),
+ "//lst[@name='highlighting']/lst[@name='1000']/arr[@name='lower' and count(*)=2]"
+ );
+
+ }
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java Tue May 7 11:20:55 2013
@@ -38,11 +38,16 @@ public class TestPostingsSolrHighlighter
assertTrue("wrong highlighter: " + highlighter.getClass(), highlighter instanceof PostingsSolrHighlighter);
// 'text' and 'text3' should have offsets, 'text2' should not
- IndexSchema schema = h.getCore().getSchema();
+ IndexSchema schema = h.getCore().getLatestSchema();
assertTrue(schema.getField("text").storeOffsetsWithPositions());
assertTrue(schema.getField("text3").storeOffsetsWithPositions());
assertFalse(schema.getField("text2").storeOffsetsWithPositions());
-
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ clearIndex();
assertU(adoc("text", "document one", "text2", "document one", "text3", "crappy document", "id", "101"));
assertU(adoc("text", "second document", "text2", "second document", "text3", "crappier document", "id", "102"));
assertU(commit());
@@ -71,6 +76,14 @@ public class TestPostingsSolrHighlighter
"count(//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/*)=0");
}
+ public void testDefaultSummary() {
+ assertQ("null snippet test",
+ req("q", "text:one OR *:*", "sort", "id asc", "hl", "true", "hl.defaultSummary", "true"),
+ "count(//lst[@name='highlighting']/*)=2",
+ "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='document <em>one</em>'",
+ "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second document'");
+ }
+
public void testDifferentField() {
assertQ("highlighting text3",
req("q", "text3:document", "sort", "id asc", "hl", "true", "hl.fl", "text3"),
@@ -100,4 +113,46 @@ public class TestPostingsSolrHighlighter
}
resetExceptionIgnores();
}
+
+ public void testTags() {
+ assertQ("different pre/post tags",
+ req("q", "text:document", "sort", "id asc", "hl", "true", "hl.tag.pre", "[", "hl.tag.post", "]"),
+ "count(//lst[@name='highlighting']/*)=2",
+ "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='[document] one'",
+ "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second [document]'");
+ }
+
+ public void testTagsPerField() {
+ assertQ("highlighting text and text3",
+ req("q", "text:document text3:document", "sort", "id asc", "hl", "true", "hl.fl", "text,text3", "f.text3.hl.tag.pre", "[", "f.text3.hl.tag.post", "]"),
+ "count(//lst[@name='highlighting']/*)=2",
+ "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='<em>document</em> one'",
+ "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text3']/str='crappy [document]'",
+ "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='second <em>document</em>'",
+ "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text3']/str='crappier [document]'");
+ }
+
+ public void testBreakIterator() {
+ assertQ("different breakiterator",
+ req("q", "text:document", "sort", "id asc", "hl", "true", "hl.bs.type", "WORD"),
+ "count(//lst[@name='highlighting']/*)=2",
+ "//lst[@name='highlighting']/lst[@name='101']/arr[@name='text']/str='<em>document</em>'",
+ "//lst[@name='highlighting']/lst[@name='102']/arr[@name='text']/str='<em>document</em>'");
+ }
+
+ public void testBreakIterator2() {
+ assertU(adoc("text", "Document one has a first sentence. Document two has a second sentence.", "id", "103"));
+ assertU(commit());
+ assertQ("different breakiterator",
+ req("q", "text:document", "sort", "id asc", "hl", "true", "hl.bs.type", "WHOLE"),
+ "//lst[@name='highlighting']/lst[@name='103']/arr[@name='text']/str='<em>Document</em> one has a first sentence. <em>Document</em> two has a second sentence.'");
+ }
+
+ public void testEncoder() {
+ assertU(adoc("text", "Document one has a first <i>sentence</i>.", "id", "103"));
+ assertU(commit());
+ assertQ("html escaped",
+ req("q", "text:document", "sort", "id asc", "hl", "true", "hl.encoder", "html"),
+ "//lst[@name='highlighting']/lst[@name='103']/arr[@name='text']/str='<em>Document</em> one has a first <i>sentence</i>.'");
+ }
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java Tue May 7 11:20:55 2013
@@ -150,6 +150,15 @@ public class SimpleFacetsTest extends So
@Test
public void testSimpleGroupedQueryRangeFacets() throws Exception {
+ // for the purposes of our test data, it shouldn't matter
+ // if we use facet.limit -100, -1, or 100 ...
+ // our set of values is small enough either way
+ testSimpleGroupedQueryRangeFacets("-100");
+ testSimpleGroupedQueryRangeFacets("-1");
+ testSimpleGroupedQueryRangeFacets("100");
+ }
+
+ private void testSimpleGroupedQueryRangeFacets(String facetLimit) {
assertQ(
req(
"q", "*:*",
@@ -158,10 +167,26 @@ public class SimpleFacetsTest extends So
"group.facet", "true",
"group.field", "hotel_s1",
"facet", "true",
+ "facet.limit", facetLimit,
"facet.query", "airport_s1:ams"
),
"//lst[@name='facet_queries']/int[@name='airport_s1:ams'][.='2']"
);
+ /* Testing facet.query using tagged filter query and exclusion */
+ assertQ(
+ req(
+ "q", "*:*",
+ "fq", "id:[2000 TO 2004]",
+ "fq", "{!tag=dus}airport_s1:dus",
+ "group", "true",
+ "group.facet", "true",
+ "group.field", "hotel_s1",
+ "facet", "true",
+ "facet.limit", facetLimit,
+ "facet.query", "{!ex=dus}airport_s1:ams"
+ ),
+ "//lst[@name='facet_queries']/int[@name='{!ex=dus}airport_s1:ams'][.='2']"
+ );
assertQ(
req(
"q", "*:*",
@@ -170,6 +195,7 @@ public class SimpleFacetsTest extends So
"group.facet", "true",
"group.field", "hotel_s1",
"facet", "true",
+ "facet.limit", facetLimit,
"facet.range", "duration_i1",
"facet.range.start", "5",
"facet.range.end", "11",
@@ -182,10 +208,43 @@ public class SimpleFacetsTest extends So
"//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='9'][.='0']",
"//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='10'][.='2']"
);
+ /* Testing facet.range using tagged filter query and exclusion */
+ assertQ(
+ req(
+ "q", "*:*",
+ "fq", "id:[2000 TO 2004]",
+ "fq", "{!tag=dus}airport_s1:dus",
+ "group", "true",
+ "group.facet", "true",
+ "group.field", "hotel_s1",
+ "facet", "true",
+ "facet.limit", facetLimit,
+ "facet.range", "{!ex=dus}duration_i1",
+ "facet.range.start", "5",
+ "facet.range.end", "11",
+ "facet.range.gap", "1"
+ ),
+ "//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='5'][.='2']",
+ "//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='6'][.='0']",
+ "//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='7'][.='0']",
+ "//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='8'][.='0']",
+ "//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='9'][.='0']",
+ "//lst[@name='facet_ranges']/lst[@name='duration_i1']/lst[@name='counts']/int[@name='10'][.='2']"
+ );
}
@Test
public void testSimpleGroupedFacets() throws Exception {
+ // for the purposes of our test data, it shouldn't matter
+ // if we use facet.limit -100, -1, or 100 ...
+ // our set of values is small enough either way
+ testSimpleGroupedFacets("100");
+ testSimpleGroupedFacets("-100");
+ testSimpleGroupedFacets("-5");
+ testSimpleGroupedFacets("-1");
+ }
+
+ private void testSimpleGroupedFacets(String facetLimit) throws Exception {
assertQ(
"Return 5 docs with id range 1937 till 1940",
req("id:[2000 TO 2004]"),
@@ -200,6 +259,7 @@ public class SimpleFacetsTest extends So
"group.facet", "true",
"group.field", "hotel_s1",
"facet", "true",
+ "facet.limit", facetLimit,
"facet.field", "airport_s1"
),
"//lst[@name='facet_fields']/lst[@name='airport_s1']",
@@ -208,6 +268,23 @@ public class SimpleFacetsTest extends So
"//lst[@name='airport_s1']/int[@name='dus'][.='1']"
);
assertQ(
+ "Return one facet count for field airport_a using facet.offset",
+ req(
+ "q", "*:*",
+ "fq", "id:[2000 TO 2004]",
+ "group", "true",
+ "group.facet", "true",
+ "group.field", "hotel_s1",
+ "facet", "true",
+ "facet.offset", "1",
+ "facet.limit", facetLimit,
+ "facet.field", "airport_s1"
+ ),
+ "//lst[@name='facet_fields']/lst[@name='airport_s1']",
+ "*[count(//lst[@name='airport_s1']/int)=1]",
+ "//lst[@name='airport_s1']/int[@name='dus'][.='1']"
+ );
+ assertQ(
"Return two facet counts for field airport_a with fq",
req(
"q", "*:*",
@@ -217,6 +294,7 @@ public class SimpleFacetsTest extends So
"group.facet", "true",
"group.field", "hotel_s1",
"facet", "true",
+ "facet.limit", facetLimit,
"facet.field", "airport_s1"
),
"//lst[@name='facet_fields']/lst[@name='airport_s1']",
@@ -234,6 +312,7 @@ public class SimpleFacetsTest extends So
"group.field", "hotel_s1",
"facet", "true",
"facet.field", "airport_s1",
+ "facet.limit", facetLimit,
"facet.prefix", "a"
),
"//lst[@name='facet_fields']/lst[@name='airport_s1']",
@@ -273,7 +352,7 @@ public class SimpleFacetsTest extends So
}
static void doEmptyFacetCounts(String field, String[] prefixes) throws Exception {
- SchemaField sf = h.getCore().getSchema().getField(field);
+ SchemaField sf = h.getCore().getLatestSchema().getField(field);
String response = JQ(req("q", "*:*"));
Map rsp = (Map) ObjectBuilder.fromJSON(response);
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/TestFaceting.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/TestFaceting.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/TestFaceting.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/request/TestFaceting.java Tue May 7 11:20:55 2013
@@ -294,4 +294,208 @@ public class TestFaceting extends SolrTe
}
}
-}
\ No newline at end of file
+ @Test
+ public void testFacetSortWithMinCount() {
+ assertU(adoc("id", "1.0", "f_td", "-420.126"));
+ assertU(adoc("id", "2.0", "f_td", "-285.672"));
+ assertU(adoc("id", "3.0", "f_td", "-1.218"));
+ assertU(commit());
+
+ assertQ(req("q", "*:*", FacetParams.FACET, "true", FacetParams.FACET_FIELD, "f_td", "f.f_td.facet.sort", FacetParams.FACET_SORT_INDEX),
+ "*[count(//lst[@name='f_td']/int)=3]",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[1][@name='-420.126']",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[2][@name='-285.672']",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[3][@name='-1.218']");
+
+ assertQ(req("q", "*:*", FacetParams.FACET, "true", FacetParams.FACET_FIELD, "f_td", "f.f_td.facet.sort", FacetParams.FACET_SORT_INDEX, FacetParams.FACET_MINCOUNT, "1", FacetParams.FACET_METHOD, FacetParams.FACET_METHOD_fc),
+ "*[count(//lst[@name='f_td']/int)=3]",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[1][@name='-420.126']",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[2][@name='-285.672']",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[3][@name='-1.218']");
+
+ assertQ(req("q", "*:*", FacetParams.FACET, "true", FacetParams.FACET_FIELD, "f_td", "f.f_td.facet.sort", FacetParams.FACET_SORT_INDEX, FacetParams.FACET_MINCOUNT, "1", "indent","true"),
+ "*[count(//lst[@name='f_td']/int)=3]",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[1][@name='-420.126']",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[2][@name='-285.672']",
+ "//lst[@name='facet_fields']/lst[@name='f_td']/int[3][@name='-1.218']");
+ }
+
+
+
+ public void testDateFacetsWithMultipleConfigurationForSameField() {
+ clearIndex();
+ final String f = "bday_dt";
+
+ assertU(adoc("id", "1", f, "1976-07-04T12:08:56.235Z"));
+ assertU(adoc("id", "2", f, "1976-07-05T00:00:00.000Z"));
+ assertU(adoc("id", "3", f, "1976-07-15T00:07:67.890Z"));
+ assertU(commit());
+ assertU(adoc("id", "4", f, "1976-07-21T00:07:67.890Z"));
+ assertU(adoc("id", "5", f, "1976-07-13T12:12:25.255Z"));
+ assertU(adoc("id", "6", f, "1976-07-03T17:01:23.456Z"));
+ assertU(adoc("id", "7", f, "1976-07-12T12:12:25.255Z"));
+ assertU(adoc("id", "8", f, "1976-07-15T15:15:15.155Z"));
+ assertU(adoc("id", "9", f, "1907-07-12T13:13:23.235Z"));
+ assertU(adoc("id", "10", f, "1976-07-03T11:02:45.678Z"));
+ assertU(commit());
+ assertU(adoc("id", "11", f, "1907-07-12T12:12:25.255Z"));
+ assertU(adoc("id", "12", f, "2007-07-30T07:07:07.070Z"));
+ assertU(adoc("id", "13", f, "1976-07-30T22:22:22.222Z"));
+ assertU(adoc("id", "14", f, "1976-07-05T22:22:22.222Z"));
+ assertU(commit());
+
+ final String preFoo = "//lst[@name='facet_dates']/lst[@name='foo']";
+ final String preBar = "//lst[@name='facet_dates']/lst[@name='bar']";
+
+ assertQ("check counts for month of facet by day",
+ req( "q", "*:*"
+ ,"rows", "0"
+ ,"facet", "true"
+ ,"facet.date", "{!key=foo " +
+ "facet.date.start=1976-07-01T00:00:00.000Z " +
+ "facet.date.end=1976-07-01T00:00:00.000Z+1MONTH " +
+ "facet.date.gap=+1DAY " +
+ "facet.date.other=all " +
+ "}" + f
+ ,"facet.date", "{!key=bar " +
+ "facet.date.start=1976-07-01T00:00:00.000Z " +
+ "facet.date.end=1976-07-01T00:00:00.000Z+7DAY " +
+ "facet.date.gap=+1DAY " +
+ "}" + f
+ )
+ // 31 days + pre+post+inner = 34
+ ,"*[count("+preFoo+"/int)=34]"
+ ,preFoo+"/int[@name='1976-07-01T00:00:00Z'][.='0' ]"
+ ,preFoo+"/int[@name='1976-07-02T00:00:00Z'][.='0' ]"
+ ,preFoo+"/int[@name='1976-07-03T00:00:00Z'][.='2' ]"
+ // july4th = 2 because exists doc @ 00:00:00.000 on July5
+ // (date faceting is inclusive)
+ ,preFoo+"/int[@name='1976-07-04T00:00:00Z'][.='2' ]"
+ ,preFoo+"/int[@name='1976-07-05T00:00:00Z'][.='2' ]"
+ ,preFoo+"/int[@name='1976-07-06T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-07T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-08T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-09T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-10T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-11T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-12T00:00:00Z'][.='1' ]"
+ ,preFoo+"/int[@name='1976-07-13T00:00:00Z'][.='1' ]"
+ ,preFoo+"/int[@name='1976-07-14T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-15T00:00:00Z'][.='2' ]"
+ ,preFoo+"/int[@name='1976-07-16T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-17T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-18T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-19T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-21T00:00:00Z'][.='1' ]"
+ ,preFoo+"/int[@name='1976-07-22T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-23T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-24T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-25T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-26T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-27T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-28T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-29T00:00:00Z'][.='0']"
+ ,preFoo+"/int[@name='1976-07-30T00:00:00Z'][.='1' ]"
+ ,preFoo+"/int[@name='1976-07-31T00:00:00Z'][.='0']"
+
+ ,preFoo+"/int[@name='before' ][.='2']"
+ ,preFoo+"/int[@name='after' ][.='1']"
+ ,preFoo+"/int[@name='between'][.='11']"
+
+ ,"*[count("+preBar+"/int)=7]"
+ ,preBar+"/int[@name='1976-07-01T00:00:00Z'][.='0' ]"
+ ,preBar+"/int[@name='1976-07-02T00:00:00Z'][.='0' ]"
+ ,preBar+"/int[@name='1976-07-03T00:00:00Z'][.='2' ]"
+ // july4th = 2 because exists doc @ 00:00:00.000 on July5
+ // (date faceting is inclusive)
+ ,preBar+"/int[@name='1976-07-04T00:00:00Z'][.='2' ]"
+ ,preBar+"/int[@name='1976-07-05T00:00:00Z'][.='2' ]"
+ ,preBar+"/int[@name='1976-07-06T00:00:00Z'][.='0']"
+ ,preBar+"/int[@name='1976-07-07T00:00:00Z'][.='0']"
+ );
+
+ clearIndex();
+ assertU(commit());
+ }
+
+ public void testSimpleFacetCountsWithMultipleConfigurationsForSameField() {
+ clearIndex();
+ String fname = "trait_ss";
+ assertU(adoc("id", "42",
+ fname, "Tool",
+ fname, "Obnoxious",
+ "name_s", "Zapp Brannigan"));
+
+ assertU(adoc("id", "43" ,
+ "title_s", "Democratic Order of Planets"));
+ assertU(commit());
+
+ assertU(adoc("id", "44",
+ fname, "Tool",
+ "name_s", "The Zapper"));
+
+ assertU(adoc("id", "45",
+ fname, "Chauvinist",
+ "title_s", "25 star General"));
+
+ assertU(adoc("id", "46",
+ fname, "Obnoxious",
+ "subject_s", "Defeated the pacifists of the Gandhi nebula"));
+
+ assertU(commit());
+
+ assertU(adoc("id", "47",
+ fname, "Pig",
+ "text_t", "line up and fly directly at the enemy death cannons, clogging them with wreckage!"));
+ assertU(commit());
+
+ assertQ("checking facets when one has missing=true&mincount=2 and the other has missing=false&mincount=0",
+ req("q", "id:[42 TO 47]"
+ ,"facet", "true"
+ ,"facet.zeros", "false"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "{!key=foo " +
+ "facet.mincount=0 "+
+ "facet.missing=false "+
+ "}"+fname
+ ,"facet.field", "{!key=bar " +
+ "facet.mincount=2 "+
+ "facet.missing=true "+
+ "}"+fname
+ )
+ ,"*[count(//doc)=4]"
+ ,"*[count(//lst[@name='foo']/int)=4]"
+ ,"*[count(//lst[@name='bar']/int)=2]"
+ ,"//lst[@name='foo']/int[@name='Tool'][.='2']"
+ ,"//lst[@name='foo']/int[@name='Obnoxious'][.='1']"
+ ,"//lst[@name='foo']/int[@name='Chauvinist'][.='1']"
+ ,"//lst[@name='foo']/int[@name='Pig'][.='0']"
+ ,"//lst[@name='foo']/int[@name='Tool'][.='2']"
+ ,"//lst[@name='bar']/int[not(@name)][.='1']"
+ );
+
+ assertQ("checking facets when one has missing=true&mincount=2 and the other has missing=false&mincount=0",
+ req("q", "id:[42 TO 47]"
+ ,"facet", "true"
+ ,"facet.zeros", "false"
+ ,"fq", "id:[42 TO 45]"
+ ,"facet.field", "{!key=foo " +
+ "facet.prefix=Too "+
+ "}"+fname
+ ,"facet.field", "{!key=bar " +
+ "facet.limit=2 "+
+ "facet.sort=false "+
+ "}"+fname
+ )
+ ,"*[count(//doc)=4]"
+ ,"*[count(//lst[@name='foo']/int)=1]"
+ ,"*[count(//lst[@name='bar']/int)=2]"
+ ,"//lst[@name='foo']/int[@name='Tool'][.='2']"
+ ,"//lst[@name='bar']/int[@name='Chauvinist'][.='1']"
+ ,"//lst[@name='bar']/int[@name='Obnoxious'][.='1']"
+ );
+ clearIndex();
+ assertU(commit());
+ }
+}
+
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java Tue May 7 11:20:55 2013
@@ -59,7 +59,7 @@ public class TestCSVResponseWriter exten
// test multivalued
assertEquals("2,\"hi,there\"\n"
, h.query(req("q","id:2", "wt","csv", "csv.header","false", "fl","id,v_ss")));
-
+
// test separator change
assertEquals("2|\"hi|there\"\n"
, h.query(req("q","id:2", "wt","csv", "csv.header","false", "csv.separator","|", "fl","id,v_ss")));
@@ -193,6 +193,21 @@ public class TestCSVResponseWriter exten
req.close();
}
+
+
+ @Test
+ public void testPseudoFields() throws Exception {
+ // Use Pseudo Field
+ assertEquals("1,hi",
+ h.query(req("q","id:1", "wt","csv", "csv.header","false", "fl","XXX:id,foo_s")).trim());
+
+ String txt = h.query(req("q","id:1", "wt","csv", "csv.header","true", "fl","XXX:id,YYY:[docid],FOO:foo_s"));
+ String[] lines = txt.split("\n");
+ assertEquals(2, lines.length);
+ assertEquals("XXX,YYY,FOO", lines[0] );
+ assertEquals("1,0,hi", lines[1] );
+ }
+
/*
* Utility method to sort a comma separated list of strings, for easier comparison regardless of platform
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java Tue May 7 11:20:55 2013
@@ -64,7 +64,7 @@ public abstract class AbstractCurrencyFi
@Test
public void testCurrencySchema() throws Exception {
- IndexSchema schema = h.getCore().getSchema();
+ IndexSchema schema = h.getCore().getLatestSchema();
SchemaField amount = schema.getField(field());
assertNotNull(amount);
@@ -91,7 +91,7 @@ public abstract class AbstractCurrencyFi
@Test
public void testCurrencyFieldType() throws Exception {
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
SchemaField amount = schema.getField(field());
assertNotNull(amount);
assertTrue(field() + " is not a poly field", amount.isPolyField());
@@ -122,7 +122,7 @@ public abstract class AbstractCurrencyFi
@Test
public void testMockExchangeRateProvider() throws Exception {
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
SchemaField amount = schema.getField("mock_amount");
// A few tests on the provider directly
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java Tue May 7 11:20:55 2013
@@ -23,7 +23,7 @@ public class BadIndexSchemaTest extends
private void doTest(final String schema, final String errString)
throws Exception {
- assertConfigs("solrconfig.xml", schema, errString);
+ assertConfigs("solrconfig-basic.xml", schema, errString);
}
public void testSevereErrorsForInvalidFieldOptions() throws Exception {
@@ -110,5 +110,13 @@ public class BadIndexSchemaTest extends
doTest("bad-schema-sweetspot-partial-norms.xml",
"Overriding default lengthNorm");
}
+
+ public void testBogusParameters() throws Exception {
+ doTest("bad-schema-bogus-field-parameters.xml", "Invalid field property");
+ }
+
+ public void testBogusAnalysisParameters() throws Exception {
+ doTest("bad-schema-bogus-analysis-parameters.xml", "Unknown parameters");
+ }
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java Tue May 7 11:20:55 2013
@@ -167,7 +167,7 @@ public class CopyFieldTest extends SolrT
public void testExplicitSourceGlob()
{
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
assertTrue("schema should contain explicit field 'sku1'", schema.getFields().containsKey("sku1"));
assertTrue("schema should contain explicit field 'sku2'", schema.getFields().containsKey("sku2"));
@@ -222,4 +222,43 @@ public class CopyFieldTest extends SolrT
assertQ("sku2 copied to dest_sub_no_ast_s (*_s subset pattern no asterisk)", req
,"//*[@numFound='1']");
}
+
+ @Test
+ public void testSourceGlobMatchesNoDynamicOrExplicitField()
+ {
+ // SOLR-4650: copyField source globs should not have to match an explicit or dynamic field
+ SolrCore core = h.getCore();
+ IndexSchema schema = core.getLatestSchema();
+
+ assertNull("'testing123_*' should not be (or match) a dynamic or explicit field", schema.getFieldOrNull("testing123_*"));
+
+ assertTrue("schema should contain dynamic field '*_s'", schema.getDynamicPattern("*_s").equals("*_s"));
+
+ assertU(adoc("id", "A5", "sku1", "10-1839ACX-93", "testing123_s", "AAM46"));
+ assertU(commit());
+
+ Map<String,String> args = new HashMap<String, String>();
+ args.put( CommonParams.Q, "text:AAM46" );
+ args.put( "indent", "true" );
+ SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
+ assertQ("sku2 copied to text", req
+ ,"//*[@numFound='1']"
+ ,"//result/doc[1]/str[@name='id'][.='A5']"
+ );
+ }
+
+ public void testCatchAllCopyField() {
+ IndexSchema schema = h.getCore().getLatestSchema();
+
+ assertNull("'*' should not be (or match) a dynamic field",
+ schema.getDynamicPattern("*"));
+
+ assertU(adoc("id", "A5", "sku1", "10-1839ACX-93", "testing123_s", "AAM46"));
+ assertU(commit());
+ for (String q : new String[] {"A5", "10-1839ACX-93", "AAM46" }) {
+ assertQ(req("q","catchall_t:" + q)
+ ,"//*[@numFound='1']"
+ ,"//result/doc[1]/str[@name='id'][.='A5']");
+ }
+ }
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java Tue May 7 11:20:55 2013
@@ -63,7 +63,7 @@ public class DocValuesTest extends SolrT
assertEquals(Double.doubleToLongBits(3), reader.getNumericDocValues("doubledv").get(0));
assertEquals(4L, reader.getNumericDocValues("longdv").get(0));
- final IndexSchema schema = core.getSchema();
+ final IndexSchema schema = core.getLatestSchema();
final SchemaField floatDv = schema.getField("floatdv");
final SchemaField intDv = schema.getField("intdv");
final SchemaField doubleDv = schema.getField("doubledv");
@@ -120,6 +120,26 @@ public class DocValuesTest extends SolrT
assertQ(req("q", "*:*", "sort", "stringdv asc", "rows", "1", "fl", "id"),
"//str[@name='id'][.='2']");
}
+
+ public void testDocValuesSorting2() {
+ assertU(adoc("id", "1", "doubledv", "12"));
+ assertU(adoc("id", "2", "doubledv", "50.567"));
+ assertU(adoc("id", "3", "doubledv", "+0"));
+ assertU(adoc("id", "4", "doubledv", "4.9E-324"));
+ assertU(adoc("id", "5", "doubledv", "-0"));
+ assertU(adoc("id", "6", "doubledv", "-5.123"));
+ assertU(adoc("id", "7", "doubledv", "1.7976931348623157E308"));
+ assertU(commit());
+ assertQ(req("fl", "id", "q", "*:*", "sort", "doubledv asc"),
+ "//result/doc[1]/str[@name='id'][.='6']",
+ "//result/doc[2]/str[@name='id'][.='5']",
+ "//result/doc[3]/str[@name='id'][.='3']",
+ "//result/doc[4]/str[@name='id'][.='4']",
+ "//result/doc[5]/str[@name='id'][.='1']",
+ "//result/doc[6]/str[@name='id'][.='2']",
+ "//result/doc[7]/str[@name='id'][.='7']"
+ );
+ }
public void testDocValuesFaceting() {
for (int i = 0; i < 50; ++i) {
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java Tue May 7 11:20:55 2013
@@ -40,7 +40,7 @@ public class IndexSchemaRuntimeFieldTest
// willi-nilly
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
final String fieldName = "runtimefield";
SchemaField sf = new SchemaField( fieldName, schema.getFieldTypes().get( "string" ) );
schema.getFields().put( fieldName, sf );
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java Tue May 7 11:20:55 2013
@@ -81,7 +81,7 @@ public class IndexSchemaTest extends Sol
@Test
public void testIsDynamicField() throws Exception {
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
assertFalse( schema.isDynamicField( "id" ) );
assertTrue( schema.isDynamicField( "aaa_i" ) );
assertFalse( schema.isDynamicField( "no_such_field" ) );
@@ -90,7 +90,7 @@ public class IndexSchemaTest extends Sol
@Test
public void testProperties() throws Exception{
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
assertFalse(schema.getField("id").multiValued());
}
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java Tue May 7 11:20:55 2013
@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.miscel
import org.apache.lucene.analysis.miscellaneous.TrimFilterFactory;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.analysis.*;
+import org.apache.solr.analysis.TokenizerChain;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,7 +42,7 @@ public class MultiTermTest extends SolrT
@Test
public void testMultiFound() {
- SchemaField field = h.getCore().getSchema().getField("content_multi");
+ SchemaField field = h.getCore().getLatestSchema().getField("content_multi");
Analyzer analyzer = ((TextField)field.getType()).getMultiTermAnalyzer();
assertTrue(analyzer instanceof TokenizerChain);
assertTrue(((TokenizerChain) analyzer).getTokenizerFactory() instanceof WhitespaceTokenizerFactory);
@@ -64,7 +64,7 @@ public class MultiTermTest extends SolrT
@Test
public void testQueryCopiedToMulti() {
- SchemaField field = h.getCore().getSchema().getField("content_charfilter");
+ SchemaField field = h.getCore().getLatestSchema().getField("content_charfilter");
Analyzer analyzer = ((TextField)field.getType()).getMultiTermAnalyzer();
assertTrue(analyzer instanceof TokenizerChain);
assertTrue(((TokenizerChain) analyzer).getTokenizerFactory() instanceof KeywordTokenizerFactory);
@@ -79,7 +79,7 @@ public class MultiTermTest extends SolrT
@Test
public void testDefaultCopiedToMulti() {
- SchemaField field = h.getCore().getSchema().getField("content_ws");
+ SchemaField field = h.getCore().getLatestSchema().getField("content_ws");
Analyzer analyzer = ((TextField)field.getType()).getMultiTermAnalyzer();
assertTrue(analyzer instanceof TokenizerChain);
assertTrue(((TokenizerChain) analyzer).getTokenizerFactory() instanceof KeywordTokenizerFactory);
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java Tue May 7 11:20:55 2013
@@ -19,7 +19,6 @@ package org.apache.solr.schema;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.schema.SchemaField;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -40,7 +39,7 @@ public class NotRequiredUniqueKeyTest ex
public void testSchemaLoading()
{
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
SchemaField uniqueKey = schema.getUniqueKeyField();
assertFalse( uniqueKey.isRequired() );
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java Tue May 7 11:20:55 2013
@@ -41,7 +41,7 @@ public class PolyFieldTest extends SolrT
@Test
public void testSchemaBasics() throws Exception {
- IndexSchema schema = h.getCore().getSchema();
+ IndexSchema schema = h.getCore().getLatestSchema();
SchemaField home = schema.getField("home");
@@ -75,7 +75,7 @@ public class PolyFieldTest extends SolrT
@Test
public void testPointFieldType() throws Exception {
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
SchemaField home = schema.getField("home");
assertNotNull(home);
assertTrue("home is not a poly field", home.isPolyField());
@@ -161,7 +161,7 @@ public class PolyFieldTest extends SolrT
@Test
public void testSearchDetails() throws Exception {
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
double[] xy = new double[]{35.0, -79.34};
String point = xy[0] + "," + xy[1];
//How about some queries?
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java Tue May 7 11:20:55 2013
@@ -21,12 +21,12 @@ import java.util.Collections;
import java.util.HashMap;
import org.apache.lucene.document.Field;
-import org.apache.lucene.util.LuceneTestCase;
-import org.apache.solr.common.util.Base64;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.schema.PreAnalyzedField.PreAnalyzedParser;
+import org.junit.BeforeClass;
import org.junit.Test;
-public class PreAnalyzedFieldTest extends LuceneTestCase {
+public class PreAnalyzedFieldTest extends SolrTestCaseJ4 {
private static final String[] valid = {
"1 one two three", // simple parsing
@@ -70,6 +70,11 @@ public class PreAnalyzedFieldTest extend
int props =
FieldProperties.INDEXED | FieldProperties.STORED;
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ initCore("solrconfig.xml","schema.xml");
+ }
+
@Override
public void setUp() throws Exception {
super.setUp();
@@ -82,7 +87,7 @@ public class PreAnalyzedFieldTest extend
// use Simple format
HashMap<String,String> args = new HashMap<String,String>();
args.put(PreAnalyzedField.PARSER_IMPL, SimplePreAnalyzedParser.class.getName());
- paf.init((IndexSchema)null, args);
+ paf.init(h.getCore().getLatestSchema(), args);
PreAnalyzedParser parser = new SimplePreAnalyzedParser();
for (int i = 0; i < valid.length; i++) {
String s = valid[i];
@@ -100,7 +105,7 @@ public class PreAnalyzedFieldTest extend
@Test
public void testInvalidSimple() {
PreAnalyzedField paf = new PreAnalyzedField();
- paf.init((IndexSchema)null, Collections.<String,String>emptyMap());
+ paf.init(h.getCore().getLatestSchema(), Collections.<String,String>emptyMap());
for (String s : invalid) {
try {
paf.fromString(field, s, 1.0f);
@@ -125,7 +130,7 @@ public class PreAnalyzedFieldTest extend
// use Simple format
HashMap<String,String> args = new HashMap<String,String>();
args.put(PreAnalyzedField.PARSER_IMPL, SimplePreAnalyzedParser.class.getName());
- paf.init((IndexSchema)null, args);
+ paf.init(h.getCore().getLatestSchema(), args);
try {
Field f = (Field)paf.fromString(field, valid[0], 1.0f);
} catch (Exception e) {
@@ -133,7 +138,7 @@ public class PreAnalyzedFieldTest extend
}
// use JSON format
args.put(PreAnalyzedField.PARSER_IMPL, JsonPreAnalyzedParser.class.getName());
- paf.init((IndexSchema)null, args);
+ paf.init(h.getCore().getLatestSchema(), args);
try {
Field f = (Field)paf.fromString(field, valid[0], 1.0f);
fail("Should fail JSON parsing: '" + valid[0]);
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java Tue May 7 11:20:55 2013
@@ -68,7 +68,7 @@ public class PrimitiveFieldTypeTest exte
// ***********************
// With schema version 1.4:
// ***********************
- schema = new IndexSchema(config, testConfHome + "schema12.xml", null);
+ schema = IndexSchemaFactory.buildIndexSchema(testConfHome + "schema12.xml", config);
dt = new DateField();
dt.init(schema, initMap);
@@ -130,7 +130,7 @@ public class PrimitiveFieldTypeTest exte
// ***********************
// With schema version 1.5
// ***********************
- schema = new IndexSchema(config, testConfHome + "schema15.xml", null);
+ schema = IndexSchemaFactory.buildIndexSchema(testConfHome + "schema15.xml", config);
dt = new DateField();
dt.init(schema, initMap);
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java Tue May 7 11:20:55 2013
@@ -21,7 +21,6 @@ import java.util.Collection;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.schema.SchemaField;
import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -42,7 +41,7 @@ public class RequiredFieldsTest extends
@Test
public void testRequiredFieldsConfig() {
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
SchemaField uniqueKey = schema.getUniqueKeyField();
// Make sure the uniqueKey is required
@@ -73,12 +72,12 @@ public class RequiredFieldsTest extends
assertU(commit());
// Add another document without a subject, which has a default in schema
- String subjectDefault = core.getSchema().getField("subject").getDefaultValue();
+ String subjectDefault = core.getLatestSchema().getField("subject").getDefaultValue();
assertNotNull("subject has no default value", subjectDefault);
assertQ("should find one with subject="+subjectDefault, req("id:530 subject:"+subjectDefault) ,"//result[@numFound=1]" );
// Add another document without a required name, which has no default
- assertNull(core.getSchema().getField("name").getDefaultValue());
+ assertNull(core.getLatestSchema().getField("name").getDefaultValue());
ignoreException("missing required field");
assertFailedU("adding doc without required field",
adoc("id", "531", "subject", "no name document", "field_t", "what's inside?") );
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java Tue May 7 11:20:55 2013
@@ -18,12 +18,6 @@
package org.apache.solr.schema;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.core.SolrCore;
-import org.apache.solr.schema.IndexSchema;
-
-
-import java.util.HashMap;
-import java.util.Map;
public class SchemaVersionSpecificBehaviorTest extends SolrTestCaseJ4 {
@@ -189,7 +183,7 @@ public class SchemaVersionSpecificBehavi
try {
System.setProperty("solr.schema.test.ver", String.valueOf(ver));
initCore( "solrconfig-basic.xml", "schema-behavior.xml" );
- IndexSchema s = h.getCore().getSchema();
+ IndexSchema s = h.getCore().getLatestSchema();
assertEquals("Schema version not set correctly",
String.valueOf(ver),
String.valueOf(s.getVersion()));
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java Tue May 7 11:20:55 2013
@@ -38,7 +38,7 @@ public class SynonymTokenizerTest extend
@Test
public void testSchemaLoading() {
SolrCore core = h.getCore();
- IndexSchema schema = core.getSchema();
+ IndexSchema schema = core.getLatestSchema();
assertTrue( schema.getFieldTypes().containsKey("text_synonyms") );
}
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java Tue May 7 11:20:55 2013
@@ -22,7 +22,6 @@ import org.apache.lucene.search.SortFiel
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.schema.IndexSchema;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -75,7 +74,6 @@ public class QueryParsingTest extends So
Sort sort;
SolrQueryRequest req = req();
- IndexSchema schema = h.getCore().getSchema();
sort = QueryParsing.parseSort("score desc", req);
assertNull("sort", sort);//only 1 thing in the list, no Sort specified
@@ -188,7 +186,6 @@ public class QueryParsingTest extends So
Sort sort;
SolrQueryRequest req = req();
- IndexSchema schema = h.getCore().getSchema();
//test some bad vals
try {
sort = QueryParsing.parseSort("weight, desc", req);
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestDocSet.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestDocSet.java Tue May 7 11:20:55 2013
@@ -364,11 +364,6 @@ public class TestDocSet extends LuceneTe
}
@Override
- public boolean hasDeletions() {
- return false;
- }
-
- @Override
public FieldInfos getFieldInfos() {
return new FieldInfos(new FieldInfo[0]);
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java Tue May 7 11:20:55 2013
@@ -847,6 +847,15 @@ public class TestExtendedDismaxParser ex
"defType", "edismax")
, "*[count(//doc)=1]");
+ assertQ(
+ "Might be double-escaping a client-escaped colon",
+ req("q", "text_sw:(theos OR thistokenhasa\\:preescapedcolon OR theou)", "defType", "edismax", "qf", "id"),
+ "*[count(//doc)=3]");
+ assertQ(
+ "Might be double-escaping a client-escaped colon",
+ req("q", "text_sw:(theos OR thistokenhasa\\:preescapedcolon OR theou)", "defType", "edismax", "qf", "text"),
+ "*[count(//doc)=3]");
+
}
/**
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java Tue May 7 11:20:55 2013
@@ -18,6 +18,7 @@
package org.apache.solr.search;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.schema.SchemaField;
import org.apache.commons.lang.StringUtils;
@@ -66,6 +67,20 @@ public class TestPseudoReturnFields exte
// a multi valued field (the field value is copied first, then
// if the type lookup is done again later, we get the wrong thing). SOLR-4036
+ // score as psuedo field - precondition checks
+ for (String name : new String[] {"score", "val_ss"}) {
+ SchemaField sf = h.getCore().getLatestSchema().getFieldOrNull(name);
+ assertNotNull("Test depends on a (dynamic) field mtching '"+name+
+ "', schema was changed out from under us!",sf);
+ assertTrue("Test depends on a multivalued dynamic field matching '"+name+
+ "', schema was changed out from under us!", sf.multiValued());
+ }
+
+ // score as psuedo field
+ assertJQ(req("q","*:*", "fq", "id:42", "fl","id,score")
+ ,"/response/docs==[{'id':'42','score':1.0}]");
+
+ // single value int using alias that matches multivalued dynamic field
assertJQ(req("q","id:42", "fl","val_ss:val_i, val2_ss:10")
,"/response/docs==[{'val2_ss':10,'val_ss':1}]"
);
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java Tue May 7 11:20:55 2013
@@ -112,4 +112,53 @@ public class TestSolrQueryParser extends
);
}
+ @Test
+ public void testNestedQueryModifiers() throws Exception {
+ // One previous error was that for nested queries, outer parameters overrode nested parameters.
+ // For example _query_:"\"a b\"~2" was parsed as "a b"
+
+ String subqq="_query_:\"{!v=$qq}\"";
+
+ assertJQ(req("q","_query_:\"\\\"how brown\\\"~2\""
+ , "debug","query"
+ )
+ ,"/response/docs/[0]/id=='1'"
+ );
+
+ assertJQ(req("q",subqq, "qq","\"how brown\"~2"
+ , "debug","query"
+ )
+ ,"/response/docs/[0]/id=='1'"
+ );
+
+ // Should explicit slop override? It currently does not, but that could be considered a bug.
+ assertJQ(req("q",subqq+"~1", "qq","\"how brown\"~2"
+ , "debug","query"
+ )
+ ,"/response/docs/[0]/id=='1'"
+ );
+
+ // Should explicit slop override? It currently does not, but that could be considered a bug.
+ assertJQ(req("q"," {!v=$qq}~1", "qq","\"how brown\"~2"
+ , "debug","query"
+ )
+ ,"/response/docs/[0]/id=='1'"
+ );
+
+ // boost should multiply
+ assertJQ(req("fq","id:1", "fl","id,score", "q", subqq+"^3", "qq","text:x^2"
+ , "debug","query"
+ )
+ ,"/debug/parsedquery=='text:x^6.0'"
+ );
+
+ // boost should multiply
+ assertJQ(req("fq","id:1", "fl","id,score", "q", " {!v=$qq}^3", "qq","text:x^2"
+ , "debug","query"
+ )
+ ,"/debug/parsedquery=='text:x^6.0'"
+ );
+
+ }
+
}
Modified: lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java?rev=1479862&r1=1479861&r2=1479862&view=diff
==============================================================================
--- lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (original)
+++ lucene/dev/branches/lucene4258/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java Tue May 7 11:20:55 2013
@@ -30,6 +30,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Vector;
import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
@@ -314,4 +315,32 @@ public class SolrRequestParserTest exten
assertEquals(500, solre.code());
}
}
+
+ @Test
+ public void testAddHttpRequestToContext() throws Exception {
+ HttpServletRequest request = createMock(HttpServletRequest.class);
+ expect(request.getMethod()).andReturn("GET").anyTimes();
+ expect(request.getContentType()).andReturn( "application/x-www-form-urlencoded" ).anyTimes();
+ expect(request.getQueryString()).andReturn("q=title:solr").anyTimes();
+ Map<String, String> headers = new HashMap<String,String>();
+ headers.put("X-Forwarded-For", "10.0.0.1");
+ expect(request.getHeaderNames()).andReturn(new Vector<String>(headers.keySet()).elements()).anyTimes();
+ for(Map.Entry<String,String> entry:headers.entrySet()) {
+ Vector<String> v = new Vector<String>();
+ v.add(entry.getValue());
+ expect(request.getHeaders(entry.getKey())).andReturn(v.elements()).anyTimes();
+ }
+ replay(request);
+
+ SolrRequestParsers parsers = new SolrRequestParsers(h.getCore().getSolrConfig());
+ assertFalse(parsers.isAddRequestHeadersToContext());
+ SolrQueryRequest solrReq = parsers.parse(h.getCore(), "/select", request);
+ assertFalse(solrReq.getContext().containsKey("httpRequest"));
+
+ parsers.setAddRequestHeadersToContext(true);
+ solrReq = parsers.parse(h.getCore(), "/select", request);
+ assertEquals(request, solrReq.getContext().get("httpRequest"));
+ assertEquals("10.0.0.1", ((HttpServletRequest)solrReq.getContext().get("httpRequest")).getHeaders("X-Forwarded-For").nextElement());
+
+ }
}