tool
/
atlas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATLAS-4531: _ALL_ENTITY_TYPES showing same basic search results even when offset is changed 

Signed-off-by: Pinal Shah <pinal.shah@freestoneinfotech.com>
This commit is contained in:
Sanket Shelar 2022-06-14 15:42:10 +05:30 committed by Pinal Shah
parent 307a3044fa
commit e5e63c150e
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java
View File

@ -252,7 +252,7 @@ public class EntitySearchProcessor extends SearchProcessor {
if (marker != null) {
qryOffset = marker;
} else {
qryOffset = (nextProcessor != null || (graphQuery != null && indexQuery != null)) ? 0 : startIdx;
qryOffset = (nextProcessor != null || (graphQuery != null && indexQuery != null) || isEntityRootType()) ? 0 : startIdx;
}
int resultIdx = qryOffset;

32
repository/src/test/java/org/apache/atlas/discovery/EntitySearchProcessorTest.java
View File

@ -23,6 +23,7 @@ import org.apache.atlas.SortOrder;
import org.apache.atlas.TestModules;
import org.apache.atlas.exception.AtlasBaseException;
import org.apache.atlas.model.discovery.SearchParameters;
import org.apache.atlas.repository.Constants;
import org.apache.atlas.repository.graph.AtlasGraphProvider;
import org.apache.atlas.repository.graph.GraphBackedSearchIndexer;
import org.apache.atlas.repository.graphdb.AtlasGraph;
@ -42,6 +43,8 @@ import java.util.Date;
import java.util.List;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -602,4 +605,33 @@ public class EntitySearchProcessorTest extends BasicTestSetup {
SearchParameters.FilterCriteria ret = processor.processDateRange(filterCriteria);
return ret;
}
@Test
public void ALLEntityTypeForPagination() throws AtlasBaseException {
SearchParameters params = new SearchParameters();
params.setTypeName(SearchParameters.ALL_ENTITY_TYPES);
params.setLimit(10);
SearchContext context = new SearchContext(params, typeRegistry, graph, Collections.<String>emptySet());
EntitySearchProcessor processor = new EntitySearchProcessor(context);
List<AtlasVertex> v = processor.execute();
List a =v.stream().map(v1 -> v1.getProperty(Constants.GUID_PROPERTY_KEY, String.class)).collect(Collectors.toList());
SearchParameters params2 = new SearchParameters();
params2.setTypeName(SearchParameters.ALL_ENTITY_TYPES);
params2.setLimit(10);
params2.setOffset(10);
SearchContext context2 = new SearchContext(params2, typeRegistry, graph, Collections.<String>emptySet());
EntitySearchProcessor processor2 = new EntitySearchProcessor(context2);
List<AtlasVertex> v2 = processor2.execute();
List b =v2.stream().map(v3 -> v3.getProperty(Constants.GUID_PROPERTY_KEY, String.class)).collect(Collectors.toList());
assertTrue(!a.stream().anyMatch(element -> b.contains(element)));
}
}