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

Revert "Fix/search 896" (#127)

Browse Source
This commit is contained in:
Michael
2018-06-08 18:06:47 +01:00
committed by GitHub
parent ea2d36d726
commit 9a56e45308
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClient.java
View File

@@ -374,7 +374,7 @@ public class SolrQueryHTTPClient extends AbstractSolrQueryHTTPClient implements
boolean requiresSeparator = false; boolean requiresSeparator = false;
for(StoreRef storeRef : storeRefs) for(StoreRef storeRef : storeRefs)
{ {
SolrStoreMappingWrapper storeMapping = SolrClientUtil.extractMapping(storeRef, mappingLookup, shardRegistry, useDynamicShardRegistration, beanFactory); SolrStoreMappingWrapper storeMapping = SolrClientUtil.extractMapping(storeRef, mappingLookup, shardRegistry, requiresSeparator, beanFactory);
if(requiresSeparator) if(requiresSeparator)
{ {
@@ -474,7 +474,7 @@ public class SolrQueryHTTPClient extends AbstractSolrQueryHTTPClient implements
SolrStoreMappingWrapper storeMapping = SolrStoreMappingWrapper storeMapping =
SolrClientUtil.extractMapping(storeRef, SolrClientUtil.extractMapping(storeRef,
mappingLookup, shardRegistry, mappingLookup, shardRegistry,
useDynamicShardRegistration, beanFactory); requiresSeparator, beanFactory);
if(requiresSeparator) if(requiresSeparator)
{ {

9
src/main/java/org/alfresco/repo/search/impl/solr/SolrSQLHttpClient.java
View File

@@ -27,7 +27,6 @@ package org.alfresco.repo.search.impl.solr;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.ConnectException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@@ -43,6 +42,7 @@ import org.alfresco.repo.search.impl.lucene.SolrJsonProcessor;
import org.alfresco.repo.tenant.TenantService; import org.alfresco.repo.tenant.TenantService;
import org.alfresco.service.cmr.repository.StoreRef; import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter; import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
import org.alfresco.service.cmr.search.BasicSearchParameters;
import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters; import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.StatsParameters; import org.alfresco.service.cmr.search.StatsParameters;
@@ -152,7 +152,7 @@ public class SolrSQLHttpClient extends AbstractSolrQueryHTTPClient implements So
* When sharded we pass array of shard instances otherwise we pass the local instance url which * When sharded we pass array of shard instances otherwise we pass the local instance url which
* is http://url:port/solr/collection_name * is http://url:port/solr/collection_name
*/ */
if(isSharded()) if(mapping.isSharded())
{ {
url.append(mapping.getShards()); url.append(mapping.getShards());
} }
@@ -205,15 +205,10 @@ public class SolrSQLHttpClient extends AbstractSolrQueryHTTPClient implements So
return new SolrSQLJSONResultSet(json, searchParameters); return new SolrSQLJSONResultSet(json, searchParameters);
}); });
} }
catch (ConnectException ce)
{
throw new LuceneQueryParserException("Unable to reach InsightEngine", ce);
}
catch (JSONException | IOException | EncoderException e) catch (JSONException | IOException | EncoderException e)
{ {
throw new LuceneQueryParserException("Unable to parse the solr response ", e); throw new LuceneQueryParserException("Unable to parse the solr response ", e);
} }
} }
protected JSONResult postSolrQuery(HttpClient httpClient, String url, JSONObject body, protected JSONResult postSolrQuery(HttpClient httpClient, String url, JSONObject body,

6
src/main/resources/alfresco/subsystems/Search/solr6/solr-search-context.xml
View File

@@ -73,9 +73,6 @@
<property name="defaultUnshardedFacetLimit" value="${solr.defaultUnshardedFacetLimit}"/> <property name="defaultUnshardedFacetLimit" value="${solr.defaultUnshardedFacetLimit}"/>
<property name="defaultShardedFacetLimit" value="${solr.defaultShardedFacetLimit}"/> <property name="defaultShardedFacetLimit" value="${solr.defaultShardedFacetLimit}"/>
<property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/> <property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/>
<property name="shardRegistry">
<ref bean="search.SolrShardRegistry"/>
</property>
</bean> </bean>
<bean id="search.solrSQLQueryHTTPCLient" class="org.alfresco.repo.search.impl.solr.SolrSQLHttpClient" init-method="init"> <bean id="search.solrSQLQueryHTTPCLient" class="org.alfresco.repo.search.impl.solr.SolrSQLHttpClient" init-method="init">
@@ -94,9 +91,6 @@
<property name="includeGroupsForRoleAdmin"> <property name="includeGroupsForRoleAdmin">
<value>${solr.query.includeGroupsForRoleAdmin}</value> <value>${solr.query.includeGroupsForRoleAdmin}</value>
</property> </property>
<property name="shardRegistry">
<ref bean="search.SolrShardRegistry"/>
</property>
<property name="anyDenyDenies" value="${security.anyDenyDenies}"/> <property name="anyDenyDenies" value="${security.anyDenyDenies}"/>
<property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/> <property name="useDynamicShardRegistration" value="${solr.useDynamicShardRegistration}"/>
</bean> </bean>