inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/solr66' into 'develop'

Browse Source 
Upgrade to Solr 6.6
This commit is contained in:
Michael Suzuki
2017-06-08 11:08:23 +01:00
parent af974ddcf6 670335cb9a
commit b3642c79fb
23 changed files with 135 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/pom.xml
+2
View File
@@ -241,6 +241,8 @@
<exclude>**/junit*.jar</exclude>
<exclude>**/mock*.jar</exclude>
<exclude>**/opencmis*.jar</exclude>
<exclude>**/metrics*.jar</exclude>
<exclude>**/gmetric*.jar</exclude>
</excludes>
</configuration>
</execution>
search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCollatableMLTextFieldType.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class AlfrescoCollatableMLTextFieldType extends StrField
* @see org.apache.lucene.search.FieldComparatorSource#newComparator(java.lang.String, int, int, boolean)
*/
@Override
public FieldComparator<String> newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException
public FieldComparator<String> newComparator(String fieldname, int numHits, int sortPos, boolean reversed)
{
return new MLTextSortFieldComparator(numHits, fieldname, I18NUtil.getLocale());
}
search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCollatableTextFieldType.java
+1 -1
View File
@@ -86,7 +86,7 @@ public class AlfrescoCollatableTextFieldType extends StrField
* @see org.apache.lucene.search.FieldComparatorSource#newComparator(java.lang.String, int, int, boolean)
*/
@Override
public FieldComparator<String> newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException
public FieldComparator<String> newComparator(String fieldname, int numHits, int sortPos, boolean reversed)
{
return new TextSortFieldComparator(numHits, fieldname, I18NUtil.getLocale());
}
search-services/alfresco-search/src/main/java/org/alfresco/solr/AlfrescoCoreAdminHandler.java
+1 -1
View File
@@ -506,7 +506,7 @@ public class AlfrescoCoreAdminHandler extends CoreAdminHandler
private void createAndRegisterNewCore(SolrQueryResponse rsp, Properties extraProperties, StoreRef storeRef, File template, String coreName, File newCore, int shardCount, int shardInstance, String templateName) throws IOException,
FileNotFoundException
{
if (coreContainer.getCoreNames().contains(coreName))
if (coreContainer.getLoadedCoreNames().contains(coreName))
{
//Core alfresco exists
log.warn(coreName + " already exists, not creating again.");
search-services/alfresco-search/src/main/java/org/alfresco/solr/component/ConsistencyComponent.java
-1
View File
@@ -72,7 +72,6 @@ public class ConsistencyComponent extends SearchComponent
SolrQueryRequest req = rb.req;
AlfrescoCoreAdminHandler adminHandler = (AlfrescoCoreAdminHandler)
req.getCore().
getCoreDescriptor().
getCoreContainer().
getMultiCoreHandler();
search-services/alfresco-search/src/main/java/org/alfresco/solr/component/FingerPrintComponent.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class FingerPrintComponent extends SearchComponent implements SolrCoreAwa
{
if(req.getSearcher() != null)
{
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
return srv.getSolrContentStore();
search-services/alfresco-search/src/main/java/org/alfresco/solr/component/QueryLoggingComponent.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class QueryLoggingComponent extends SearchComponent
boolean isShard = rb.req.getParams().getBool(ShardParams.IS_SHARD, false);
if (!isShard)
{
CoreContainer container = rb.req.getCore().getCoreDescriptor().getCoreContainer();
CoreContainer container = rb.req.getCore().getCoreContainer();
SolrCore logCore = container.getCore(rb.req.getCore().getName() + "_qlog");
if (logCore != null)
{
search-services/alfresco-search/src/main/java/org/alfresco/solr/lifecycle/SolrCoreLoadListener.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class SolrCoreLoadListener extends AbstractSolrEventListener {
@Override
public void newSearcher(SolrIndexSearcher newSearcher, SolrIndexSearcher currentSearcher) {
CoreContainer coreContainer = getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrCoreLoadRegistration.registerForCore(coreAdminHandler, coreContainer, getCore(), getCore().getName());
search-services/alfresco-search/src/main/java/org/alfresco/solr/query/Solr4QueryParser.java
+3 -3
View File
@@ -159,7 +159,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
this.solrParams = req.getParams();
SolrCore core = req.getCore();
if(core != null) {
this.shardHandlerFactory = core.getCoreDescriptor().getCoreContainer().getShardHandlerFactory();
this.shardHandlerFactory = core.getCoreContainer().getShardHandlerFactory();
}
this.request = req;
@@ -179,7 +179,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
{
if(req.getSearcher() != null)
{
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
return srv.getSolrContentStore();
@@ -809,7 +809,7 @@ public class Solr4QueryParser extends QueryParser implements QueryConstants
private Collection fetchFingerPrint(String shards, String nodeId) {
shards = shards.replace(",", "|");
List<String> urls = ((HttpShardHandlerFactory)shardHandlerFactory).makeURLList(shards);
List<String> urls = ((HttpShardHandlerFactory)shardHandlerFactory).buildURLList(shards);
ExecutorService executorService = null;
List<Future> futures = new ArrayList();
Collection fingerPrint = null;
search-services/alfresco-search/src/main/java/org/alfresco/solr/transformer/CachedDocTransformer.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class CachedDocTransformer extends DocTransformer
{
String id = getFieldValueString(doc, FIELD_SOLR4_ID);
TenantAclIdDbId tenantAndDbId = AlfrescoSolrDataModel.decodeNodeDocumentId(id);
CoreContainer coreContainer = context.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = context.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(context.getSearcher().getCore().getName());
SolrContentStore solrContentStore = srv.getSolrContentStore();
search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSearchHandler.java
+3 -6
View File
@@ -140,8 +140,7 @@ public class AlfrescoSearchHandler extends RequestHandlerBase implements
"First/Last components only valid if you do not declare 'components'");
if (shfInfo == null) {
shardHandlerFactory = core.getCoreDescriptor().getCoreContainer()
.getShardHandlerFactory();
shardHandlerFactory = core.getCoreContainer().getShardHandlerFactory();
} else {
shardHandlerFactory = core.createInitInstance(shfInfo,
ShardHandlerFactory.class, null, null);
@@ -259,8 +258,7 @@ public class AlfrescoSearchHandler extends RequestHandlerBase implements
rb.isDistrib = req.getParams().getBool(
"distrib",
req.getCore().getCoreDescriptor().getCoreContainer()
.isZooKeeperAware());
req.getCore().getCoreContainer().isZooKeeperAware());
if (!rb.isDistrib) {
// for back compat, a shards param with URLs like
// localhost:8983/solr will mean that this
@@ -486,8 +484,7 @@ public class AlfrescoSearchHandler extends RequestHandlerBase implements
params.remove(CommonParams.QT);
}
}
shardHandler1.submit(sreq, shard, params,
rb.preferredHostAddress);
shardHandler1.submit(sreq, shard, params);
}
}
search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrClusteringComponent.java
+1 -1
View File
@@ -295,7 +295,7 @@ public class AlfrescoSolrClusteringComponent extends SearchComponent implements
TenantAclIdDbId tenantAndDbId = AlfrescoSolrDataModel
.decodeNodeDocumentId(id);
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
SolrContentStore solrContentStore = srv.getSolrContentStore();
search-services/alfresco-search/src/main/java/org/apache/solr/handler/component/AlfrescoSolrHighlighter.java
+1 -1
View File
@@ -599,7 +599,7 @@ public class AlfrescoSolrHighlighter extends DefaultSolrHighlighter implements
String id = getFieldValueString(doc, FIELD_SOLR4_ID);
TenantAclIdDbId tenantAndDbId = AlfrescoSolrDataModel
.decodeNodeDocumentId(id);
CoreContainer coreContainer = req.getSearcher().getCore().getCoreDescriptor().getCoreContainer();
CoreContainer coreContainer = req.getSearcher().getCore().getCoreContainer();
AlfrescoCoreAdminHandler coreAdminHandler = (AlfrescoCoreAdminHandler) coreContainer.getMultiCoreHandler();
SolrInformationServer srv = (SolrInformationServer) coreAdminHandler.getInformationServers().get(req.getSearcher().getCore().getName());
SolrContentStore solrContentStore = srv.getSolrContentStore();
search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class AlfrescoSolrReloadTest extends AbstractAlfrescoSolrTests {
@BeforeClass
public static void beforeClass() throws Exception {
initAlfrescoCore("schema.xml");
admin = (AlfrescoCoreAdminHandler)h.getCore().getCoreDescriptor().getCoreContainer().getMultiCoreHandler();
admin = (AlfrescoCoreAdminHandler)h.getCore().getCoreContainer().getMultiCoreHandler();
}
@After
search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrCoreTestBase.java
+11 -12
View File
@@ -30,22 +30,18 @@ import java.util.Properties;
import org.alfresco.solr.client.SOLRAPIClient;
import org.apache.commons.lang.reflect.FieldUtils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.RequestHandlers;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.solr.core.*;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.IndexSchemaFactory;
import org.apache.solr.update.UpdateHandler;
import org.apache.solr.update.processor.RunUpdateProcessorFactory;
import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.update.processor.UpdateRequestProcessorChain;
import org.apache.solr.update.processor.UpdateRequestProcessorFactory;
import org.apache.solr.util.TestHarness;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -91,12 +87,15 @@ public abstract class SolrCoreTestBase implements SolrTestFiles
coreContainer = new CoreContainer(TEST_FILES_LOCATION);
resourceLoader = new SolrResourceLoader(Paths.get(TEST_SOLR_CONF), null, properties);
SolrConfig solrConfig = new SolrConfig(resourceLoader, "solrconfig-afts.xml", null);
IndexSchemaFactory.buildIndexSchema("schema-afts.xml", solrConfig);
coreDescriptor = new CoreDescriptor(coreContainer, "name", Paths.get(TEST_SOLR_COLLECTION));
IndexSchema schema = IndexSchemaFactory.buildIndexSchema("schema-afts.xml", solrConfig);
coreDescriptor = new CoreDescriptor("test_core_name", Paths.get(TEST_SOLR_COLLECTION),
coreContainer.getContainerProperties(), false,
CoreDescriptor.CORE_TRANSIENT, "true",
CoreDescriptor.CORE_LOADONSTARTUP, "true");
// SolrCore is final, we can't mock with mockito
core = new SolrCore("name", null, solrConfig, null, null, coreDescriptor, null, null, null);
core = new SolrCore(coreContainer, coreDescriptor, new ConfigSet("testConfigset", solrConfig, schema, null, true));
FieldUtils.writeField(core, "updateHandler", updateHandler, true);
FieldUtils.writeField(core, "resourceLoader", resourceLoader, true);
infoRegistry = new HashMap<String, SolrInfoMBean>();
search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterTest.java
+2 -2
View File
@@ -307,7 +307,7 @@ public class AlfrescoHighlighterTest extends AbstractAlfrescoSolrTests
"*[count(//lst[@name='highlighting']/lst/arr[@name='name'])=0]",
"//lst[@name='highlighting']/lst[1]/arr[@name='title']/str[.='title1 is very {long}']");
/**
logger.info("######### MultiTerm ###########");
req = areq(params( "q", "name:long", "qt", "/afts", "start", "0", "rows", "5",
@@ -326,7 +326,7 @@ public class AlfrescoHighlighterTest extends AbstractAlfrescoSolrTests
"*[count(//lst[@name='highlighting']/lst/arr[@name='title'])=0]",
"*[count(//lst[@name='highlighting']/lst/arr[@name='name'])=0]");
**/
logger.info("######### CamelCase ###########");
req = areq(params( "q", "name:cabbage", "qt", "/afts", "start", "0", "rows", "5",
search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoReRankQParserPluginTest.java
+20
View File
@@ -88,6 +88,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
ModifiableSolrParams params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=200 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "term_s:YYYY");
params.add("rqq", "{!edismax bf=$bff}*:*");
params.add("bff", "field(test_ti)");
@@ -104,6 +105,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "{!edismax bq=$bqq2}*:*");
@@ -124,6 +126,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test with sort by score.
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "{!edismax bq=$bqq2}*:*");
@@ -145,6 +148,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test with compound sort.
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "{!edismax bq=$bqq2}*:*");
@@ -168,6 +172,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
/*
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 reRankWeight=50 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "{!edismax bq=$bqq2}*:*");
@@ -192,6 +197,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test TermQuery rqq
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "test_ti:50^1000");
@@ -213,6 +219,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
/*
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "test_ti:50^1000");
@@ -317,6 +324,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Pass in reRankDocs lower then the length being collected.
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=1 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "test_ti:50^1000");
@@ -335,6 +343,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=0 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "test_ti:50^1000");
@@ -353,6 +362,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=2 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "test_ti:4^1000");
@@ -372,6 +382,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test reRankWeight of 0, reranking will have no effect.
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 reRankWeight=0 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "test_ti:50^1000");
@@ -392,6 +403,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test range query
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "test_ti:[0 TO 2000]");
params.add("rqq", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("fl", "id,score");
@@ -409,6 +421,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test range query embedded in larger query
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "*:* OR test_ti:[0 TO 2000]");
params.add("rqq", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("fl", "id,score");
@@ -428,6 +441,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test with start beyond reRankDocs
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=3 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("rqq", "id:1^1000");
params.add("fl", "id,score");
@@ -443,6 +457,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=6 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50");
params.add("rqq", "id:1^1000");
params.add("fl", "id,score");
@@ -458,6 +473,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Test with zero results
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=3 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "term_s:NNNN");
params.add("rqq", "id:1^1000");
params.add("fl", "id,score");
@@ -515,6 +531,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
ModifiableSolrParams params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=11 reRankWeight=2 scale="+scale+"}");
params.add("df", "TEXT");
params.add("q", "{!edismax bq=$bqq1}*:*");
params.add("bqq1", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60 id:7^70 id:8^80 id:9^90 id:10^100 id:11^110");
params.add("rqq", "test_ti:50^1000");
@@ -577,6 +594,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Calculate the scales manually
ModifiableSolrParams params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=200 scale=false}");
params.add("df", "TEXT");
params.add("q", "term_s:YYYY");
params.add("rqq", "{!edismax bf=$bff}id:(1 2 4 5 6)");
params.add("bff", "field(test_ti)");
@@ -626,6 +644,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Get the scaled scores from the reRanker
params = new ModifiableSolrParams();
params.add("rq", "{!alfrescoReRank reRankQuery=$rqq reRankDocs=200 scale=true}");
params.add("df", "TEXT");
params.add("q", "term_s:YYYY");
params.add("rqq", "{!edismax bf=$bff}id:(1 2 4 5 6)");
params.add("bff", "field(test_ti)");
@@ -669,6 +688,7 @@ public class AlfrescoReRankQParserPluginTest extends AbstractAlfrescoSolrTests
//Request with lots of rows 200000001
ModifiableSolrParams params = new ModifiableSolrParams();
params.add("qt", "/afts");
params.add("df", "TEXT");
params.add("q", "term_s:YYYY");
params.add("rows", "200000001");
params.add("rq","{!alfrescoReRank reRankQuery=$rqq reRankDocs=3 reRankWeight=2 }");
search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackTest.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class AlfrescoSolrTrackerRollbackTest extends AbstractAlfrescoSolrTests
public void testTrackers() throws Exception
{
AlfrescoCoreAdminHandler alfrescoCoreAdminHandler = (AlfrescoCoreAdminHandler)h.getCore().getCoreDescriptor().getCoreContainer().getMultiCoreHandler();
AlfrescoCoreAdminHandler alfrescoCoreAdminHandler = (AlfrescoCoreAdminHandler)h.getCore().getCoreContainer().getMultiCoreHandler();
/*
search-services/alfresco-search/src/test/resources/test-files/collection1/conf/schema-rerank.xml
-3
View File
@@ -407,7 +407,4 @@ valued. -->
-->
<uniqueKey>id</uniqueKey>
<!-- field for the QueryParser to use when an explicit fieldname is absent -->
<defaultSearchField>text</defaultSearchField>
</schema>
search-services/packaging/config.properties
-3
View File
@@ -1,6 +1,3 @@
alfresco.search.ssl=<Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="JCEKS"/></Set>\
${line.separator} <Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="JCEKS"/></Set>
alfresco.search.ssl.token= <Set name="excludeProtocols">
alfresco.search.ssl.need.token=needClientAuth" default="false"
alfresco.search.ssl.need=needclientauth" default="true"
alfresco.search.logs=SOLR_LOGS_DIR=../../logs\
search-services/packaging/pom.xml
+81 -96
View File
@@ -52,7 +52,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -132,103 +131,89 @@
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
<execution>
<id>replace</id>
<phase>validate</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.3.2</version>
<outputDirectory>${project.build.directory}/solr-libs/libs</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<!-- Set the default solr home directory to solrhome -->
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>prepare-package</phase>
<configuration>
<target>
<replace token= "SOLR_SERVER_DIR/solr" value="SOLR_TIP/../solrhome" dir="target/solr-${solr.version}">
<include name="**/bin/solr"/>
</replace>
<replace token= "%SOLR_SERVER_DIR%\solr" value="%SOLR_TIP%\..\solrhome" dir="target/solr-${solr.version}">
<include name="**/bin/solr.cmd"/>
</replace>
<replace token= "HOME/.solr.in.sh" value="SOLR_TIP/../solr.in.sh" dir="target/solr-${solr.version}">
<include name="**/bin/solr"/>
</replace>
<replace token= "\bin\solr.in.cmd" value="\..\solr.in.cmd" dir="target/solr-${solr.version}">
<include name="**/bin/solr.cmd"/>
</replace>
<replace token= "SOLR_SSL_OPTS=%SOLR_SSL_OPTS%" value="SOLR_SSL_OPTS=!SOLR_SSL_OPTS!" dir="target/solr-${solr.version}">
<include name="**/bin/solr.cmd"/>
</replace>
<replace token= "#SOLR_LOGS_DIR=logs" value="${alfresco.search.logs}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "REM set SOLR_LOGS_DIR=logs" value="${alfresco.search.logs.win}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "GC logging" value="GC logging${line.separator}${alfresco.gc.logs}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "GC logging" value="GC logging${line.separator}${alfresco.gc.logs.win}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "# Anything you add to the SOLR_OPTS" value="${alfresco.search.config}${line.separator}${line.separator}# Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "REM Anything you add to the SOLR_OPTS" value="${alfresco.search.config.win}${line.separator}${line.separator}REM Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "${alfresco.search.ssl.token}" value="${alfresco.search.ssl}${line.separator} ${alfresco.search.ssl.token}" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty*.xml"/>
</replace>
<replace token= "${alfresco.search.ssl.need.token}" value="${alfresco.search.ssl.need}" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty-ssl.xml"/>
</replace>
<replace token= "wantClientAuth" value="wantclientauth" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty-ssl.xml"/>
</replace>
<chmod file="target/solr-${solr.version}/bin/solr" perm="755"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/solr-distribution.xml</descriptor>
</descriptors>
</configuration>
</plugin>
<plugin>
<!-- Set the default solr home directory to solrhome -->
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>prepare-package</phase>
<configuration>
<target>
<replace token= "SOLR_SERVER_DIR/solr" value="SOLR_TIP/../solrhome" dir="target/solr-${solr.version}">
<include name="**/bin/solr"/>
</replace>
<replace token= "%SOLR_SERVER_DIR%\solr" value="%SOLR_TIP%\..\solrhome" dir="target/solr-${solr.version}">
<include name="**/bin/solr.cmd"/>
</replace>
<replace token= "HOME/.solr.in.sh" value="SOLR_TIP/../solr.in.sh" dir="target/solr-${solr.version}">
<include name="**/bin/solr"/>
</replace>
<replace token= "\bin\solr.in.cmd" value="\..\solr.in.cmd" dir="target/solr-${solr.version}">
<include name="**/bin/solr.cmd"/>
</replace>
<replace token= "SOLR_SSL_OPTS=%SOLR_SSL_OPTS%" value="SOLR_SSL_OPTS=!SOLR_SSL_OPTS!" dir="target/solr-${solr.version}">
<include name="**/bin/solr.cmd"/>
</replace>
<replace token= "#SOLR_LOGS_DIR=logs" value="${alfresco.search.logs}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "REM set SOLR_LOGS_DIR=logs" value="${alfresco.search.logs.win}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "(java9)" value="(java9)${line.separator}${alfresco.gc.logs}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "GC logging" value="GC logging${line.separator}${alfresco.gc.logs.win}" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "# Anything you add to the SOLR_OPTS" value="${alfresco.search.config}${line.separator}${line.separator}# Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "REM Anything you add to the SOLR_OPTS" value="${alfresco.search.config.win}${line.separator}${line.separator}REM Anything you add to the SOLR_OPTS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
</replace>
<replace token= "${alfresco.search.ssl.need.token}" value="${alfresco.search.ssl.need}" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty-ssl.xml"/>
</replace>
<replace token= "wantClientAuth" value="wantclientauth" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty-ssl.xml"/>
</replace>
<replace token= "STORE_TYPE=JKS" value="STORE_TYPE=JCEKS" dir="target/solr-${solr.version}">
<include name="**/bin/solr.in.cmd"/>
<include name="**/bin/solr.in.sh"/>
</replace>
<replace token= "JKS" value="JCEKS" dir="target/solr-${solr.version}">
<include name="**/server/etc/jetty-ssl.xml"/>
</replace>
<chmod file="target/solr-${solr.version}/bin/solr" perm="755"/>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/solr-distribution.xml</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins>
</build>
</project>
search-services/packaging/src/assembly/solr-distribution.xml
+1 -2
View File
@@ -32,7 +32,7 @@
<exclude>**/example/**</exclude>
<exclude>**/bin/solr.in.sh</exclude>
<exclude>**/bin/solr.in.cmd</exclude>
<exclude>**/commons-fileupload-1.3.1.jar</exclude>
</excludes>
</fileSet>
<!-- Solr config -->
@@ -52,7 +52,6 @@
<excludes>
<exclude>**/workspace-SpacesStore/**</exclude>
<exclude>**/archive-SpacesStore/**</exclude>
<exclude>**/commons-fileupload-1.3.1.jar</exclude>
<exclude>context.xml</exclude>
</excludes>
</fileSet>
search-services/pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<packaging>pom</packaging>
<name>Alfresco Solr Search parent</name>
<properties>
<solr.version>6.3.0</solr.version>
<solr.version>6.6.0</solr.version>
<alfresco-solr.version>5.2.1-SNAPSHOT</alfresco-solr.version>
</properties>
<distributionManagement>