[atlas] branch branch-2.0 updated: ATLAS-3760: optimize freetext search handling of excludeDeletedEntities flag

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git


The following commit(s) were added to refs/heads/branch-2.0 by this push:
     new 3fba80f  ATLAS-3760: optimize freetext search handling of 
excludeDeletedEntities flag
3fba80f is described below

commit 3fba80f2fc16bc87e82d2bb5a3f57e6c028a5e06
Author: Damian Warszawski <damian.warszaw...@ing.com>
AuthorDate: Tue Apr 28 22:55:21 2020 +0200

    ATLAS-3760: optimize freetext search handling of excludeDeletedEntities flag
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
    (cherry picked from commit 204275cc2d7fc520e1f9ea2b0f2ad6161af706c5)
---
 .../org/apache/atlas/discovery/FreeTextSearchProcessor.java   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git 
a/repository/src/main/java/org/apache/atlas/discovery/FreeTextSearchProcessor.java
 
b/repository/src/main/java/org/apache/atlas/discovery/FreeTextSearchProcessor.java
index 92b5eb4..9850d8e 100644
--- 
a/repository/src/main/java/org/apache/atlas/discovery/FreeTextSearchProcessor.java
+++ 
b/repository/src/main/java/org/apache/atlas/discovery/FreeTextSearchProcessor.java
@@ -57,6 +57,8 @@ public class FreeTextSearchProcessor extends SearchProcessor {
             queryString.append(AND_STR).append(context.getEntityTypesQryStr());
         }
 
+        graphIndexQueryBuilder.addActiveStateQueryFilter(queryString);
+
         if (CollectionUtils.isNotEmpty(context.getClassificationTypes()) && 
context.getClassificationTypesQryStr().length() <= MAX_QUERY_STR_LENGTH_TYPES) {
             
queryString.append(AND_STR).append(context.getClassificationTypesQryStr());
         }
@@ -90,9 +92,8 @@ public class FreeTextSearchProcessor extends SearchProcessor {
         }
 
         try {
-            final int     startIdx   = 
context.getSearchParameters().getOffset();
-            final int     limit      = 
context.getSearchParameters().getLimit();
-            final boolean activeOnly = 
context.getSearchParameters().getExcludeDeletedEntities();
+            final int startIdx = context.getSearchParameters().getOffset();
+            final int limit    = context.getSearchParameters().getLimit();
 
             // query to start at 0, even though startIdx can be higher - 
because few results in earlier retrieval could
             // have been dropped: like vertices of non-entity or 
non-active-entity
@@ -137,10 +138,6 @@ public class FreeTextSearchProcessor extends 
SearchProcessor {
                             continue;
                         }
 
-                        if (activeOnly && AtlasGraphUtilsV2.getState(vertex) 
!= AtlasEntity.Status.ACTIVE) {
-                            continue;
-                        }
-
                         if (context.getClassificationType() != null) {
                             List<String> entityClassifications = 
GraphHelper.getAllTraitNames(vertex);