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

ATLAS-3778: Improve performance during classification delete

This commit is contained in:
Sarath Subramanian 2020-05-03 17:01:08 -07:00
parent 1c07f93b57
commit 0e53c3ee3a
4 changed files with 83 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
graphdb/api/src/main/java/org/apache/atlas/repository/graphdb/AtlasElement.java
View File

@ -110,6 +110,16 @@ public interface AtlasElement {
*/
void removeProperty(String propertyName);
/**
* Removes a property with given property value from the vertex.
*/
void removePropertyValue(String propertyName, Object propertyValue);
/**
* Removes a property with given property value from the vertex.
*/
void removeAllPropertyValue(String propertyName, Object propertyValue);
/**
* Sets a single-valued property to the given value. For
* properties defined as multiplicty many in the graph schema, the value is added instead

30
graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusElement.java
View File

@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import org.apache.atlas.repository.graphdb.AtlasEdge;
@ -106,6 +107,35 @@ public class AtlasJanusElement<T extends Element> implements AtlasElement {
}
}
@Override
public void removePropertyValue(String propertyName, Object propertyValue) {
Iterator<? extends Property<Object>> it = getWrappedElement().properties(propertyName);
while (it.hasNext()) {
Property currentProperty = it.next();
Object currentPropertyValue = currentProperty.value();
if (Objects.equals(currentPropertyValue, propertyValue)) {
currentProperty.remove();
break;
}
}
}
@Override
public void removeAllPropertyValue(String propertyName, Object propertyValue) {
Iterator<? extends Property<Object>> it = getWrappedElement().properties(propertyName);
while (it.hasNext()) {
Property currentProperty = it.next();
Object currentPropertyValue = currentProperty.value();
if (Objects.equals(currentPropertyValue, propertyValue)) {
currentProperty.remove();
}
}
}
@Override
public void setProperty(String propertyName, Object value) {
try {

55
repository/src/main/java/org/apache/atlas/repository/store/graph/v1/DeleteHandlerV1.java
View File

@ -993,44 +993,41 @@ public abstract class DeleteHandlerV1 {
}
entityVertex.addListProperty(PROPAGATED_TRAIT_NAMES_PROPERTY_KEY, classificationName);
String propClsNames = entityVertex.getProperty(PROPAGATED_CLASSIFICATION_NAMES_KEY, String.class);
propClsNames = StringUtils.isEmpty(propClsNames) ? CLASSIFICATION_NAME_DELIMITER + classificationName
: (propClsNames + classificationName);
propClsNames = propClsNames + CLASSIFICATION_NAME_DELIMITER;
entityVertex.setProperty(PROPAGATED_CLASSIFICATION_NAMES_KEY, propClsNames);
entityVertex.setProperty(PROPAGATED_CLASSIFICATION_NAMES_KEY, getDelimitedPropagatedClassificationNames(entityVertex, classificationName));
}
private void removeFromPropagatedClassificationNames(AtlasVertex entityVertex, String classificationName) {
public void removeFromPropagatedClassificationNames(AtlasVertex entityVertex, String classificationName) {
if (entityVertex != null && StringUtils.isNotEmpty(classificationName)) {
List<String> propagatedTraitNames = getTraitNames(entityVertex, true);
propagatedTraitNames.remove(classificationName);
setPropagatedClassificationNames(entityVertex, propagatedTraitNames);
}
}
private void setPropagatedClassificationNames(AtlasVertex entityVertex, List<String> classificationNames) {
if (LOG.isDebugEnabled()) {
LOG.debug("Adding property {} = \"{}\" to vertex {}", PROPAGATED_TRAIT_NAMES_PROPERTY_KEY, classificationNames, string(entityVertex));
}
entityVertex.removeProperty(PROPAGATED_TRAIT_NAMES_PROPERTY_KEY);
entityVertex.removeProperty(PROPAGATED_CLASSIFICATION_NAMES_KEY);
if (CollectionUtils.isNotEmpty(classificationNames)) {
for (String classificationName : classificationNames) {
entityVertex.addListProperty(PROPAGATED_TRAIT_NAMES_PROPERTY_KEY, classificationName);
if (LOG.isDebugEnabled()) {
LOG.debug("Removing from property: {} value: {} in vertex: {}", PROPAGATED_TRAIT_NAMES_PROPERTY_KEY, classificationName, string(entityVertex));
}
String propClsName = CLASSIFICATION_NAME_DELIMITER + StringUtils.join(classificationNames, CLASSIFICATION_NAME_DELIMITER) + CLASSIFICATION_NAME_DELIMITER;
entityVertex.removePropertyValue(PROPAGATED_TRAIT_NAMES_PROPERTY_KEY, classificationName);
entityVertex.setProperty(PROPAGATED_CLASSIFICATION_NAMES_KEY, propClsName);
List<String> propagatedTraitNames = getPropagatedTraitNames(entityVertex);
if (CollectionUtils.isNotEmpty(propagatedTraitNames)) {
propagatedTraitNames.remove(classificationName);
String propClsName = CLASSIFICATION_NAME_DELIMITER + StringUtils.join(propagatedTraitNames, CLASSIFICATION_NAME_DELIMITER) + CLASSIFICATION_NAME_DELIMITER;
entityVertex.setProperty(PROPAGATED_CLASSIFICATION_NAMES_KEY, propClsName);
}
}
}
private String getDelimitedPropagatedClassificationNames(AtlasVertex entityVertex, String classificationName) {
String ret = entityVertex.getProperty(PROPAGATED_CLASSIFICATION_NAMES_KEY, String.class);
if (StringUtils.isEmpty(ret)) {
ret = CLASSIFICATION_NAME_DELIMITER + classificationName + CLASSIFICATION_NAME_DELIMITER;
} else {
ret = ret + classificationName + CLASSIFICATION_NAME_DELIMITER;
}
return ret;
}
/**
* Delete all associated classifications from the specified entity vertex.
* @param instanceVertex

37
repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphMapper.java
View File

@ -2086,7 +2086,13 @@ public class EntityGraphMapper {
traitNames.remove(classificationName);
setClassificationNames(entityVertex, traitNames);
// update 'TRAIT_NAMES_PROPERTY_KEY' property
entityVertex.removePropertyValue(TRAIT_NAMES_PROPERTY_KEY, classificationName);
// update 'CLASSIFICATION_NAMES_KEY' property
entityVertex.removeProperty(CLASSIFICATION_NAMES_KEY);
entityVertex.setProperty(CLASSIFICATION_NAMES_KEY, getClassificationNamesString(traitNames));
updateModificationMetadata(entityVertex);
@ -2140,30 +2146,21 @@ public class EntityGraphMapper {
private void addToClassificationNames(AtlasVertex entityVertex, String classificationName) {
AtlasGraphUtilsV2.addEncodedProperty(entityVertex, TRAIT_NAMES_PROPERTY_KEY, classificationName);
String clsNames = entityVertex.getProperty(CLASSIFICATION_NAMES_KEY, String.class);
String delimitedClassificationNames = entityVertex.getProperty(CLASSIFICATION_NAMES_KEY, String.class);
clsNames = StringUtils.isEmpty(clsNames) ? CLASSIFICATION_NAME_DELIMITER + classificationName : clsNames + classificationName;
if (StringUtils.isEmpty(delimitedClassificationNames)) {
delimitedClassificationNames = CLASSIFICATION_NAME_DELIMITER + classificationName + CLASSIFICATION_NAME_DELIMITER;
} else {
delimitedClassificationNames = delimitedClassificationNames + classificationName + CLASSIFICATION_NAME_DELIMITER;
}
clsNames = clsNames + CLASSIFICATION_NAME_DELIMITER;
entityVertex.setProperty(CLASSIFICATION_NAMES_KEY, clsNames);
entityVertex.setProperty(CLASSIFICATION_NAMES_KEY, delimitedClassificationNames);
}
private void setClassificationNames(AtlasVertex entityVertex, List<String> traitNames) {
if (entityVertex != null) {
entityVertex.removeProperty(TRAIT_NAMES_PROPERTY_KEY);
entityVertex.removeProperty(CLASSIFICATION_NAMES_KEY);
private String getClassificationNamesString(List<String> traitNames) {
String ret = StringUtils.join(traitNames, CLASSIFICATION_NAME_DELIMITER);
for (String traitName : traitNames) {
AtlasGraphUtilsV2.addEncodedProperty(entityVertex, TRAIT_NAMES_PROPERTY_KEY, traitName);
}
String clsNames = StringUtils.join(traitNames, CLASSIFICATION_NAME_DELIMITER);
clsNames = StringUtils.isEmpty(clsNames) ? clsNames : CLASSIFICATION_NAME_DELIMITER + clsNames + CLASSIFICATION_NAME_DELIMITER;
entityVertex.setProperty(CLASSIFICATION_NAMES_KEY, clsNames);
}
return StringUtils.isEmpty(ret) ? ret : CLASSIFICATION_NAME_DELIMITER + ret + CLASSIFICATION_NAME_DELIMITER;
}
public void updateClassifications(EntityMutationContext context, String guid, List<AtlasClassification> classifications) throws AtlasBaseException {