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

Merged HEAD-BUG-FIX (Cloud33/4.3) to HEAD (Cloud33/4.3)

Browse Source 
62928: Merged PLATFORM1 (Cloud33) to HEAD-BUG-FIX (Cloud33/4.3)
      62580: ACE-482: now logs timings for search types other than hybrid.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62983 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-20 14:43:50 +00:00
parent b0954de8b3
commit 149492e25c
1 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,7 +108,16 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
{ {
logger.debug("Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters); logger.debug("Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters);
} }
return indexQueryLanguage.executeQuery(searchParameters, admLuceneSearcher); StopWatch stopWatch = new StopWatch("index only");
stopWatch.start();
ResultSet results = indexQueryLanguage.executeQuery(searchParameters, admLuceneSearcher);
stopWatch.stop();
if (logger.isDebugEnabled())
{
logger.debug("SOLR returned " + results.length() + " results in " +
stopWatch.getLastTaskTimeMillis() + "ms");
}
return results;
} }
else else
{ {
@@ -121,7 +130,16 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
{ {
logger.debug("Trying db query for "+dbQueryLanguage.getName()+" for "+searchParameters); logger.debug("Trying db query for "+dbQueryLanguage.getName()+" for "+searchParameters);
} }
return dbQueryLanguage.executeQuery(searchParameters, admLuceneSearcher); StopWatch stopWatch = new StopWatch("database only");
stopWatch.start();
ResultSet results = dbQueryLanguage.executeQuery(searchParameters, admLuceneSearcher);
stopWatch.stop();
if (logger.isDebugEnabled())
{
logger.debug("DB returned " + results.length() + " results in " +
stopWatch.getLastTaskTimeMillis() + "ms");
}
return results;
} }
else else
{ {
@@ -136,6 +154,7 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
case DEFAULT: case DEFAULT:
case TRANSACTIONAL_IF_POSSIBLE: case TRANSACTIONAL_IF_POSSIBLE:
default: default:
StopWatch stopWatch = new StopWatch("DB if possible");
if(dbQueryLanguage != null) if(dbQueryLanguage != null)
{ {
try try
@@ -144,7 +163,15 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
{ {
logger.debug("Trying db query for "+dbQueryLanguage.getName()+" for "+searchParameters); logger.debug("Trying db query for "+dbQueryLanguage.getName()+" for "+searchParameters);
} }
return dbQueryLanguage.executeQuery(searchParameters, admLuceneSearcher); stopWatch.start();
ResultSet results = dbQueryLanguage.executeQuery(searchParameters, admLuceneSearcher);
stopWatch.stop();
if (logger.isDebugEnabled())
{
logger.debug("DB returned " + results.length() + " results in " +
stopWatch.getLastTaskTimeMillis() + "ms");
}
return results;
} }
catch(QueryModelException qme) catch(QueryModelException qme)
{ {
@@ -160,7 +187,15 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
{ {
logger.debug("Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters); logger.debug("Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters);
} }
return indexQueryLanguage.executeQuery(searchParameters, admLuceneSearcher); stopWatch.start();
ResultSet results = indexQueryLanguage.executeQuery(searchParameters, admLuceneSearcher);
stopWatch.stop();
if (logger.isDebugEnabled())
{
logger.debug("SOLR returned " + results.length() + " results in " +
stopWatch.getLastTaskTimeMillis() + "ms");
}
return results;
} }
} }
} }
@@ -172,7 +207,15 @@ public class DbOrIndexSwitchingQueryLanguage extends AbstractLuceneQueryLanguage
{ {
logger.debug("(No DB QL) Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters); logger.debug("(No DB QL) Using SOLR query: "+dbQueryLanguage.getName()+" for "+searchParameters);
} }
return indexQueryLanguage.executeQuery(searchParameters, admLuceneSearcher); stopWatch.start();
ResultSet results = indexQueryLanguage.executeQuery(searchParameters, admLuceneSearcher);
stopWatch.stop();
if (logger.isDebugEnabled())
{
logger.debug("SOLR returned " + results.length() + " results in " +
stopWatch.getLastTaskTimeMillis() + "ms");
}
return results;
} }
} }
throw new QueryModelException("No query language available"); throw new QueryModelException("No query language available");