inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged searchrep (5.2.1) to 5.2.N (5.2.1)

Browse Source 
136768 msuzuki: Search-347, refactor to use search parmeters hasFaceting method


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:09:50 +00:00
parent 7f4c1882a7
commit 7a78667f8c
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguage.java
View File

@@ -183,7 +183,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
default:
StopWatch stopWatch = new StopWatch("DB if possible");
//SEARCH-347, exclude TMDQ calls if faceting present.
if(dbQueryLanguage != null && !hasFaceting(searchParameters))
if(dbQueryLanguage != null && !searchParameters.hasFaceting())
{
try
{
@@ -284,24 +284,6 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
}
}
/**
* Checks if faceted fields or faceted queries are present if so it needs
* to be excluded from the TMDQ call.
* @param searchParameters
* @return true if exists
*/
private boolean hasFaceting(SearchParameters searchParameters)
{
if(searchParameters.getFacetQueries() != null && !searchParameters.getFacetQueries().isEmpty())
{
return true;
}
if(searchParameters.getFieldFacets() != null && !searchParameters.getFieldFacets().isEmpty())
{
return true;
}
return false;
}
private ResultSet executeHybridQuery(SearchParameters searchParameters,
ADMLuceneSearcherImpl admLuceneSearcher)
{