chore: unify to call SchemaLabel.getLabelId()

javeme · javeme · commit 0e4a1230ad37 · 2024-02-24T12:38:59.000+08:00
Change-Id: I31bcc0d1ee99f3c443f8f4f0d458e06ca89977ef
diff --git a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/Vertices.java b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/Vertices.java
@@ -26,6 +26,7 @@
 import org.apache.hugegraph.HugeGraph;
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.backend.query.ConditionQuery;
+import org.apache.hugegraph.schema.SchemaLabel;
 import org.apache.hugegraph.structure.HugeVertex;
 import org.apache.hugegraph.traversal.optimize.TraversalUtil;
 import org.apache.hugegraph.type.HugeType;
@@ -51,6 +52,10 @@ public Iterator<Vertex> vertices(HugeGraph g) {
                           this.label == null), "No source vertices provided");
         Iterator<Vertex> iterator;
         if (this.ids != null && !this.ids.isEmpty()) {
+            E.checkArgument(this.label == null,
+                            "Just provide one of ids or label of source vertices");
+            E.checkArgument(props == null || props.isEmpty(),
+                            "Just provide one of ids or properties of source vertices");
             List<Id> sourceIds = new ArrayList<>(this.ids.size());
             for (Object id : this.ids) {
                 sourceIds.add(HugeVertex.getIdValue(id));
@@ -62,7 +67,7 @@ public Iterator<Vertex> vertices(HugeGraph g) {
         } else {
             ConditionQuery query = new ConditionQuery(HugeType.VERTEX);
             if (this.label != null) {
-                Id label = g.vertexLabel(this.label).id();
+                Id label = SchemaLabel.getVertexLabelId(g, this.label);
                 query.eq(HugeKeys.LABEL, label);
             }
             if (props != null && !props.isEmpty()) {
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AbstractAlgorithm.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/AbstractAlgorithm.java
@@ -379,7 +379,7 @@ protected Iterator<Vertex> vertices(Object label, long limit) {
             ConditionQuery query = new ConditionQuery(HugeType.VERTEX);
             query.capacity(Query.NO_CAPACITY);
             query.limit(limit);
-            query.eq(HugeKeys.LABEL, this.getVertexLabelId(label));
+            query.eq(HugeKeys.LABEL, this.getVertexLabelIdOrNull(label));
             return this.graph().vertices(query);
         }
 
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/BetweennessCentralityAlgorithmV2.java
@@ -26,6 +26,7 @@
 import org.apache.hugegraph.backend.query.Query;
 import org.apache.hugegraph.job.UserJob;
 import org.apache.hugegraph.job.algorithm.BfsTraverser;
+import org.apache.hugegraph.schema.SchemaLabel;
 import org.apache.hugegraph.structure.HugeVertex;
 import org.apache.hugegraph.traversal.algorithm.HugeTraverser;
 import org.apache.hugegraph.type.define.Directions;
@@ -80,10 +81,7 @@ private Object betweenessCentrality(Directions direction,
             assert topN >= 0L || topN == NO_LIMIT;
 
             this.globalBetweennesses = new HashMap<>();
-            Id edgeLabelId = null;
-            if (label != null) {
-                edgeLabelId = this.graph().edgeLabel(label).id();
-            }
+            Id edgeLabelId = this.getEdgeLabelIdOrNull(label);
 
             // TODO: sample the startVertices
             Iterator<Vertex> startVertices = this.vertices(sourceLabel,
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/ClosenessCentralityAlgorithmV2.java
@@ -81,10 +81,7 @@ private Object closenessCentrality(Directions direction,
             assert degree > 0L || degree == NO_LIMIT;
             assert topN >= 0L || topN == NO_LIMIT;
 
-            Id edgeLabelId = null;
-            if (label != null) {
-                edgeLabelId = this.graph().edgeLabel(label).id();
-            }
+            Id edgeLabelId = this.getEdgeLabelIdOrNull(label);
 
             // TODO: sample the startVertices
             Iterator<Vertex> startVertices = this.vertices(sourceLabel,
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/DegreeCentralityAlgorithm.java
@@ -73,7 +73,7 @@ public Object degreeCentrality(Directions direction,
             JsonMap degrees = new JsonMap();
             TopMap<Id> tops = new TopMap<>(topN);
             Id vertex = null;
-            Id labelId = this.getEdgeLabelId(label);
+            Id labelId = this.getEdgeLabelIdOrNull(label);
             long degree = 0L;
             long totalEdges = 0L;
 
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/cent/StressCentralityAlgorithmV2.java
@@ -60,7 +60,7 @@ public Object call(UserJob<Object> job, Map<String, Object> parameters) {
 
     private static class Traverser extends BfsTraverser<StressNode> {
 
-        private Map<Id, MutableLong> globalStresses;
+        private final Map<Id, MutableLong> globalStresses;
 
         private Traverser(UserJob<Object> job) {
             super(job);
@@ -80,10 +80,7 @@ private Object stressCentrality(Directions direction,
             assert degree > 0L || degree == NO_LIMIT;
             assert topN >= 0L || topN == NO_LIMIT;
 
-            Id edgeLabelId = null;
-            if (label != null) {
-                edgeLabelId = this.graph().edgeLabel(label).id();
-            }
+            Id edgeLabelId = this.getEdgeLabelIdOrNull(label);
 
             // TODO: sample the startVertices
             Iterator<Vertex> startVertices = this.vertices(sourceLabel,
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LpaAlgorithm.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/job/algorithm/comm/LpaAlgorithm.java
@@ -178,7 +178,7 @@ private String voteCommunityOfVertex(Vertex vertex, String edgeLabel,
                                              Directions dir, long degree) {
             // neighbors of source vertex v
             Id source = (Id) vertex.id();
-            Id labelId = this.getEdgeLabelId(edgeLabel);
+            Id labelId = this.getEdgeLabelIdOrNull(edgeLabel);
             Iterator<Id> neighbors = this.adjacentVertices(source, dir,
                                                            labelId, degree);
 
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaLabel.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/schema/SchemaLabel.java
@@ -177,4 +177,12 @@ public static Id getLabelId(HugeGraph graph, HugeType type, Object label) {
                     label.getClass());
         }
     }
+
+    public static Id getVertexLabelId(HugeGraph graph, Object label) {
+        return SchemaLabel.getLabelId(graph, HugeType.VERTEX, label);
+    }
+
+    public static Id getEdgeLabelId(HugeGraph graph, Object label) {
+        return SchemaLabel.getLabelId(graph, HugeType.EDGE, label);
+    }
 }
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/FusiformSimilarityTraverser.java
@@ -112,7 +112,7 @@ private Set<Similar> fusiformSimilarityForVertex(
             // Ignore current vertex if its neighbors number is not enough
             return ImmutableSet.of();
         }
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
         // Get similar nodes and counts
         Iterator<Edge> edges = this.edgesOfVertex(vertex.id(), direction,
                                                   labelId, degree);
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java
@@ -620,18 +620,18 @@ protected long edgesCount(Id source, EdgeStep edgeStep) {
         }
     }
 
-    protected Object getVertexLabelId(Object label) {
+    protected Object getVertexLabelIdOrNull(Object label) {
         if (label == null) {
             return null;
         }
-        return SchemaLabel.getLabelId(this.graph, HugeType.VERTEX, label);
+        return SchemaLabel.getVertexLabelId(this.graph, label);
     }
 
-    protected Id getEdgeLabelId(Object label) {
+    protected Id getEdgeLabelIdOrNull(Object label) {
         if (label == null) {
             return null;
         }
-        return SchemaLabel.getLabelId(this.graph, HugeType.EDGE, label);
+        return SchemaLabel.getEdgeLabelId(this.graph, label);
     }
 
     protected void checkVertexExist(Id vertexId, String name) {
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/JaccardSimilarTraverser.java
@@ -54,7 +54,7 @@ public double jaccardSimilarity(Id vertex, Id other, Directions dir,
         E.checkNotNull(dir, "direction");
         checkDegree(degree);
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
 
         Set<Id> sourceNeighbors = IteratorUtils.set(this.adjacentVertices(
                 vertex, dir, labelId, degree));
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KneighborTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KneighborTraverser.java
@@ -46,7 +46,7 @@ public Set<Id> kneighbor(Id sourceV, Directions dir,
         checkDegree(degree);
         checkLimit(limit);
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
 
         KneighborRecords records = new KneighborRecords(true, sourceV, true);
 
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KoutTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KoutTraverser.java
@@ -58,7 +58,7 @@ public Set<Id> kout(Id sourceV, Directions dir, String label,
                             capacity, limit);
         }
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
 
         Set<Id> sources = newIdSet();
         Set<Id> neighbors = newIdSet();
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathsTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathsTraverser.java
@@ -59,7 +59,7 @@ public PathSet paths(Id sourceV, Directions sourceDir,
             return PathSet.EMPTY;
         }
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
         Traverser traverser = new Traverser(sourceV, targetV, labelId,
                                             degree, capacity, limit);
         // We should stop early if walk backtrace or reach limit
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PersonalRankTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PersonalRankTraverser.java
@@ -55,7 +55,7 @@ public Map<Id, Double> personalRank(Id source, String label,
         Map<Id, Double> ranks = newMap();
         ranks.put(source, 1.0);
 
-        Id labelId = this.graph().edgeLabel(label).id();
+        Id labelId = this.getEdgeLabelIdOrNull(label);
         Directions dir = this.getStartDirection(source, label);
 
         Set<Id> outSeeds = newIdSet();
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SameNeighborTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SameNeighborTraverser.java
@@ -45,7 +45,7 @@ public Set<Id> sameNeighbors(Id vertex, Id other, Directions direction,
         checkDegree(degree);
         checkLimit(limit);
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
 
         Set<Id> sourceNeighbors = IteratorUtils.set(this.adjacentVertices(
                 vertex, direction, labelId, degree));
@@ -80,7 +80,7 @@ public Set<Id> sameNeighbors(List<Id> vertexIds, Directions direction,
         List<Id> labelsId = new ArrayList<>();
         if (labels != null) {
             for (String label : labels) {
-                labelsId.add(this.getEdgeLabelId(label));
+                labelsId.add(this.getEdgeLabelIdOrNull(label));
             }
         }
 
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/ShortestPathTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/ShortestPathTraverser.java
@@ -61,7 +61,7 @@ public Path shortestPath(Id sourceV, Id targetV, Directions dir,
 
         Map<Id, String> labelMap = newMap(labels.size());
         for (String label : labels) {
-            labelMap.put(this.getEdgeLabelId(label), label);
+            labelMap.put(this.getEdgeLabelIdOrNull(label), label);
         }
         Traverser traverser = new Traverser(sourceV, targetV, dir, labelMap,
                                             degree, skipDegree, capacity);
@@ -122,7 +122,7 @@ public PathSet allShortestPaths(Id sourceV, Id targetV, Directions dir,
 
         Map<Id, String> labelMap = newMap(labels.size());
         for (String label : labels) {
-            labelMap.put(this.getEdgeLabelId(label), label);
+            labelMap.put(this.getEdgeLabelIdOrNull(label), label);
         }
         Traverser traverser = new Traverser(sourceV, targetV, dir, labelMap,
                                             degree, skipDegree, capacity);
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SingleSourceShortestPathTraverser.java
@@ -58,7 +58,7 @@ public WeightedPaths singleSourceShortestPaths(Id sourceV, Directions dir,
         checkSkipDegree(skipDegree, degree, capacity);
         checkLimit(limit);
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
         Traverser traverser = new Traverser(sourceV, dir, labelId, weight,
                                             degree, skipDegree, capacity, limit);
         while (true) {
@@ -94,7 +94,7 @@ public NodeWithWeight weightedShortestPath(Id sourceV, Id targetV,
         checkCapacity(capacity);
         checkSkipDegree(skipDegree, degree, capacity);
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
         Traverser traverser = new Traverser(sourceV, dir, labelId, weight,
                                             degree, skipDegree, capacity,
                                             NO_LIMIT);
diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SubGraphTraverser.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/SubGraphTraverser.java
@@ -81,7 +81,7 @@ private PathSet subGraphPaths(Id sourceV, Directions dir, String label,
         checkCapacity(capacity);
         checkLimit(limit);
 
-        Id labelId = this.getEdgeLabelId(label);
+        Id labelId = this.getEdgeLabelIdOrNull(label);
         Traverser traverser = new Traverser(sourceV, labelId, depth, degree,
                                             capacity, limit, rings,
                                             sourceInRing);

Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ protected Iterator<Vertex> vertices(Object label, long limit) {`
`379`	`379`	`ConditionQuery query = new ConditionQuery(HugeType.VERTEX);`
`380`	`380`	`query.capacity(Query.NO_CAPACITY);`
`381`	`381`	`query.limit(limit);`
`382`		`- query.eq(HugeKeys.LABEL, this.getVertexLabelId(label));`
	`382`	`+ query.eq(HugeKeys.LABEL, this.getVertexLabelIdOrNull(label));`
`383`	`383`	`return this.graph().vertices(query);`
`384`	`384`	`}`
`385`	`385`
Original file line number	Diff line number	Diff line change
`@@ -177,4 +177,12 @@ public static Id getLabelId(HugeGraph graph, HugeType type, Object label) {`
`177`	`177`	`label.getClass());`
`178`	`178`	`}`
`179`	`179`	`}`
	`180`	`+`
	`181`	`+ public static Id getVertexLabelId(HugeGraph graph, Object label) {`
	`182`	`+ return SchemaLabel.getLabelId(graph, HugeType.VERTEX, label);`
	`183`	`+ }`
	`184`	`+`
	`185`	`+ public static Id getEdgeLabelId(HugeGraph graph, Object label) {`
	`186`	`+ return SchemaLabel.getLabelId(graph, HugeType.EDGE, label);`
	`187`	`+ }`
`180`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private Set<Similar> fusiformSimilarityForVertex(`
`112`	`112`	`// Ignore current vertex if its neighbors number is not enough`
`113`	`113`	`return ImmutableSet.of();`
`114`	`114`	`}`
`115`		`- Id labelId = this.getEdgeLabelId(label);`
	`115`	`+ Id labelId = this.getEdgeLabelIdOrNull(label);`
`116`	`116`	`// Get similar nodes and counts`
`117`	`117`	`Iterator<Edge> edges = this.edgesOfVertex(vertex.id(), direction,`
`118`	`118`	`labelId, degree);`
Original file line number	Diff line number	Diff line change
`@@ -620,18 +620,18 @@ protected long edgesCount(Id source, EdgeStep edgeStep) {`
`620`	`620`	`}`
`621`	`621`	`}`
`622`	`622`
`623`		`- protected Object getVertexLabelId(Object label) {`
	`623`	`+ protected Object getVertexLabelIdOrNull(Object label) {`
`624`	`624`	`if (label == null) {`
`625`	`625`	`return null;`
`626`	`626`	`}`
`627`		`- return SchemaLabel.getLabelId(this.graph, HugeType.VERTEX, label);`
	`627`	`+ return SchemaLabel.getVertexLabelId(this.graph, label);`
`628`	`628`	`}`
`629`	`629`
`630`		`- protected Id getEdgeLabelId(Object label) {`
	`630`	`+ protected Id getEdgeLabelIdOrNull(Object label) {`
`631`	`631`	`if (label == null) {`
`632`	`632`	`return null;`
`633`	`633`	`}`
`634`		`- return SchemaLabel.getLabelId(this.graph, HugeType.EDGE, label);`
	`634`	`+ return SchemaLabel.getEdgeLabelId(this.graph, label);`
`635`	`635`	`}`
`636`	`636`
`637`	`637`	`protected void checkVertexExist(Id vertexId, String name) {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public Set<Id> kout(Id sourceV, Directions dir, String label,`
`58`	`58`	`capacity, limit);`
`59`	`59`	`}`
`60`	`60`
`61`		`- Id labelId = this.getEdgeLabelId(label);`
	`61`	`+ Id labelId = this.getEdgeLabelIdOrNull(label);`
`62`	`62`
`63`	`63`	`Set<Id> sources = newIdSet();`
`64`	`64`	`Set<Id> neighbors = newIdSet();`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public PathSet paths(Id sourceV, Directions sourceDir,`
`59`	`59`	`return PathSet.EMPTY;`
`60`	`60`	`}`
`61`	`61`
`62`		`- Id labelId = this.getEdgeLabelId(label);`
	`62`	`+ Id labelId = this.getEdgeLabelIdOrNull(label);`
`63`	`63`	`Traverser traverser = new Traverser(sourceV, targetV, labelId,`
`64`	`64`	`degree, capacity, limit);`
`65`	`65`	`// We should stop early if walk backtrace or reach limit`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public Set<Id> sameNeighbors(Id vertex, Id other, Directions direction,`
`45`	`45`	`checkDegree(degree);`
`46`	`46`	`checkLimit(limit);`
`47`	`47`
`48`		`- Id labelId = this.getEdgeLabelId(label);`
	`48`	`+ Id labelId = this.getEdgeLabelIdOrNull(label);`
`49`	`49`
`50`	`50`	`Set<Id> sourceNeighbors = IteratorUtils.set(this.adjacentVertices(`
`51`	`51`	`vertex, direction, labelId, degree));`
`@@ -80,7 +80,7 @@ public Set<Id> sameNeighbors(List<Id> vertexIds, Directions direction,`
`80`	`80`	`List<Id> labelsId = new ArrayList<>();`
`81`	`81`	`if (labels != null) {`
`82`	`82`	`for (String label : labels) {`
`83`		`- labelsId.add(this.getEdgeLabelId(label));`
	`83`	`+ labelsId.add(this.getEdgeLabelIdOrNull(label));`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`