Skip to content

A
atlas
Commit 4d0f5ce2 by Pinal Shah Committed by nixonrodrigues
Options

ATLAS-3672 : Search with Classification without filters and Entity with filters…

ATLAS-3672 : Search with Classification without filters and Entity with filters doesn't fetch expected results. Signed-off-by: 's avatarnixonrodrigues <nixon@apache.org>
parent 61c2fe3e
Showing with 42 additions and 46 deletions
repository/src/main/java/org/apache/atlas/discovery/SearchProcessor.java
...@@ -738,52 +738,48 @@ public abstract class SearchProcessor { ...@@ -738,52 +738,48 @@ public abstract class SearchProcessor {
operator = processedCriteria.getOperator(); operator = processedCriteria.getOperator();
} }
try { final String qualifiedName = type.getAttribute(attrName).getVertexPropertyName();
final String qualifiedName = type.getQualifiedAttributeName(attrName);
switch (operator) {
switch (operator) { case LT:
case LT: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.LESS_THAN, attrValue);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.LESS_THAN, attrValue); break;
break; case LTE:
case LTE: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.LESS_THAN_EQUAL, attrValue);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.LESS_THAN_EQUAL, attrValue); break;
break; case GT:
case GT: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.GREATER_THAN, attrValue);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.GREATER_THAN, attrValue); break;
break; case GTE:
case GTE: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.GREATER_THAN_EQUAL, attrValue);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.GREATER_THAN_EQUAL, attrValue); break;
break; case EQ:
case EQ: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.EQUAL, attrValue);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.EQUAL, attrValue); break;
break; case NEQ:
case NEQ: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.NOT_EQUAL, attrValue);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.NOT_EQUAL, attrValue); break;
break; case LIKE:
case LIKE: query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.REGEX, attrValue);
query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.REGEX, attrValue); break;
break; case CONTAINS:
case CONTAINS: query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.REGEX, getContainsRegex(attrValue));
query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.REGEX, getContainsRegex(attrValue)); break;
break; case STARTS_WITH:
case STARTS_WITH: query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.PREFIX, attrValue);
query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.PREFIX, attrValue); break;
break; case ENDS_WITH:
case ENDS_WITH: query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.REGEX, getSuffixRegex(attrValue));
query.has(qualifiedName, AtlasGraphQuery.MatchingOperator.REGEX, getSuffixRegex(attrValue)); break;
break; case IS_NULL:
case IS_NULL: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.EQUAL, null);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.EQUAL, null); break;
break; case NOT_NULL:
case NOT_NULL: query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.NOT_EQUAL, null);
query.has(qualifiedName, AtlasGraphQuery.ComparisionOperator.NOT_EQUAL, null); break;
break; default:
default: LOG.warn("{}: unsupported operator. Ignored", operator);
LOG.warn("{}: unsupported operator. Ignored", operator); break;
break;
}
} catch (AtlasBaseException e) {
LOG.error("toGraphFilterQuery(): failed for attrName=" + attrName + "; operator=" + operator + "; attrValue=" + attrValue, e);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment