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

SOLR-8026: skew test query to get factional scores for assert 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1703817 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mikhail Khludnev 2015-09-18 12:22:57 +00:00
parent c17deb08a0
commit e8bb3e4757
1 changed files with 41 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java
View File

@ -32,9 +32,9 @@ import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.Slice;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.junit.Test; import org.junit.Test;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.*;
import java.io.IOException; import java.io.IOException;
@ -46,6 +46,8 @@ import java.util.Set;
*/ */
public class DistribJoinFromCollectionTest extends AbstractFullDistribZkTestBase { public class DistribJoinFromCollectionTest extends AbstractFullDistribZkTestBase {
final private static String[] scoreModes = {"avg","max","min","total"};
public DistribJoinFromCollectionTest() { public DistribJoinFromCollectionTest() {
super(); super();
} }
@ -119,20 +121,23 @@ public class DistribJoinFromCollectionTest extends AbstractFullDistribZkTestBase
private void testJoins(String toColl, String fromColl, Integer toDocId, boolean isScoresTest) private void testJoins(String toColl, String fromColl, Integer toDocId, boolean isScoresTest)
throws SolrServerException, IOException { throws SolrServerException, IOException {
// verify the join with fromIndex works // verify the join with fromIndex works
final String[] scoreModes = {"avg","max","min","total"}; final String fromQ = "match_s:c match_s:not_1_0_score_after_weight_normalization";
String joinQ = "{!join " + anyScoreMode(isScoresTest, scoreModes) {
+ "from=join_s fromIndex=" + fromColl + " to=join_s}match_s:c"; final String joinQ = "{!join " + anyScoreMode(isScoresTest)
+ "from=join_s fromIndex=" + fromColl +
" to=join_s}" + fromQ;
QueryRequest qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score")); QueryRequest qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score"));
QueryResponse rsp = new QueryResponse(cloudClient.request(qr), cloudClient); QueryResponse rsp = new QueryResponse(cloudClient.request(qr), cloudClient);
SolrDocumentList hits = rsp.getResults(); SolrDocumentList hits = rsp.getResults();
assertTrue("Expected 1 doc", hits.getNumFound() == 1); assertTrue("Expected 1 doc, got "+hits, hits.getNumFound() == 1);
SolrDocument doc = hits.get(0); SolrDocument doc = hits.get(0);
assertEquals(toDocId, doc.getFirstValue("id")); assertEquals(toDocId, doc.getFirstValue("id"));
assertEquals("b", doc.getFirstValue("get_s")); assertEquals("b", doc.getFirstValue("get_s"));
assertScore(isScoresTest, doc); assertScore(isScoresTest, doc);
}
//negative test before creating an alias //negative test before creating an alias
checkAbsentFromIndex(fromColl, toColl, isScoresTest, scoreModes); checkAbsentFromIndex(fromColl, toColl, isScoresTest);
// create an alias for the fromIndex and then query through the alias // create an alias for the fromIndex and then query through the alias
String alias = fromColl+"Alias"; String alias = fromColl+"Alias";
@ -141,46 +146,48 @@ public class DistribJoinFromCollectionTest extends AbstractFullDistribZkTestBase
request.setAliasedCollections(fromColl); request.setAliasedCollections(fromColl);
request.process(cloudClient); request.process(cloudClient);
joinQ = "{!join " + anyScoreMode(isScoresTest, scoreModes) {
+ "from=join_s fromIndex=" + alias + " to=join_s}match_s:c"; final String joinQ = "{!join " + anyScoreMode(isScoresTest)
qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score")); + "from=join_s fromIndex=" + alias + " to=join_s}"+fromQ;
rsp = new QueryResponse(cloudClient.request(qr), cloudClient); final QueryRequest qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score"));
hits = rsp.getResults(); final QueryResponse rsp = new QueryResponse(cloudClient.request(qr), cloudClient);
final SolrDocumentList hits = rsp.getResults();
assertTrue("Expected 1 doc", hits.getNumFound() == 1); assertTrue("Expected 1 doc", hits.getNumFound() == 1);
doc = hits.get(0); SolrDocument doc = hits.get(0);
assertEquals(toDocId, doc.getFirstValue("id")); assertEquals(toDocId, doc.getFirstValue("id"));
assertEquals("b", doc.getFirstValue("get_s")); assertEquals("b", doc.getFirstValue("get_s"));
assertScore(isScoresTest, doc); assertScore(isScoresTest, doc);
}
//negative test after creating an alias //negative test after creating an alias
checkAbsentFromIndex(fromColl, toColl, isScoresTest, scoreModes); checkAbsentFromIndex(fromColl, toColl, isScoresTest);
{
// verify join doesn't work if no match in the "from" index // verify join doesn't work if no match in the "from" index
joinQ = "{!join " + (anyScoreMode(isScoresTest, scoreModes)) final String joinQ = "{!join " + (anyScoreMode(isScoresTest))
+ "from=join_s fromIndex=" + fromColl + " to=join_s}match_s:d"; + "from=join_s fromIndex=" + fromColl + " to=join_s}match_s:d";
qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score")); final QueryRequest qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score"));
rsp = new QueryResponse(cloudClient.request(qr), cloudClient); final QueryResponse rsp = new QueryResponse(cloudClient.request(qr), cloudClient);
hits = rsp.getResults(); final SolrDocumentList hits = rsp.getResults();
assertTrue("Expected no hits", hits.getNumFound() == 0); assertTrue("Expected no hits", hits.getNumFound() == 0);
assertScore(isScoresTest, doc); }
} }
//@Ignore ("SOLR-8026, SOLR-7775")
private void assertScore(boolean isScoresTest, SolrDocument doc) { private void assertScore(boolean isScoresTest, SolrDocument doc) {
//if (isScoresTest) { if (isScoresTest) {
// assertThat(doc.getFirstValue("score").toString(), not("1.0")); assertThat("score join doesn't return 1.0",doc.getFirstValue("score").toString(), not("1.0"));
//} else { } else {
// assertEquals("1.0", doc.getFirstValue("score").toString()); assertEquals("Solr join has constant score", "1.0", doc.getFirstValue("score").toString());
//} }
} }
private String anyScoreMode(boolean isScoresTest, String[] scoreModes) { private String anyScoreMode(boolean isScoresTest) {
return isScoresTest ? "score=" + (scoreModes[random().nextInt(scoreModes.length)]) + " " : ""; return isScoresTest ? "score=" + (scoreModes[random().nextInt(scoreModes.length)]) + " " : "";
} }
private void checkAbsentFromIndex(String fromColl, String toColl, boolean isScoresTest, String[] scoreModes) throws SolrServerException, IOException { private void checkAbsentFromIndex(String fromColl, String toColl, boolean isScoresTest) throws SolrServerException, IOException {
final String wrongName = fromColl + "WrongName"; final String wrongName = fromColl + "WrongName";
final String joinQ = "{!join " + (anyScoreMode(isScoresTest, scoreModes)) final String joinQ = "{!join " + (anyScoreMode(isScoresTest))
+ "from=join_s fromIndex=" + wrongName + " to=join_s}match_s:c"; + "from=join_s fromIndex=" + wrongName + " to=join_s}match_s:c";
final QueryRequest qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score")); final QueryRequest qr = new QueryRequest(params("collection", toColl, "q", joinQ, "fl", "id,get_s,score"));
try { try {