From 0464daed638b792454d6799d82b3826353a66896 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Fri, 15 Apr 2022 12:02:56 +0800 Subject: [PATCH 01/22] remove unused import --- .../hugegraph/backend/serializer/SerializerFactory.java | 2 -- .../backend/store/AbstractBackendStoreProvider.java | 1 - .../backend/store/raft/RaftBackendStoreProvider.java | 1 - .../baidu/hugegraph/api/traversers/AdamicAdarAPITest.java | 1 - .../hugegraph/api/traversers/ResourceAllocationAPITest.java | 1 - .../hugegraph/unit/serializer/SerializerFactoryTest.java | 5 ++--- 6 files changed, 2 insertions(+), 9 deletions(-) diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SerializerFactory.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SerializerFactory.java index 217719ead3..56a6956bb1 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SerializerFactory.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/serializer/SerializerFactory.java @@ -19,13 +19,11 @@ package com.baidu.hugegraph.backend.serializer; -import java.lang.reflect.Constructor; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import com.baidu.hugegraph.backend.BackendException; import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; public class SerializerFactory { diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStoreProvider.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStoreProvider.java index c9f0c6e996..005d133ba4 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStoreProvider.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/AbstractBackendStoreProvider.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Future; -import com.baidu.hugegraph.config.HugeConfig; import org.slf4j.Logger; import com.baidu.hugegraph.HugeGraph; diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStoreProvider.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStoreProvider.java index 73d8c200c0..7e9ca5e66e 100644 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStoreProvider.java +++ b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/store/raft/RaftBackendStoreProvider.java @@ -22,7 +22,6 @@ import java.util.Set; import java.util.concurrent.Future; -import com.baidu.hugegraph.config.HugeConfig; import org.slf4j.Logger; import com.baidu.hugegraph.HugeGraph; diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPITest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPITest.java index 04a1b67ab5..4d65c274a8 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPITest.java +++ b/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/AdamicAdarAPITest.java @@ -48,7 +48,6 @@ public void testGet() { String markoId = name2Ids.get("marko"); String joshId = name2Ids.get("josh"); - String peterId = name2Ids.get("peter"); Response r = client().get(PATH, ImmutableMap.of("vertex", id2Json(markoId), "other", diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPITest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPITest.java index ede6b7031e..72101e68eb 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPITest.java +++ b/hugegraph-test/src/main/java/com/baidu/hugegraph/api/traversers/ResourceAllocationAPITest.java @@ -48,7 +48,6 @@ public void testGet() { String markoId = name2Ids.get("marko"); String joshId = name2Ids.get("josh"); - String peterId = name2Ids.get("peter"); Response r = client().get(PATH, ImmutableMap.of("vertex", id2Json(markoId), "other", diff --git a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/SerializerFactoryTest.java b/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/SerializerFactoryTest.java index b1d0e3464f..dec6fb9bc5 100644 --- a/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/SerializerFactoryTest.java +++ b/hugegraph-test/src/main/java/com/baidu/hugegraph/unit/serializer/SerializerFactoryTest.java @@ -19,9 +19,6 @@ package com.baidu.hugegraph.unit.serializer; -import com.baidu.hugegraph.config.HugeConfig; -import com.baidu.hugegraph.type.HugeType; -import com.baidu.hugegraph.unit.FakeObjects; import org.junit.Test; import com.baidu.hugegraph.backend.BackendException; @@ -30,8 +27,10 @@ import com.baidu.hugegraph.backend.serializer.BinarySerializer; import com.baidu.hugegraph.backend.serializer.SerializerFactory; import com.baidu.hugegraph.backend.serializer.TextSerializer; +import com.baidu.hugegraph.config.HugeConfig; import com.baidu.hugegraph.testutil.Assert; import com.baidu.hugegraph.unit.BaseUnitTest; +import com.baidu.hugegraph.unit.FakeObjects; public class SerializerFactoryTest extends BaseUnitTest { From 89af87d2766ae7dfa0b19383feb4efa74c82b3a9 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Wed, 20 Apr 2022 18:24:11 +0800 Subject: [PATCH 02/22] fix hugegraph-example/Example checkstyle issue --- .../com/baidu/hugegraph/example/Example1.java | 54 ++++++++++--------- .../com/baidu/hugegraph/example/Example2.java | 24 ++++----- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index b99e57b7d4..cb5a940b4d 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -165,8 +165,10 @@ public static void loadSchema(final HugeGraph graph) { // schemaManager.getVertexLabel("author").index("byName").secondary().by("name").add(); // schemaManager.getVertexLabel("recipe").index("byRecipe").materialized().by("name").add(); // schemaManager.getVertexLabel("meal").index("byMeal").materialized().by("name").add(); - // schemaManager.getVertexLabel("ingredient").index("byIngredient").materialized().by("name").add(); - // schemaManager.getVertexLabel("reviewer").index("byReviewer").materialized().by("name").add(); + // schemaManager.getVertexLabel("ingredient").index("byIngredient").materialized() + // .by("name").add(); + // schemaManager.getVertexLabel("reviewer").index("byReviewer").materialized() + // .by("name").add(); LOG.info("=============== edgeLabel ================"); @@ -268,19 +270,19 @@ public static void testQuery(final HugeGraph graph) { GraphTraversal vertices = graph.traversal().V(); int size = vertices.toList().size(); assert size == 12; - System.out.println(">>>> query all vertices: size=" + size); + LOG.info(">>>> query all vertices: size=" + size); // query by label vertices = graph.traversal().V().hasLabel("person"); size = vertices.toList().size(); assert size == 5; - System.out.println(">>>> query all persons: size=" + size); + LOG.info(">>>> query all persons: size=" + size); // query vertex by primary-values vertices = graph.traversal().V().hasLabel("author").has("id", 1); List vertexList = vertices.toList(); assert vertexList.size() == 1; - System.out.println(">>>> query vertices by primary-values: " + + LOG.info(">>>> query vertices by primary-values: " + vertexList); VertexLabel author = graph.schema().getVertexLabel("author"); @@ -291,19 +293,19 @@ public static void testQuery(final HugeGraph graph) { GraphTraversal edgesOfVertex = vertices.outE("created"); List edgeList = edgesOfVertex.toList(); assert edgeList.size() == 1; - System.out.println(">>>> query edges of vertex: " + edgeList); + LOG.info(">>>> query edges of vertex: " + edgeList); vertices = graph.traversal().V(authorId); vertexList = vertices.out("created").toList(); assert vertexList.size() == 1; - System.out.println(">>>> query vertices of vertex: " + vertexList); + LOG.info(">>>> query vertices of vertex: " + vertexList); // query edge by sort-values vertices = graph.traversal().V(authorId); edgesOfVertex = vertices.outE("write").has("time", "2017-4-28"); edgeList = edgesOfVertex.toList(); assert edgeList.size() == 2; - System.out.println(">>>> query edges of vertex by sort-values: " + + LOG.info(">>>> query edges of vertex by sort-values: " + edgeList); // query vertex by condition (filter by property name) @@ -314,9 +316,9 @@ public static void testQuery(final HugeGraph graph) { .supportsQueryWithContainsKey()) { Iterator iter = graph.vertices(q); assert iter.hasNext(); - System.out.println(">>>> queryVertices(age): " + iter.hasNext()); + LOG.info(">>>> queryVertices(age): " + iter.hasNext()); while (iter.hasNext()) { - System.out.println(">>>> queryVertices(age): " + iter.next()); + LOG.info(">>>> queryVertices(age): " + iter.next()); } } @@ -324,7 +326,7 @@ public static void testQuery(final HugeGraph graph) { GraphTraversal edges = graph.traversal().E().limit(2); size = edges.toList().size(); assert size == 2; - System.out.println(">>>> query all edges with limit 2: size=" + size); + LOG.info(">>>> query all edges with limit 2: size=" + size); // query edge by id EdgeLabel authored = graph.edgeLabel("authored"); @@ -337,13 +339,13 @@ public static void testQuery(final HugeGraph graph) { edges = graph.traversal().E(edgeId); edgeList = edges.toList(); assert edgeList.size() == 1; - System.out.println(">>>> query edge by id: " + edgeList); + LOG.info(">>>> query edge by id: " + edgeList); Edge edge = edgeList.get(0); edges = graph.traversal().E(edge.id()); edgeList = edges.toList(); assert edgeList.size() == 1; - System.out.println(">>>> query edge by id: " + edgeList); + LOG.info(">>>> query edge by id: " + edgeList); // query edge by condition q = new ConditionQuery(HugeType.EDGE); @@ -355,10 +357,10 @@ public static void testQuery(final HugeGraph graph) { Iterator edges2 = graph.edges(q); assert edges2.hasNext(); - System.out.println(">>>> queryEdges(id-condition): " + + LOG.info(">>>> queryEdges(id-condition): " + edges2.hasNext()); while (edges2.hasNext()) { - System.out.println(">>>> queryEdges(id-condition): " + + LOG.info(">>>> queryEdges(id-condition): " + edges2.next()); } @@ -368,10 +370,10 @@ public static void testQuery(final HugeGraph graph) { q.key(HugeKeys.PROPERTIES, contribution.id()); Iterator edges3 = graph.edges(q); assert edges3.hasNext(); - System.out.println(">>>> queryEdges(contribution): " + + LOG.info(">>>> queryEdges(contribution): " + edges3.hasNext()); while (edges3.hasNext()) { - System.out.println(">>>> queryEdges(contribution): " + + LOG.info(">>>> queryEdges(contribution): " + edges3.next()); } } @@ -380,39 +382,39 @@ public static void testQuery(final HugeGraph graph) { vertices = graph.traversal().V().hasLabel("book"); size = vertices.toList().size(); assert size == 5; - System.out.println(">>>> query all books: size=" + size); + LOG.info(">>>> query all books: size=" + size); // query by vertex label and key-name vertices = graph.traversal().V().hasLabel("person").has("age"); size = vertices.toList().size(); assert size == 5; - System.out.println(">>>> query all persons with age: size=" + size); + LOG.info(">>>> query all persons with age: size=" + size); // query by vertex props vertices = graph.traversal().V().hasLabel("person") .has("city", "Taipei"); vertexList = vertices.toList(); assert vertexList.size() == 1; - System.out.println(">>>> query all persons in Taipei: " + vertexList); + LOG.info(">>>> query all persons in Taipei: " + vertexList); vertices = graph.traversal().V().hasLabel("person").has("age", 19); vertexList = vertices.toList(); assert vertexList.size() == 1; - System.out.println(">>>> query all persons age==19: " + vertexList); + LOG.info(">>>> query all persons age==19: " + vertexList); vertices = graph.traversal().V().hasLabel("person") .has("age", P.lt(19)); vertexList = vertices.toList(); assert vertexList.size() == 1; assert vertexList.get(0).property("age").value().equals(3); - System.out.println(">>>> query all persons age<19: " + vertexList); + LOG.info(">>>> query all persons age<19: " + vertexList); String addr = "Bay Area"; vertices = graph.traversal().V().hasLabel("author") .has("lived", Text.contains(addr)); vertexList = vertices.toList(); assert vertexList.size() == 1; - System.out.println(String.format(">>>> query all authors lived %s: %s", + LOG.info(String.format(">>>> query all authors lived %s: %s", addr, vertexList)); } @@ -427,7 +429,7 @@ public static void testRemove(final HugeGraph graph) { james.addEdge("look", book6, "timestamp", "2017-5-3 12:00:08.0"); graph.tx().commit(); assert graph.traversal().V(book6.id()).bothE().hasNext(); - System.out.println(">>>> removing vertex: " + james); + LOG.info(">>>> removing vertex: " + james); james.remove(); graph.tx().commit(); assert !graph.traversal().V(james.id()).hasNext(); @@ -443,10 +445,10 @@ public static void testRemove(final HugeGraph graph) { String edgeId = String.format("S%s>%s>%s>S%s", authorId, authored.id(), "", book2Id); - List edges = graph.traversal().E(edgeId).toList(); + List edges = graph.traversal().E(edgeId).toList(); assert edges.size() == 1; Edge edge = edges.get(0); - System.out.println(">>>> removing edge: " + edge); + LOG.info(">>>> removing edge: " + edge); edge.remove(); graph.tx().commit(); assert !graph.traversal().E(edgeId).hasNext(); diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java index 28588c0912..1756f1a8d6 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java @@ -58,16 +58,16 @@ public static void traversal(final HugeGraph graph) { GraphTraversalSource g = graph.traversal(); GraphTraversal vertices = g.V(); - System.out.println(">>>> query all vertices: size=" + + LOG.info(">>>> query all vertices: size=" + vertices.toList().size()); List edges = g.E().toList(); - System.out.println(">>>> query all edges: size=" + + LOG.info(">>>> query all edges: size=" + edges.size()); List names = g.V().inE("knows").limit(2) .outV().values("name").toList(); - System.out.println(">>>> query vertex(with props) of edges: " + names); + LOG.info(">>>> query vertex(with props) of edges: " + names); assert names.size() == 2 : names.size(); names = g.V().as("a") @@ -75,11 +75,11 @@ public static void traversal(final HugeGraph graph) { .and() .out("created").in("created").as("a").values("name") .toList(); - System.out.println(">>>> query with AND: " + names); + LOG.info(">>>> query with AND: " + names); assert names.size() == 1 : names.size(); List vertex = g.V().has("age", 29).toList(); - System.out.println(">>>> age = 29: " + vertex); + LOG.info(">>>> age = 29: " + vertex); assert vertex.size() == 1 && vertex.get(0).value("name").equals("marko"); @@ -87,12 +87,12 @@ public static void traversal(final HugeGraph graph) { .has("age", 29) .has("city", "Beijing") .toList(); - System.out.println(">>>> age = 29 and city is Beijing: " + vertex); + LOG.info(">>>> age = 29 and city is Beijing: " + vertex); assert vertex.size() == 1 && vertex.get(0).value("name").equals("marko"); edges = g.E().has("weight", P.lt(1.0)).toList(); - System.out.println(">>>> edges with weight < 1.0: " + edges); + LOG.info(">>>> edges with weight < 1.0: " + edges); assert edges.size() == 4; String person = graph.schema().getVertexLabel("person").id().asString(); @@ -107,12 +107,12 @@ public static void traversal(final HugeGraph graph) { .has("weight", P.lt(1.0)) .otherV() .toList(); - System.out.println(">>>> josh's both edges with weight < 1.0: " + + LOG.info(">>>> josh's both edges with weight < 1.0: " + vertex); assert vertex.size() == 1 && vertex.get(0).value("name").equals("lop"); List paths = g.V(markoId).out().out().path().by("name").toList(); - System.out.println(">>>> test out path: " + paths); + LOG.info(">>>> test out path: " + paths); assert paths.size() == 2; assert paths.get(0).get(0).equals("marko"); assert paths.get(0).get(1).equals("josh"); @@ -122,17 +122,17 @@ public static void traversal(final HugeGraph graph) { assert paths.get(1).get(2).equals("ripple"); paths = shortestPath(graph, markoId, lopId, 5); - System.out.println(">>>> test shortest path: " + paths.get(0)); + LOG.info(">>>> test shortest path: " + paths.get(0)); assert paths.get(0).get(0).equals("marko"); assert paths.get(0).get(1).equals("lop"); - System.out.println(">>>> query with out() optimize: " + + LOG.info(">>>> query with out() optimize: " + graph.traversal().V(markoId) .out() .out() .values("name").toList()); - System.out.println(">>>> query with out() optimize and path(): " + + LOG.info(">>>> query with out() optimize and path(): " + graph.traversal().V() .out("knows") .out("created") From 7b6cc42788ddb3d82a6e5bcdfda135928e8d3327 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Wed, 20 Apr 2022 19:36:48 +0800 Subject: [PATCH 03/22] fix hugegraph-example/Example checkstyle issue --- .../src/main/java/com/baidu/hugegraph/example/Example1.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index cb5a940b4d..4dafbf52a1 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -270,7 +270,7 @@ public static void testQuery(final HugeGraph graph) { GraphTraversal vertices = graph.traversal().V(); int size = vertices.toList().size(); assert size == 12; - LOG.info(">>>> query all vertices: size=" + size); + LOG.info(">>>> query all vertices: size=", size); // query by label vertices = graph.traversal().V().hasLabel("person"); From 1d92f44779b3f9f00ea2d837765f4d60c783a07b Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Wed, 20 Apr 2022 19:48:09 +0800 Subject: [PATCH 04/22] fix hugegraph-example/Example checkstyle issue --- .../src/main/java/com/baidu/hugegraph/example/Example1.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index 4dafbf52a1..e6b87eb1fd 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -276,7 +276,7 @@ public static void testQuery(final HugeGraph graph) { vertices = graph.traversal().V().hasLabel("person"); size = vertices.toList().size(); assert size == 5; - LOG.info(">>>> query all persons: size=" + size); + LOG.info(">>>> query all persons: size {}" + size); // query vertex by primary-values vertices = graph.traversal().V().hasLabel("author").has("id", 1); From 38fbfdcb402aacbb9fa1a82c94ee2e608642b2b2 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Wed, 20 Apr 2022 20:13:59 +0800 Subject: [PATCH 05/22] fix hugegraph-example/Example checkstyle issue --- .../com/baidu/hugegraph/example/Example1.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index e6b87eb1fd..1546cb7029 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -270,19 +270,19 @@ public static void testQuery(final HugeGraph graph) { GraphTraversal vertices = graph.traversal().V(); int size = vertices.toList().size(); assert size == 12; - LOG.info(">>>> query all vertices: size=", size); + LOG.info(">>>> query all vertices: size {}", size); // query by label vertices = graph.traversal().V().hasLabel("person"); size = vertices.toList().size(); assert size == 5; - LOG.info(">>>> query all persons: size {}" + size); + LOG.info(">>>> query all persons: size {}", size); // query vertex by primary-values vertices = graph.traversal().V().hasLabel("author").has("id", 1); List vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(">>>> query vertices by primary-values: " + + LOG.info(">>>> query vertices by primary-values: {}", vertexList); VertexLabel author = graph.schema().getVertexLabel("author"); @@ -293,12 +293,12 @@ public static void testQuery(final HugeGraph graph) { GraphTraversal edgesOfVertex = vertices.outE("created"); List edgeList = edgesOfVertex.toList(); assert edgeList.size() == 1; - LOG.info(">>>> query edges of vertex: " + edgeList); + LOG.info(">>>> query edges of vertex: {}", edgeList); vertices = graph.traversal().V(authorId); vertexList = vertices.out("created").toList(); assert vertexList.size() == 1; - LOG.info(">>>> query vertices of vertex: " + vertexList); + LOG.info(">>>> query vertices of vertex: {}", vertexList); // query edge by sort-values vertices = graph.traversal().V(authorId); @@ -316,9 +316,9 @@ public static void testQuery(final HugeGraph graph) { .supportsQueryWithContainsKey()) { Iterator iter = graph.vertices(q); assert iter.hasNext(); - LOG.info(">>>> queryVertices(age): " + iter.hasNext()); + LOG.info(">>>> queryVertices(age): {}", iter.hasNext()); while (iter.hasNext()) { - LOG.info(">>>> queryVertices(age): " + iter.next()); + LOG.info(">>>> queryVertices(age): {}", iter.next()); } } @@ -326,7 +326,7 @@ public static void testQuery(final HugeGraph graph) { GraphTraversal edges = graph.traversal().E().limit(2); size = edges.toList().size(); assert size == 2; - LOG.info(">>>> query all edges with limit 2: size=" + size); + LOG.info(">>>> query all edges with limit 2: size {}", size); // query edge by id EdgeLabel authored = graph.edgeLabel("authored"); @@ -339,13 +339,13 @@ public static void testQuery(final HugeGraph graph) { edges = graph.traversal().E(edgeId); edgeList = edges.toList(); assert edgeList.size() == 1; - LOG.info(">>>> query edge by id: " + edgeList); + LOG.info(">>>> query edge by id: {}", edgeList); Edge edge = edgeList.get(0); edges = graph.traversal().E(edge.id()); edgeList = edges.toList(); assert edgeList.size() == 1; - LOG.info(">>>> query edge by id: " + edgeList); + LOG.info(">>>> query edge by id: {}", edgeList); // query edge by condition q = new ConditionQuery(HugeType.EDGE); @@ -357,10 +357,10 @@ public static void testQuery(final HugeGraph graph) { Iterator edges2 = graph.edges(q); assert edges2.hasNext(); - LOG.info(">>>> queryEdges(id-condition): " + + LOG.info(">>>> queryEdges(id-condition): {}", edges2.hasNext()); while (edges2.hasNext()) { - LOG.info(">>>> queryEdges(id-condition): " + + LOG.info(">>>> queryEdges(id-condition): {}", edges2.next()); } @@ -370,10 +370,10 @@ public static void testQuery(final HugeGraph graph) { q.key(HugeKeys.PROPERTIES, contribution.id()); Iterator edges3 = graph.edges(q); assert edges3.hasNext(); - LOG.info(">>>> queryEdges(contribution): " + + LOG.info(">>>> queryEdges(contribution): {}", edges3.hasNext()); while (edges3.hasNext()) { - LOG.info(">>>> queryEdges(contribution): " + + LOG.info(">>>> queryEdges(contribution): {}", edges3.next()); } } @@ -382,39 +382,39 @@ public static void testQuery(final HugeGraph graph) { vertices = graph.traversal().V().hasLabel("book"); size = vertices.toList().size(); assert size == 5; - LOG.info(">>>> query all books: size=" + size); + LOG.info(">>>> query all books: size {}", size); // query by vertex label and key-name vertices = graph.traversal().V().hasLabel("person").has("age"); size = vertices.toList().size(); assert size == 5; - LOG.info(">>>> query all persons with age: size=" + size); + LOG.info(">>>> query all persons with age: size {}", size); // query by vertex props vertices = graph.traversal().V().hasLabel("person") .has("city", "Taipei"); vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(">>>> query all persons in Taipei: " + vertexList); + LOG.info(">>>> query all persons in Taipei: {}", vertexList); vertices = graph.traversal().V().hasLabel("person").has("age", 19); vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(">>>> query all persons age==19: " + vertexList); + LOG.info(">>>> query all persons age==19: {}", vertexList); vertices = graph.traversal().V().hasLabel("person") .has("age", P.lt(19)); vertexList = vertices.toList(); assert vertexList.size() == 1; assert vertexList.get(0).property("age").value().equals(3); - LOG.info(">>>> query all persons age<19: " + vertexList); + LOG.info(">>>> query all persons age<19: {}", vertexList); String addr = "Bay Area"; vertices = graph.traversal().V().hasLabel("author") .has("lived", Text.contains(addr)); vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(String.format(">>>> query all authors lived %s: %s", + LOG.info(String.format(">>>> query all authors lived {}: {}", addr, vertexList)); } @@ -429,7 +429,7 @@ public static void testRemove(final HugeGraph graph) { james.addEdge("look", book6, "timestamp", "2017-5-3 12:00:08.0"); graph.tx().commit(); assert graph.traversal().V(book6.id()).bothE().hasNext(); - LOG.info(">>>> removing vertex: " + james); + LOG.info(">>>> removing vertex: {}", james); james.remove(); graph.tx().commit(); assert !graph.traversal().V(james.id()).hasNext(); @@ -448,7 +448,7 @@ public static void testRemove(final HugeGraph graph) { List edges = graph.traversal().E(edgeId).toList(); assert edges.size() == 1; Edge edge = edges.get(0); - LOG.info(">>>> removing edge: " + edge); + LOG.info(">>>> removing edge: {}", edge); edge.remove(); graph.tx().commit(); assert !graph.traversal().E(edgeId).hasNext(); From e908a2d40ae43874f9f16e0c7bb131183c895ef4 Mon Sep 17 00:00:00 2001 From: imbajin <17706099+imbajin@users.noreply.github.com> Date: Wed, 20 Apr 2022 23:44:45 +0800 Subject: [PATCH 06/22] Empty From 947c4da0a025fc373c0bda846780814156059ac7 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Thu, 21 Apr 2022 11:03:25 +0800 Subject: [PATCH 07/22] fix hugegraph-example/Example checkstyle issue --- .../com/baidu/hugegraph/example/Example1.java | 3 +-- .../com/baidu/hugegraph/example/Example2.java | 27 +++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index 1546cb7029..6fbae99f46 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -414,8 +414,7 @@ public static void testQuery(final HugeGraph graph) { .has("lived", Text.contains(addr)); vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(String.format(">>>> query all authors lived {}: {}", - addr, vertexList)); + LOG.info(String.format(">>>> query all authors lived {}: {}", addr, vertexList)); } public static void testRemove(final HugeGraph graph) { diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java index 1756f1a8d6..dfcafb967d 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example2.java @@ -58,16 +58,14 @@ public static void traversal(final HugeGraph graph) { GraphTraversalSource g = graph.traversal(); GraphTraversal vertices = g.V(); - LOG.info(">>>> query all vertices: size=" + - vertices.toList().size()); + LOG.info(">>>> query all vertices: size {}", vertices.toList().size()); List edges = g.E().toList(); - LOG.info(">>>> query all edges: size=" + - edges.size()); + LOG.info(">>>> query all edges: size {}", edges.size()); List names = g.V().inE("knows").limit(2) .outV().values("name").toList(); - LOG.info(">>>> query vertex(with props) of edges: " + names); + LOG.info(">>>> query vertex(with props) of edges: {}", names); assert names.size() == 2 : names.size(); names = g.V().as("a") @@ -75,11 +73,11 @@ public static void traversal(final HugeGraph graph) { .and() .out("created").in("created").as("a").values("name") .toList(); - LOG.info(">>>> query with AND: " + names); + LOG.info(">>>> query with AND: {}", names); assert names.size() == 1 : names.size(); List vertex = g.V().has("age", 29).toList(); - LOG.info(">>>> age = 29: " + vertex); + LOG.info(">>>> age = 29: {}", vertex); assert vertex.size() == 1 && vertex.get(0).value("name").equals("marko"); @@ -87,12 +85,12 @@ public static void traversal(final HugeGraph graph) { .has("age", 29) .has("city", "Beijing") .toList(); - LOG.info(">>>> age = 29 and city is Beijing: " + vertex); + LOG.info(">>>> age = 29 and city is Beijing: {}", vertex); assert vertex.size() == 1 && vertex.get(0).value("name").equals("marko"); edges = g.E().has("weight", P.lt(1.0)).toList(); - LOG.info(">>>> edges with weight < 1.0: " + edges); + LOG.info(">>>> edges with weight < 1.0: {}", edges); assert edges.size() == 4; String person = graph.schema().getVertexLabel("person").id().asString(); @@ -107,12 +105,11 @@ public static void traversal(final HugeGraph graph) { .has("weight", P.lt(1.0)) .otherV() .toList(); - LOG.info(">>>> josh's both edges with weight < 1.0: " + - vertex); + LOG.info(">>>> josh's both edges with weight < 1.0: ", vertex); assert vertex.size() == 1 && vertex.get(0).value("name").equals("lop"); List paths = g.V(markoId).out().out().path().by("name").toList(); - LOG.info(">>>> test out path: " + paths); + LOG.info(">>>> test out path: {}", paths); assert paths.size() == 2; assert paths.get(0).get(0).equals("marko"); assert paths.get(0).get(1).equals("josh"); @@ -122,17 +119,17 @@ public static void traversal(final HugeGraph graph) { assert paths.get(1).get(2).equals("ripple"); paths = shortestPath(graph, markoId, lopId, 5); - LOG.info(">>>> test shortest path: " + paths.get(0)); + LOG.info(">>>> test shortest path: {}", paths.get(0)); assert paths.get(0).get(0).equals("marko"); assert paths.get(0).get(1).equals("lop"); - LOG.info(">>>> query with out() optimize: " + + LOG.info(">>>> query with out() optimize: {}", graph.traversal().V(markoId) .out() .out() .values("name").toList()); - LOG.info(">>>> query with out() optimize and path(): " + + LOG.info(">>>> query with out() optimize and path(): {}", graph.traversal().V() .out("knows") .out("created") From 6b6a6d13da630065144f2787f2860abf2c28d9ed Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Fri, 22 Apr 2022 16:03:25 +0800 Subject: [PATCH 08/22] fix hugegraph-example/Example checkstyle issue --- .../com/baidu/hugegraph/example/Example1.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index 6fbae99f46..2da45775c7 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -282,8 +282,7 @@ public static void testQuery(final HugeGraph graph) { vertices = graph.traversal().V().hasLabel("author").has("id", 1); List vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(">>>> query vertices by primary-values: {}", - vertexList); + LOG.info(">>>> query vertices by primary-values: {}",vertexList); VertexLabel author = graph.schema().getVertexLabel("author"); String authorId = String.format("%s:%s", author.id().asString(), "11"); @@ -305,8 +304,7 @@ public static void testQuery(final HugeGraph graph) { edgesOfVertex = vertices.outE("write").has("time", "2017-4-28"); edgeList = edgesOfVertex.toList(); assert edgeList.size() == 2; - LOG.info(">>>> query edges of vertex by sort-values: " + - edgeList); + LOG.info(">>>> query edges of vertex by sort-values: {}",edgeList); // query vertex by condition (filter by property name) ConditionQuery q = new ConditionQuery(HugeType.VERTEX); @@ -357,11 +355,9 @@ public static void testQuery(final HugeGraph graph) { Iterator edges2 = graph.edges(q); assert edges2.hasNext(); - LOG.info(">>>> queryEdges(id-condition): {}", - edges2.hasNext()); + LOG.info(">>>> queryEdges(id-condition): {}",edges2.hasNext()); while (edges2.hasNext()) { - LOG.info(">>>> queryEdges(id-condition): {}", - edges2.next()); + LOG.info(">>>> queryEdges(id-condition): {}",edges2.next()); } // NOTE: query edge by has-key just supported by Cassandra @@ -370,11 +366,9 @@ public static void testQuery(final HugeGraph graph) { q.key(HugeKeys.PROPERTIES, contribution.id()); Iterator edges3 = graph.edges(q); assert edges3.hasNext(); - LOG.info(">>>> queryEdges(contribution): {}", - edges3.hasNext()); + LOG.info(">>>> queryEdges(contribution): {}",edges3.hasNext()); while (edges3.hasNext()) { - LOG.info(">>>> queryEdges(contribution): {}", - edges3.next()); + LOG.info(">>>> queryEdges(contribution): {}",edges3.next()); } } @@ -414,7 +408,7 @@ public static void testQuery(final HugeGraph graph) { .has("lived", Text.contains(addr)); vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(String.format(">>>> query all authors lived {}: {}", addr, vertexList)); + LOG.info(">>>> query all authors lived {}: {}", addr, vertexList); } public static void testRemove(final HugeGraph graph) { From d9fefb42b57f86873bed516033203e7d3463dd65 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Fri, 22 Apr 2022 16:16:09 +0800 Subject: [PATCH 09/22] fix hugegraph-example/Example checkstyle issue --- .../java/com/baidu/hugegraph/example/Example1.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java index 2da45775c7..3d79446993 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example1.java @@ -282,7 +282,7 @@ public static void testQuery(final HugeGraph graph) { vertices = graph.traversal().V().hasLabel("author").has("id", 1); List vertexList = vertices.toList(); assert vertexList.size() == 1; - LOG.info(">>>> query vertices by primary-values: {}",vertexList); + LOG.info(">>>> query vertices by primary-values: {}", vertexList); VertexLabel author = graph.schema().getVertexLabel("author"); String authorId = String.format("%s:%s", author.id().asString(), "11"); @@ -304,7 +304,7 @@ public static void testQuery(final HugeGraph graph) { edgesOfVertex = vertices.outE("write").has("time", "2017-4-28"); edgeList = edgesOfVertex.toList(); assert edgeList.size() == 2; - LOG.info(">>>> query edges of vertex by sort-values: {}",edgeList); + LOG.info(">>>> query edges of vertex by sort-values: {}", edgeList); // query vertex by condition (filter by property name) ConditionQuery q = new ConditionQuery(HugeType.VERTEX); @@ -355,9 +355,9 @@ public static void testQuery(final HugeGraph graph) { Iterator edges2 = graph.edges(q); assert edges2.hasNext(); - LOG.info(">>>> queryEdges(id-condition): {}",edges2.hasNext()); + LOG.info(">>>> queryEdges(id-condition): {}", edges2.hasNext()); while (edges2.hasNext()) { - LOG.info(">>>> queryEdges(id-condition): {}",edges2.next()); + LOG.info(">>>> queryEdges(id-condition): {}", edges2.next()); } // NOTE: query edge by has-key just supported by Cassandra @@ -366,9 +366,9 @@ public static void testQuery(final HugeGraph graph) { q.key(HugeKeys.PROPERTIES, contribution.id()); Iterator edges3 = graph.edges(q); assert edges3.hasNext(); - LOG.info(">>>> queryEdges(contribution): {}",edges3.hasNext()); + LOG.info(">>>> queryEdges(contribution): {}", edges3.hasNext()); while (edges3.hasNext()) { - LOG.info(">>>> queryEdges(contribution): {}",edges3.next()); + LOG.info(">>>> queryEdges(contribution): {}", edges3.next()); } } From 9283d39cbe7ff5cf9d85e6a922e3c43cff86438e Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 19:10:24 +0800 Subject: [PATCH 10/22] fix hugegraph-hbase checkstyle issue --- .../backend/store/hbase/HbaseSessions.java | 17 +++++++++++------ .../backend/store/hbase/HbaseStore.java | 14 +++++++++----- .../backend/store/hbase/HbaseTable.java | 3 ++- .../backend/store/hbase/HbaseTables.java | 4 ---- 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java index 011026fd8b..4ee3623948 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java @@ -31,6 +31,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.Future; +import com.baidu.hugegraph.util.Log; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; @@ -69,6 +70,7 @@ import org.apache.hadoop.hbase.filter.PrefixFilter; import org.apache.hadoop.hbase.util.VersionInfo; import org.apache.hadoop.security.UserGroupInformation; +import org.slf4j.Logger; import com.baidu.hugegraph.backend.BackendException; import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; @@ -84,6 +86,7 @@ import com.google.common.util.concurrent.Futures; public class HbaseSessions extends BackendSessionPool { + private static final Logger LOG = Log.logger(HbaseSessions.class); private static final String COPROCESSOR_AGGR = "org.apache.hadoop.hbase.coprocessor.AggregateImplementation"; @@ -222,19 +225,21 @@ public void createTable(String table, List cfs) throws IOException { .build()); } tdb.setCoprocessor(COPROCESSOR_AGGR); - try(Admin admin = this.hbase.getAdmin()) { + try (Admin admin = this.hbase.getAdmin()) { admin.createTable(tdb.build()); } } - public void createPreSplitTable(String table, List cfs, short numOfPartitions) throws IOException { + public void createPreSplitTable(String table, List cfs, + short numOfPartitions) throws IOException { TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder( TableName.valueOf(this.namespace, table)); for (byte[] cf : cfs) { builder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(cf) .build()); } - byte[][] splits = new byte[numOfPartitions - 1][org.apache.hadoop.hbase.util.Bytes.SIZEOF_SHORT]; + byte[][] splits = new byte[numOfPartitions - 1][org.apache.hadoop + .hbase.util.Bytes.SIZEOF_SHORT]; for (short split = 1; split < numOfPartitions; split++) { splits[split - 1] = org.apache.hadoop.hbase.util.Bytes.toBytes(split); } @@ -793,18 +798,18 @@ public long storeSize(String table) throws IOException { */ @SuppressWarnings("unused") private void dump(String table, Scan scan) throws IOException { - System.out.println(String.format(">>>> scan table %s with %s", + LOG.info(String.format(">>>> scan table %s with %s", table, scan)); RowIterator iterator = this.scan(table, scan); while (iterator.hasNext()) { Result row = iterator.next(); - System.out.println(StringEncoding.format(row.getRow())); + LOG.info(StringEncoding.format(row.getRow())); CellScanner cellScanner = row.cellScanner(); while (cellScanner.advance()) { Cell cell = cellScanner.current(); byte[] key = CellUtil.cloneQualifier(cell); byte[] val = CellUtil.cloneValue(cell); - System.out.println(String.format(" %s=%s", + LOG.info(String.format(" %s=%s", StringEncoding.format(key), StringEncoding.format(val))); } diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java index 6b3dbb0750..c1ac66a14d 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java @@ -54,7 +54,7 @@ public abstract class HbaseStore extends AbstractBackendStore { private static final Logger LOG = Log.logger(HbaseStore.class); - private final BackendFeatures FEATURES; + private final BackendFeatures features; private final String store; private final String namespace; @@ -258,9 +258,11 @@ public void init() { for (String table : this.tableNames()) { try { if (table.equals("g_oe") || table.equals("g_ie")) { - this.sessions.createPreSplitTable(table, HbaseTable.cfs(), this.edgeLogicPartitions); + this.sessions.createPreSplitTable(table, HbaseTable.cfs(), + this.edgeLogicPartitions); } else if (table.equals("g_v")) { - this.sessions.createPreSplitTable(table, HbaseTable.cfs(), this.vertexLogicPartitions); + this.sessions.createPreSplitTable(table, HbaseTable.cfs(), + this.vertexLogicPartitions); } else { this.sessions.createTable(table, HbaseTable.cfs()); } @@ -445,7 +447,8 @@ public static class HbaseSchemaStore extends HbaseStore { public HbaseSchemaStore(HugeConfig config, BackendStoreProvider provider, String namespace, String store) { - super(provider, namespace, store, config.get(HbaseOptions.HBASE_ENABLE_PARTITION).booleanValue()); + super(provider, namespace, store, config.get(HbaseOptions + .HBASE_ENABLE_PARTITION).booleanValue()); this.counters = new HbaseTables.Counters(); @@ -492,7 +495,8 @@ public static class HbaseGraphStore extends HbaseStore { private boolean enablePartition; public HbaseGraphStore(HugeConfig config, BackendStoreProvider provider, String namespace, String store) { - super(provider, namespace, store, config.get(HbaseOptions.HBASE_ENABLE_PARTITION).booleanValue()); + super(provider, namespace, store, config.get(HbaseOptions.HBASE_ENABLE_PARTITION) + .booleanValue()); this.enablePartition = config.get(HbaseOptions.HBASE_ENABLE_PARTITION).booleanValue(); registerTableManager(HugeType.VERTEX, new HbaseTables.Vertex(store, enablePartition)); diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java index 5d14028c91..66b8089f54 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java @@ -283,7 +283,8 @@ protected BackendEntryIterator newEntryIterator(Query query, }); } - protected void parseRowColumns(Result row, BackendEntry entry, Query query, boolean enablePartition) + protected void parseRowColumns(Result row, BackendEntry entry, Query query, + boolean enablePartition) throws IOException { CellScanner cellScanner = row.cellScanner(); while (cellScanner.advance()) { diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java index 1f47516113..8aa9d8cc6a 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTables.java @@ -21,11 +21,8 @@ import java.io.IOException; import java.util.Arrays; -import java.util.Iterator; -import com.baidu.hugegraph.backend.id.EdgeId; import com.baidu.hugegraph.backend.serializer.BytesBuffer; -import com.baidu.hugegraph.config.HugeConfig; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; @@ -35,7 +32,6 @@ import com.baidu.hugegraph.backend.query.Query; import com.baidu.hugegraph.backend.serializer.BinaryBackendEntry; import com.baidu.hugegraph.backend.serializer.BinaryEntryIterator; -import com.baidu.hugegraph.backend.serializer.BytesBuffer; import com.baidu.hugegraph.backend.store.BackendEntry; import com.baidu.hugegraph.backend.store.BackendEntry.BackendColumn; import com.baidu.hugegraph.backend.store.BackendEntryIterator; From 9fdad029eb994f6676cf4d3bd5e7ce61332778a6 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 19:27:55 +0800 Subject: [PATCH 11/22] fix hugegraph-hbase checkstyle issue --- .../com/baidu/hugegraph/example/Example3.java | 50 ++--- .../baidu/hugegraph/example/ExampleUtil.java | 4 + .../example/GraphOfTheMoviesExample.java | 187 ++++++++++++------ .../hugegraph/example/PerfExampleBase.java | 10 +- .../baidu/hugegraph/example/TaskExample.java | 11 +- .../example/ThreadRangePerfTest.java | 2 +- 6 files changed, 162 insertions(+), 102 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java index 53b174f405..27b67a5ee7 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java @@ -82,23 +82,23 @@ public static void loadNeighborRankData(final HugeGraph graph) { graph.tx().open(); - Vertex O = graph.addVertex(T.label, "person", T.id, "O", "name", "O"); + Vertex o = graph.addVertex(T.label, "person", T.id, "O", "name", "O"); - Vertex A = graph.addVertex(T.label, "person", T.id, "A", "name", "A"); - Vertex B = graph.addVertex(T.label, "person", T.id, "B", "name", "B"); - Vertex C = graph.addVertex(T.label, "person", T.id, "C", "name", "C"); - Vertex D = graph.addVertex(T.label, "person", T.id, "D", "name", "D"); + Vertex a = graph.addVertex(T.label, "person", T.id, "A", "name", "A"); + Vertex b = graph.addVertex(T.label, "person", T.id, "B", "name", "B"); + Vertex c = graph.addVertex(T.label, "person", T.id, "C", "name", "C"); + Vertex d = graph.addVertex(T.label, "person", T.id, "D", "name", "D"); - Vertex E = graph.addVertex(T.label, "movie", T.id, "E", "name", "E"); - Vertex F = graph.addVertex(T.label, "movie", T.id, "F", "name", "F"); - Vertex G = graph.addVertex(T.label, "movie", T.id, "G", "name", "G"); - Vertex H = graph.addVertex(T.label, "movie", T.id, "H", "name", "H"); - Vertex I = graph.addVertex(T.label, "movie", T.id, "I", "name", "I"); - Vertex J = graph.addVertex(T.label, "movie", T.id, "J", "name", "J"); + Vertex e = graph.addVertex(T.label, "movie", T.id, "E", "name", "E"); + Vertex f = graph.addVertex(T.label, "movie", T.id, "F", "name", "F"); + Vertex g = graph.addVertex(T.label, "movie", T.id, "G", "name", "G"); + Vertex h = graph.addVertex(T.label, "movie", T.id, "H", "name", "H"); + Vertex i = graph.addVertex(T.label, "movie", T.id, "I", "name", "I"); + Vertex j = graph.addVertex(T.label, "movie", T.id, "J", "name", "J"); - Vertex K = graph.addVertex(T.label, "person", T.id, "K", "name", "K"); - Vertex L = graph.addVertex(T.label, "person", T.id, "L", "name", "L"); - Vertex M = graph.addVertex(T.label, "person", T.id, "M", "name", "M"); + Vertex k = graph.addVertex(T.label, "person", T.id, "K", "name", "K"); + Vertex l = graph.addVertex(T.label, "person", T.id, "L", "name", "L"); + Vertex m = graph.addVertex(T.label, "person", T.id, "M", "name", "M"); O.addEdge("follow", A); O.addEdge("follow", B); @@ -149,25 +149,25 @@ public static void loadPersonalRankData(final HugeGraph graph) { graph.tx().open(); - Vertex A = graph.addVertex(T.label, "person", T.id, "A", "name", "A"); - Vertex B = graph.addVertex(T.label, "person", T.id, "B", "name", "B"); - Vertex C = graph.addVertex(T.label, "person", T.id, "C", "name", "C"); + Vertex aPerson = graph.addVertex(T.label, "person", T.id, "A", "name", "A"); + Vertex bPerson = graph.addVertex(T.label, "person", T.id, "B", "name", "B"); + Vertex cPerson = graph.addVertex(T.label, "person", T.id, "C", "name", "C"); Vertex a = graph.addVertex(T.label, "movie", T.id, "a", "name", "a"); Vertex b = graph.addVertex(T.label, "movie", T.id, "b", "name", "b"); Vertex c = graph.addVertex(T.label, "movie", T.id, "c", "name", "c"); Vertex d = graph.addVertex(T.label, "movie", T.id, "d", "name", "d"); - A.addEdge("like", a); - A.addEdge("like", c); + aPerson.addEdge("like", a); + aPerson.addEdge("like", c); - B.addEdge("like", a); - B.addEdge("like", b); - B.addEdge("like", c); - B.addEdge("like", d); + bPerson.addEdge("like", a); + bPerson.addEdge("like", b); + bPerson.addEdge("like", c); + bPerson.addEdge("like", d); - C.addEdge("like", c); - C.addEdge("like", d); + cPerson.addEdge("like", c); + cPerson.addEdge("like", d); graph.tx().commit(); } diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ExampleUtil.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ExampleUtil.java index fe68f0d654..18be21c3ba 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ExampleUtil.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ExampleUtil.java @@ -22,6 +22,7 @@ import java.io.File; import java.util.Iterator; import java.util.concurrent.TimeoutException; +import org.slf4j.Logger; import com.baidu.hugegraph.HugeException; import com.baidu.hugegraph.HugeFactory; @@ -32,8 +33,10 @@ import com.baidu.hugegraph.task.HugeTask; import com.baidu.hugegraph.task.TaskScheduler; import com.baidu.hugegraph.type.define.NodeRole; +import com.baidu.hugegraph.util.Log; public class ExampleUtil { + private static final Logger LOG = Log.logger(ExampleUtil.class); private static boolean registered = false; @@ -71,6 +74,7 @@ public static HugeGraph loadGraph(boolean needClear, boolean needProfile) { conf = path; } } catch (Exception ignored) { + LOG.warn("loadGraph warn {} ",ignored); } HugeGraph graph = HugeFactory.open(conf); diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java index 93c14436d5..a4b6bf87e9 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java @@ -44,31 +44,31 @@ public static void main(String[] args) { long startTime = System.currentTimeMillis(); GraphOfTheMoviesExample.load(graph); long endTime = System.currentTimeMillis(); - System.out.println(">>>> adding all vertices cost time(s): " + + LOG.info(">>>> adding all vertices cost time(s): {}", (endTime - startTime) / 1000.0); GraphOfTheMoviesExample.query(graph); - System.out.println(">>>> perf: " + PerfUtil.instance().toECharts()); + LOG.info(">>>> perf: {}", PerfUtil.instance().toECharts()); System.exit(0); } public static void query(HugeGraph graph) { // query all vertices - System.out.println(">>>> query all vertices"); + LOG.info(">>>> query all vertices"); GraphTraversal vertex = graph.traversal().V(); - System.out.println(">>>> query all vertices: size=" + vertex.toList().size()); + LOG.info(">>>> query all vertices: size= {}", vertex.toList().size()); // query all edges GraphTraversal edges = graph.traversal().E(); - System.out.println(">>>> query all edges: size=" + edges.toList().size()); + LOG.info(">>>> query all edges: size= {}", edges.toList().size()); // query edges by condition List tomhanksMovies = graph.traversal().V() .hasLabel("person") .has("name", "Tom Hanks") .outE("ACTED_IN").toList(); - System.out.println(">>>> Tom Hanks ACTED_IN: " + tomhanksMovies); + LOG.info{(">>>> Tom Hanks ACTED_IN: {}", tomhanksMovies); } public static void load(final HugeGraph graph) { @@ -112,10 +112,13 @@ public static void load(final HugeGraph graph) { graph.tx().open(); - Vertex theMatrix = graph.addVertex(T.label, "movie", "title", "The Matrix", "released", 1999); + Vertex theMatrix = graph.addVertex(T.label, "movie", "title", + "The Matrix", "released", 1999); Vertex keanu = graph.addVertex(T.label, "person", "name", "keanu Reeves", "born", 1964); - Vertex carrie = graph.addVertex(T.label, "person", "name", "carrie-anne Moss", "born", 1967); - Vertex laurence = graph.addVertex(T.label, "person", "name", "laurence Fishburne", "born", 1961); + Vertex carrie = graph.addVertex(T.label, "person", "name", + "carrie-anne Moss", "born", 1967); + Vertex laurence = graph.addVertex(T.label, "person", "name", + "laurence Fishburne", "born", 1961); Vertex hugo = graph.addVertex(T.label, "person", "name", "hugo Weaving", "born", 1960); Vertex lillyW = graph.addVertex(T.label, "person", "name", "Lilly Wachowski", "born", 1967); Vertex lanaW = graph.addVertex(T.label, "person", "name", "Lana Wachowski", "born", 1965); @@ -132,7 +135,8 @@ public static void load(final HugeGraph graph) { Vertex emil = graph.addVertex(T.label, "person", "name", "emil Eifrem", "born", 1978); emil.addEdge("ACTED_IN", theMatrix, "roles", "emil"); - Vertex theMatrixReloaded = graph.addVertex(T.label, "movie", "title", "The Matrix Reloaded", "released", 2003); + Vertex theMatrixReloaded = graph.addVertex(T.label, "movie", "title", + "The Matrix Reloaded", "released", 2003); keanu.addEdge("ACTED_IN", theMatrixReloaded, "roles", "Neo"); carrie.addEdge("ACTED_IN", theMatrixReloaded, "roles", "Trinity"); @@ -142,7 +146,8 @@ public static void load(final HugeGraph graph) { lanaW.addEdge("DIRECTED", theMatrix, "score", 10); joelS.addEdge("PRODUCED", theMatrixReloaded, "score", 10); - Vertex theMatrixRevolutions = graph.addVertex(T.label, "movie", "title", "The Matrix Revolutions", "released", 2003); + Vertex theMatrixRevolutions = graph.addVertex(T.label, "movie", "title", + "The Matrix Revolutions", "released", 2003); keanu.addEdge("ACTED_IN", theMatrixRevolutions, "roles", "Neo"); carrie.addEdge("ACTED_IN", theMatrixRevolutions, "roles", "Trinity"); @@ -152,9 +157,11 @@ public static void load(final HugeGraph graph) { lanaW.addEdge("DIRECTED", theMatrixRevolutions, "score", 10); joelS.addEdge("PRODUCED", theMatrixRevolutions, "score", 10); - Vertex theDevilsadvocate = graph.addVertex(T.label, "movie", "title", "The Devil's advocate", "released", 1997); + Vertex theDevilsadvocate = graph.addVertex(T.label, "movie", "title", + "The Devil's advocate", "released", 1997); - Vertex charlize = graph.addVertex(T.label, "person", "name", "charlize Theron", "born", 1975); + Vertex charlize = graph.addVertex(T.label, "person", "name", + "charlize Theron", "born", 1975); Vertex al = graph.addVertex(T.label, "person", "name", "al Pacino", "born", 1940); Vertex taylor = graph.addVertex(T.label, "person", "name", "taylor Hackford", "born", 1944); @@ -163,19 +170,22 @@ public static void load(final HugeGraph graph) { al.addEdge("ACTED_IN", theDevilsadvocate, "roles", "John Milton"); taylor.addEdge("DIRECTED", theDevilsadvocate, "score", 10); - Vertex aFewGoodMen = graph.addVertex(T.label, "movie", "title", "a Few Good Men", "released", 1992); + Vertex aFewGoodMen = graph.addVertex(T.label, "movie", "title", + "a Few Good Men", "released", 1992); Vertex tomC = graph.addVertex(T.label, "person", "name", "Tom Cruise", "born", 1962); Vertex jackN = graph.addVertex(T.label, "person", "name", "Jack Nicholson", "born", 1937); Vertex demiM = graph.addVertex(T.label, "person", "name", "Demi Moore", "born", 1962); Vertex kevinB = graph.addVertex(T.label, "person", "name", "Kevin Bacon", "born", 1958); - Vertex kieferS = graph.addVertex(T.label, "person", "name", "Kiefer Sutherland", "born", 1966); + Vertex kieferS = graph.addVertex(T.label, "person", "name", + "Kiefer Sutherland", "born", 1966); Vertex noahW = graph.addVertex(T.label, "person", "name", "Noah Wyle", "born", 1971); Vertex cubaG = graph.addVertex(T.label, "person", "name", "Cuba Gooding Jr.", "born", 1968); Vertex kevinP = graph.addVertex(T.label, "person", "name", "Kevin Pollak", "born", 1957); Vertex jtw = graph.addVertex(T.label, "person", "name", "J.T. Walsh", "born", 1943); Vertex jamesM = graph.addVertex(T.label, "person", "name", "James Marshall", "born", 1967); - Vertex christopherG = graph.addVertex(T.label, "person", "name", "Christopher Guest", "born", 1948); + Vertex christopherG = graph.addVertex(T.label, "person", "name", + "Christopher Guest", "born", 1948); Vertex robR = graph.addVertex(T.label, "person", "name", "Rob Reiner", "born", 1947); Vertex aaronS = graph.addVertex(T.label, "person", "name", "aaron Sorkin", "born", 1961); @@ -198,7 +208,8 @@ public static void load(final HugeGraph graph) { Vertex kellyM = graph.addVertex(T.label, "person", "name", "Kelly McGillis", "born", 1957); Vertex valK = graph.addVertex(T.label, "person", "name", "Val Kilmer", "born", 1959); - Vertex anthonyE = graph.addVertex(T.label, "person", "name", "anthony Edwards", "born", 1962); + Vertex anthonyE = graph.addVertex(T.label, "person", "name", + "anthony Edwards", "born", 1962); Vertex tomS = graph.addVertex(T.label, "person", "name", "Tom Skerritt", "born", 1933); Vertex megR = graph.addVertex(T.label, "person", "name", "Meg Ryan", "born", 1961); Vertex tonyS = graph.addVertex(T.label, "person", "name", "Tony Scott", "born", 1944); @@ -213,7 +224,8 @@ public static void load(final HugeGraph graph) { tonyS.addEdge("DIRECTED", topGun, "score", 10); jimC.addEdge("WROTE", topGun, "score", 10); - Vertex jerryMaguire = graph.addVertex(T.label, "movie", "title", "Jerry Maguire", "released", 2000); + Vertex jerryMaguire = graph.addVertex(T.label, "movie", "title", + "Jerry Maguire", "released", 2000); Vertex reneeZ = graph.addVertex(T.label, "person", "name", "Renee Zellweger", "born", 1969); Vertex kellyP = graph.addVertex(T.label, "person", "name", "Kelly Preston", "born", 1962); @@ -221,7 +233,8 @@ public static void load(final HugeGraph graph) { Vertex jayM = graph.addVertex(T.label, "person", "name", "Jay Mohr", "born", 1970); Vertex bonnieH = graph.addVertex(T.label, "person", "name", "Bonnie Hunt", "born", 1970); Vertex reginaK = graph.addVertex(T.label, "person", "name", "Regina King", "born", 1961); - Vertex jonathanL = graph.addVertex(T.label, "person", "name", "Jonathan Lipnicki", "born", 1996); + Vertex jonathanL = graph.addVertex(T.label, "person", "name", + "Jonathan Lipnicki", "born", 1996); Vertex cameronC = graph.addVertex(T.label, "person", "name", "Cameron Crowe", "born", 1957); tomC.addEdge("ACTED_IN", jerryMaguire, "roles", "Jerry Maguire"); @@ -237,13 +250,15 @@ public static void load(final HugeGraph graph) { cameronC.addEdge("PRODUCED", jerryMaguire, "score", 10); cameronC.addEdge("WROTE", jerryMaguire, "score", 10); - Vertex standByMe = graph.addVertex(T.label, "movie", "title", "Stand By Me", "released", 1986); + Vertex standByMe = graph.addVertex(T.label, "movie", "title", + "Stand By Me", "released", 1986); Vertex riverP = graph.addVertex(T.label, "person", "name", "River Phoenix", "born", 1970); Vertex coreyF = graph.addVertex(T.label, "person", "name", "Corey Feldman", "born", 1971); Vertex wilW = graph.addVertex(T.label, "person", "name", "Wil Wheaton", "born", 1972); Vertex johnC = graph.addVertex(T.label, "person", "name", "John Cusack", "born", 1966); - Vertex marshallB = graph.addVertex(T.label, "person", "name", "Marshall Bell", "born", 1942); + Vertex marshallB = graph.addVertex(T.label, "person", "name", + "Marshall Bell", "born", 1942); wilW.addEdge("ACTED_IN", standByMe, "roles", "Gordie Lachance"); riverP.addEdge("ACTED_IN", standByMe, "roles", "Chris Chambers"); @@ -254,7 +269,8 @@ public static void load(final HugeGraph graph) { marshallB.addEdge("ACTED_IN", standByMe, "roles", "Mr. Lachance"); robR.addEdge("DIRECTED", standByMe, "score", 10); - Vertex asGoodasItGets = graph.addVertex(T.label, "movie", "title", "as Good as It Gets", "released", 1997); + Vertex asGoodasItGets = graph.addVertex(T.label, "movie", "title", + "as Good as It Gets", "released", 1997); Vertex helenH = graph.addVertex(T.label, "person", "name", "Helen Hunt", "born", 1963); Vertex gregK = graph.addVertex(T.label, "person", "name", "Greg Kinnear", "born", 1963); @@ -266,9 +282,11 @@ public static void load(final HugeGraph graph) { cubaG.addEdge("ACTED_IN", asGoodasItGets, "roles", "Frank Sachs"); jamesB.addEdge("DIRECTED", asGoodasItGets, "score", 10); - Vertex whatDreamsMayCome = graph.addVertex(T.label, "movie", "title", "What Dreams May Come", "released", 1998); + Vertex whatDreamsMayCome = graph.addVertex(T.label, "movie", "title", + "What Dreams May Come", "released", 1998); - Vertex annabellaS = graph.addVertex(T.label, "person", "name", "annabella Sciorra", "born", 1960); + Vertex annabellaS = graph.addVertex(T.label, "person", "name", + "annabella Sciorra", "born", 1960); Vertex maxS = graph.addVertex(T.label, "person", "name", "Max von Sydow", "born", 1929); Vertex wernerH = graph.addVertex(T.label, "person", "name", "Werner Herzog", "born", 1942); Vertex robin = graph.addVertex(T.label, "person", "name", "robin Williams", "born", 1951); @@ -281,7 +299,8 @@ public static void load(final HugeGraph graph) { wernerH.addEdge("ACTED_IN", whatDreamsMayCome, "roles", "The Face"); vincentW.addEdge("DIRECTED", whatDreamsMayCome, "score", 10); - Vertex snowFallingonCedars = graph.addVertex(T.label, "movie", "title", "Snow Falling on Cedars", "released", 1999); + Vertex snowFallingonCedars = graph.addVertex(T.label, "movie", "title", + "Snow Falling on Cedars", "released", 1999); Vertex ethanH = graph.addVertex(T.label, "person", "name", "Ethan Hawke", "born", 1970); Vertex rickY = graph.addVertex(T.label, "person", "name", "Rick Yune", "born", 1971); @@ -294,7 +313,8 @@ public static void load(final HugeGraph graph) { jamesC.addEdge("ACTED_IN", snowFallingonCedars, "roles", "Judge Fielding"); scottH.addEdge("DIRECTED", snowFallingonCedars, "score", 10); - Vertex youveGotMail = graph.addVertex(T.label, "movie", "title", "You've Got Mail", "released", 1998); + Vertex youveGotMail = graph.addVertex(T.label, "movie", "title", + "You've Got Mail", "released", 1998); Vertex parkerP = graph.addVertex(T.label, "person", "name", "Parker Posey", "born", 1968); Vertex daveC = graph.addVertex(T.label, "person", "name", "Dave Chappelle", "born", 1973); @@ -310,7 +330,8 @@ public static void load(final HugeGraph graph) { steveZ.addEdge("ACTED_IN", youveGotMail, "roles", "George Pappas"); noraE.addEdge("DIRECTED", youveGotMail, "score", 10); - Vertex sleeplessInSeattle = graph.addVertex(T.label, "movie", "title", "Sleepless in Seattle", "released", 1993); + Vertex sleeplessInSeattle = graph.addVertex(T.label, "movie", "title", + "Sleepless in Seattle", "released", 1993); Vertex ritaW = graph.addVertex(T.label, "person", "name", "Rita Wilson", "born", 1956); Vertex billPull = graph.addVertex(T.label, "person", "name", "Bill Pullman", "born", 1953); @@ -325,17 +346,21 @@ public static void load(final HugeGraph graph) { rosieO.addEdge("ACTED_IN", sleeplessInSeattle, "roles", "Becky"); noraE.addEdge("DIRECTED", sleeplessInSeattle, "score", 10); - Vertex joeVersustheVolcano = graph.addVertex(T.label, "movie", "title", "Joe Versus the Volcano", "released", 1990); + Vertex joeVersustheVolcano = graph.addVertex(T.label, "movie", "title", + "Joe Versus the Volcano", "released", 1990); - Vertex johnS = graph.addVertex(T.label, "person", "name", "John Patrick Stanley", "born", 1950); + Vertex johnS = graph.addVertex(T.label, "person", "name", + "John Patrick Stanley", "born", 1950); Vertex nathan = graph.addVertex(T.label, "person", "name", "nathan Lane", "born", 1956); tomH.addEdge("ACTED_IN", joeVersustheVolcano, "roles", "Joe Banks"); - megR.addEdge("ACTED_IN", joeVersustheVolcano, "roles", "DeDe, angelica Graynamore, Patricia Graynamore"); + megR.addEdge("ACTED_IN", joeVersustheVolcano, "roles", + "DeDe, angelica Graynamore, Patricia Graynamore"); nathan.addEdge("ACTED_IN", joeVersustheVolcano, "roles", "Baw"); johnS.addEdge("DIRECTED", joeVersustheVolcano, "score", 10); - Vertex whenHarryMetSally = graph.addVertex(T.label, "movie", "title", "When Harry Met Sally", "released", 1998); + Vertex whenHarryMetSally = graph.addVertex(T.label, "movie", "title", + "When Harry Met Sally", "released", 1998); Vertex billyC = graph.addVertex(T.label, "person", "name", "Billy Crystal", "born", 1948); Vertex carrieF = graph.addVertex(T.label, "person", "name", "carrie Fisher", "born", 1956); @@ -350,7 +375,8 @@ public static void load(final HugeGraph graph) { noraE.addEdge("PRODUCED", whenHarryMetSally, "score", 10); noraE.addEdge("WROTE", whenHarryMetSally, "score", 10); - Vertex thatThingYouDo = graph.addVertex(T.label, "movie", "title", "That Thing You Do", "released", 1996); + Vertex thatThingYouDo = graph.addVertex(T.label, "movie", "title", + "That Thing You Do", "released", 1996); Vertex livT = graph.addVertex(T.label, "person", "name", "Liv Tyler", "born", 1977); @@ -359,7 +385,8 @@ public static void load(final HugeGraph graph) { charlize.addEdge("ACTED_IN", thatThingYouDo, "roles", "Tina"); tomH.addEdge("DIRECTED", thatThingYouDo, "score", 10); - Vertex theReplacements = graph.addVertex(T.label, "movie", "title", "The Replacements", "released", 2000); + Vertex theReplacements = graph.addVertex(T.label, "movie", "title", + "The Replacements", "released", 2000); Vertex brooke = graph.addVertex(T.label, "person", "name", "brooke Langton", "born", 1970); Vertex gene = graph.addVertex(T.label, "person", "name", "gene Hackman", "born", 1930); @@ -372,9 +399,11 @@ public static void load(final HugeGraph graph) { orlando.addEdge("ACTED_IN", theReplacements, "roles", "Clifford Franklin"); howard.addEdge("DIRECTED", theReplacements, "score", 10); - Vertex rescueDawn = graph.addVertex(T.label, "movie", "title", "rescueDawn", "released", 2006); + Vertex rescueDawn = graph.addVertex(T.label, "movie", "title", + "rescueDawn", "released", 2006); - Vertex christianB = graph.addVertex(T.label, "person", "name", "Christian Bale", "born", 1974); + Vertex christianB = graph.addVertex(T.label, "person", "name", + "Christian Bale", "born", 1974); Vertex zachG = graph.addVertex(T.label, "person", "name", "Zach Grenier", "born", 1954); marshallB.addEdge("ACTED_IN", rescueDawn, "roles", "admiral"); @@ -383,7 +412,8 @@ public static void load(final HugeGraph graph) { steveZ.addEdge("ACTED_IN", rescueDawn, "roles", "Duane"); wernerH.addEdge("DIRECTED", rescueDawn, "score", 10); - Vertex theBirdcage = graph.addVertex(T.label, "movie", "title", "The Birdcage", "released", 1996); + Vertex theBirdcage = graph.addVertex(T.label, "movie", "title", + "The Birdcage", "released", 1996); Vertex mikeN = graph.addVertex(T.label, "person", "name", "Mike Nichols", "born", 1931); @@ -392,9 +422,11 @@ public static void load(final HugeGraph graph) { gene.addEdge("ACTED_IN", theBirdcage, "roles", "Sen. Kevin Keeley"); mikeN.addEdge("DIRECTED", theBirdcage, "score", 10); - Vertex unforgiven = graph.addVertex(T.label, "movie", "title", "unforgiven", "released", 1992); + Vertex unforgiven = graph.addVertex(T.label, "movie", "title", + "unforgiven", "released", 1992); - Vertex richardH = graph.addVertex(T.label, "person", "name", "Richard Harris", "born", 1930); + Vertex richardH = graph.addVertex(T.label, "person", "name", + "Richard Harris", "born", 1930); Vertex clintE = graph.addVertex(T.label, "person", "name", "Richard Harris", "born", 1930); richardH.addEdge("ACTED_IN", unforgiven, "roles", "English Bob"); @@ -402,7 +434,8 @@ public static void load(final HugeGraph graph) { gene.addEdge("ACTED_IN", unforgiven, "roles", "Little Bill Daggett"); clintE.addEdge("DIRECTED", unforgiven, "score", 10); - Vertex johnnyMnemonic = graph.addVertex(T.label, "movie", "title", "Johnny Mnemonic", "released", 1995); + Vertex johnnyMnemonic = graph.addVertex(T.label, "movie", "title", + "Johnny Mnemonic", "released", 1995); Vertex takeshi = graph.addVertex(T.label, "person", "name", "takeshi Kitano", "born", 1947); Vertex dina = graph.addVertex(T.label, "person", "name", "dina Meyer", "born", 1968); @@ -415,26 +448,33 @@ public static void load(final HugeGraph graph) { iceT.addEdge("ACTED_IN", johnnyMnemonic, "roles", "J-Bone"); robertL.addEdge("DIRECTED", johnnyMnemonic, "score", 10); - Vertex cloudatlas = graph.addVertex(T.label, "movie", "title", "Cloud atlas", "released", 2012); + Vertex cloudatlas = graph.addVertex(T.label, "movie", "title", + "Cloud atlas", "released", 2012); Vertex halleB = graph.addVertex(T.label, "person", "name", "Halle Berry", "born", 1966); Vertex jimB = graph.addVertex(T.label, "person", "name", "Jim Broadbent", "born", 1949); Vertex tomT = graph.addVertex(T.label, "person", "name", "Tom Tykwer", "born", 1965); - Vertex davidMitchell = graph.addVertex(T.label, "person", "name", "David Mitchell", "born", 1969); - Vertex stefanarndt = graph.addVertex(T.label, "person", "name", "Stefan arndt", "born", 1961); - - tomH.addEdge("ACTED_IN", cloudatlas, "roles", "Zachry, Dr. Henry Goose, Isaac Sachs, Dermot Hoggins"); - hugo.addEdge("ACTED_IN", cloudatlas, "roles", "Bill Smoke, Haskell Moore, Tadeusz Kesselring, Nurse Noakes," - + " Boardman Mephi, Old Georgie"); + Vertex davidMitchell = graph.addVertex(T.label, "person", "name", + "David Mitchell", "born", 1969); + Vertex stefanarndt = graph.addVertex(T.label, "person", "name", + "Stefan arndt", "born", 1961); + + tomH.addEdge("ACTED_IN", cloudatlas, "roles", + "Zachry, Dr. Henry Goose, Isaac Sachs, Dermot Hoggins"); + hugo.addEdge("ACTED_IN", cloudatlas, "roles", + "Bill Smoke, Haskell Moore, Tadeusz Kesselring, Nurse Noakes," + + " Boardman Mephi, Old Georgie"); halleB.addEdge("ACTED_IN", cloudatlas, "roles", "Luisa Rey, Jocasta ayrs, Ovid, Meronym"); - jimB.addEdge("ACTED_IN", cloudatlas, "roles", "Vyvyan ayrs, Captain Molyneux, Timothy Cavendish"); + jimB.addEdge("ACTED_IN", cloudatlas, "roles", + "Vyvyan ayrs, Captain Molyneux, Timothy Cavendish"); tomT.addEdge("DIRECTED", cloudatlas, "score", 10); lillyW.addEdge("DIRECTED", cloudatlas, "score", 10); lanaW.addEdge("DIRECTED", cloudatlas, "score", 10); davidMitchell.addEdge("WROTE", cloudatlas, "score", 10); stefanarndt.addEdge("PRODUCED", cloudatlas, "score", 10); - Vertex theDaVinciCode = graph.addVertex(T.label, "movie", "title", "The Da Vinci Code", "released", 2006); + Vertex theDaVinciCode = graph.addVertex(T.label, "movie", "title", + "The Da Vinci Code", "released", 2006); Vertex ianM = graph.addVertex(T.label, "person", "name", "Ian McKellen", "born", 1939); Vertex audreyT = graph.addVertex(T.label, "person", "name", "audrey Tautou", "born", 1976); @@ -447,9 +487,11 @@ public static void load(final HugeGraph graph) { paulB.addEdge("ACTED_IN", theDaVinciCode, "roles", "Silas"); ronH.addEdge("DIRECTED", theDaVinciCode, "score", 10); - Vertex vforVendetta = graph.addVertex(T.label, "movie", "title", "The Da Vinci Code", "released", 2006); + Vertex vforVendetta = graph.addVertex(T.label, "movie", "title", + "The Da Vinci Code", "released", 2006); - Vertex natalieP = graph.addVertex(T.label, "person", "name", "Natalie Portman", "born", 1981); + Vertex natalieP = graph.addVertex(T.label, "person", "name", + "Natalie Portman", "born", 1981); Vertex stephenR = graph.addVertex(T.label, "person", "name", "Stephen Rea", "born", 1946); Vertex johnH = graph.addVertex(T.label, "person", "name", "John Hurt", "born", 1940); Vertex benM = graph.addVertex(T.label, "person", "name", "Ben Miles", "born", 1967); @@ -466,13 +508,15 @@ public static void load(final HugeGraph graph) { lillyW.addEdge("WROTE", vforVendetta, "score", 10); lanaW.addEdge("WROTE", vforVendetta, "score", 10); - Vertex speedRacer = graph.addVertex(T.label, "movie", "title", "Speed Racer", "released", 2008); + Vertex speedRacer = graph.addVertex(T.label, "movie", "title", + "Speed Racer", "released", 2008); Vertex matthewF = graph.addVertex(T.label, "person", "name", "Matthew Fox", "born", 1966); Vertex emileH = graph.addVertex(T.label, "person", "name", "Emile Hirsch", "born", 1985); Vertex johnG = graph.addVertex(T.label, "person", "name", "John Goodman", "born", 1940); Vertex susanS = graph.addVertex(T.label, "person", "name", "Susan Sarandon", "born", 1966); - Vertex christinaR = graph.addVertex(T.label, "person", "name", "Christina Ricci", "born", 1980); + Vertex christinaR = graph.addVertex(T.label, "person", "name", + "Christina Ricci", "born", 1980); Vertex rain = graph.addVertex(T.label, "person", "name", "Rain", "born", 1982); emileH.addEdge("ACTED_IN", speedRacer, "roles", "Speed Racer"); @@ -488,7 +532,8 @@ public static void load(final HugeGraph graph) { lanaW.addEdge("WROTE", speedRacer, "score", 10); joelS.addEdge("PRODUCED", speedRacer, "score", 10); - Vertex ninjaassassin = graph.addVertex(T.label, "movie", "title", "Speed Racer", "released", 2009); + Vertex ninjaassassin = graph.addVertex(T.label, "movie", "title", + "Speed Racer", "released", 2009); Vertex naomieH = graph.addVertex(T.label, "person", "name", "Naomie Harris", "born", 1982); @@ -501,13 +546,16 @@ public static void load(final HugeGraph graph) { lanaW.addEdge("PRODUCED", ninjaassassin, "score", 10); joelS.addEdge("PRODUCED", ninjaassassin, "score", 10); - Vertex theGreenMile = graph.addVertex(T.label, "movie", "title", "The Green Mile", "released", 1999); + Vertex theGreenMile = graph.addVertex(T.label, "movie", "title", + "The Green Mile", "released", 1999); - Vertex michaelD = graph.addVertex(T.label, "person", "name", "Michael Clarke Duncan", "born", 1957); + Vertex michaelD = graph.addVertex(T.label, "person", "name", + "Michael Clarke Duncan", "born", 1957); Vertex davidM = graph.addVertex(T.label, "person", "name", "David Morse", "born", 1953); Vertex samR = graph.addVertex(T.label, "person", "name", "Sam Rockwell", "born", 1968); Vertex garyS = graph.addVertex(T.label, "person", "name", "Gary Sinise", "born", 1955); - Vertex patriciaC = graph.addVertex(T.label, "person", "name", "Patricia Clarkson", "born", 1959); + Vertex patriciaC = graph.addVertex(T.label, "person", "name", + "Patricia Clarkson", "born", 1959); Vertex frankD = graph.addVertex(T.label, "person", "name", "Frank Darabont", "born", 1959); tomH.addEdge("ACTED_IN", theGreenMile, "roles", "Paul Edgecomb"); @@ -520,7 +568,8 @@ public static void load(final HugeGraph graph) { patriciaC.addEdge("ACTED_IN", theGreenMile, "roles", "Melinda Moores"); frankD.addEdge("DIRECTED", theGreenMile, "score", 10); - Vertex frostNixon = graph.addVertex(T.label, "movie", "title", "Frost/Nixon", "released", 2008); + Vertex frostNixon = graph.addVertex(T.label, "movie", "title", + "Frost/Nixon", "released", 2008); Vertex frankL = graph.addVertex(T.label, "person", "name", "Frank Langella", "born", 1938); Vertex michaelS = graph.addVertex(T.label, "person", "name", "Michael Sheen", "born", 1969); @@ -558,7 +607,8 @@ public static void load(final HugeGraph graph) { Vertex twister = graph.addVertex(T.label, "movie", "title", "twister", "released", 1996); - Vertex philipH = graph.addVertex(T.label, "person", "name", "Philip Seymour Hoffman", "born", 1967); + Vertex philipH = graph.addVertex(T.label, "person", "name", + "Philip Seymour Hoffman", "born", 1967); Vertex janB = graph.addVertex(T.label, "person", "name", "Jan de Bont", "born", 1943); billPax.addEdge("ACTED_IN", twister, "roles", "Bill Harding"); @@ -569,13 +619,15 @@ public static void load(final HugeGraph graph) { Vertex castaway = graph.addVertex(T.label, "movie", "title", "Cast away", "released", 2000); - Vertex robertZ = graph.addVertex(T.label, "person", "name", "Robert Zemeckis", "born", 1951); + Vertex robertZ = graph.addVertex(T.label, "person", "name", + "Robert Zemeckis", "born", 1951); tomH.addEdge("ACTED_IN", castaway, "roles", "Chuck Noland"); helenH.addEdge("ACTED_IN", castaway, "roles", "Kelly Frears"); robertZ.addEdge("DIRECTED", castaway, "score", 10); - Vertex oneFlewOvertheCuckoosNest = graph.addVertex(T.label, "movie", "title", "One Flew Over the Cuckoo's Nest", "released", 1975); + Vertex oneFlewOvertheCuckoosNest = graph.addVertex(T.label, "movie", "title", + "One Flew Over the Cuckoo's Nest", "released", 1975); Vertex milosF = graph.addVertex(T.label, "person", "name", "Milos Forman", "born", 1932); @@ -583,7 +635,8 @@ public static void load(final HugeGraph graph) { dannyD.addEdge("ACTED_IN", oneFlewOvertheCuckoosNest, "roles", "Martini"); milosF.addEdge("DIRECTED", oneFlewOvertheCuckoosNest, "score", 10); - Vertex somethingsGottaGive = graph.addVertex(T.label, "movie", "title", "Something's Gotta Give", "released", 2003); + Vertex somethingsGottaGive = graph.addVertex(T.label, "movie", "title", + "Something's Gotta Give", "released", 2003); Vertex dianeK = graph.addVertex(T.label, "person", "name", "Diane Keaton", "born", 1946); Vertex nancyM = graph.addVertex(T.label, "person", "name", "Nancy Meyers", "born", 1949); @@ -595,7 +648,8 @@ public static void load(final HugeGraph graph) { nancyM.addEdge("PRODUCED", somethingsGottaGive, "score", 10); nancyM.addEdge("WROTE", somethingsGottaGive, "score", 10); - Vertex bicentennialMan = graph.addVertex(T.label, "movie", "title", "Bicentennial Man", "released", 2000); + Vertex bicentennialMan = graph.addVertex(T.label, "movie", "title", + "Bicentennial Man", "released", 2000); Vertex chrisC = graph.addVertex(T.label, "person", "name", "Chris Columbus", "born", 1958); @@ -603,7 +657,8 @@ public static void load(final HugeGraph graph) { oliverP.addEdge("ACTED_IN", bicentennialMan, "roles", "Rupert Burns"); chrisC.addEdge("DIRECTED", bicentennialMan, "score", 10); - Vertex charlieWilsonsWar = graph.addVertex(T.label, "movie", "title", "Charlie Wilson's War", "released", 2007); + Vertex charlieWilsonsWar = graph.addVertex(T.label, "movie", "title", + "Charlie Wilson's War", "released", 2007); Vertex juliaR = graph.addVertex(T.label, "person", "name", "Julia Roberts", "born", 1967); @@ -612,13 +667,15 @@ public static void load(final HugeGraph graph) { philipH.addEdge("ACTED_IN", charlieWilsonsWar, "roles", "Gust avrakotos"); mikeN.addEdge("DIRECTED", charlieWilsonsWar, "score", 10); - Vertex thePolarExpress = graph.addVertex(T.label, "movie", "title", "The Polar Express", "released", 2004); + Vertex thePolarExpress = graph.addVertex(T.label, "movie", "title", + "The Polar Express", "released", 2004); tomH.addEdge("ACTED_IN", thePolarExpress, "roles", "Hero Boy"); robertZ.addEdge("DIRECTED", thePolarExpress, "score", 10); - Vertex aLeagueofTheirOwn = graph.addVertex(T.label, "movie", "title", "a League of Their Own", "released", 1992); + Vertex aLeagueofTheirOwn = graph.addVertex(T.label, "movie", "title", + "a League of Their Own", "released", 1992); Vertex madonna = graph.addVertex(T.label, "person", "name", "madonna", "born", 1954); Vertex geenaD = graph.addVertex(T.label, "person", "name", "Geena Davis", "born", 1956); diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java index ab87559f8d..22590ec68e 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java @@ -62,7 +62,7 @@ public abstract class PerfExampleBase { public int test(String[] args) throws Exception { if (args.length != 4) { - System.out.println("Usage: threadCount times multiple profile"); + LOG.info("Usage: threadCount times multiple profile"); return -1; } @@ -115,8 +115,8 @@ public void testInsertPerf(GraphManager graph, this.testInsert(graph, times, multiple); }, threadCount); - LOG.info("Insert rate with threads: {} vertices/s & {} edges/s, " + - "insert total {} vertices & {} edges, cost time: {}ms", + LOG.info("Insert rate with threads: {} vertices/s & {} edges/s, + insert total {} vertices & {} edges, cost time: {}ms", vertices * 1000 / cost, edges * 1000 / cost, vertices, edges, cost); @@ -133,8 +133,8 @@ public void testQueryVertexPerf(GraphManager graph, }, threadCount); final long size = (PERSON_NUM + SOFTWARE_NUM) * threadCount * times; - LOG.info("Query rate with threads: {} vertices/s, " + - "query total vertices {}, cost time: {}ms", + LOG.info("Query rate with threads: {} vertices/s, + query total vertices {}, cost time: {}ms", size * 1000 / cost, size, cost); } diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java index 8fd7a49ca4..621c698c1e 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java @@ -62,7 +62,7 @@ public static void testTask(HugeGraph graph) throws InterruptedException { scheduler.save(task); Iterator> iter; iter = scheduler.tasks(TaskStatus.RUNNING, -1, null); - System.out.println(">>>> running task: " + IteratorUtils.toList(iter)); + LOG.info(">>>> running task: {}", IteratorUtils.toList(iter)); Thread.sleep(TestTask.UNIT * 33); task.cancel(true); @@ -74,10 +74,10 @@ public static void testTask(HugeGraph graph) throws InterruptedException { assert iter.hasNext(); task = iter.next(); - System.out.println(">>>> task may be interrupted"); + LOG.info(">>>> task may be interrupted"); Thread.sleep(TestTask.UNIT * 10); - System.out.println(">>>> restore task..."); + LOG.info(">>>> restore task..."); Whitebox.setInternalState(task, "status", TaskStatus.RUNNING); scheduler.restoreTasks(); Thread.sleep(TestTask.UNIT * 80); @@ -98,10 +98,9 @@ public static class TestTask extends TaskCallable { @Override public Integer call() throws Exception { - System.out.println(">>>> running task with parameter: " + - this.task().input()); + LOG.info(">>>> running task with parameter: {}", this.task().input()); for (int i = this.task().progress(); i <= 100 && this.run; i++) { - System.out.println(">>>> progress " + i); + LOG.info(">>>> progress " + i); this.task().progress(i); this.graph().taskScheduler().save(this.task()); Thread.sleep(UNIT); diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java index e96a6a0039..0296a7f346 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java @@ -30,7 +30,7 @@ public class ThreadRangePerfTest { public static void main(String[] args) throws Exception { if (args.length != 6) { - System.out.println("Usage: minThread maxThread threadStep " + + LOG.info("Usage: minThread maxThread threadStep " + "times multiple profile"); return; } From 656f94b36f541261c0b180d8de1324958a4a0715 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 19:30:27 +0800 Subject: [PATCH 12/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../com/baidu/hugegraph/backend/store/hbase/HbaseStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java index c1ac66a14d..64d086ee91 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java @@ -74,7 +74,7 @@ public HbaseStore(BackendStoreProvider provider, this.namespace = namespace; this.store = store; this.sessions = null; - this.FEATURES = new HbaseFeatures(enablePartition); + this.features = new HbaseFeatures(enablePartition); this.registerMetaHandlers(); LOG.debug("Store loaded: {}", store); @@ -138,7 +138,7 @@ public BackendStoreProvider provider() { @Override public BackendFeatures features() { - return FEATURES; + return features; } @Override From 614f8640b32b3e13386f98241a2f3fb183d4e8ac Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 19:35:27 +0800 Subject: [PATCH 13/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../src/main/java/com/baidu/hugegraph/example/TaskExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java index 621c698c1e..7b69871de1 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/TaskExample.java @@ -100,7 +100,7 @@ public static class TestTask extends TaskCallable { public Integer call() throws Exception { LOG.info(">>>> running task with parameter: {}", this.task().input()); for (int i = this.task().progress(); i <= 100 && this.run; i++) { - LOG.info(">>>> progress " + i); + LOG.info(">>>> progress {}", i); this.task().progress(i); this.graph().taskScheduler().save(this.task()); Thread.sleep(UNIT); From c75dede1e9ed406d7498ff47cce727b62f795016 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 19:43:33 +0800 Subject: [PATCH 14/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../hugegraph/backend/store/hbase/HbaseSessions.java | 12 ++++++------ .../hugegraph/backend/store/hbase/HbaseStore.java | 8 ++++---- .../hugegraph/backend/store/hbase/HbaseTable.java | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java index 4ee3623948..aa248e559b 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java @@ -86,8 +86,9 @@ import com.google.common.util.concurrent.Futures; public class HbaseSessions extends BackendSessionPool { - private static final Logger LOG = Log.logger(HbaseSessions.class); + private static final Logger LOG = Log.logger(HbaseSessions.class); + private static final String COPROCESSOR_AGGR = "org.apache.hadoop.hbase.coprocessor.AggregateImplementation"; private static final long SCANNER_CACHING = 1000L; @@ -238,8 +239,8 @@ public void createPreSplitTable(String table, List cfs, builder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(cf) .build()); } - byte[][] splits = new byte[numOfPartitions - 1][org.apache.hadoop - .hbase.util.Bytes.SIZEOF_SHORT]; + byte[][] splits = new byte[numOfPartitions - 1] + [org.apache.hadoop.hbase.util.Bytes.SIZEOF_SHORT]; for (short split = 1; split < numOfPartitions; split++) { splits[split - 1] = org.apache.hadoop.hbase.util.Bytes.toBytes(split); } @@ -798,8 +799,7 @@ public long storeSize(String table) throws IOException { */ @SuppressWarnings("unused") private void dump(String table, Scan scan) throws IOException { - LOG.info(String.format(">>>> scan table %s with %s", - table, scan)); + LOG.info(String.format(">>>> scan table {} with {}", table, scan)); RowIterator iterator = this.scan(table, scan); while (iterator.hasNext()) { Result row = iterator.next(); @@ -809,7 +809,7 @@ private void dump(String table, Scan scan) throws IOException { Cell cell = cellScanner.current(); byte[] key = CellUtil.cloneQualifier(cell); byte[] val = CellUtil.cloneValue(cell); - LOG.info(String.format(" %s=%s", + LOG.info(String.format(" {}={}", StringEncoding.format(key), StringEncoding.format(val))); } diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java index 64d086ee91..061b65ecb7 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseStore.java @@ -447,8 +447,8 @@ public static class HbaseSchemaStore extends HbaseStore { public HbaseSchemaStore(HugeConfig config, BackendStoreProvider provider, String namespace, String store) { - super(provider, namespace, store, config.get(HbaseOptions - .HBASE_ENABLE_PARTITION).booleanValue()); + super(provider, namespace, store, + config.get(HbaseOptions.HBASE_ENABLE_PARTITION).booleanValue()); this.counters = new HbaseTables.Counters(); @@ -495,8 +495,8 @@ public static class HbaseGraphStore extends HbaseStore { private boolean enablePartition; public HbaseGraphStore(HugeConfig config, BackendStoreProvider provider, String namespace, String store) { - super(provider, namespace, store, config.get(HbaseOptions.HBASE_ENABLE_PARTITION) - .booleanValue()); + super(provider, namespace, store, + config.get(HbaseOptions.HBASE_ENABLE_PARTITION).booleanValue()); this.enablePartition = config.get(HbaseOptions.HBASE_ENABLE_PARTITION).booleanValue(); registerTableManager(HugeType.VERTEX, new HbaseTables.Vertex(store, enablePartition)); diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java index 66b8089f54..3cca9a5dcc 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseTable.java @@ -284,7 +284,7 @@ protected BackendEntryIterator newEntryIterator(Query query, } protected void parseRowColumns(Result row, BackendEntry entry, Query query, - boolean enablePartition) + boolean enablePartition) throws IOException { CellScanner cellScanner = row.cellScanner(); while (cellScanner.advance()) { From d998fa3c5816c779347de7e06d844557fabdd872 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 21:15:52 +0800 Subject: [PATCH 15/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../java/com/baidu/hugegraph/example/PerfExampleBase.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java index 22590ec68e..5a1d523180 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/PerfExampleBase.java @@ -115,8 +115,8 @@ public void testInsertPerf(GraphManager graph, this.testInsert(graph, times, multiple); }, threadCount); - LOG.info("Insert rate with threads: {} vertices/s & {} edges/s, - insert total {} vertices & {} edges, cost time: {}ms", + LOG.info("Insert rate with threads: {} vertices/s & {} edges/s, " + + "insert total {} vertices & {} edges, cost time: {}ms", vertices * 1000 / cost, edges * 1000 / cost, vertices, edges, cost); @@ -133,8 +133,8 @@ public void testQueryVertexPerf(GraphManager graph, }, threadCount); final long size = (PERSON_NUM + SOFTWARE_NUM) * threadCount * times; - LOG.info("Query rate with threads: {} vertices/s, - query total vertices {}, cost time: {}ms", + LOG.info("Query rate with threads: {} vertices/s, " + + "query total vertices {}, cost time: {}ms", size * 1000 / cost, size, cost); } From d05f20bff904849a3e2e9472a3e6ebed8561b882 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 21:17:36 +0800 Subject: [PATCH 16/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../java/com/baidu/hugegraph/example/ThreadRangePerfTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java index 0296a7f346..6f63b16ebe 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java @@ -30,8 +30,8 @@ public class ThreadRangePerfTest { public static void main(String[] args) throws Exception { if (args.length != 6) { - LOG.info("Usage: minThread maxThread threadStep " + - "times multiple profile"); + LOG.info("Usage: minThread maxThread threadStep {}", + "times multiple profile"); return; } From 2bb799bdb39ef2eb6bcafefeae24da3a15142529 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 21:22:50 +0800 Subject: [PATCH 17/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../java/com/baidu/hugegraph/example/ThreadRangePerfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java index 6f63b16ebe..271e291cc2 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/ThreadRangePerfTest.java @@ -30,7 +30,7 @@ public class ThreadRangePerfTest { public static void main(String[] args) throws Exception { if (args.length != 6) { - LOG.info("Usage: minThread maxThread threadStep {}", + LOG.info("Usage: minThread maxThread threadStep " + "times multiple profile"); return; } From 15c00f05128743473b56659e058feb5b31f37644 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sat, 7 May 2022 21:29:32 +0800 Subject: [PATCH 18/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../com/baidu/hugegraph/example/GraphOfTheMoviesExample.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java index a4b6bf87e9..1f994c0d57 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/GraphOfTheMoviesExample.java @@ -68,7 +68,7 @@ public static void query(HugeGraph graph) { .hasLabel("person") .has("name", "Tom Hanks") .outE("ACTED_IN").toList(); - LOG.info{(">>>> Tom Hanks ACTED_IN: {}", tomhanksMovies); + LOG.info(">>>> Tom Hanks ACTED_IN: {}", tomhanksMovies); } public static void load(final HugeGraph graph) { From c03bcb889113f82b7fb4a8e35049bbe1a03401e0 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sun, 8 May 2022 12:04:52 +0800 Subject: [PATCH 19/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../com/baidu/hugegraph/example/Example3.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java index 27b67a5ee7..abb2e19e8c 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java @@ -100,26 +100,26 @@ public static void loadNeighborRankData(final HugeGraph graph) { Vertex l = graph.addVertex(T.label, "person", T.id, "L", "name", "L"); Vertex m = graph.addVertex(T.label, "person", T.id, "M", "name", "M"); - O.addEdge("follow", A); - O.addEdge("follow", B); - O.addEdge("follow", C); - D.addEdge("follow", O); + o.addEdge("follow", a); + o.addEdge("follow", b); + o.addEdge("follow", c); + d.addEdge("follow", o); - A.addEdge("follow", B); - A.addEdge("like", E); - A.addEdge("like", F); + a.addEdge("follow", b); + a.addEdge("like", e); + a.addEdge("like", f); - B.addEdge("like", G); - B.addEdge("like", H); + b.addEdge("like", g); + b.addEdge("like", h); - C.addEdge("like", I); - C.addEdge("like", J); + c.addEdge("like", i); + c.addEdge("like", j); - E.addEdge("directedBy", K); - F.addEdge("directedBy", B); - F.addEdge("directedBy", L); + e.addEdge("directedBy", k); + f.addEdge("directedBy", b); + f.addEdge("directedBy", l); - G.addEdge("directedBy", M); + G.addEdge("directedBy", m); graph.tx().commit(); } From 2cae00a5347eb257e2be9a8c2da5c47f1d29ae44 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Sun, 8 May 2022 13:15:54 +0800 Subject: [PATCH 20/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../src/main/java/com/baidu/hugegraph/example/Example3.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java index abb2e19e8c..6f1bd6dbaf 100644 --- a/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java +++ b/hugegraph-example/src/main/java/com/baidu/hugegraph/example/Example3.java @@ -119,7 +119,7 @@ public static void loadNeighborRankData(final HugeGraph graph) { f.addEdge("directedBy", b); f.addEdge("directedBy", l); - G.addEdge("directedBy", m); + g.addEdge("directedBy", m); graph.tx().commit(); } From adee7e2dc268f64103414f2107c330c48bc540a4 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Mon, 9 May 2022 14:13:11 +0800 Subject: [PATCH 21/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../baidu/hugegraph/backend/store/hbase/HbaseSessions.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java index aa248e559b..df0678ead2 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java @@ -88,7 +88,7 @@ public class HbaseSessions extends BackendSessionPool { private static final Logger LOG = Log.logger(HbaseSessions.class); - + private static final String COPROCESSOR_AGGR = "org.apache.hadoop.hbase.coprocessor.AggregateImplementation"; private static final long SCANNER_CACHING = 1000L; @@ -236,8 +236,7 @@ public void createPreSplitTable(String table, List cfs, TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder( TableName.valueOf(this.namespace, table)); for (byte[] cf : cfs) { - builder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(cf) - .build()); + builder.setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(cf).build()); } byte[][] splits = new byte[numOfPartitions - 1] [org.apache.hadoop.hbase.util.Bytes.SIZEOF_SHORT]; From 3b171c379ac07f856872fc8adbc6a84085814a45 Mon Sep 17 00:00:00 2001 From: May <18222918782@163.com> Date: Mon, 9 May 2022 14:36:11 +0800 Subject: [PATCH 22/22] fix hugegraph-hbase and hugegraph-example checkstyle issue --- .../baidu/hugegraph/backend/store/hbase/HbaseSessions.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java index df0678ead2..35d8e051c5 100644 --- a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java +++ b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java @@ -808,9 +808,8 @@ private void dump(String table, Scan scan) throws IOException { Cell cell = cellScanner.current(); byte[] key = CellUtil.cloneQualifier(cell); byte[] val = CellUtil.cloneValue(cell); - LOG.info(String.format(" {}={}", - StringEncoding.format(key), - StringEncoding.format(val))); + LOG.info(" {}={}", StringEncoding.format(key), + StringEncoding.format(val)); } } }