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

SEARCH-347, fix to skip TMDQ when faceting is involved

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136049 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Michael Suzuki
2017-03-23 11:20:05 +00:00
parent 8bb66c2e40
commit 9a04e4b078
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,7 +182,8 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
case TRANSACTIONAL_IF_POSSIBLE:
default:
StopWatch stopWatch = new StopWatch("DB if possible");
if(dbQueryLanguage != null)
//SEARCH-347, exclude TMDQ calls if faceting present.
if(dbQueryLanguage != null && !hasFaceting(searchParameters))
{
try
{
@@ -251,8 +252,6 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
}
throw new QueryModelException("No query language available");
}
}
private SearchParameters flattenDBQuery(SearchParameters sp)
@@ -285,6 +284,24 @@ 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)
{