javeme commented on code in PR #2295:
URL:
https://github.com/apache/incubator-hugegraph/pull/2295#discussion_r1310642023
##########
hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java:
##########
@@ -1574,14 +1597,14 @@ private void checkNonnullProperty(HugeVertex vertex) {
// Check whether passed all non-null property
@SuppressWarnings("unchecked")
Collection<Id> nonNullKeys = CollectionUtils.subtract(
- vertexLabel.properties(),
- vertexLabel.nullableKeys());
+ vertexLabel.properties(),
+ vertexLabel.nullableKeys());
if (!keys.containsAll(nonNullKeys)) {
@SuppressWarnings("unchecked")
Collection<Id> missed = CollectionUtils.subtract(nonNullKeys,
keys);
HugeGraph graph = this.graph();
E.checkArgument(false, "All non-null property keys %s of " +
- "vertex label '%s' must be set, missed keys %s",
+ "vertex label '%s' must be set, missed keys
%s",
Review Comment:
prefer to wrap line before "All non-null..."
##########
hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java:
##########
@@ -438,6 +465,92 @@ private Iterator<Edge> edgesOfVertex(Id source, EdgeStep
edgeStep,
return edgeStep.skipSuperNodeIfNeeded(edges);
}
+ protected Iterator<Edge> edgesOfVertex(Id source, Steps steps) {
+ List<Id> edgeLabels = steps.edgeLabels();
+ ConditionQuery cq = GraphTransaction.constructEdgesQuery(
+ source, steps.direction(), edgeLabels);
+ cq.capacity(Query.NO_CAPACITY);
+ if (steps.limit() != NO_LIMIT) {
+ cq.limit(steps.limit());
+ }
+
+ Map<Id, ConditionQuery> edgeConditions =
+ getElementFilterQuery(steps.edgeSteps(), HugeType.EDGE);
+
+ Iterator<Edge> filteredEdges =
+ new FilterIterator<>(this.graph().edges(cq),
+ edge -> validateEdge(edgeConditions,
(HugeEdge) edge));
+
+ return edgesOfVertexStep(filteredEdges, steps);
+ }
+
+ protected Iterator<Edge> edgesOfVertexStep(Iterator<Edge> edges, Steps
steps) {
+ if (steps.isVertexEmpty()) {
+ return edges;
+ }
+
+ Map<Id, ConditionQuery> vertexConditions =
+ getElementFilterQuery(steps.vertexSteps(), HugeType.VERTEX);
+
+ return new FilterIterator<>(edges,
+ edge -> validateVertex(vertexConditions,
(HugeEdge) edge));
+ }
+
+ private Boolean validateVertex(Map<Id, ConditionQuery> vConditions,
+ HugeEdge edge) {
+ HugeVertex sourceV = edge.sourceVertex();
+ HugeVertex targetV = edge.targetVertex();
+ if (!vConditions.containsKey(sourceV.schemaLabel().id()) ||
+ !vConditions.containsKey(targetV.schemaLabel().id())) {
+ return false;
+ }
+
+ ConditionQuery cq = vConditions.get(sourceV.schemaLabel().id());
+ if (cq != null) {
+ sourceV = (HugeVertex) this.graph.vertex(sourceV.id());
+ if (!cq.test(sourceV)) {
+ return false;
+ }
+ }
+
+ cq = vConditions.get(targetV.schemaLabel().id());
+ if (cq != null) {
+ targetV = (HugeVertex) this.graph.vertex(targetV.id());
+ return cq.test(targetV);
+ }
+ return true;
+ }
+
+ private Boolean validateEdge(Map<Id, ConditionQuery> eConditions,
Review Comment:
ditto
##########
hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java:
##########
@@ -438,6 +465,92 @@ private Iterator<Edge> edgesOfVertex(Id source, EdgeStep
edgeStep,
return edgeStep.skipSuperNodeIfNeeded(edges);
}
+ protected Iterator<Edge> edgesOfVertex(Id source, Steps steps) {
+ List<Id> edgeLabels = steps.edgeLabels();
+ ConditionQuery cq = GraphTransaction.constructEdgesQuery(
+ source, steps.direction(), edgeLabels);
+ cq.capacity(Query.NO_CAPACITY);
+ if (steps.limit() != NO_LIMIT) {
+ cq.limit(steps.limit());
+ }
+
+ Map<Id, ConditionQuery> edgeConditions =
+ getElementFilterQuery(steps.edgeSteps(), HugeType.EDGE);
+
+ Iterator<Edge> filteredEdges =
+ new FilterIterator<>(this.graph().edges(cq),
+ edge -> validateEdge(edgeConditions,
(HugeEdge) edge));
+
+ return edgesOfVertexStep(filteredEdges, steps);
+ }
+
+ protected Iterator<Edge> edgesOfVertexStep(Iterator<Edge> edges, Steps
steps) {
+ if (steps.isVertexEmpty()) {
+ return edges;
+ }
+
+ Map<Id, ConditionQuery> vertexConditions =
+ getElementFilterQuery(steps.vertexSteps(), HugeType.VERTEX);
+
+ return new FilterIterator<>(edges,
+ edge -> validateVertex(vertexConditions,
(HugeEdge) edge));
+ }
+
+ private Boolean validateVertex(Map<Id, ConditionQuery> vConditions,
+ HugeEdge edge) {
+ HugeVertex sourceV = edge.sourceVertex();
+ HugeVertex targetV = edge.targetVertex();
+ if (!vConditions.containsKey(sourceV.schemaLabel().id()) ||
+ !vConditions.containsKey(targetV.schemaLabel().id())) {
+ return false;
+ }
+
+ ConditionQuery cq = vConditions.get(sourceV.schemaLabel().id());
+ if (cq != null) {
+ sourceV = (HugeVertex) this.graph.vertex(sourceV.id());
+ if (!cq.test(sourceV)) {
+ return false;
+ }
+ }
+
+ cq = vConditions.get(targetV.schemaLabel().id());
+ if (cq != null) {
+ targetV = (HugeVertex) this.graph.vertex(targetV.id());
+ return cq.test(targetV);
+ }
+ return true;
+ }
+
+ private Boolean validateEdge(Map<Id, ConditionQuery> eConditions,
+ HugeEdge edge) {
+ if (!eConditions.containsKey(edge.schemaLabel().id())) {
+ return false;
+ }
+
+ ConditionQuery cq = eConditions.get(edge.schemaLabel().id());
+ if (cq != null) {
+ return cq.test(edge);
+ }
+ return true;
+ }
+
+ private Map<Id, ConditionQuery> getElementFilterQuery(
Review Comment:
prefer to rename to getFilterQueryConditions
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
