Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PLT-2782 | Janus0.6 #3852

Merged
merged 20 commits into from
Dec 10, 2024
Merged

PLT-2782 | Janus0.6 #3852

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4b00c08
janus0.6 changes
sriram-atlan Dec 5, 2024
af722cb
fix object type and simplify conditional logic
sriram-atlan Dec 5, 2024
4f1289b
better approach
sriram-atlan Dec 5, 2024
74858aa
fallback always
sriram-atlan Dec 5, 2024
d237e9a
add log to track non null attributes
sriram-atlan Dec 6, 2024
d1e72e0
add log to understand relationship labels
sriram-atlan Dec 6, 2024
837d507
use prefetch final for map,struct and array of primitives
sriram-atlan Dec 6, 2024
5c5bb2d
fallback on relationship links only
sriram-atlan Dec 6, 2024
62c4f97
preload properties for relatedvertex
aarshi0301 Dec 6, 2024
bf34539
remove check for maps
aarshi0301 Dec 9, 2024
f6c9bde
fix business attributes
aarshi0301 Dec 9, 2024
664501f
fix log level
aarshi0301 Dec 9, 2024
87568ed
update branch
aarshi0301 Dec 9, 2024
291cb2e
add strict check for business attribute
aarshi0301 Dec 10, 2024
1078182
code cleanup
aarshi0301 Dec 10, 2024
dce4f05
compute flag only if property exists
aarshi0301 Dec 10, 2024
b2a58a6
verbose comment
aarshi0301 Dec 10, 2024
0da7195
add policy variables
aarshi0301 Dec 10, 2024
759c230
fix pipeline
aarshi0301 Dec 10, 2024
f2de42d
remove log line
aarshi0301 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions ...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.janusgraph.core.Cardinality;
import org.janusgraph.graphdb.relations.CacheVertexProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
Expand Down Expand Up @@ -1031,28 +1033,16 @@ private Map<String, Object> preloadProperties(AtlasVertex entityVertex, AtlasEnt
AtlasAttribute attribute = entityType.getAttribute(property.key());
TypeCategory typeCategory = attribute != null ? attribute.getAttributeType().getTypeCategory() : null;
TypeCategory elementTypeCategory = attribute != null && attribute.getAttributeType().getTypeCategory() == TypeCategory.ARRAY ? ((AtlasArrayType) attribute.getAttributeType()).getElementType().getTypeCategory() : null;
boolean canBeBusinessAttribute = attribute == null;
boolean isMultiValuedProperty = (property instanceof CacheVertexProperty && ((CacheVertexProperty) property).propertyKey().cardinality().equals(Cardinality.SET));

if (property.isPresent()) {
if (typeCategory == TypeCategory.ARRAY && elementTypeCategory == TypeCategory.PRIMITIVE) {
Object value = propertiesMap.get(property.key());
if (value instanceof List) {
((List) value).add(property.value());
} else {
List<Object> values = new ArrayList<>();
values.add(property.value());
propertiesMap.put(property.key(), values);
}
} else {
if (propertiesMap.get(property.key()) == null) {
propertiesMap.put(property.key(), property.value());
} else if (canBeBusinessAttribute) { // If it is a business attribute, and is a multi-valued attribute
LOG.warn("Duplicate property key {} found for entity vertex: {}", property.key(), entityVertex);
List<Object> values = new ArrayList<>();
values.add(propertiesMap.get(property.key()));
values.add(property.value());
propertiesMap.put(property.key(), values);
}
updateAttrValue(propertiesMap, property);
} else if (attribute == null && isMultiValuedProperty) {
LOG.warn("Multiple value found for key {} for entity vertex: {}", property.key(), entityVertex);
updateAttrValue(propertiesMap, property);
} else if (propertiesMap.get(property.key()) == null) {
propertiesMap.put(property.key(), property.value());
}
}
} catch (RuntimeException e) {
Expand All @@ -1063,6 +1053,16 @@ private Map<String, Object> preloadProperties(AtlasVertex entityVertex, AtlasEnt
return propertiesMap;
}

private void updateAttrValue( Map<String, Object> propertiesMap, VertexProperty<Object> property){
Object value = propertiesMap.get(property.key());
if (value instanceof List) {
((List) value).add(property.value());
} else {
List<Object> values = new ArrayList<>();
values.add(property.value());
propertiesMap.put(property.key(), values);
aarshi0301 marked this conversation as resolved.
Show resolved Hide resolved
}
}

private boolean isPolicyAttribute(Set<String> attributes) {
Set<String> exclusionSet = new HashSet<>(Arrays.asList(AccessControlUtils.ATTR_POLICY_TYPE,
Expand Down
Loading