inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2025-09-17 14:21:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-67: Improved AlfrescoSolrReloadTest

Browse Source
This commit is contained in:
Joel
2016-07-28 15:23:24 -04:00
parent d53e1d5321
commit 3ab403e0b0
2 changed files with 58 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
search-services/alfresco-solr/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
View File

@@ -104,7 +104,7 @@ public class AlfrescoSolrUtils
*/ */
public static Transaction getTransaction(int deletes, int updates) public static Transaction getTransaction(int deletes, int updates)
{ {
long txnCommitTime = generateId(); long txnCommitTime = System.currentTimeMillis();
Transaction transaction = new Transaction(); Transaction transaction = new Transaction();
transaction.setCommitTimeMs(txnCommitTime); transaction.setCommitTimeMs(txnCommitTime);
transaction.setId(generateId()); transaction.setId(generateId());
@@ -112,6 +112,19 @@ public class AlfrescoSolrUtils
transaction.setUpdates(updates); transaction.setUpdates(updates);
return transaction; return transaction;
} }
public static Transaction getTransaction(int deletes, int updates, long id)
{
long txnCommitTime = System.currentTimeMillis();
Transaction transaction = new Transaction();
transaction.setCommitTimeMs(txnCommitTime);
transaction.setId(id);
transaction.setDeletes(deletes);
transaction.setUpdates(updates);
return transaction;
}
/** /**
* Get a node. * Get a node.
* @param txn * @param txn
@@ -225,6 +238,13 @@ public class AlfrescoSolrUtils
AclChangeSet aclChangeSet = new AclChangeSet(generateId(), System.currentTimeMillis(), aclCount); AclChangeSet aclChangeSet = new AclChangeSet(generateId(), System.currentTimeMillis(), aclCount);
return aclChangeSet; return aclChangeSet;
} }
public static AclChangeSet getAclChangeSet(int aclCount, long id)
{
AclChangeSet aclChangeSet = new AclChangeSet(id, System.currentTimeMillis(), aclCount);
return aclChangeSet;
}
private static AtomicLong id = new AtomicLong(System.currentTimeMillis()); private static AtomicLong id = new AtomicLong(System.currentTimeMillis());
/** /**
* Creates a unique id. * Creates a unique id.
@@ -241,7 +261,6 @@ public class AlfrescoSolrUtils
* @param doc the Document to add * @param doc the Document to add
* @param args 0th and Even numbered args are param names, Odds are param values. * @param args 0th and Even numbered args are param names, Odds are param values.
* @see #add * @see #add
* @see #doc
*/ */
public static String add(XmlDoc doc, String... args) public static String add(XmlDoc doc, String... args)
{ {
@@ -550,7 +569,6 @@ public class AlfrescoSolrUtils
} }
/** /**
* Add an acl. * Add an acl.
* @param solrQueryRequest
* @param core * @param core
* @param dataModel * @param dataModel
* @param acltxid * @param acltxid

134
search-services/alfresco-solr/src/test/java/org/alfresco/solr/test/AlfrescoSolrReloadTest.java
View File

@@ -49,42 +49,11 @@ public class AlfrescoSolrReloadTest extends AbstractAlfrescoSolrTests {
private static long MAX_WAIT_TIME = 80000; private static long MAX_WAIT_TIME = 80000;
static AlfrescoCoreAdminHandler admin; static AlfrescoCoreAdminHandler admin;
private static NodeRef rootNodeRef;
private static NodeRef n01NodeRef;
@BeforeClass @BeforeClass
public static void beforeClass() throws Exception { public static void beforeClass() throws Exception {
initAlfrescoCore("solrconfig-afts.xml", "schema-afts.xml"); initAlfrescoCore("solrconfig-afts.xml", "schema-afts.xml");
admin = (AlfrescoCoreAdminHandler) h.getCoreContainer().getMultiCoreHandler(); admin = (AlfrescoCoreAdminHandler)h.getCore().getCoreDescriptor().getCoreContainer().getMultiCoreHandler();
// Root
SolrCore core = h.getCore();
AlfrescoSolrDataModel dataModel = AlfrescoSolrDataModel.getInstance();
dataModel.setCMDefaultUri();
rootNodeRef = new NodeRef(new StoreRef("workspace", "SpacesStore"), createGUID());
addStoreRoot(core, dataModel, rootNodeRef, 1, 1, 1, 1);
// 1
n01NodeRef = new NodeRef(new StoreRef("workspace", "SpacesStore"), createGUID());
QName n01QName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "one");
ChildAssociationRef n01CAR = new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, n01QName,
n01NodeRef, true, 0);
Map<QName, PropertyValue> testProperties = new HashMap<QName, PropertyValue>();
Date orderDate = new Date();
testProperties.put(createdDate,
new StringPropertyValue(DefaultTypeConverter.INSTANCE.convert(String.class, orderDate)));
testProperties.put(createdTime,
new StringPropertyValue(DefaultTypeConverter.INSTANCE.convert(String.class, orderDate)));
testProperties.put(ContentModel.PROP_CONTENT, new StringPropertyValue("lettice and cabbage"));
testProperties.put(ContentModel.PROP_NAME, new StringPropertyValue("reload"));
addNode(core, dataModel, 1, 2, 1, testSuperType, null, testProperties, null, "andy",
new ChildAssociationRef[]{n01CAR}, new NodeRef[]{rootNodeRef}, new String[]{"/"
+ n01QName.toString()}, n01NodeRef, true);
testNodeRef = n01NodeRef;
} }
@After @After
@@ -98,51 +67,55 @@ public class AlfrescoSolrReloadTest extends AbstractAlfrescoSolrTests {
} }
@Test @Test
public void testReloadUsingNodes() throws Exception { public void testReload() throws Exception {
long localId = 0L;
logger.info("######### Starting tracker reload test NODES ###########"); logger.info("######### Starting tracker reload test NODES ###########");
assertAQuery("PATH:\"/\"", 1); AclChangeSet aclChangeSet = getAclChangeSet(1, ++localId);
assertAQuery("TYPE:\"" + testSuperType + "\"", 1);
Collection<Tracker> trackers = getTrackers(); Acl acl = getAcl(aclChangeSet);
int numOfTrackers = trackers.size();
int jobs = getJobsCount();
addNodes(1, 10); AclReaders aclReaders = getAclReaders(aclChangeSet, acl, list("joel"), list("phil"), null);
assertAQuery("TYPE:\"" + testSuperType + "\"", 10);
reloadAndAssertCorrect(trackers, numOfTrackers, jobs); indexAclChangeSet(aclChangeSet,
list(acl),
list(aclReaders));
addNodes(10, 21); int numNodes = 1000;
assertAQuery("TYPE:\"" + testSuperType + "\"", 21); List<Node> nodes = new ArrayList();
List<NodeMetaData> nodeMetaDatas = new ArrayList();
Transaction bigTxn = getTransaction(0, numNodes, ++localId);
for(int i=0; i<numNodes; i++) {
Node node = getNode(bigTxn, acl, Node.SolrApiNodeStatus.UPDATED);
nodes.add(node);
NodeMetaData nodeMetaData = getNodeMetaData(node, bigTxn, acl, "mike", null, false);
nodeMetaDatas.add(nodeMetaData);
} }
@Test indexTransaction(bigTxn, nodes, nodeMetaDatas);
public void testReloadUsingAcls() throws Exception { waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), 1000, 100000);
logger.info("######### Starting tracker reload test ACLS ###########");
Collection<Tracker> trackers = getTrackers(); Collection<Tracker> trackers = getTrackers();
int numOfTrackers = trackers.size(); int numOfTrackers = trackers.size();
int jobs = getJobsCount(); int jobs = getJobsCount();
indexAndVerify(250, 251);
reloadAndAssertCorrect(trackers, numOfTrackers, jobs); reloadAndAssertCorrect(trackers, numOfTrackers, jobs);
//This is a bit of a hack to skip integrity checking. This is because our test client doesn't correctly Transaction bigTxn2 = getTransaction(0, numNodes, ++localId);
//similate the Alfresco repo. This "hack" doesn't invalidate the test.
Optional<Tracker> aTracker = getTrackers().stream().filter(tracker -> tracker.getClass().equals(AclTracker.class)).findFirst();
aTracker.ifPresent(foundTracker ->
{
AclTracker aclTracker = (AclTracker) foundTracker;
aclTracker.getTrackerState().setCheckedLastAclTransactionTime(true);
aclTracker.getTrackerState().setCheckedFirstAclTransactionTime(true);
logger.info("Changed CheckedLastAclTransactionTime for " + aclTracker.getClass().getSimpleName() + " " + aclTracker.hashCode());
aclTracker.track();
});
for(int i=0; i<numNodes; i++) {
Node node = getNode(bigTxn2, acl, Node.SolrApiNodeStatus.UPDATED);
nodes.add(node);
NodeMetaData nodeMetaData = getNodeMetaData(node, bigTxn2, acl, "mike", null, false);
nodeMetaDatas.add(nodeMetaData);
}
indexTransaction(bigTxn2, nodes, nodeMetaDatas);
waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", "world")), 2000, 100000);
} }
private void reloadAndAssertCorrect(Collection<Tracker> trackers, int numOfTrackers, int jobs) throws Exception { private void reloadAndAssertCorrect(Collection<Tracker> trackers, int numOfTrackers, int jobs) throws Exception {
@@ -162,46 +135,6 @@ public class AlfrescoSolrReloadTest extends AbstractAlfrescoSolrTests {
}); });
} }
private void addNodes(int startInclusive, int endExclusive) {
IntStream.range(startInclusive, endExclusive).forEach(i ->
{
NodeRef newNodeRef = new NodeRef(new StoreRef("workspace", "SpacesStore"), createGUID());
QName n2Name = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "loop"+i);
ChildAssociationRef childAssoc = new ChildAssociationRef(ContentModel.ASSOC_CHILDREN, rootNodeRef, n2Name, newNodeRef, true, 0);
try {
addNode(h.getCore(), dataModel, 1+i, 2+i, 1+i, testSuperType, null, null, null, "andy",
new ChildAssociationRef[]{childAssoc}, new NodeRef[]{rootNodeRef}, new String[]{"/"+ n2Name.toString()},
newNodeRef, true);
} catch (IOException e) {
e.printStackTrace();
}
}
);
}
private void indexAndVerify(int numAcls, int expected) throws Exception {
AclChangeSet bulkAclChangeSet = getAclChangeSet(numAcls);
List<Acl> bulkAcls = new ArrayList();
List<AclReaders> bulkAclReaders = new ArrayList();
for(int i=0; i<numAcls; i++) {
Acl bulkAcl = getAcl(bulkAclChangeSet);
bulkAcls.add(bulkAcl);
bulkAclReaders.add(getAclReaders(bulkAclChangeSet,
bulkAcl,
list("joel"+bulkAcl.getId()),
list("phil"+bulkAcl.getId()),
null));
}
indexAclChangeSet(bulkAclChangeSet, bulkAcls, bulkAclReaders);
waitForDocCount(new TermQuery(new Term(FIELD_DOC_TYPE, SolrInformationServer.DOC_TYPE_ACL)), expected, 10000);
}
private int getJobsCount() throws SchedulerException { private int getJobsCount() throws SchedulerException {
int count = admin.getScheduler().getJobsCount(); int count = admin.getScheduler().getJobsCount();
logger.info("######### Number of jobs is "+count+" ###########"); logger.info("######### Number of jobs is "+count+" ###########");
@@ -213,5 +146,4 @@ public class AlfrescoSolrReloadTest extends AbstractAlfrescoSolrTests {
logger.info("######### Number of trackers is "+trackers.size()+" ###########"); logger.info("######### Number of trackers is "+trackers.size()+" ###########");
return trackers; return trackers;
} }
} }