inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged searchapi (5.2.1) to 5.2.N (5.2.1)

Browse Source 
130022 gjames: Merged 5.2.N-AHIND (5.2.1) to searchapi (5.2.1)
      129926 ahind: SEARCH-31    SOLR 6 - Shard based on date - SOLR implementation
      - Support returning a date, datetime or string property to use for sharding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@130285 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2016-09-06 15:35:59 +00:00
parent 905c97c8f8
commit 1672f28cb1
13 changed files with 147 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/test-java/org/alfresco/repo/domain/solr/SOLRDAOTest.java
View File

@@ -102,7 +102,7 @@ public class SOLRDAOTest extends TestCase
@Override
public List<Node> execute() throws Throwable
{
return solrDAO.getNodes(nodeParameters);
return solrDAO.getNodes(nodeParameters, null);
}
}, true);
}

2
source/test-java/org/alfresco/repo/search/impl/solr/DbOrIndexSwitchingQueryLanguageTest.java
View File

@@ -88,7 +88,7 @@ public class DbOrIndexSwitchingQueryLanguageTest
when(indexQueryLang.executeQuery(argThat(isSearchParamsSinceTxId(null)), eq(admLuceneSearcher))).thenReturn(indexResults);
when(indexResults.getLastIndexedTxId()).thenReturn(80L);
when(dbQueryLang.executeQuery(argThat(isSearchParamsSinceTxId(80L)), eq(admLuceneSearcher))).thenReturn(dbResults);
when(solrDAO.getNodes(argThat(isNodeParamsFromTxnId(81L)))).thenReturn(changedNodes);
when(solrDAO.getNodes(argThat(isNodeParamsFromTxnId(81L)), null)).thenReturn(changedNodes);
searchParameters.setQueryConsistency(QueryConsistency.HYBRID);

6
source/test-java/org/alfresco/repo/search/impl/solr/TestNode.java
View File

@@ -131,6 +131,12 @@ class TestNode implements Node
public AuditablePropertiesEntity getAuditableProperties()
{
return null;
}
@Override
public String getShardKey()
{
return null;
}
}