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

tests: get model order from index, fix some json numeric comparisons 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1066850 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2011-02-03 16:14:07 +00:00
parent 30ed34d4fe
commit 7b32753293
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
solr/src/test/org/apache/solr/JSONTestUtil.java
View File

@ -135,14 +135,16 @@ class CollectionTester {
if (!expected.equals(val)) {
// make an exception for some numerics
if (expected instanceof Integer && val instanceof Long || expected instanceof Long && val instanceof Integer
if ((expected instanceof Integer && val instanceof Long || expected instanceof Long && val instanceof Integer)
&& ((Number)expected).longValue() == ((Number)val).longValue())
{
// OK
} else if (expected instanceof Float && val instanceof Double || expected instanceof Double && val instanceof Float
&& ((Number)expected).doubleValue() == ((Number)val).doubleValue())
{
// OK
return true;
} else if ((expected instanceof Float && val instanceof Double || expected instanceof Double && val instanceof Float)) {
double a = ((Number)expected).doubleValue();
double b = ((Number)val).doubleValue();
if (Double.compare(a,b) == 0) return true;
if (Math.abs(a-b) < 1e-5) return true;
return false;
} else {
setErr("mismatch: '" + expected + "'!='" + val + "'");
return false;

30
solr/src/test/org/apache/solr/SolrTestCaseJ4.java
View File

@ -22,6 +22,7 @@ package org.apache.solr;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.noggit.CharArr;
import org.apache.noggit.JSONUtil;
import org.apache.noggit.ObjectBuilder;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
@ -837,17 +838,9 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
// commit an average of 10 times for large sets, or 10% of the time for small sets
int commitOneOutOf = Math.max(nDocs/10, 10);
// find the max order (docid) and start from there
int order = -1;
for (Doc doc : model.values()) {
order = Math.max(order, doc.order);
}
order++;
for (int i=0; i<nDocs; i++) {
Doc doc = createDoc(descriptor);
doc.order = order++;
// doc.order = order++;
updateJ(toJSON(doc), null);
model.put(doc.id, doc);
@ -870,6 +863,25 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
assertU(commit());
}
// merging segments no longer selects just adjacent segments hence ids (doc.order) can be shuffled.
// we need to look at the index to determine the order.
String responseStr = h.query(req("q","*:*", "fl","id", "sort","_docid_ asc", "rows",Integer.toString(model.size()*2), "wt","json", "indent","true"));
Object response = ObjectBuilder.fromJSON(responseStr);
response = ((Map)response).get("response");
response = ((Map)response).get("docs");
List<Map> docList = (List<Map>)response;
int order = 0;
for (Map doc : docList) {
Object id = doc.get("id");
Doc modelDoc = model.get(id);
if (modelDoc == null) continue; // may be some docs in the index that aren't modeled
modelDoc.order = order++;
}
// make sure we updated the order of all docs in the model
assertEquals(order, model.size());
return model;
}