inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SEARCH-1490]

Browse Source 
Modified utility methods in abstract class
This commit is contained in:
eliaporciani
2019-04-18 15:03:39 +02:00
parent 6368156384
commit 9ee5dc608b
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java
+25 -7
View File
@@ -227,24 +227,34 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestInitialize
* @throws Exception
*/
public static void waitForDocCount(Query query, int count, long waitMillis) throws Exception
{
waitForDocCount(luceneToSolrQuery(query), count, waitMillis);
}
public static void waitForDocCount(ModifiableSolrParams query, int count, long waitMillis) throws Exception
{
long begin = System.currentTimeMillis();
//TODO: Support multiple cores per jetty
SolrClient standaloneClient = getStandaloneClients().get(0); //Get the first one
waitForDocCountCore(standaloneClient, luceneToSolrQuery(query), count, waitMillis, begin);
waitForDocCountCore(standaloneClient, query, count, waitMillis, begin);
waitForShardsCount(query, count, waitMillis, begin);
}
public static void assertShardCount(int shardNumber, Query query, int count) throws Exception {
public static void assertShardCount(int shardNumber, Query query, int count) throws Exception
{
assertShardCount(shardNumber, luceneToSolrQuery(query), count);
}
public static void assertShardCount(int shardNumber, ModifiableSolrParams query, int count) throws Exception
{
List<SolrClient> clients = getShardedClients();
SolrClient client = clients.get(shardNumber);
QueryResponse response = client.query(luceneToSolrQuery(query));
QueryResponse response = client.query(query);
int totalHits = (int) response.getResults().getNumFound();
if (count != totalHits) {
throw new Exception("Expecting " + count + " docs on shard " + shardNumber + " , found " + totalHits);
}
}
private static String escapeQueryClause(String query)
@@ -291,15 +301,16 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestInitialize
public static void waitForShardsCount(Query query, int count, long waitMillis, long start) throws Exception
{
SolrQuery solrQuery = luceneToSolrQuery(query);
solrQuery.setParam("shards", shards);
waitForShardsCount(solrQuery, count, waitMillis, start);
}
public static void waitForShardsCount(SolrQuery query, int count, long waitMillis, long start) throws Exception
public static void waitForShardsCount(ModifiableSolrParams query, int count, long waitMillis, long start) throws Exception
{
long timeOut = start+waitMillis;
int totalCount = 0;
query.set("shards", shards);
SolrClient clientShard = clientShards.get(0);
while (System.currentTimeMillis() < timeOut)
{
@@ -450,7 +461,7 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestInitialize
}
public static void waitForDocCountCore(SolrClient client,
SolrQuery query,
ModifiableSolrParams query,
long expectedNumFound,
long waitMillis,
long startMillis)
@@ -734,6 +745,13 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestInitialize
return request;
}
protected QueryResponse queryN(SolrClient solrClient, boolean setDistribParams, SolrParams p) throws IOException, SolrServerException {
final ModifiableSolrParams params = new ModifiableSolrParams(p);
params.set("distrib", "false");
return solrClient.query(params);
}
/**
* Returns the QueryResponse from {@link #queryRandomShard}
*/