Changeset 6661


Ignore:
Timestamp:
10/12/15 12:12:04 (9 years ago)
Author:
Twan Goosen
Message:

Using 'fast' solr request handler for facet and single document queries in VLO web app

Location:
vlo/branches/vlo-3.3/vlo-web-app/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/AbstractSolrQueryFactory.java

    r6315 r6661  
    3232public abstract class AbstractSolrQueryFactory {
    3333
    34     protected static final String SOLR_SEARCH_ALL = null;
     34    protected static final String SOLR_SEARCH_ALL = "*:*";
    3535
    3636    protected final void addQueryFacetParameters(final SolrQuery query, QueryFacetsSelection queryFacetsSelections) {
  • vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrDocumentQueryFactoryImpl.java

    r6284 r6661  
    6262        // make a query to look up a specific document by its ID
    6363        final SolrQuery query = getDefaultDocumentQuery();
     64        // we can use the 'fast' request handler here, document ranking is of no interest
     65        query.setRequestHandler(FacetConstants.SOLR_REQUEST_HANDLER_FAST);
    6466        // consider all documents
    6567        query.setQuery(SOLR_SEARCH_ALL);
     
    7375                .build();
    7476        query.addFilterQuery(createFilterOrQuery(idOrQueryMap));
    75        
     77
    7678        // one result max
    7779        query.setRows(1);
  • vlo/branches/vlo-3.3/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImpl.java

    r4932 r6661  
    1717package eu.clarin.cmdi.vlo.service.solr.impl;
    1818
     19import eu.clarin.cmdi.vlo.FacetConstants;
    1920import eu.clarin.cmdi.vlo.service.solr.SolrFacetQueryFactory;
    2021import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
     
    4647    public SolrQuery createFacetQuery(QueryFacetsSelection queryFacetsSelections, List<String> facets, int facetValueLimit) {
    4748        final SolrQuery query = getBaseQuery(facets);
     49        // we can use the 'fast' request handler here, document ranking is of no interest
     50        query.setRequestHandler(FacetConstants.SOLR_REQUEST_HANDLER_FAST);
    4851        addQueryFacetParameters(query, queryFacetsSelections);
    4952        query.setFacetLimit(facetValueLimit);
  • vlo/branches/vlo-3.3/vlo-web-app/src/test/java/eu/clarin/cmdi/vlo/service/solr/impl/SolrFacetQueryFactoryImplTest.java

    r6284 r6661  
    5858
    5959        // default: query selects all values
    60         assertNull(query.getQuery());
     60        assertEquals("*:*", query.getQuery());
    6161
    6262        // no selection -> no filter queries
     
    8282
    8383        // default: query selects all values
    84         assertNull(query.getQuery());
     84        assertEquals("*:*", query.getQuery());
    8585
    8686        // Only empty selections -> no filter queries
     
    107107
    108108        // default: query selects all values
    109         assertNull(query.getQuery());
     109        assertEquals("*:*", query.getQuery());
    110110
    111111        // Expecting three filter queries as three values have been selected in total
Note: See TracChangeset for help on using the changeset viewer.