inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-10 14:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SEARCH-1364] finilizing test refactor in AbstractAlfrescoDistributedTest

Browse Source 
Cherry picket from 2.0 to master
This commit is contained in:
eliaporciani
2019-01-14 19:41:27 +01:00
parent a4a80dfc99
commit aebbe75b6b
3 changed files with 82 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
View File

@@ -248,6 +248,7 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
/**
* Waits until all cores (including shards) reach a count.
*
* @param query
* @param count
* @param waitMillis
@@ -277,6 +278,7 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
/**
* Delele by query on all Clients
*
* @param q
* @throws Exception
*/
@@ -291,6 +293,7 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
/**
* Gets a list of all clients for that test
*
* @return list of SolrClient
*/
public List<SolrClient> getAllClients()
@@ -326,22 +329,15 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
}
public void assertShardCount(int shardNumber, Query query, int count) throws Exception {
List<SolrCore> cores = getJettyCores(jettyShards);
SolrCore core = cores.get(shardNumber);
RefCounted<SolrIndexSearcher> refCounted = null;
try {
refCounted = core.getSearcher();
SolrIndexSearcher searcher = refCounted.get();
TopDocs topDocs = searcher.search(query, 10);
if(count != topDocs.totalHits) {
throw new Exception("Expecting "+count+" docs on shard "+shardNumber+" , found "+topDocs.totalHits);
}
} finally {
if (refCounted != null)
{
refCounted.decref();
}
List<SolrClient> clients = getClusterClients();
SolrClient client = clients.get(shardNumber);
QueryResponse response = client.query(luceneToSolrQuery(query));
int totalHits = (int) response.getResults().getNumFound();
if (count != totalHits) {
throw new Exception("Expecting " + count + " docs on shard " + shardNumber + " , found " + totalHits);
}
}
private String fixTermQuery(String query)
@@ -352,13 +348,17 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
}
String[] operands = {query.substring(0, i), query.substring(i+1)};
String s1 = operands[0].replaceAll("\\:", "\\\\:")
.replaceAll("\\{", "\\\\{")
.replaceAll("\\}", "\\\\}");
String s1 = fixSpecialCharQuery(operands[0]);
return s1 + ":" + operands[1] + " ";
}
protected String fixSpecialCharQuery(String query) {
return query.replaceAll("\\:", "\\\\:")
.replaceAll("\\{", "\\\\{")
.replaceAll("\\}", "\\\\}");
}
public SolrQuery luceneToSolrQuery(Query query)
{
@@ -464,6 +464,7 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
/**
* Gets the Default test client.
*
* @return
*/
protected SolrClient getDefaultTestClient()
@@ -485,7 +486,7 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
public int assertNodesPerShardGreaterThan(int count, boolean ignoreZero) throws Exception
{
int shardHit = 0;
List<SolrClient> clients = getJettyClients();
List<SolrClient> clients = getClusterClients();
List<SolrCore> cores = getJettyCores(jettyShards);
SolrQuery query = luceneToSolrQuery(new TermQuery(new Term(FIELD_DOC_TYPE, SolrInformationServer.DOC_TYPE_NODE)));
StringBuilder error = new StringBuilder();
@@ -529,32 +530,23 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
public void assertCountAndColocation(Query query, int count) throws Exception
{
assertCountAndColocation(luceneToSolrQuery(query), count);
}
List<SolrCore> cores = getJettyCores(jettyShards);
public void assertCountAndColocation(SolrQuery query, int count) throws Exception
{
List<SolrClient> clients = getClusterClients();
int shardHit = 0;
int totalCount = 0;
for (SolrCore core : cores)
{
RefCounted<SolrIndexSearcher> refCounted = null;
try
{
refCounted = core.getSearcher();
SolrIndexSearcher searcher = refCounted.get();
TopDocs topDocs = searcher.search(query, 10);
totalCount += topDocs.totalHits;
if(topDocs.totalHits > 0)
for (SolrClient client : clients)
{
QueryResponse response = client.query(query);
int hits = (int) response.getResults().getNumFound();
totalCount += hits;
if (hits > 0) {
shardHit++;
}
}
finally
{
if (refCounted != null)
{
refCounted.decref();
}
}
}
if (totalCount != count) {
throw new Exception(totalCount + " docs found for query: " + query.toString() + " expecting " + count);
@@ -567,25 +559,17 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
public void assertShardSequence(int shard, Query query, int count) throws Exception
{
List<SolrCore> cores = getJettyCores(jettyShards);
int totalCount = 0;
SolrCore core = cores.get(shard);
assertShardSequence(shard, luceneToSolrQuery(query), count);
}
RefCounted<SolrIndexSearcher> refCounted = null;
try
public void assertShardSequence(int shard, SolrQuery query, int count) throws Exception
{
refCounted = core.getSearcher();
SolrIndexSearcher searcher = refCounted.get();
TopDocs topDocs = searcher.search(query, 10);
totalCount = topDocs.totalHits;
}
finally
{
if (refCounted != null)
{
refCounted.decref();
}
}
List<SolrClient> clients = getClusterClients();
int totalCount = 0;
SolrClient client = clients.get(shard);
QueryResponse response = client.query(query);
totalCount = (int) response.getResults().getNumFound();
if(totalCount != count) {
throw new Exception(totalCount+" docs found for query: "+query.toString()+" expecting "+count);
@@ -1813,20 +1797,6 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
}
protected List<Long> assertCapOnAllShards(String[] starts) throws Exception
{
List<SolrCore> cores = getJettyCores(jettyShards);
List<Long> caps = new ArrayList();
List<AlfrescoCoreAdminHandler> alfrescoCoreAdminHandlers = getAdminHandlers(jettyShards);
for (int i=0; i<cores.size(); i++) {
caps.add(assertCapForCore(alfrescoCoreAdminHandlers.get(i), cores.get(i), Long.parseLong(starts[i])));
}
return caps;
}
public SolrQueryResponse rangeCheck(int shard) throws Exception {
while(true) {
List<SolrCore> cores = getJettyCores(jettyShards);
@@ -1853,102 +1823,6 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
return response;
}
protected long assertCapForCore(AlfrescoCoreAdminHandler coreAdminHandler,
SolrCore core,
long start)
throws IOException
{
//Get the cap from the index
long cap = -1;
RefCounted<SolrIndexSearcher> refCounted = null;
Set<String> fields = new HashSet();
fields.add(FIELD_DBID);
try {
refCounted = core.getSearcher();
SolrIndexSearcher searcher = refCounted.get();
TopDocs topDocs = searcher.search(new TermQuery(new Term(FIELD_SOLR4_ID, "TRACKER!STATE!CAP")), 10);
ScoreDoc doc = topDocs.scoreDocs[0];
Document document = searcher.doc(doc.doc, fields);
cap = Math.abs(getFieldValueLong(document, FIELD_DBID));
} finally {
if (refCounted != null)
{
refCounted.decref();
}
}
System.out.println("####### got cap:"+cap);
//Check that the max DBID in the core matches the cap.
long maxDBID = -1;
Query query = new TermQuery(new Term(FIELD_DOC_TYPE, SolrInformationServer.DOC_TYPE_NODE));
refCounted = null;
try {
refCounted = core.getSearcher();
SolrIndexSearcher searcher = refCounted.get();
TopDocs topDocs = searcher.search(query,
1,
new Sort(new SortField(FIELD_DBID, SortField.Type.LONG, true)));
System.out.println("####### hits:"+topDocs.totalHits+":"+query);
ScoreDoc doc = topDocs.scoreDocs[0];
Document document = searcher.doc(doc.doc, fields);
maxDBID = getFieldValueLong(document, FIELD_DBID);
} finally {
if (refCounted != null)
{
refCounted.decref();
}
}
System.out.println("####### got max DBID:"+maxDBID);
if(maxDBID != cap) {
throw new IOException("Max DBID should equal cap:"+maxDBID+" != "+cap);
}
long minDBID = -1;
refCounted = null;
try {
refCounted = core.getSearcher();
SolrIndexSearcher searcher = refCounted.get();
TopDocs topDocs = searcher.search(query,
1,
new Sort(new SortField(FIELD_DBID, SortField.Type.LONG, false)));
ScoreDoc doc = topDocs.scoreDocs[0];
Document document = searcher.doc(doc.doc, fields);
minDBID = getFieldValueLong(document, FIELD_DBID);
} finally {
if (refCounted != null)
{
refCounted.decref();
}
}
System.out.println("####### got min DBID:"+minDBID);
if(minDBID != start) {
throw new IOException("Min DBID should equal start:"+minDBID+" != "+start);
}
SolrQueryResponse response = callHandler(coreAdminHandler, core, "CHECKCAP");
NamedList values = response.getValues();
long checkCap = (long)values.get("CAP");
if(checkCap != cap)
{
throw new IOException("The admin handler returned bad cap:"+checkCap+":"+cap);
}
return cap;
}
private String getFieldValueString(Document doc, String fieldName)
{
IndexableField field = doc.getField(fieldName);

21
search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateAbstractSolrTrackerTest.java
View File

@@ -29,9 +29,11 @@ import org.apache.lucene.search.LegacyNumericRangeQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.junit.Rule;
import org.junit.Test;
import java.text.SimpleDateFormat;
import java.util.*;
import static org.alfresco.solr.AlfrescoSolrUtils.*;
@@ -104,9 +106,22 @@ public abstract class DistributedDateAbstractSolrTrackerTest extends AbstractAlf
AlfrescoSolrDataModel.FieldInstance fieldInstance = fieldInstanceList.get(0);
String fieldName = fieldInstance.getField();
for (int i = 0; i < dates.length; i++) {
LegacyNumericRangeQuery query = LegacyNumericRangeQuery.newLongRange(fieldName, dates[i].getTime(), dates[i].getTime() + 1, true, false);
assertCountAndColocation(query, counts[i]);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
format.setTimeZone(TimeZone.getTimeZone("GMT"));
for (int i = 0; i < dates.length; i++)
{
String startDate = format.format(dates[i]);
Calendar gcal = new GregorianCalendar();
gcal.setTime(dates[i]);
gcal.add(Calendar.SECOND, 1);
String endDate = format.format(gcal.getTime());
SolrQuery solrQuery = new SolrQuery("{!lucene}" + fixSpecialCharQuery(fieldName) +
":[" + fixSpecialCharQuery(startDate) + " TO " + fixSpecialCharQuery(endDate) + " } " );
assertCountAndColocation(solrQuery, counts[i]);
assertCorrect(numNodes);
}
}

21
search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedDateMonthAlfrescoSolrTrackerTest.java
View File

@@ -28,6 +28,7 @@ import static org.alfresco.solr.AlfrescoSolrUtils.getTransaction;
import static org.alfresco.solr.AlfrescoSolrUtils.indexAclChangeSet;
import static org.alfresco.solr.AlfrescoSolrUtils.list;
import java.text.SimpleDateFormat;
import java.util.*;
import org.alfresco.model.ContentModel;
@@ -44,6 +45,7 @@ import org.apache.lucene.search.LegacyNumericRangeQuery;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.schema.TrieDateField;
import org.junit.Rule;
@@ -130,10 +132,21 @@ public class DistributedDateMonthAlfrescoSolrTrackerTest extends AbstractAlfresc
AlfrescoSolrDataModel.FieldInstance fieldInstance = fieldInstanceList.get(0);
String fieldName = fieldInstance.getField();
for (int i = 0; i < dates.length; i++) {
LegacyNumericRangeQuery query = LegacyNumericRangeQuery.newLongRange(fieldName, dates[i].getTime(), dates[i].getTime() + 1, true, false);
assertCountAndColocation(query, counts[i]);
assertShardSequence(i, query, counts[i]);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
format.setTimeZone(TimeZone.getTimeZone("GMT"));
for (int i = 0; i < dates.length; i++)
{
String startDate = format.format(dates[i]);
Calendar gcal = new GregorianCalendar();
gcal.setTime(dates[i]);
gcal.add(Calendar.SECOND, 1);
String endDate = format.format(gcal.getTime());
SolrQuery solrQuery = new SolrQuery("{!lucene}" + fixSpecialCharQuery(fieldName) +
":[" + fixSpecialCharQuery(startDate) + " TO " + fixSpecialCharQuery(endDate) + " } " );
assertCountAndColocation(solrQuery, counts[i]);
assertShardSequence(i, solrQuery, counts[i]);
}
nodes.clear();