Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up and expand distrib mlt tests - still ignored until I can test on freebsd 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1424555 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2012-12-20 16:04:23 +00:00
parent d475d822d0
commit 430b975221
3 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
View File

@ -408,6 +408,8 @@ public class MoreLikeThisHandler extends RequestHandlerBase
DocIterator iterator = docs.iterator();
while (iterator.hasNext()) {
int id = iterator.nextDoc();
String uniqueId = schema.printableUniqueKey(reader.document(id));
BooleanQuery mltquery = (BooleanQuery) mlt.like(id);
if (mltquery.clauses().size() == 0) {
return result;
@ -417,14 +419,12 @@ public class MoreLikeThisHandler extends RequestHandlerBase
// exclude current document from results
BooleanQuery mltQuery = new BooleanQuery();
mltQuery.add(mltquery, BooleanClause.Occur.MUST);
String name = schema.printableUniqueKey(reader.document(id));
// Added in-case uniqueKey is uri.
mltQuery.add(
new TermQuery(new Term(uniqueKeyField.getName(), name.replace(":",
"\\:"))), BooleanClause.Occur.MUST_NOT);
result.add(name, mltQuery);
new TermQuery(new Term(uniqueKeyField.getName(), uniqueId)), BooleanClause.Occur.MUST_NOT);
result.add(uniqueId, mltQuery);
}
return result;
}

13
solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
View File

@ -78,6 +78,12 @@ public class MoreLikeThisComponent extends SearchComponent {
int mltcount = params.getInt(MoreLikeThisParams.DOC_COUNT, 20);
if (params.getBool(ShardParams.IS_SHARD, false)) {
if (params.get(MoreLikeThisComponent.DIST_DOC_ID) == null) {
if (rb.getResults().docList.size() == 0) {
// return empty response
rb.rsp.add("moreLikeThis", new NamedList<DocList>());
return;
}
MoreLikeThisHandler.MoreLikeThisHelper mlt = new MoreLikeThisHandler.MoreLikeThisHelper(
params, searcher);
@ -132,11 +138,9 @@ public class MoreLikeThisComponent extends SearchComponent {
}
}
if ((sreq.purpose & ShardRequest.PURPOSE_GET_MLT_RESULTS) != 0) {
for (ShardResponse r : sreq.responses) {
log.info("MLT Query returned: "
log.debug("MLT Query returned: "
+ r.getSolrResponse().getResponse().toString());
}
}
@ -312,7 +316,6 @@ public class MoreLikeThisComponent extends SearchComponent {
// MLT Query is submitted as normal query to shards.
s.params.set(CommonParams.Q, q);
s.shards = ShardRequest.ALL_SHARDS;
return s;
}
@ -323,7 +326,7 @@ public class MoreLikeThisComponent extends SearchComponent {
s.params.set(CommonParams.START, 0);
String id = rb.req.getSchema().getUniqueKeyField() .getName();
String id = rb.req.getSchema().getUniqueKeyField().getName();
s.params.set(CommonParams.FL, "score," + id);
// MLT Query is submitted as normal query to shards.

34
solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java
View File

@ -19,6 +19,7 @@ package org.apache.solr.handler.component;
import org.apache.lucene.util.LuceneTestCase.Slow;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.common.params.MoreLikeThisParams;
import org.junit.BeforeClass;
import org.junit.Ignore;
@ -38,7 +39,7 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
public DistributedMLTComponentTest()
{
fixShardCount=true;
shardCount=2;
shardCount=3;
stress=0;
}
@ -67,7 +68,7 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
index(id, "4", "lowerfilt", "ford");
index(id, "5", "lowerfilt", "ferrari");
index(id, "6", "lowerfilt", "jaguar");
index(id, "7", "lowerfilt", "mclaren moon or the moon and moon");
index(id, "7", "lowerfilt", "mclaren moon or the moon and moon moon shine and the moon but moon was good foxes too");
index(id, "8", "lowerfilt", "sonata");
index(id, "9", "lowerfilt", "The quick red fox jumped over the lazy big and large brown dogs.");
index(id, "10", "lowerfilt", "blue");
@ -76,7 +77,7 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
index(id, "14", "lowerfilt", "The quote red fox jumped over the lazy brown dogs.");
index(id, "15", "lowerfilt", "The fat red fox jumped over the lazy brown dogs.");
index(id, "16", "lowerfilt", "The slim red fox jumped over the lazy brown dogs.");
index(id, "17", "lowerfilt", "The quote red fox jumped moon over the lazy brown dogs moon. Of course moon");
index(id, "17", "lowerfilt", "The quote red fox jumped moon over the lazy brown dogs moon. Of course moon. Foxes and moon come back to the foxes and moon");
index(id, "18", "lowerfilt", "The quote red fox jumped over the lazy brown dogs.");
index(id, "19", "lowerfilt", "The hose red fox jumped over the lazy brown dogs.");
index(id, "20", "lowerfilt", "The quote red fox jumped over the lazy brown dogs.");
@ -85,6 +86,7 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
index(id, "23", "lowerfilt", "The quote red fox jumped over the lazy brown dogs.");
index(id, "24", "lowerfilt", "The file red fox jumped over the lazy brown dogs.");
index(id, "25", "lowerfilt", "rod fix");
commit();
handle.clear();
@ -102,8 +104,6 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
query("q", "lowerfilt:sonata", "mlt", "true", "mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt", requestHandlerName);
query("q", "lowerfilt:moon", "fl", id, "sort", "id desc", "mlt", "true", "mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt", requestHandlerName);
handle.put("24", UNORDERED);
handle.put("23", UNORDERED);
handle.put("22", UNORDERED);
@ -116,10 +116,30 @@ public class DistributedMLTComponentTest extends BaseDistributedSearchTestCase {
handle.put("15", UNORDERED);
handle.put("14", UNORDERED);
handle.put("13", UNORDERED);
handle.put("7", UNORDERED);
// keep in mind that MLT params influence stats that are calulated
// per shard - because of this, depending on params, distrib and single
// shard queries will not match.
query("q", "lowerfilt:fox", "fl", id, "sort", "id desc", "mlt", "true", "mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt", requestHandlerName);
query("q", "lowerfilt:moon", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 2,
MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName);
//query("q", "*:*", "mlt", "true", "mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt", requestHandlerName);
query("q", "lowerfilt:fox", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 1,
MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName);
query("q", "lowerfilt:the red fox", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 1,
MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName);
query("q", "lowerfilt:blue moon", "fl", id, MoreLikeThisParams.MIN_TERM_FREQ, 1,
MoreLikeThisParams.MIN_DOC_FREQ, 1, "sort", "id desc", "mlt", "true",
"mlt.fl", "lowerfilt", "qt", requestHandlerName, "shards.qt",
requestHandlerName);
}
}