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-499, improve tracker logging and changed pom dependency to latest repo release

Browse Source
This commit is contained in:
Michael Suzuki
2017-07-19 21:04:33 +01:00
parent b4cbd7b559
commit b11fef8e20
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
alfresco-search/src/main/java/org/alfresco/solr/InformationServer.java
+6 -3
View File
@@ -30,12 +30,15 @@ import org.alfresco.repo.dictionary.NamespaceDAO;
import org.alfresco.service.namespace.QName;
import org.alfresco.solr.AlfrescoSolrDataModel.TenantAclIdDbId;
import org.alfresco.solr.adapters.IOpenBitSet;
import org.alfresco.solr.adapters.ISimpleOrderedMap;
import org.alfresco.solr.client.*;
import org.alfresco.solr.client.AclChangeSet;
import org.alfresco.solr.client.AclReaders;
import org.alfresco.solr.client.AlfrescoModel;
import org.alfresco.solr.client.Node;
import org.alfresco.solr.client.NodeMetaData;
import org.alfresco.solr.client.Transaction;
import org.alfresco.solr.tracker.IndexHealthReport;
import org.alfresco.solr.tracker.TrackerStats;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
import org.json.JSONException;
/**
alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java
+3 -3
View File
@@ -284,7 +284,7 @@ public class ModelTracker extends AbstractTracker implements Tracker
{
long start = System.nanoTime();
List<AlfrescoModelDiff> modelDiffs = client.getModelsDiff(this.infoSrv.getAlfrescoModels());
List<AlfrescoModelDiff> modelDiffs = client.getModelsDiff(coreName, this.infoSrv.getAlfrescoModels());
HashMap<String, M2Model> modelMap = new HashMap<String, M2Model>();
for (AlfrescoModelDiff modelDiff : modelDiffs)
@@ -292,14 +292,14 @@ public class ModelTracker extends AbstractTracker implements Tracker
switch (modelDiff.getType())
{
case CHANGED:
AlfrescoModel changedModel = client.getModel(modelDiff.getModelName());
AlfrescoModel changedModel = client.getModel(coreName, modelDiff.getModelName());
for (M2Namespace namespace : changedModel.getModel().getNamespaces())
{
modelMap.put(namespace.getUri(), changedModel.getModel());
}
break;
case NEW:
AlfrescoModel newModel = client.getModel(modelDiff.getModelName());
AlfrescoModel newModel = client.getModel(coreName, modelDiff.getModelName());
for (M2Namespace namespace : newModel.getModel().getNamespaces())
{
modelMap.put(namespace.getUri(), newModel.getModel());
alfresco-search/src/test/java/org/alfresco/solr/tracker/ModelTrackerTest.java
+3 -2
View File
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -162,14 +163,14 @@ public class ModelTrackerTest
AlfrescoModelDiff diff = new AlfrescoModelDiff(modelName, type, oldChecksum, newChecksum);
List<AlfrescoModelDiff> modelDiffs = new ArrayList<>();
modelDiffs.add(diff);
when(this.repositoryClient.getModelsDiff(any(List.class))).thenReturn(modelDiffs);
when(this.repositoryClient.getModelsDiff(any(String.class),any(List.class))).thenReturn(modelDiffs);
final String name = "a model name";
M2Model model = M2Model.createModel(name);
M2Model spiedModel = spy(model);
model.createNamespace("uri", "prefix");
AlfrescoModel alfrescoModel = new AlfrescoModel(spiedModel, newChecksum);
when(this.repositoryClient.getModel(modelName)).thenReturn(alfrescoModel);
when(this.repositoryClient.getModel(any(String.class),eq(modelName))).thenReturn(alfrescoModel);
NamespaceDAO namespaceDao = mock(NamespaceDAO.class);
Collection<String> values = new ArrayList<>();
pom.xml
+1 -1
View File
@@ -12,7 +12,7 @@
<name>Alfresco Solr Search parent</name>
<properties>
<solr.version>6.6.0</solr.version>
<alfresco-solr.version>5.2.1-SNAPSHOT</alfresco-solr.version>
<alfresco-solr.version>5.2.2-SNAPSHOT</alfresco-solr.version>
</properties>
<distributionManagement>
<repository>