Skip to content

A
atlas
Commit e75473a3 by Madhan Neethiraj
Options

ATLAS-2008: basic-search gremlin query updated to use bind varibles, to avoid ClassCastException

Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 9b72de98
Showing with 91 additions and 87 deletions
repository/src/main/java/org/apache/atlas/discovery/ClassificationSearchProcessor.java
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
package org.apache.atlas.discovery; package org.apache.atlas.discovery;
import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.exception.AtlasBaseException;
import org.apache.atlas.model.discovery.SearchParameters;
import org.apache.atlas.model.discovery.SearchParameters.FilterCriteria; import org.apache.atlas.model.discovery.SearchParameters.FilterCriteria;
import org.apache.atlas.model.instance.AtlasEntity; import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.repository.Constants; import org.apache.atlas.repository.Constants;
...@@ -33,7 +32,6 @@ import org.apache.atlas.type.AtlasClassificationType; ...@@ -33,7 +32,6 @@ import org.apache.atlas.type.AtlasClassificationType;
import org.apache.atlas.util.AtlasGremlinQueryProvider; import org.apache.atlas.util.AtlasGremlinQueryProvider;
import org.apache.atlas.utils.AtlasPerfTracer; import org.apache.atlas.utils.AtlasPerfTracer;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -65,30 +63,30 @@ public class ClassificationSearchProcessor extends SearchProcessor { ...@@ -65,30 +63,30 @@ public class ClassificationSearchProcessor extends SearchProcessor {
final FilterCriteria filterCriteria = context.getSearchParameters().getTagFilters(); final FilterCriteria filterCriteria = context.getSearchParameters().getTagFilters();
final Set<String> typeAndSubTypes = classificationType.getTypeAndAllSubTypes(); final Set<String> typeAndSubTypes = classificationType.getTypeAndAllSubTypes();
final String typeAndSubTypesQryStr = classificationType.getTypeAndAllSubTypesQryStr(); final String typeAndSubTypesQryStr = classificationType.getTypeAndAllSubTypesQryStr();
final Set<String> solrAttributes = new HashSet<>(); final Set<String> indexAttributes = new HashSet<>();
final Set<String> gremlinAttributes = new HashSet<>(); final Set<String> graphAttributes = new HashSet<>();
final Set<String> allAttributes = new HashSet<>(); final Set<String> allAttributes = new HashSet<>();
processSearchAttributes(classificationType, filterCriteria, solrAttributes, gremlinAttributes, allAttributes); processSearchAttributes(classificationType, filterCriteria, indexAttributes, graphAttributes, allAttributes);
// for classification search, if any attribute can't be handled by Solr - switch to all Gremlin // for classification search, if any attribute can't be handled by index query - switch to all filter by Graph query
boolean useSolrSearch = typeAndSubTypesQryStr.length() <= MAX_QUERY_STR_LENGTH_TAGS && CollectionUtils.isEmpty(gremlinAttributes) && canApplySolrFilter(classificationType, filterCriteria, false); boolean useIndexSearch = typeAndSubTypesQryStr.length() <= MAX_QUERY_STR_LENGTH_TAGS && CollectionUtils.isEmpty(graphAttributes) && canApplyIndexFilter(classificationType, filterCriteria, false);
AtlasGraph graph = context.getGraph(); AtlasGraph graph = context.getGraph();
if (useSolrSearch) { if (useIndexSearch) {
StringBuilder solrQuery = new StringBuilder(); StringBuilder indexQuery = new StringBuilder();
constructTypeTestQuery(solrQuery, typeAndSubTypesQryStr); constructTypeTestQuery(indexQuery, typeAndSubTypesQryStr);
constructFilterQuery(solrQuery, classificationType, filterCriteria, solrAttributes); constructFilterQuery(indexQuery, classificationType, filterCriteria, indexAttributes);
String solrQueryString = STRAY_AND_PATTERN.matcher(solrQuery).replaceAll(")"); String indexQueryString = STRAY_AND_PATTERN.matcher(indexQuery).replaceAll(")");
solrQueryString = STRAY_OR_PATTERN.matcher(solrQueryString).replaceAll(")"); indexQueryString = STRAY_OR_PATTERN.matcher(indexQueryString).replaceAll(")");
solrQueryString = STRAY_ELIPSIS_PATTERN.matcher(solrQueryString).replaceAll(""); indexQueryString = STRAY_ELIPSIS_PATTERN.matcher(indexQueryString).replaceAll("");
indexQuery = graph.indexQuery(Constants.VERTEX_INDEX, solrQueryString); this.indexQuery = graph.indexQuery(Constants.VERTEX_INDEX, indexQueryString);
} else { } else {
indexQuery = null; indexQuery = null;
} }
...@@ -101,22 +99,23 @@ public class ClassificationSearchProcessor extends SearchProcessor { ...@@ -101,22 +99,23 @@ public class ClassificationSearchProcessor extends SearchProcessor {
// Now filter on the tag attributes // Now filter on the tag attributes
AtlasGremlinQueryProvider queryProvider = AtlasGremlinQueryProvider.INSTANCE; AtlasGremlinQueryProvider queryProvider = AtlasGremlinQueryProvider.INSTANCE;
gremlinQueryBindings = new HashMap<>();
StringBuilder gremlinQuery = new StringBuilder(); StringBuilder gremlinQuery = new StringBuilder();
gremlinQuery.append("g.V().has('__guid', T.in, guids)"); gremlinQuery.append("g.V().has('__guid', T.in, guids)");
gremlinQuery.append(queryProvider.getQuery(AtlasGremlinQueryProvider.AtlasGremlinQuery.BASIC_SEARCH_CLASSIFICATION_FILTER)); gremlinQuery.append(queryProvider.getQuery(AtlasGremlinQueryProvider.AtlasGremlinQuery.BASIC_SEARCH_CLASSIFICATION_FILTER));
gremlinQuery.append(".as('e').out()"); gremlinQuery.append(".as('e').out()");
gremlinQuery.append(queryProvider.getQuery(AtlasGremlinQueryProvider.AtlasGremlinQuery.BASIC_SEARCH_TYPE_FILTER)); gremlinQuery.append(queryProvider.getQuery(AtlasGremlinQueryProvider.AtlasGremlinQuery.BASIC_SEARCH_TYPE_FILTER));
constructGremlinFilterQuery(gremlinQuery, context.getClassificationType(), context.getSearchParameters().getTagFilters()); constructGremlinFilterQuery(gremlinQuery, gremlinQueryBindings, context.getClassificationType(), context.getSearchParameters().getTagFilters());
// After filtering on tags go back to e and output the list of entity vertices // After filtering on tags go back to e and output the list of entity vertices
gremlinQuery.append(".back('e').toList()"); gremlinQuery.append(".back('e').toList()");
gremlinTagFilterQuery = gremlinQuery.toString();
gremlinQueryBindings = new HashMap<>();
gremlinQueryBindings.put("traitNames", typeAndSubTypes); gremlinQueryBindings.put("traitNames", typeAndSubTypes);
gremlinQueryBindings.put("typeNames", typeAndSubTypes); // classification typeName gremlinQueryBindings.put("typeNames", typeAndSubTypes); // classification typeName
gremlinTagFilterQuery = gremlinQuery.toString();
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("gremlinTagFilterQuery={}", gremlinTagFilterQuery); LOG.debug("gremlinTagFilterQuery={}", gremlinTagFilterQuery);
} }
...@@ -170,7 +169,7 @@ public class ClassificationSearchProcessor extends SearchProcessor { ...@@ -170,7 +169,7 @@ public class ClassificationSearchProcessor extends SearchProcessor {
if (indexQuery != null) { if (indexQuery != null) {
Iterator<AtlasIndexQuery.Result> queryResult = indexQuery.vertices(qryOffset, limit); Iterator<AtlasIndexQuery.Result> queryResult = indexQuery.vertices(qryOffset, limit);
if (!queryResult.hasNext()) { // no more results from solr - end of search if (!queryResult.hasNext()) { // no more results from index query - end of search
break; break;
} }
...@@ -259,7 +258,7 @@ public class ClassificationSearchProcessor extends SearchProcessor { ...@@ -259,7 +258,7 @@ public class ClassificationSearchProcessor extends SearchProcessor {
} }
} catch (AtlasBaseException | ScriptException e) { } catch (AtlasBaseException | ScriptException e) {
LOG.warn(e.getMessage()); LOG.warn(e.getMessage(), e);
} }
} }
......
repository/src/main/java/org/apache/atlas/discovery/EntitySearchProcessor.java
...@@ -50,50 +50,50 @@ public class EntitySearchProcessor extends SearchProcessor { ...@@ -50,50 +50,50 @@ public class EntitySearchProcessor extends SearchProcessor {
final FilterCriteria filterCriteria = context.getSearchParameters().getEntityFilters(); final FilterCriteria filterCriteria = context.getSearchParameters().getEntityFilters();
final Set<String> typeAndSubTypes = entityType.getTypeAndAllSubTypes(); final Set<String> typeAndSubTypes = entityType.getTypeAndAllSubTypes();
final String typeAndSubTypesQryStr = entityType.getTypeAndAllSubTypesQryStr(); final String typeAndSubTypesQryStr = entityType.getTypeAndAllSubTypesQryStr();
final Set<String> solrAttributes = new HashSet<>(); final Set<String> indexAttributes = new HashSet<>();
final Set<String> gremlinAttributes = new HashSet<>(); final Set<String> graphAttributes = new HashSet<>();
final Set<String> allAttributes = new HashSet<>(); final Set<String> allAttributes = new HashSet<>();
final AtlasClassificationType classificationType = context.getClassificationType(); final AtlasClassificationType classificationType = context.getClassificationType();
final boolean filterClassification = classificationType != null && !context.needClassificationProcessor(); final boolean filterClassification = classificationType != null && !context.needClassificationProcessor();
processSearchAttributes(entityType, filterCriteria, solrAttributes, gremlinAttributes, allAttributes); processSearchAttributes(entityType, filterCriteria, indexAttributes, graphAttributes, allAttributes);
final boolean typeSearchBySolr = !filterClassification && typeAndSubTypesQryStr.length() <= MAX_QUERY_STR_LENGTH_TYPES; final boolean typeSearchByIndex = !filterClassification && typeAndSubTypesQryStr.length() <= MAX_QUERY_STR_LENGTH_TYPES;
final boolean attrSearchBySolr = !filterClassification && CollectionUtils.isNotEmpty(solrAttributes) && canApplySolrFilter(entityType, filterCriteria, false); final boolean attrSearchByIndex = !filterClassification && CollectionUtils.isNotEmpty(indexAttributes) && canApplyIndexFilter(entityType, filterCriteria, false);
StringBuilder solrQuery = new StringBuilder(); StringBuilder indexQuery = new StringBuilder();
if (typeSearchBySolr) { if (typeSearchByIndex) {
constructTypeTestQuery(solrQuery, typeAndSubTypesQryStr); constructTypeTestQuery(indexQuery, typeAndSubTypesQryStr);
} }
if (attrSearchBySolr) { if (attrSearchByIndex) {
constructFilterQuery(solrQuery, entityType, filterCriteria, solrAttributes); constructFilterQuery(indexQuery, entityType, filterCriteria, indexAttributes);
} else { } else {
gremlinAttributes.addAll(solrAttributes); graphAttributes.addAll(indexAttributes);
} }
if (solrQuery.length() > 0) { if (indexQuery.length() > 0) {
if (context.getSearchParameters().getExcludeDeletedEntities()) { if (context.getSearchParameters().getExcludeDeletedEntities()) {
constructStateTestQuery(solrQuery); constructStateTestQuery(indexQuery);
} }
String solrQueryString = STRAY_AND_PATTERN.matcher(solrQuery).replaceAll(")"); String indexQueryString = STRAY_AND_PATTERN.matcher(indexQuery).replaceAll(")");
solrQueryString = STRAY_OR_PATTERN.matcher(solrQueryString).replaceAll(")"); indexQueryString = STRAY_OR_PATTERN.matcher(indexQueryString).replaceAll(")");
solrQueryString = STRAY_ELIPSIS_PATTERN.matcher(solrQueryString).replaceAll(""); indexQueryString = STRAY_ELIPSIS_PATTERN.matcher(indexQueryString).replaceAll("");
indexQuery = context.getGraph().indexQuery(Constants.VERTEX_INDEX, solrQueryString); this.indexQuery = context.getGraph().indexQuery(Constants.VERTEX_INDEX, indexQueryString);
} else { } else {
indexQuery = null; this.indexQuery = null;
} }
if (CollectionUtils.isNotEmpty(gremlinAttributes) || !typeSearchBySolr) { if (CollectionUtils.isNotEmpty(graphAttributes) || !typeSearchByIndex) {
AtlasGraphQuery query = context.getGraph().query(); AtlasGraphQuery query = context.getGraph().query();
if (!typeSearchBySolr) { if (!typeSearchByIndex) {
query.in(Constants.TYPE_NAME_PROPERTY_KEY, typeAndSubTypes); query.in(Constants.TYPE_NAME_PROPERTY_KEY, typeAndSubTypes);
} }
...@@ -101,9 +101,9 @@ public class EntitySearchProcessor extends SearchProcessor { ...@@ -101,9 +101,9 @@ public class EntitySearchProcessor extends SearchProcessor {
query.in(Constants.TRAIT_NAMES_PROPERTY_KEY, classificationType.getTypeAndAllSubTypes()); query.in(Constants.TRAIT_NAMES_PROPERTY_KEY, classificationType.getTypeAndAllSubTypes());
} }
graphQuery = toGraphFilterQuery(entityType, filterCriteria, gremlinAttributes, query); graphQuery = toGraphFilterQuery(entityType, filterCriteria, graphAttributes, query);
if (context.getSearchParameters().getExcludeDeletedEntities() && indexQuery == null) { if (context.getSearchParameters().getExcludeDeletedEntities() && this.indexQuery == null) {
graphQuery.has(Constants.STATE_PROPERTY_KEY, "ACTIVE"); graphQuery.has(Constants.STATE_PROPERTY_KEY, "ACTIVE");
} }
} else { } else {
...@@ -161,7 +161,7 @@ public class EntitySearchProcessor extends SearchProcessor { ...@@ -161,7 +161,7 @@ public class EntitySearchProcessor extends SearchProcessor {
if (indexQuery != null) { if (indexQuery != null) {
Iterator<AtlasIndexQuery.Result> idxQueryResult = indexQuery.vertices(qryOffset, limit); Iterator<AtlasIndexQuery.Result> idxQueryResult = indexQuery.vertices(qryOffset, limit);
if (!idxQueryResult.hasNext()) { // no more results from solr - end of search if (!idxQueryResult.hasNext()) { // no more results from index query - end of search
break; break;
} }
......
repository/src/main/java/org/apache/atlas/discovery/SearchProcessor.java
...@@ -96,7 +96,7 @@ public abstract class SearchProcessor { ...@@ -96,7 +96,7 @@ public abstract class SearchProcessor {
} }
protected void processSearchAttributes(AtlasStructType structType, FilterCriteria filterCriteria, Set<String> solrFiltered, Set<String> gremlinFiltered, Set<String> allAttributes) { protected void processSearchAttributes(AtlasStructType structType, FilterCriteria filterCriteria, Set<String> indexFiltered, Set<String> graphFiltered, Set<String> allAttributes) {
if (structType == null || filterCriteria == null) { if (structType == null || filterCriteria == null) {
return; return;
} }
...@@ -106,7 +106,7 @@ public abstract class SearchProcessor { ...@@ -106,7 +106,7 @@ public abstract class SearchProcessor {
if (filterCondition != null && CollectionUtils.isNotEmpty(criterion)) { if (filterCondition != null && CollectionUtils.isNotEmpty(criterion)) {
for (SearchParameters.FilterCriteria criteria : criterion) { for (SearchParameters.FilterCriteria criteria : criterion) {
processSearchAttributes(structType, criteria, solrFiltered, gremlinFiltered, allAttributes); processSearchAttributes(structType, criteria, indexFiltered, graphFiltered, allAttributes);
} }
} else if (StringUtils.isNotEmpty(filterCriteria.getAttributeName())) { } else if (StringUtils.isNotEmpty(filterCriteria.getAttributeName())) {
try { try {
...@@ -115,11 +115,11 @@ public abstract class SearchProcessor { ...@@ -115,11 +115,11 @@ public abstract class SearchProcessor {
Set<String> indexedKeys = context.getIndexedKeys(); Set<String> indexedKeys = context.getIndexedKeys();
if (indexedKeys != null && indexedKeys.contains(qualifiedName)) { if (indexedKeys != null && indexedKeys.contains(qualifiedName)) {
solrFiltered.add(attributeName); indexFiltered.add(attributeName);
} else { } else {
LOG.warn("search includes non-indexed attribute '{}'; might cause poor performance", qualifiedName); LOG.warn("search includes non-indexed attribute '{}'; might cause poor performance", qualifiedName);
gremlinFiltered.add(attributeName); graphFiltered.add(attributeName);
} }
if (structType instanceof AtlasEntityType) { if (structType instanceof AtlasEntityType) {
...@@ -136,16 +136,16 @@ public abstract class SearchProcessor { ...@@ -136,16 +136,16 @@ public abstract class SearchProcessor {
// //
// If filterCriteria contains any non-indexed attribute inside OR condition: // If filterCriteria contains any non-indexed attribute inside OR condition:
// Solr+Grelin can't be used. Need to use only Gremlin filter for all attributes. Examples: // Index+Graph can't be used. Need to use only Graph query filter for all attributes. Examples:
// (OR idx-att1=x non-idx-attr=z) // (OR idx-att1=x non-idx-attr=z)
// (AND idx-att1=x (OR idx-attr2=y non-idx-attr=z)) // (AND idx-att1=x (OR idx-attr2=y non-idx-attr=z))
// Else // Else
// Solr can be used for indexed-attribute filtering and Gremlin for non-indexed attributes. Examples: // Index query can be used for indexed-attribute filtering and Graph query for non-indexed attributes. Examples:
// (AND idx-att1=x idx-attr2=y non-idx-attr=z) // (AND idx-att1=x idx-attr2=y non-idx-attr=z)
// (AND (OR idx-att1=x idx-attr1=y) non-idx-attr=z) // (AND (OR idx-att1=x idx-attr1=y) non-idx-attr=z)
// (AND (OR idx-att1=x idx-attr1=y) non-idx-attr=z (AND idx-attr2=xyz idx-attr2=abc)) // (AND (OR idx-att1=x idx-attr1=y) non-idx-attr=z (AND idx-attr2=xyz idx-attr2=abc))
// //
protected boolean canApplySolrFilter(AtlasStructType structType, FilterCriteria filterCriteria, boolean insideOrCondition) { protected boolean canApplyIndexFilter(AtlasStructType structType, FilterCriteria filterCriteria, boolean insideOrCondition) {
if (filterCriteria == null) { if (filterCriteria == null) {
return true; return true;
} }
...@@ -161,7 +161,7 @@ public abstract class SearchProcessor { ...@@ -161,7 +161,7 @@ public abstract class SearchProcessor {
// If we have nested criterion let's find any nested ORs with non-indexed attr // If we have nested criterion let's find any nested ORs with non-indexed attr
for (FilterCriteria criteria : criterion) { for (FilterCriteria criteria : criterion) {
ret = canApplySolrFilter(structType, criteria, insideOrCondition); ret = canApplyIndexFilter(structType, criteria, insideOrCondition);
if (!ret) { if (!ret) {
break; break;
...@@ -182,33 +182,33 @@ public abstract class SearchProcessor { ...@@ -182,33 +182,33 @@ public abstract class SearchProcessor {
return ret; return ret;
} }
protected void constructTypeTestQuery(StringBuilder solrQuery, String typeAndAllSubTypesQryStr) { protected void constructTypeTestQuery(StringBuilder indexQuery, String typeAndAllSubTypesQryStr) {
if (StringUtils.isNotEmpty(typeAndAllSubTypesQryStr)) { if (StringUtils.isNotEmpty(typeAndAllSubTypesQryStr)) {
if (solrQuery.length() > 0) { if (indexQuery.length() > 0) {
solrQuery.append(AND_STR); indexQuery.append(AND_STR);
} }
solrQuery.append("v.\"").append(Constants.TYPE_NAME_PROPERTY_KEY).append("\":").append(typeAndAllSubTypesQryStr); indexQuery.append("v.\"").append(Constants.TYPE_NAME_PROPERTY_KEY).append("\":").append(typeAndAllSubTypesQryStr);
} }
} }
protected void constructFilterQuery(StringBuilder solrQuery, AtlasStructType type, FilterCriteria filterCriteria, Set<String> solrAttributes) { protected void constructFilterQuery(StringBuilder indexQuery, AtlasStructType type, FilterCriteria filterCriteria, Set<String> indexAttributes) {
if (filterCriteria != null) { if (filterCriteria != null) {
LOG.debug("Processing Filters"); LOG.debug("Processing Filters");
String filterQuery = toSolrQuery(type, filterCriteria, solrAttributes, 0); String filterQuery = toIndexQuery(type, filterCriteria, indexAttributes, 0);
if (StringUtils.isNotEmpty(filterQuery)) { if (StringUtils.isNotEmpty(filterQuery)) {
if (solrQuery.length() > 0) { if (indexQuery.length() > 0) {
solrQuery.append(AND_STR); indexQuery.append(AND_STR);
} }
solrQuery.append(filterQuery); indexQuery.append(filterQuery);
} }
} }
} }
protected void constructGremlinFilterQuery(StringBuilder tagFilterQuery, AtlasStructType structType, FilterCriteria filterCriteria) { protected void constructGremlinFilterQuery(StringBuilder gremlinQuery, Map<String, Object> queryBindings, AtlasStructType structType, FilterCriteria filterCriteria) {
if (filterCriteria != null) { if (filterCriteria != null) {
FilterCriteria.Condition condition = filterCriteria.getCondition(); FilterCriteria.Condition condition = filterCriteria.getCondition();
...@@ -223,16 +223,16 @@ public abstract class SearchProcessor { ...@@ -223,16 +223,16 @@ public abstract class SearchProcessor {
if (condition == FilterCriteria.Condition.OR) { if (condition == FilterCriteria.Condition.OR) {
StringBuilder nestedOrQuery = new StringBuilder("_()"); StringBuilder nestedOrQuery = new StringBuilder("_()");
constructGremlinFilterQuery(nestedOrQuery, structType, criteria); constructGremlinFilterQuery(nestedOrQuery, queryBindings, structType, criteria);
orQuery.append(i == 0 ? "" : ",").append(nestedOrQuery); orQuery.append(i == 0 ? "" : ",").append(nestedOrQuery);
} else { } else {
constructGremlinFilterQuery(tagFilterQuery, structType, criteria); constructGremlinFilterQuery(gremlinQuery, queryBindings, structType, criteria);
} }
} }
if (condition == FilterCriteria.Condition.OR) { if (condition == FilterCriteria.Condition.OR) {
tagFilterQuery.append(".or(").append(orQuery).append(")"); gremlinQuery.append(".or(").append(orQuery).append(")");
} }
} else { } else {
String attributeName = filterCriteria.getAttributeName(); String attributeName = filterCriteria.getAttributeName();
...@@ -242,7 +242,7 @@ public abstract class SearchProcessor { ...@@ -242,7 +242,7 @@ public abstract class SearchProcessor {
SearchParameters.Operator operator = filterCriteria.getOperator(); SearchParameters.Operator operator = filterCriteria.getOperator();
String attributeValue = filterCriteria.getAttributeValue(); String attributeValue = filterCriteria.getAttributeValue();
tagFilterQuery.append(toGremlinComparisonQuery(attribute, operator, attributeValue)); gremlinQuery.append(toGremlinComparisonQuery(attribute, operator, attributeValue, queryBindings));
} else { } else {
LOG.warn("Ignoring unknown attribute {}.{}", structType.getTypeName(), attributeName); LOG.warn("Ignoring unknown attribute {}.{}", structType.getTypeName(), attributeName);
} }
...@@ -251,30 +251,30 @@ public abstract class SearchProcessor { ...@@ -251,30 +251,30 @@ public abstract class SearchProcessor {
} }
} }
protected void constructStateTestQuery(StringBuilder solrQuery) { protected void constructStateTestQuery(StringBuilder indexQuery) {
if (solrQuery.length() > 0) { if (indexQuery.length() > 0) {
solrQuery.append(AND_STR); indexQuery.append(AND_STR);
} }
solrQuery.append("v.\"").append(Constants.STATE_PROPERTY_KEY).append("\":ACTIVE"); indexQuery.append("v.\"").append(Constants.STATE_PROPERTY_KEY).append("\":ACTIVE");
} }
private String toSolrQuery(AtlasStructType type, FilterCriteria criteria, Set<String> solrAttributes, int level) { private String toIndexQuery(AtlasStructType type, FilterCriteria criteria, Set<String> indexAttributes, int level) {
return toSolrQuery(type, criteria, solrAttributes, new StringBuilder(), level); return toIndexQuery(type, criteria, indexAttributes, new StringBuilder(), level);
} }
private String toSolrQuery(AtlasStructType type, FilterCriteria criteria, Set<String> solrAttributes, StringBuilder sb, int level) { private String toIndexQuery(AtlasStructType type, FilterCriteria criteria, Set<String> indexAttributes, StringBuilder sb, int level) {
if (criteria.getCondition() != null && CollectionUtils.isNotEmpty(criteria.getCriterion())) { if (criteria.getCondition() != null && CollectionUtils.isNotEmpty(criteria.getCriterion())) {
StringBuilder nestedExpression = new StringBuilder(); StringBuilder nestedExpression = new StringBuilder();
for (FilterCriteria filterCriteria : criteria.getCriterion()) { for (FilterCriteria filterCriteria : criteria.getCriterion()) {
String nestedQuery = toSolrQuery(type, filterCriteria, solrAttributes, level + 1); String nestedQuery = toIndexQuery(type, filterCriteria, indexAttributes, level + 1);
if (StringUtils.isNotEmpty(nestedQuery)) { if (StringUtils.isNotEmpty(nestedQuery)) {
if (nestedExpression.length() > 0) { if (nestedExpression.length() > 0) {
nestedExpression.append(SPACE_STRING).append(criteria.getCondition()).append(SPACE_STRING); nestedExpression.append(SPACE_STRING).append(criteria.getCondition()).append(SPACE_STRING);
} }
// todo: when a neq operation is nested and occurs in the beginning of the query, solr has issues // todo: when a neq operation is nested and occurs in the beginning of the query, index query has issues
nestedExpression.append(nestedQuery); nestedExpression.append(nestedQuery);
} }
} }
...@@ -284,14 +284,14 @@ public abstract class SearchProcessor { ...@@ -284,14 +284,14 @@ public abstract class SearchProcessor {
} else { } else {
return nestedExpression.length() > 0 ? sb.append(BRACE_OPEN_STR).append(nestedExpression).append(BRACE_CLOSE_STR).toString() : EMPTY_STRING; return nestedExpression.length() > 0 ? sb.append(BRACE_OPEN_STR).append(nestedExpression).append(BRACE_CLOSE_STR).toString() : EMPTY_STRING;
} }
} else if (solrAttributes.contains(criteria.getAttributeName())){ } else if (indexAttributes.contains(criteria.getAttributeName())){
return toSolrExpression(type, criteria.getAttributeName(), criteria.getOperator(), criteria.getAttributeValue()); return toIndexExpression(type, criteria.getAttributeName(), criteria.getOperator(), criteria.getAttributeValue());
} else { } else {
return EMPTY_STRING; return EMPTY_STRING;
} }
} }
private String toSolrExpression(AtlasStructType type, String attrName, SearchParameters.Operator op, String attrVal) { private String toIndexExpression(AtlasStructType type, String attrName, SearchParameters.Operator op, String attrVal) {
String ret = EMPTY_STRING; String ret = EMPTY_STRING;
try { try {
...@@ -307,12 +307,12 @@ public abstract class SearchProcessor { ...@@ -307,12 +307,12 @@ public abstract class SearchProcessor {
return ret; return ret;
} }
protected AtlasGraphQuery toGraphFilterQuery(AtlasStructType type, FilterCriteria criteria, Set<String> gremlinAttributes, AtlasGraphQuery query) { protected AtlasGraphQuery toGraphFilterQuery(AtlasStructType type, FilterCriteria criteria, Set<String> graphAttributes, AtlasGraphQuery query) {
if (criteria != null) { if (criteria != null) {
if (criteria.getCondition() != null) { if (criteria.getCondition() != null) {
if (criteria.getCondition() == Condition.AND) { if (criteria.getCondition() == Condition.AND) {
for (FilterCriteria filterCriteria : criteria.getCriterion()) { for (FilterCriteria filterCriteria : criteria.getCriterion()) {
AtlasGraphQuery nestedQuery = toGraphFilterQuery(type, filterCriteria, gremlinAttributes, context.getGraph().query()); AtlasGraphQuery nestedQuery = toGraphFilterQuery(type, filterCriteria, graphAttributes, context.getGraph().query());
query.addConditionsFrom(nestedQuery); query.addConditionsFrom(nestedQuery);
} }
...@@ -320,7 +320,7 @@ public abstract class SearchProcessor { ...@@ -320,7 +320,7 @@ public abstract class SearchProcessor {
List<AtlasGraphQuery> orConditions = new LinkedList<>(); List<AtlasGraphQuery> orConditions = new LinkedList<>();
for (FilterCriteria filterCriteria : criteria.getCriterion()) { for (FilterCriteria filterCriteria : criteria.getCriterion()) {
AtlasGraphQuery nestedQuery = toGraphFilterQuery(type, filterCriteria, gremlinAttributes, context.getGraph().query()); AtlasGraphQuery nestedQuery = toGraphFilterQuery(type, filterCriteria, graphAttributes, context.getGraph().query());
orConditions.add(context.getGraph().query().createChildQuery().addConditionsFrom(nestedQuery)); orConditions.add(context.getGraph().query().createChildQuery().addConditionsFrom(nestedQuery));
} }
...@@ -329,7 +329,7 @@ public abstract class SearchProcessor { ...@@ -329,7 +329,7 @@ public abstract class SearchProcessor {
query.or(orConditions); query.or(orConditions);
} }
} }
} else if (gremlinAttributes.contains(criteria.getAttributeName())) { } else if (graphAttributes.contains(criteria.getAttributeName())) {
String attrName = criteria.getAttributeName(); String attrName = criteria.getAttributeName();
String attrValue = criteria.getAttributeValue(); String attrValue = criteria.getAttributeValue();
SearchParameters.Operator operator = criteria.getOperator(); SearchParameters.Operator operator = criteria.getOperator();
...@@ -374,7 +374,7 @@ public abstract class SearchProcessor { ...@@ -374,7 +374,7 @@ public abstract class SearchProcessor {
break; break;
} }
} catch (AtlasBaseException e) { } catch (AtlasBaseException e) {
LOG.error("toGremlinFilterQuery(): failed for attrName=" + attrName + "; operator=" + operator + "; attrValue=" + attrValue, e); LOG.error("toGraphFilterQuery(): failed for attrName=" + attrName + "; operator=" + operator + "; attrValue=" + attrValue, e);
} }
} }
} }
...@@ -382,7 +382,10 @@ public abstract class SearchProcessor { ...@@ -382,7 +382,10 @@ public abstract class SearchProcessor {
return query; return query;
} }
private String toGremlinComparisonQuery(AtlasAttribute attribute, SearchParameters.Operator operator, String attrValue) { private String toGremlinComparisonQuery(AtlasAttribute attribute, SearchParameters.Operator operator, String attrValue, Map<String, Object> queryBindings) {
String bindName = "__bind_" + queryBindings.size();
Object bindValue = attribute.getAttributeType().getNormalizedValue(attrValue);
AtlasGremlinQueryProvider queryProvider = AtlasGremlinQueryProvider.INSTANCE; AtlasGremlinQueryProvider queryProvider = AtlasGremlinQueryProvider.INSTANCE;
String queryTemplate = null; String queryTemplate = null;
switch (operator) { switch (operator) {
...@@ -419,11 +422,13 @@ public abstract class SearchProcessor { ...@@ -419,11 +422,13 @@ public abstract class SearchProcessor {
} }
if (org.apache.commons.lang3.StringUtils.isNotEmpty(queryTemplate)) { if (org.apache.commons.lang3.StringUtils.isNotEmpty(queryTemplate)) {
if (StringUtils.equalsIgnoreCase(attribute.getAttributeType().getTypeName(), AtlasBaseTypeDef.ATLAS_TYPE_STRING)) { if (bindValue instanceof Date) {
attrValue = "'" + attrValue + "'"; bindValue = ((Date)bindValue).getTime();
} }
return String.format(queryTemplate, attribute.getQualifiedName(), attrValue); queryBindings.put(bindName, bindValue);
return String.format(queryTemplate, attribute.getQualifiedName(), bindName);
} else { } else {
return EMPTY_STRING; return EMPTY_STRING;
} }
......
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