This is an automated email from the ASF dual-hosted git repository. yangjiaqi pushed a commit to branch pd-store-jacky in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
commit 3c680e8db46a154ba8989a4946252891dfa0d0df Author: JackyYangPassion <[email protected]> AuthorDate: Thu Mar 7 10:38:35 2024 +0800 add comment & fix KVStore unitTests & rollback --- .../src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java | 4 +++- .../java/org/apache/hugegraph/backend/tx/AbstractTransaction.java | 2 +- .../src/main/java/org/apache/hugegraph/api/BaseApiTest.java | 6 +++--- .../src/main/java/org/apache/hugegraph/api/EdgeApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/LoginApiTest.java | 4 ++-- .../src/main/java/org/apache/hugegraph/api/ProjectApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/SchemaApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/TaskApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/UserApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/VertexApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java | 2 +- .../main/java/org/apache/hugegraph/store/client/HgKvStoreTest.java | 2 +- .../java/org/apache/hugegraph/store/client/HgStoreClientTest.java | 2 +- 16 files changed, 21 insertions(+), 19 deletions(-) diff --git a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java index 25e8cacf0..00158e40d 100644 --- a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java +++ b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/graph/EdgeAPI.java @@ -101,7 +101,9 @@ public class EdgeAPI extends BatchAPI { vertexLabel(g, jsonEdge.sourceLabel, "Invalid source vertex label '%s'"); vertexLabel(g, jsonEdge.targetLabel, "Invalid target vertex label '%s'"); } - + //边写入逻辑 + //1. 首先根据起始节点判断点已经存在 + //2. 然后调用 点：addEdge 方法生成edge对象 Vertex srcVertex = getVertex(g, jsonEdge.source, jsonEdge.sourceLabel); Vertex tgtVertex = getVertex(g, jsonEdge.target, jsonEdge.targetLabel); diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/AbstractTransaction.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/AbstractTransaction.java index 43393252d..463a97322 100644 --- a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/AbstractTransaction.java +++ b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/AbstractTransaction.java @@ -315,7 +315,7 @@ public abstract class AbstractTransaction implements Transaction { // If an exception occurred, catch in the upper layer and rollback this.store.beginTx(); for (BackendMutation mutation : mutations) { - this.store.mutate(mutation); + this.store.mutate(mutation);//调用 Store mutate 接口写入 } this.store.commitTx(); diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/BaseApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/BaseApiTest.java index 620818422..43b8cdbd1 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/BaseApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/BaseApiTest.java @@ -60,7 +60,7 @@ public class BaseApiTest { private static final String USERNAME = "admin"; private static final String PASSWORD = "pa"; - protected static final String URL_PREFIX = "conf/graphs/" + GRAPH; + protected static final String URL_PREFIX = "graphs/" + GRAPH; private static final String SCHEMA_PKS = "/schema/propertykeys"; private static final String SCHEMA_VLS = "/schema/vertexlabels"; private static final String SCHEMA_ELS = "/schema/edgelabels"; @@ -564,7 +564,7 @@ public class BaseApiTest { int times = 0; int maxTimes = 100000; do { - Response r = client.get("/conf/graphs/hugegraph/tasks/", + Response r = client.get("/graphs/hugegraph/tasks/", String.valueOf(task)); String content = assertResponseStatus(200, r); status = assertJsonContains(content, "task_status"); @@ -610,7 +610,7 @@ public class BaseApiTest { Map<String, Object> param = ImmutableMap.of("token", token, "confirm_message", message); - client.delete("conf/graphs/" + GRAPH + "/clear", param); + client.delete("graphs/" + GRAPH + "/clear", param); } protected static String assertResponseStatus(int status, diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeApiTest.java index 8964b119e..6d9c65fee 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeApiTest.java @@ -29,7 +29,7 @@ import jakarta.ws.rs.core.Response; public class EdgeApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/graph/edges/"; + private static final String PATH = "/graphs/hugegraph/graph/edges/"; @Before public void prepareSchema() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java index 5cf924ce1..2a9e85b3a 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.core.Response; public class EdgeLabelApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/schema/edgelabels/"; + private static final String PATH = "/graphs/hugegraph/schema/edgelabels/"; @Before public void prepareSchema() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java index 0b1d975b3..5b232c5e1 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/IndexLabelApiTest.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.core.Response; public class IndexLabelApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/schema/indexlabels/"; + private static final String PATH = "/graphs/hugegraph/schema/indexlabels/"; @Before public void prepareSchema() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/LoginApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/LoginApiTest.java index 6ed79709e..b323efa36 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/LoginApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/LoginApiTest.java @@ -35,8 +35,8 @@ import jakarta.ws.rs.core.Response; public class LoginApiTest extends BaseApiTest { - private static final String PATH = "conf/graphs/hugegraph/auth"; - private static final String USER_PATH = "conf/graphs/hugegraph/auth/users"; + private static final String PATH = "graphs/hugegraph/auth"; + private static final String USER_PATH = "graphs/hugegraph/auth/users"; private String userId4Test; @Before diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/ProjectApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/ProjectApiTest.java index d03c6896e..e48f9f50a 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/ProjectApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/ProjectApiTest.java @@ -34,7 +34,7 @@ import jakarta.ws.rs.core.Response; public class ProjectApiTest extends BaseApiTest { - private static final String PATH = "conf/graphs/hugegraph/auth/projects"; + private static final String PATH = "graphs/hugegraph/auth/projects"; @Override @After diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java index eacd45d15..662a643b1 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/PropertyKeyApiTest.java @@ -24,7 +24,7 @@ import jakarta.ws.rs.core.Response; public class PropertyKeyApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/schema/propertykeys/"; + private static final String PATH = "/graphs/hugegraph/schema/propertykeys/"; @Test public void testCreate() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/SchemaApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/SchemaApiTest.java index 3ff15e626..93d07664c 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/SchemaApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/SchemaApiTest.java @@ -23,7 +23,7 @@ import jakarta.ws.rs.core.Response; public class SchemaApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/schema"; + private static final String PATH = "/graphs/hugegraph/schema"; @Test public void testGet() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/TaskApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/TaskApiTest.java index 048cefda7..5e4995b69 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/TaskApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/TaskApiTest.java @@ -30,7 +30,7 @@ import jakarta.ws.rs.core.Response; public class TaskApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/tasks/"; + private static final String PATH = "/graphs/hugegraph/tasks/"; @Before public void prepareSchema() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/UserApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/UserApiTest.java index 57a95b362..da189cd1a 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/UserApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/UserApiTest.java @@ -33,7 +33,7 @@ import jakarta.ws.rs.core.Response; public class UserApiTest extends BaseApiTest { - private static final String PATH = "conf/graphs/hugegraph/auth/users"; + private static final String PATH = "graphs/hugegraph/auth/users"; private static final int NO_LIMIT = -1; @Override diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexApiTest.java index 4ae61146c..292fc0aa3 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexApiTest.java @@ -26,7 +26,7 @@ import jakarta.ws.rs.core.Response; public class VertexApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/graph/vertices/"; + private static final String PATH = "/graphs/hugegraph/graph/vertices/"; @Before public void prepareSchema() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java index b4ce3c727..71c5f99d5 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/VertexLabelApiTest.java @@ -28,7 +28,7 @@ import jakarta.ws.rs.core.Response; public class VertexLabelApiTest extends BaseApiTest { - private static final String PATH = "/conf/graphs/hugegraph/schema/vertexlabels/"; + private static final String PATH = "/graphs/hugegraph/schema/vertexlabels/"; @Before public void prepareSchema() { diff --git a/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgKvStoreTest.java b/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgKvStoreTest.java index 1866e3fbd..518bd3930 100644 --- a/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgKvStoreTest.java +++ b/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgKvStoreTest.java @@ -29,7 +29,7 @@ import org.junit.Assert; import org.junit.Test; public class HgKvStoreTest extends BaseClientTest { - public static final String TABLE_NAME = "unit-table"; + public static final String TABLE_NAME = "g+v"; @Test public void truncateTest() { diff --git a/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgStoreClientTest.java b/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgStoreClientTest.java index 2ccbe5e45..cf046e4bf 100644 --- a/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgStoreClientTest.java +++ b/hugegraph-store/hg-store-test/src/main/java/org/apache/hugegraph/store/client/HgStoreClientTest.java @@ -35,7 +35,7 @@ import org.junit.Test; public class HgStoreClientTest extends BaseClientTest { public static final byte[] EMPTY_BYTES = new byte[0]; private static final String graphName = "testGraphName"; - private static String tableName = "testTableName"; + private static String tableName = "unknown"; @Test public void testPutData() {
