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

ALF-9611 RSOLR 049: Share works against SOLR

Browse Source 
- mostly working with bugs raised or the issues found
- ALF-9627 	RSOLR 049: Support for TAG list - simple field facettting
  - was not required. Facetting alpha is there (limits not set and need to go into JSON) - added to result set
- ALF-9628 	RSOLR 049: HTTPClient pooling and sharing by query
  - pooled for query, one reused instance for each tracker (could be shared)
- ALF-9629 	RSOLR 049: Support for PARENT field and start of PATH rebuilding other index tracking (group and site search)
  - done - also started PATH change and returns other data as not yet finished (QNAME is the most obvious)
  - fixed up and tidied query generation for index tokenisation mode form the model and what the query would like

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@29585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2011-08-05 19:43:05 +00:00
parent 4a8f8b7c2f
commit 37f19ecf45
17 changed files with 304 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/repo/search/AbstractResultSet.java
View File

@@ -19,12 +19,14 @@
package org.alfresco.repo.search;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.util.Pair;
import org.apache.lucene.search.HitCollector;
/**
@@ -113,4 +115,12 @@ public abstract class AbstractResultSet implements ResultSet
{
return 0;
}
@Override
public List<Pair<String, Integer>> getFieldFacet(String field)
{
return Collections.<Pair<String, Integer>>emptyList();
}
}

7
source/java/org/alfresco/repo/search/EmptyResultSet.java
View File

@@ -31,6 +31,7 @@ import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.ResultSetMetaData;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.util.Pair;
/**
* An empty result set
@@ -148,4 +149,10 @@ public class EmptyResultSet implements ResultSet
{
return false;
}
@Override
public List<Pair<String, Integer>> getFieldFacet(String field)
{
return Collections.<Pair<String, Integer>>emptyList();
}
}

12
source/java/org/alfresco/repo/search/impl/lucene/LuceneCategoryServiceImpl.java
View File

@@ -59,17 +59,17 @@ import org.alfresco.util.Pair;
*/
public class LuceneCategoryServiceImpl implements CategoryService
{
private NodeService nodeService;
protected NodeService nodeService;
private NodeService publicNodeService;
protected NodeService publicNodeService;
private TenantService tenantService;
protected TenantService tenantService;
private NamespacePrefixResolver namespacePrefixResolver;
protected NamespacePrefixResolver namespacePrefixResolver;
private DictionaryService dictionaryService;
protected DictionaryService dictionaryService;
private IndexerAndSearcher indexerAndSearcher;
protected IndexerAndSearcher indexerAndSearcher;
/**
*

8
source/java/org/alfresco/repo/search/impl/lucene/PagingLuceneResultSet.java
View File

@@ -20,6 +20,7 @@ package org.alfresco.repo.search.impl.lucene;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -33,6 +34,7 @@ import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.ResultSetMetaData;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.util.Pair;
/**
* @author andyh
@@ -233,4 +235,10 @@ public class PagingLuceneResultSet implements ResultSet, Serializable
{
return wrapped.getBulkFetchSize();
}
@Override
public List<Pair<String, Integer>> getFieldFacet(String field)
{
return wrapped.getFieldFacet(field);
}
}

56
source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
View File

@@ -19,6 +19,8 @@
package org.alfresco.repo.search.impl.lucene;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -26,6 +28,7 @@ import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.search.SimpleResultSetMetaData;
import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.LimitBy;
import org.alfresco.service.cmr.search.PermissionEvaluationMode;
import org.alfresco.service.cmr.search.ResultSet;
@@ -33,6 +36,7 @@ import org.alfresco.service.cmr.search.ResultSetMetaData;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.util.Pair;
import org.apache.solr.client.solrj.response.FacetField;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
@@ -60,6 +64,8 @@ public class SolrJSONResultSet implements ResultSet
private SimpleResultSetMetaData resultSetMetaData;
private HashMap<String, List<Pair<String, Integer>>> fieldFacets = new HashMap<String, List<Pair<String, Integer>>>(1);
/**
* Detached result set based on that provided
* @param resultSet
@@ -98,6 +104,30 @@ public class SolrJSONResultSet implements ResultSet
}
}
if(json.has("facet_counts"))
{
JSONObject facet_counts = json.getJSONObject("facet_counts");
if(facet_counts.has("facet_fields"))
{
JSONObject facet_fields = facet_counts.getJSONObject("facet_fields");
for(Iterator it = facet_fields.keys(); it.hasNext(); /**/)
{
String fieldName = (String)it.next();
JSONArray facets = facet_fields.getJSONArray(fieldName);
int facetArraySize = facets.length();
ArrayList<Pair<String, Integer>> facetValues = new ArrayList<Pair<String, Integer>>(facetArraySize/2);
for(int i = 0; i < facetArraySize; i+=2)
{
String facetEntryName = facets.getString(i);
Integer facetEntryCount = Integer.parseInt(facets.getString(i+1));
Pair<String, Integer> pair = new Pair<String, Integer>(facetEntryName, facetEntryCount);
facetValues.add(pair);
}
fieldFacets.put(fieldName, facetValues);
}
}
}
}
catch (JSONException e)
{
@@ -147,7 +177,7 @@ public class SolrJSONResultSet implements ResultSet
Pair<Long, ChildAssociationRef> primaryParentAssoc = nodeDAO.getPrimaryParentAssoc(page.get(n).getFirst());
if(primaryParentAssoc != null)
{
return nodeDAO.getPrimaryParentAssoc(page.get(n).getFirst()).getSecond();
return primaryParentAssoc.getSecond();
}
else
{
@@ -179,7 +209,15 @@ public class SolrJSONResultSet implements ResultSet
public NodeRef getNodeRef(int n)
{
// TODO: lost nodes?
return nodeDAO.getNodePair(page.get(n).getFirst()).getSecond();
Pair<Long, NodeRef> nodePair = nodeDAO.getNodePair(page.get(n).getFirst());
if(nodePair != null)
{
return nodePair.getSecond();
}
else
{
return new NodeRef(new StoreRef("missing", "missing"), "missing");
}
}
/*
@@ -305,5 +343,17 @@ public class SolrJSONResultSet implements ResultSet
return numberFound;
}
@Override
public List<Pair<String, Integer>> getFieldFacet(String field)
{
List<Pair<String, Integer>> answer = fieldFacets.get(field);
if(answer != null)
{
return answer;
}
else
{
return Collections.<Pair<String, Integer>>emptyList();
}
}
}

118
source/java/org/alfresco/repo/search/impl/solr/SolrCategoryServiceImpl.java Normal file
View File

@@ -0,0 +1,118 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.search.impl.solr;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.alfresco.repo.search.impl.lucene.LuceneCategoryServiceImpl;
import org.alfresco.repo.search.impl.lucene.LuceneIndexerAndSearcher;
import org.alfresco.repo.search.impl.lucene.LuceneSearcher;
import org.alfresco.service.cmr.dictionary.AspectDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
/**
* @author Andy
*
*/
public class SolrCategoryServiceImpl extends LuceneCategoryServiceImpl
{
@Override
public List<Pair<NodeRef, Integer>> getTopCategories(StoreRef storeRef, QName aspectName, int count)
{
AspectDefinition definition = dictionaryService.getAspect(aspectName);
if(definition == null)
{
throw new IllegalStateException("Unknown aspect");
}
QName catProperty = null;
Map<QName, PropertyDefinition> properties = definition.getProperties();
for(QName pName : properties.keySet())
{
if(pName.getNamespaceURI().equals(aspectName.getNamespaceURI()))
{
if(pName.getLocalName().equalsIgnoreCase(aspectName.getLocalName()))
{
PropertyDefinition def = properties.get(pName);
if(def.getDataType().getName().equals(DataTypeDefinition.CATEGORY))
{
catProperty = pName;
}
}
}
}
if(catProperty == null)
{
throw new IllegalStateException("Aspect does not have category property mirroring the aspect name");
}
String field = "@" + catProperty;
SearchParameters sp = new SearchParameters();
sp.setLanguage(SearchService.LANGUAGE_SOLR_FTS_ALFRESCO);
sp.addStore(storeRef);
sp.setQuery(catProperty+":*");
FieldFacet ff = new FieldFacet(field);
ff.setLimit(count);
sp.addFieldFacet(ff);
ResultSet resultSet = null;
try
{
resultSet = indexerAndSearcher.getSearcher(storeRef, false).query(sp);
List<Pair<String, Integer>> facetCounts = resultSet.getFieldFacet(field);
List<Pair<NodeRef, Integer>> answer = new LinkedList<Pair<NodeRef, Integer>>();
for (Pair<String, Integer> term : facetCounts)
{
Pair<NodeRef, Integer> toAdd;
NodeRef nodeRef = new NodeRef(term.getFirst());
if (nodeService.exists(nodeRef))
{
toAdd = new Pair<NodeRef, Integer>(nodeRef, term.getSecond());
}
else
{
toAdd = new Pair<NodeRef, Integer>(null, term.getSecond());
}
answer.add(toAdd);
}
return answer;
}
finally
{
if (resultSet != null)
{
resultSet.close();
}
}
}
}

18
source/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
View File

@@ -29,12 +29,14 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.search.impl.lucene.LuceneQueryParserException;
import org.alfresco.repo.search.impl.lucene.SolrJSONResultSet;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchParameters.FieldFacet;
import org.alfresco.service.cmr.search.SearchParameters.SortDefinition;
import org.alfresco.service.cmr.security.PermissionService;
import org.apache.commons.codec.net.URLCodec;
@@ -107,7 +109,7 @@ public class SolrQueryHTTPClient
}
public ResultSet executeQuery(SearchParameters searchParameters, String language)
{
{
try
{
@@ -189,7 +191,7 @@ public class SolrQueryHTTPClient
{
authQuery.append(" ");
}
authQuery.append("AUTHORITY:\"").append(authority).append("\"");
authQuery.append("|AUTHORITY:\"").append(authority).append("\"");
}
// url.append("&fq=");
@@ -200,6 +202,18 @@ public class SolrQueryHTTPClient
// facets would go on url?
if(searchParameters.getFieldFacets().size() > 0)
{
url.append("&facet=").append(encoder.encode("true", "UTF-8"));
for(FieldFacet facet : searchParameters.getFieldFacets())
{
url.append("&facet.field=").append(encoder.encode(facet.getField(), "UTF-8"));
url.append("&").append(encoder.encode("f."+facet.getField()+".limit", "UTF-8")).append("=").append(encoder.encode(""+facet.getLimit(), "UTF-8"));
}
}
// end of field factes
JSONObject body = new JSONObject();
body.put("query", searchParameters.getQuery());
// body.put("defaultField", searchParameters.getDefaultFieldName());

8
source/java/org/alfresco/repo/search/results/ResultSetSPIWrapper.java
View File

@@ -18,6 +18,7 @@
*/
package org.alfresco.repo.search.results;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -27,6 +28,7 @@ import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.ResultSetMetaData;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.cmr.search.ResultSetSPI;
import org.alfresco.util.Pair;
/**
* Wrap an SPI result set with the basic interface
@@ -149,6 +151,12 @@ public class ResultSetSPIWrapper<ROW extends ResultSetRow, MD extends ResultSetM
return wrapped.getBulkFetchSize();
}
@Override
public List<Pair<String, Integer>> getFieldFacet(String field)
{
return wrapped.getFieldFacet(field);
}
private static class WrappedIterator<ROW extends ResultSetRow> implements Iterator<ResultSetRow>
{
private Iterator<ROW> wrapped;

7
source/java/org/alfresco/repo/search/results/SortedResultSet.java
View File

@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.search.SearchParameters.SortDefinition;
import org.alfresco.service.namespace.NamespacePrefixResolver;
import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
/**
* Sorted results
@@ -343,5 +344,11 @@ public class SortedResultSet implements ResultSet
{
return resultSet.getBulkFetchSize();
}
@Override
public List<Pair<String, Integer>> getFieldFacet(String field)
{
return resultSet.getFieldFacet(field);
}
}