From 68b0dca194a7512ca22ea4a2bdb3c54619b82cc9 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 23 Jul 2014 11:10:55 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 76937: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 67159: ACE-916: Carve out tracking from SOLR 1.4 - Refactored checkIndex and checkAcl in CoreTracker git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@77780 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../source/java/org/alfresco/solr/InformationServer.java | 8 ++++++++ .../java/org/alfresco/solr/adapters/IOpenBitSet.java | 2 ++ 2 files changed, 10 insertions(+) diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java index 9beab8428..b4e70cfda 100644 --- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java +++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/InformationServer.java @@ -35,6 +35,7 @@ import org.alfresco.solr.client.AclReaders; import org.alfresco.solr.client.AlfrescoModel; import org.alfresco.solr.client.Node; import org.alfresco.solr.client.Transaction; +import org.alfresco.solr.tracker.IndexHealthReport; import org.alfresco.solr.tracker.Tracker; import org.json.JSONException; @@ -104,4 +105,11 @@ public interface InformationServer M2Model getM2Model(QName modelQName); + long getHoleRetention(); + + AclReport checkAclInIndex(Long aclid, AclReport aclReport); + + IndexHealthReport checkIndexTransactions(IndexHealthReport indexHealthReport, Long minTxId, Long minAclTxId, + IOpenBitSet txIdsInDb, long maxTxId, IOpenBitSet aclTxIdsInDb, long maxAclTxId) throws IOException; + } diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java index a34aecefa..9fa671972 100644 --- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java +++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/adapters/IOpenBitSet.java @@ -11,5 +11,7 @@ public interface IOpenBitSet long nextSetBit(long l); long cardinality(); + + boolean get(long i); } \ No newline at end of file