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

Merged 5.2.N (5.2.2) to HEAD (5.2)

Browse Source 
137063 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136846 msuzuki: Serach-427, refactored to return the facets response as a generic facets when group by is used


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:16:30 +00:00
parent 31488e63aa
commit d776dffab9
4 changed files with 82 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/rest/api/search/context/FacetFieldContext.java
View File

@@ -27,8 +27,10 @@ package org.alfresco.rest.api.search.context;
import java.util.List;
import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericBucket;
/**
* The results of a Field Facetting
* The results of a Field Faceting
*/
public class FacetFieldContext
{

9
source/java/org/alfresco/rest/api/search/context/SearchContext.java
View File

@@ -25,12 +25,11 @@
*/
package org.alfresco.rest.api.search.context;
import java.util.List;
import org.alfresco.repo.search.impl.solr.facet.facetsresponse.GenericFacetResponse;
import org.alfresco.rest.api.search.model.SearchQuery;
import java.util.ArrayList;
import java.util.List;
/**
* The contextual results of a Search
*/
@@ -43,7 +42,7 @@ public class SearchContext
private final List<GenericFacetResponse> facets;
private final SearchQuery request;
public SearchContext(long lastTxId, List<GenericFacetResponse> facets, List<FacetQueryContext> facetQueries, List<FacetFieldContext> facetsFields, SpellCheckContext spellCheck,
public SearchContext(long lastTxId, List<GenericFacetResponse> facets, List<FacetQueryContext> facetResults, List<FacetFieldContext> facetsFields, SpellCheckContext spellCheck,
SearchQuery request)
{
this.spellCheck = spellCheck;
@@ -56,7 +55,7 @@ public class SearchContext
{
consistency = null;
}
this.facetQueries = facetQueries;
this.facetQueries = facetResults;
this.facetsFields = facetsFields;
this.facets = facets;
}

40
source/java/org/alfresco/rest/api/search/impl/ResultMapper.java
View File

@@ -301,11 +301,10 @@ public class ResultMapper
if(facetQueries!= null && !facetQueries.isEmpty())
{
//If group by field populated in query facet return bucketing into facet field.
List<FacetFieldContext> facetQueryForFields =
getFacetBucketsFromFacetQueries(facetQueries,searchQuery);
List<GenericFacetResponse> facetQueryForFields = getFacetBucketsFromFacetQueries(facetQueries,searchQuery);
if(!facetQueryForFields.isEmpty())
{
ffcs.addAll(facetQueryForFields);
facets.addAll(facetQueryForFields);
}
else
{
@@ -351,15 +350,24 @@ public class ResultMapper
return isNullContext(context)?null:context;
}
private boolean hasGroup(Map<String, Integer> facetQueries, SearchQuery searchQuery)
{
for (Entry<String, Integer> fq:facetQueries.entrySet())
{
Optional<FacetQuery> found = searchQuery.getFacetQueries().stream().filter(facetQuery -> fq.getKey().equals(facetQuery.getLabel())).findFirst();
return (found.isPresent() && found.get().getGroup() != null);
}
return false;
}
/**
* Builds a facet field from facet queries.
* @param facetQueries
* @return
*/
protected List<FacetFieldContext> getFacetBucketsFromFacetQueries(Map<String, Integer> facetQueries, SearchQuery searchQuery)
protected List<GenericFacetResponse> getFacetBucketsFromFacetQueries(Map<String, Integer> facetQueries, SearchQuery searchQuery)
{
List<FacetFieldContext> facetResults = new ArrayList<FacetFieldContext>();
Map<String,List<Bucket>> groups = new HashMap<>();
List<GenericFacetResponse> facetResults = new ArrayList<GenericFacetResponse>();
Map<String,List<GenericBucket>> groups = new HashMap<>();
String group = null;
for (Entry<String, Integer> fq:facetQueries.entrySet())
@@ -371,26 +379,30 @@ public class ResultMapper
filterQuery = found.isPresent()? found.get().getQuery():fq.getKey();
if(found.isPresent() && found.get().getGroup() != null)
{
group= found.get().getGroup();
group = found.get().getGroup();
}
}
if(group != null && !group.isEmpty())
{
if(groups.containsKey(group))
{
groups.get(group).add(new Bucket(fq.getKey(), filterQuery, fq.getValue(), null));
Set<Metric> metrics = new HashSet<>(1);
metrics.add(new SimpleMetric(METRIC_TYPE.count, fq.getValue()));
groups.get(group).add(new GenericBucket(fq.getKey(), filterQuery, null,metrics, null));
}
else
{
List<Bucket> l = new ArrayList<Bucket>();
l.add(new Bucket(fq.getKey(),filterQuery, fq.getValue(),null));
List<GenericBucket> l = new ArrayList<GenericBucket>();
Set<Metric> metrics = new HashSet<>(1);
metrics.add(new SimpleMetric(METRIC_TYPE.count, fq.getValue()));
l.add(new GenericBucket(fq.getKey(),filterQuery, fq.getValue(), metrics, null));
groups.put(group, l);
}
}
}
if(!groups.isEmpty())
{
groups.forEach((a,v) -> facetResults.add(new FacetFieldContext(a,v)));
groups.forEach((a,v) -> facetResults.add(new GenericFacetResponse(FACET_TYPE.query, a, v)));
}
return facetResults;
}
@@ -452,7 +464,7 @@ public class ResultMapper
{
if (facet.getValue() != null && !facet.getValue().isEmpty())
{
List<FacetFieldContext.Bucket> buckets = new ArrayList<>(facet.getValue().size());
List<Bucket> buckets = new ArrayList<>(facet.getValue().size());
for (Pair<String, Integer> buck:facet.getValue())
{
Object display = null;
@@ -474,7 +486,9 @@ public class ResultMapper
}
}
}
buckets.add(new FacetFieldContext.Bucket(buck.getFirst(), filterQuery, buck.getSecond(), display));
// Set<Metric> metrics = new HashSet<>(1);
// metrics.add(new SimpleMetric(METRIC_TYPE.count,buck.getSecond()));
buckets.add(new Bucket(buck.getFirst(), filterQuery,buck.getSecond(),display));
}
ffcs.add(new FacetFieldContext(facet.getKey(), buckets));
}

53
source/test-java/org/alfresco/rest/api/search/ResultMapperTests.java
View File

@@ -536,11 +536,54 @@ public class ResultMapperTests
SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
assertEquals(34l, searchContext.getConsistency().getlastTxId());
assertEquals(null, searchContext.getFacetQueries());
assertEquals(1, searchContext.getFacetsFields().size());
assertEquals(3,searchContext.getFacetsFields().get(0).getBuckets().size());
assertEquals("small",searchContext.getFacetsFields().get(0).getBuckets().get(0).getLabel());
assertEquals("content.size:[o TO 102400]",searchContext.getFacetsFields().get(0).getBuckets().get(0).getFilterQuery());
assertNotNull(searchContext.getFacetsFields().get(0).getBuckets().get(0).getCount());
assertEquals(1, searchContext.getFacets().size());
assertEquals(3,searchContext.getFacets().get(0).getBuckets().size());
assertEquals("small",searchContext.getFacets().get(0).getBuckets().get(0).getLabel());
assertEquals("content.size:[o TO 102400]",searchContext.getFacets().get(0).getBuckets().get(0).getFilterQuery());
assertFalse(searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().isEmpty());
Metric[] metrics = searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().toArray(new Metric[searchContext.getFacets().get(0).getBuckets().get(0).getMetrics().size()]);
assertEquals(METRIC_TYPE.count, metrics[0].getType());
assertEquals("{count=52}", metrics[0].getValue().toString());
}
@Test
/**
* Test facet fields with out group label in the query.
* This is to support original api methods query for facet query.
*
*
* @throws Exception
*/
public void testFacetQueryWithoutGroupResponse() throws Exception
{
String jsonQuery = "{\"query\": {\"query\": \"alfresco\"},"
+ "\"facetQueries\": ["
+ "{\"query\": \"content.size:[0 TO 102400]\", \"label\": \"small\"},"
+ "{\"query\": \"content.size:[102400 TO 1048576]\", \"label\": \"medium\"},"
+ "{\"query\": \"content.size:[1048576 TO 16777216]\", \"label\": \"large\"}]"
+ "}";
String expectedResponse = "{\"responseHeader\":{\"status\":0,\"QTime\":9},\"_original_parameters_\":\"org.apache.solr.common.params.DefaultSolrParams:{params(df=TEXT&alternativeDic=DEFAULT_DICTIONARY&fl=DBID,score&start=0&fq={!afts}AUTHORITY_FILTER_FROM_JSON&fq={!afts}TENANT_FILTER_FROM_JSON&rows=1000&locale=en_US&wt=json),defaults(carrot.url=id&spellcheck.collateExtendedResults=true&carrot.produceSummary=true&spellcheck.maxCollations=3&spellcheck.maxCollationTries=5&spellcheck.alternativeTermCount=2&spellcheck.extendedResults=false&defType=afts&spellcheck.maxResultsForSuggest=5&spellcheck=false&carrot.outputSubClusters=false&spellcheck.count=5&carrot.title=mltext@m___t@{http://www.alfresco.org/model/content/1.0}title&carrot.snippet=content@s___t@{http://www.alfresco.org/model/content/1.0}content&spellcheck.collate=true)}\",\"_field_mappings_\":{},\"_date_mappings_\":{},\"_range_mappings_\":{},\"_pivot_mappings_\":{},\"_interval_mappings_\":{},\"_stats_field_mappings_\":{},\"_stats_facet_mappings_\":{},\"_facet_function_mappings_\":{},\"response\":{\"numFound\":6,\"start\":0,\"maxScore\":0.7849362,\"docs\":[{\"DBID\":565,\"score\":0.7849362},{\"DBID\":566,\"score\":0.7849362},{\"DBID\":521,\"score\":0.3540957},{\"DBID\":514,\"score\":0.33025497},{\"DBID\":420,\"score\":0.32440513},{\"DBID\":415,\"score\":0.2780319}]},"
+ "\"spellcheck\":{\"searchInsteadFor\":\"alfresco\"},"
+ "\"facet_counts\":{\"facet_queries\": {\"small\": 52,\"large\": 0,\"medium\": 0}},"
+ "\"processedDenies\":true, \"lastIndexedTx\":34}";
ResultSet results = mockResultset(expectedResponse);
SearchQuery searchQuery = helper.extractFromJson(jsonQuery);
SearchRequestContext searchRequest = SearchRequestContext.from(searchQuery);
SearchContext searchContext = mapper.toSearchContext((SolrJSONResultSet) results, searchRequest, searchQuery, 0);
assertEquals(34l, searchContext.getConsistency().getlastTxId());
assertTrue(searchContext.getFacets().isEmpty());
assertEquals(3,searchContext.getFacetQueries().size());
assertEquals("small",searchContext.getFacetQueries().get(0).getLabel());
assertEquals("content.size:[0 TO 102400]",searchContext.getFacetQueries().get(0).getFilterQuery());
assertEquals(52, searchContext.getFacetQueries().get(0).getCount());
assertEquals("large",searchContext.getFacetQueries().get(1).getLabel());
assertEquals("content.size:[1048576 TO 16777216]",searchContext.getFacetQueries().get(1).getFilterQuery());
assertEquals(0, searchContext.getFacetQueries().get(1).getCount());
assertEquals("medium",searchContext.getFacetQueries().get(2).getLabel());
assertEquals("content.size:[102400 TO 1048576]",searchContext.getFacetQueries().get(2).getFilterQuery());
assertEquals(0, searchContext.getFacetQueries().get(2).getCount());
}
private ResultSet mockResultset(String json) throws Exception
{