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

Merge pull request #2181 from Alfresco/fix/MNT-24778_solr_report_incorrect_missing_transaction

Browse Source 
[MNT-24778] Limit Increased for facet solr query to max transaction id
This commit is contained in:
vedantmehra9
2025-02-20 10:17:38 +05:30
committed by GitHub
parent 54efa10347 466ba39254
commit afedbfd058
2 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
search-services/alfresco-search/src/main/java/org/alfresco/solr/SolrInformationServer.java
View File

@@ -3747,7 +3747,7 @@ public class SolrInformationServer implements InformationServer
long iterationStart = batchStartId; long iterationStart = batchStartId;
NamedList<Integer> idCounts = this.getFacets(request, NamedList<Integer> idCounts = this.getFacets(request,
field + ":[" + batchStartId + " TO " + batchEndId + "]", field + ":[" + batchStartId + " TO " + batchEndId + "]",
field, 1); // Min count of 1 ensures that the id returned is in the index field, 1, maxId); // Min count of 1 ensures that the id returned is in the index
for (Map.Entry<String, Integer> idCount : idCounts) for (Map.Entry<String, Integer> idCount : idCounts)
{ {
idInIndex = Long.parseLong(idCount.getKey()); idInIndex = Long.parseLong(idCount.getKey());
@@ -3847,6 +3847,25 @@ public class SolrInformationServer implements InformationServer
NamedList facetFields = (NamedList) facetCounts.get("facet_fields"); NamedList facetFields = (NamedList) facetCounts.get("facet_fields");
return (NamedList) facetFields.get(field); return (NamedList) facetFields.get(field);
} }
@SuppressWarnings({ "unchecked", "rawtypes" })
NamedList<Integer> getFacets(SolrQueryRequest request, String query, String field, int minCount,
long maxCount)
{
ModifiableSolrParams params =
new ModifiableSolrParams(request.getParams())
.set(CommonParams.Q, query)
.set(CommonParams.ROWS, 0)
.set(FacetParams.FACET, true)
.set(FacetParams.FACET_FIELD, field)
.set(FacetParams.FACET_LIMIT, Math.toIntExact(Math.min(maxCount, Integer.MAX_VALUE)))
.set(FacetParams.FACET_MINCOUNT, minCount);
SolrQueryResponse response = cloud.getResponse(nativeRequestHandler, request, params);
NamedList facetCounts = (NamedList) response.getValues().get("facet_counts");
NamedList facetFields = (NamedList) facetCounts.get("facet_fields");
return (NamedList) facetFields.get(field);
}
public int getDocListSize(String query) public int getDocListSize(String query)
{ {

38
search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrInformationServerTest.java
View File

@@ -27,7 +27,6 @@
package org.alfresco.solr; package org.alfresco.solr;
import static java.util.Optional.ofNullable; import static java.util.Optional.ofNullable;
import static org.alfresco.service.cmr.dictionary.DataTypeDefinition.ANY; import static org.alfresco.service.cmr.dictionary.DataTypeDefinition.ANY;
import static org.alfresco.service.cmr.dictionary.DataTypeDefinition.ASSOC_REF; import static org.alfresco.service.cmr.dictionary.DataTypeDefinition.ASSOC_REF;
import static org.alfresco.service.cmr.dictionary.DataTypeDefinition.BOOLEAN; import static org.alfresco.service.cmr.dictionary.DataTypeDefinition.BOOLEAN;
@@ -75,7 +74,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.IntStream; import java.util.stream.IntStream;
import java.util.stream.Stream; import java.util.stream.Stream;
@@ -533,5 +531,39 @@ public class SolrInformationServerTest
// verifies if the method was called // verifies if the method was called
verify(updateRequestProcessor).processAdd(any()); verify(updateRequestProcessor).processAdd(any());
} }
@Test
public void testGetFacets()
{
SimpleOrderedMap<Object> responseContent = new SimpleOrderedMap<>();
// Create facet_fields (TXID) as SimpleOrderedMap with Integer as value type
SimpleOrderedMap<Object> txidFacet = new SimpleOrderedMap<>();
txidFacet.add("1", 1);
txidFacet.add("2", 1);
txidFacet.add("3", 1);
// Create and populate the NamedList to simulate facet_counts
NamedList<Object> facetCounts = new NamedList<>();
facetCounts.add("facet_queries", new SimpleOrderedMap<>());
facetCounts.add("facet_fields", new SimpleOrderedMap<>());
// Add TXID facet to facet_fields
SimpleOrderedMap<Object> facetFields = (SimpleOrderedMap<Object>) facetCounts.get("facet_fields");
facetFields.add("TXID", txidFacet);
// Add the facet_counts to the main facetMap
responseContent.add("facet_counts", facetCounts);
// Set up the request handler to return the fake response.
doAnswer(invocation -> {
SolrQueryResponse solrQueryResponse = invocation.getArgument(1);
solrQueryResponse.setAllValues(responseContent);
return null;
}).when(handler).handleRequest(any(SolrQueryRequest.class), any(SolrQueryResponse.class));
NamedList<Integer> actualResult = infoServer.getFacets(request, "TXID:[1 TO 3]", "TXID", 1, 3);
NamedList<Integer> expectedResult = new NamedList<Integer>() {
{
add("1", 1);
add("2", 1);
add("3", 1);
}
};
assertEquals(expectedResult, actualResult);
}
} }