chore: log improvement

apache · Feb 29, 2024 · 0b1c720 · 0b1c720
1 parent aa8238d
commit 0b1c720
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/.../java/org/apache/hugegraph/computer/algorithm/path/shortest/SingleSourceShortestPath.java b/.../java/org/apache/hugegraph/computer/algorithm/path/shortest/SingleSourceShortestPath.java
@@ -142,16 +142,15 @@ public void compute0(ComputationContext context, Vertex vertex) {
 
         // single target && source == target
         if (this.targetQuantityType == QuantityType.SINGLE &&
-            this.sourceId.equals(this.targetIdSet.value().iterator().next())) {
-            LOG.debug("source vertex {} equals target vertex {}",
-                      this.sourceId, this.targetIdSet.value().iterator().next());
+            this.targetIdSet.contains(this.sourceId)) {
+            LOG.debug("source vertex equals target vertex: {}", this.sourceId);
             vertex.inactivate();
             return;
         }
 
         if (vertex.numEdges() <= 0) {
             // isolated vertex
-            LOG.debug("source vertex {} is isolated", this.sourceId);
+            LOG.debug("The source vertex is isolated: {}", this.sourceId);
             vertex.inactivate();
             return;
         }
@@ -279,25 +278,4 @@ private boolean isAllTargetsReached(Vertex vertex) {
         }
         return false;
     }
-
-    static class VertexInputJson {
-        private String id;
-        private String idType;
-
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public String getIdType() {
-            return idType;
-        }
-
-        public void setIdType(String idType) {
-            this.idType = idType;
-        }
-    }
 }
diff --git a/computer-api/src/main/java/org/apache/hugegraph/computer/core/util/JsonUtilExt.java b/computer-api/src/main/java/org/apache/hugegraph/computer/core/util/JsonUtilExt.java
@@ -25,7 +25,7 @@
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-// todo move to org.apache.hugegraph.util.JsonUtil later
+// TODO: move to org.apache.hugegraph.util.JsonUtil later
 public class JsonUtilExt {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();

diff --git a/...a/org/apache/hugegraph/computer/algorithm/path/shortest/SingleSourceShortestPathTest.java b/...a/org/apache/hugegraph/computer/algorithm/path/shortest/SingleSourceShortestPathTest.java
@@ -135,9 +135,10 @@ public String value(org.apache.hugegraph.computer.core.graph.vertex.Vertex verte
             if (vertex.id().value().toString().equals(TARGET_ID)) {
                 Map map = JsonUtil.fromJson(json, Map.class);
 
-                LOG.info("source vertex {} to target vertex {}, " +
+                LOG.info("source vertex to target vertex: {}, {}, " +
                          "shortest path: {}, total weight: {}",
-                         SOURCE_ID, TARGET_ID, map.get("path"), map.get("total_weight"));
+                         SOURCE_ID, TARGET_ID,
+                         map.get("path"), map.get("total_weight"));
                 Assert.assertEquals(map.get("path"), SHORTEST_PATH);
                 Assert.assertEquals(map.get("total_weight"), TOTAL_WEIGHT);
             }