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

[SEARCH-1744] Fix bamboo failures

Browse Source
This commit is contained in:
agazzarini
2019-07-23 17:18:27 +02:00
parent c38b7e3df7
commit 1785c8a238
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/PropertyRouter.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class PropertyRouter implements DocRouter
try
{
Matcher matcher = pattern.matcher(shardBy);
if (matcher.find() && matcher.groupCount() > 1 && !matcher.group(1).isEmpty())
if (matcher.find() && !matcher.group(1).isEmpty())
{
shardBy = matcher.group(1);
}
search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/DistributedPropertyBasedAlfrescoSolrTrackerTest.java
+12 -8
View File
@@ -39,12 +39,15 @@ import org.junit.BeforeClass;
import org.junit.Test;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Random;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static org.alfresco.repo.search.adaptor.lucene.QueryConstants.FIELD_DOC_TYPE;
import static org.alfresco.solr.AlfrescoSolrUtils.getAcl;
import static org.alfresco.solr.AlfrescoSolrUtils.getAclChangeSet;
@@ -92,8 +95,8 @@ public class DistributedPropertyBasedAlfrescoSolrTrackerTest extends AbstractAlf
int numAcls = 25;
AclChangeSet bulkAclChangeSet = getAclChangeSet(numAcls);
List<Acl> bulkAcls = new ArrayList();
List<AclReaders> bulkAclReaders = new ArrayList();
List<Acl> bulkAcls = new ArrayList<>();
List<AclReaders> bulkAclReaders = new ArrayList<>();
for (int i = 0; i < numAcls; i++) {
@@ -101,8 +104,8 @@ public class DistributedPropertyBasedAlfrescoSolrTrackerTest extends AbstractAlf
bulkAcls.add(bulkAcl);
bulkAclReaders.add(getAclReaders(bulkAclChangeSet,
bulkAcl,
list("king" + bulkAcl.getId()),
list("king" + bulkAcl.getId()),
singletonList("king" + bulkAcl.getId()),
singletonList("king" + bulkAcl.getId()),
null));
}
@@ -111,19 +114,20 @@ public class DistributedPropertyBasedAlfrescoSolrTrackerTest extends AbstractAlf
bulkAclReaders);
int numNodes = 1000;
List<Node> nodes = new ArrayList();
List<NodeMetaData> nodeMetaDatas = new ArrayList();
List<Node> nodes = new ArrayList<>();
List<NodeMetaData> nodeMetaDatas = new ArrayList<>();
Transaction bigTxn = getTransaction(0, numNodes);
RandomizedContext context = RandomizedContext.current();
Random ints = context.getRandom();
for (int i = 0; i < numNodes; i++) {
for (int i = 0; i < numNodes; i++)
{
int aclIndex = i % numAcls;
Node node = getNode(bigTxn, bulkAcls.get(aclIndex), Node.SolrApiNodeStatus.UPDATED);
String domain = DOMAINS[ints.nextInt(DOMAINS.length)];
domainsCount.put(domain, domainsCount.get(domain)+1);
//String emailAddress = RANDOM_NAMES[ints.nextInt(RANDOM_NAMES.length)]+ "@"+ domain;
String emailAddress = "peter.pan"+ "@"+ domain;
node.setShardPropertyValue(emailAddress);
nodes.add(node);
search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/PropertyRouterTest.java
+2 -2
View File
@@ -179,7 +179,7 @@ public class PropertyRouterTest
.mapToLong(Long::valueOf)
.forEach(id -> {
Node node = new Node();
node.setShardPropertyValue(String.valueOf(randomPositiveInteger()));
node.setShardPropertyValue(String.valueOf(id));
stream(shardIdentifiers)
.forEach(shardId -> {
if (router.routeNode(shardCount, shardId, node))
@@ -219,7 +219,7 @@ public class PropertyRouterTest
.mapToLong(Long::valueOf)
.forEach(id -> {
Node node = new Node();
node.setShardPropertyValue(randomPositiveInteger() + "_ignoreThisPart");
node.setShardPropertyValue(id + "_ignoreThisPart");
stream(shardIdentifiers)
.forEach(shardId -> {
if (router.routeNode(shardCount, shardId, node))