You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ap...@apache.org on 2017/08/04 14:25:04 UTC
atlas git commit: ATLAS-2022 - Validate limit and offset for basic
search query
Repository: atlas
Updated Branches:
refs/heads/master c585b60de -> e0bd96b73
ATLAS-2022 - Validate limit and offset for basic search query
Signed-off-by: apoorvnaik <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/e0bd96b7
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/e0bd96b7
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/e0bd96b7
Branch: refs/heads/master
Commit: e0bd96b73d4330e221e65aae0ecb25c9fd9fdc26
Parents: c585b60
Author: Sharmadha Sainath <ss...@hortonworks.com>
Authored: Fri Aug 4 17:11:09 2017 +0530
Committer: apoorvnaik <ap...@apache.org>
Committed: Fri Aug 4 07:24:54 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/atlas/discovery/EntityDiscoveryService.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/e0bd96b7/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java b/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
index b183c72..66dd748 100644
--- a/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
+++ b/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
@@ -403,6 +403,9 @@ public class EntityDiscoveryService implements AtlasDiscoveryService {
@GraphTransaction
public AtlasSearchResult searchWithParameters(SearchParameters searchParameters) throws AtlasBaseException {
AtlasSearchResult ret = new AtlasSearchResult(searchParameters);
+ final QueryParams params = validateSearchParams(searchParameters.getLimit(),searchParameters.getOffset());
+ searchParameters.setLimit(params.limit());
+ searchParameters.setOffset(params.offset());
SearchContext context = new SearchContext(searchParameters, typeRegistry, graph, indexer.getVertexIndexKeys());
String searchID = searchTracker.add(context); // For future cancellations