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 626f527970f8815cae5b57ce8a871f43e4831d61 Author: JackyYangPassion <[email protected]> AuthorDate: Mon Mar 4 19:46:46 2024 +0800 add comment --- .../java/org/apache/hugegraph/pd/client/AbstractClient.java | 6 ++++++ .../src/assembly/static/bin/hugegraph-server.sh | 1 + .../hugegraph/backend/store/hstore/HstoreSessionsImpl.java | 2 +- .../apache/hugegraph/backend/store/hstore/HstoreStore.java | 11 ++++++++++- .../src/main/java/org/apache/hugegraph/api/BaseApiTest.java | 8 ++++---- .../src/main/java/org/apache/hugegraph/api/EdgeApiTest.java | 2 +- .../main/java/org/apache/hugegraph/api/EdgeLabelApiTest.java | 2 +- .../main/java/org/apache/hugegraph/api/GremlinApiTest.java | 4 ++-- .../main/java/org/apache/hugegraph/api/IndexLabelApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/LoginApiTest.java | 4 ++-- .../main/java/org/apache/hugegraph/api/ProjectApiTest.java | 2 +- .../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 | 6 +++--- .../src/main/java/org/apache/hugegraph/api/UserApiTest.java | 2 +- .../src/main/java/org/apache/hugegraph/api/VertexApiTest.java | 2 +- .../java/org/apache/hugegraph/api/VertexLabelApiTest.java | 2 +- .../org/apache/hugegraph/api/traversers/EdgesApiTest.java | 2 +- 18 files changed, 39 insertions(+), 23 deletions(-) diff --git a/hugegraph-pd/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java b/hugegraph-pd/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java index 874ef6f67..a0d8eff3f 100644 --- a/hugegraph-pd/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java +++ b/hugegraph-pd/hg-pd-client/src/main/java/org/apache/hugegraph/pd/client/AbstractClient.java @@ -47,6 +47,12 @@ import io.grpc.stub.ClientCalls; import io.grpc.stub.StreamObserver; import lombok.extern.slf4j.Slf4j; +/** + * gRPC 基本开发 + * 1. 创建通信 channle + * 2. 创建函数调用桩 + */ + @Slf4j public abstract class AbstractClient implements Closeable { diff --git a/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh b/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh index 4a08e4b8e..6777939a7 100644 --- a/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh +++ b/hugegraph-server/hugegraph-dist/src/assembly/static/bin/hugegraph-server.sh @@ -67,6 +67,7 @@ MIN_MEM=$((1 * 512)) MIN_JAVA_VERSION=8 # download binary file +# 为什么要下载这个文件呢？ if [[ ! -e "${CONF}/hugegraph-server.keystore" ]]; then download "${CONF}" "https://github.com/apache/hugegraph-doc/raw/binary-1.0/dist/server/hugegraph-server.keystore"; fi diff --git a/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreSessionsImpl.java b/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreSessionsImpl.java index 27de0e029..b34808c8c 100755 --- a/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreSessionsImpl.java +++ b/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreSessionsImpl.java @@ -77,7 +77,7 @@ public class HstoreSessionsImpl extends HstoreSessions { super(config, database, store); this.config = config; this.graphName = database + "/" + store; - this.initStoreNode(config); + this.initStoreNode(config);//此处创建 defaultPdClient && 如何配置分布式？ this.session = new HstoreSession(this.config, graphName); this.tables = new ConcurrentHashMap<>(); this.refCount = new AtomicInteger(1); diff --git a/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreStore.java b/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreStore.java index e4ba81558..830563b75 100644 --- a/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreStore.java +++ b/hugegraph-server/hugegraph-hstore/src/main/java/org/apache/hugegraph/backend/store/hstore/HstoreStore.java @@ -241,7 +241,7 @@ public abstract class HstoreStore extends AbstractBackendStore<Session> { HugeType key = entry.getKey(); // in order to obtain the owner efficiently, special for edge boolean isEdge = key.isEdge(); - HstoreTable hTable = this.table(key); + HstoreTable hTable = this.table(key);// 获取对应的table Map<Id, List<BackendAction>> table = entry.getValue(); Collection<List<BackendAction>> values = table.values(); for (List<BackendAction> items : values) { @@ -728,6 +728,15 @@ public abstract class HstoreStore extends AbstractBackendStore<Session> { } } + /** + * GraphStore 相关表 + * 1. 点表 HugeTableType.VERTEX + * 2. 边表 HugeTableType.OUT_EDGE && HugeTableType.IN_EDGE + * 3. 索引表 HugeTableType.ALL_INDEX_TABLE + * 4. OLAP表 HugeTableType.TASK_INFO_TABLE（暂时使用不到） + * 5. task表 HugeTableType.TASK_INFO_TABLE + * 6. server表 HugeTableType.SERVER_INFO_TABLE + */ public static class HstoreGraphStore extends HstoreStore { public HstoreGraphStore(BackendStoreProvider provider, 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 6d173e908..620818422 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 = "graphs/" + GRAPH; + protected static final String URL_PREFIX = "conf/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"; @@ -88,7 +88,7 @@ public class BaseApiTest { @After public void teardown() throws Exception { - //BaseApiTest.clearData(); + BaseApiTest.clearData(); } public RestClient client() { @@ -564,7 +564,7 @@ public class BaseApiTest { int times = 0; int maxTimes = 100000; do { - Response r = client.get("/graphs/hugegraph/tasks/", + Response r = client.get("/conf/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("graphs/" + GRAPH + "/clear", param); + client.delete("conf/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 6d9c65fee..8964b119e 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 = "/graphs/hugegraph/graph/edges/"; + private static final String PATH = "/conf/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 2a9e85b3a..5cf924ce1 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 = "/graphs/hugegraph/schema/edgelabels/"; + private static final String PATH = "/conf/graphs/hugegraph/schema/edgelabels/"; @Before public void prepareSchema() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/GremlinApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/GremlinApiTest.java index 612914177..969e709bd 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/GremlinApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/GremlinApiTest.java @@ -142,7 +142,7 @@ public class GremlinApiTest extends BaseApiTest { @Test public void testSetVertexProperty() { - String pkPath = "/graphs/hugegraph/schema/propertykeys/"; + String pkPath = "/conf/graphs/hugegraph/schema/propertykeys/"; // Cardinality single String foo = "{" + "\"name\": \"foo\"," + @@ -160,7 +160,7 @@ public class GremlinApiTest extends BaseApiTest { "}"; assertResponseStatus(202, client().post(pkPath, bar)); - String vlPath = "/graphs/hugegraph/schema/vertexlabels/"; + String vlPath = "/conf/graphs/hugegraph/schema/vertexlabels/"; String vertexLabel = "{" + "\"name\": \"person\"," + "\"id_strategy\": \"CUSTOMIZE_STRING\"," + 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 5b232c5e1..0b1d975b3 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 = "/graphs/hugegraph/schema/indexlabels/"; + private static final String PATH = "/conf/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 b323efa36..6ed79709e 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 = "graphs/hugegraph/auth"; - private static final String USER_PATH = "graphs/hugegraph/auth/users"; + private static final String PATH = "conf/graphs/hugegraph/auth"; + private static final String USER_PATH = "conf/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 e48f9f50a..d03c6896e 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 = "graphs/hugegraph/auth/projects"; + private static final String PATH = "conf/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 662a643b1..eacd45d15 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 = "/graphs/hugegraph/schema/propertykeys/"; + private static final String PATH = "/conf/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 93d07664c..3ff15e626 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 = "/graphs/hugegraph/schema"; + private static final String PATH = "/conf/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 3800ebb30..048cefda7 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 = "/graphs/hugegraph/tasks/"; + private static final String PATH = "/conf/graphs/hugegraph/tasks/"; @Before public void prepareSchema() { @@ -134,7 +134,7 @@ public class TaskApiTest extends BaseApiTest { private int rebuild() { // create a rebuild_index task - String rebuildPath = "/graphs/hugegraph/jobs/rebuild/indexlabels"; + String rebuildPath = "/conf/graphs/hugegraph/jobs/rebuild/indexlabels"; String personByCity = "personByCity"; Map<String, Object> params = ImmutableMap.of(); Response r = client().put(rebuildPath, personByCity, "", params); @@ -148,7 +148,7 @@ public class TaskApiTest extends BaseApiTest { "\"bindings\":{}," + "\"language\":\"gremlin-groovy\"," + "\"aliases\":{}}"; - String path = "/graphs/hugegraph/jobs/gremlin"; + String path = "/conf/graphs/hugegraph/jobs/gremlin"; String content = assertResponseStatus(201, client().post(path, body)); return assertJsonContains(content, "task_id"); } 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 da189cd1a..57a95b362 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 = "graphs/hugegraph/auth/users"; + private static final String PATH = "conf/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 292fc0aa3..4ae61146c 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 = "/graphs/hugegraph/graph/vertices/"; + private static final String PATH = "/conf/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 71c5f99d5..b4ce3c727 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 = "/graphs/hugegraph/schema/vertexlabels/"; + private static final String PATH = "/conf/graphs/hugegraph/schema/vertexlabels/"; @Before public void prepareSchema() { diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/EdgesApiTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/EdgesApiTest.java index 34915f040..b86a53f52 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/EdgesApiTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/api/traversers/EdgesApiTest.java @@ -48,7 +48,7 @@ public class EdgesApiTest extends BaseApiTest { @Test public void testList() { Map<String, String> name2Ids = listAllVertexName2Ids(); - final String edgeGetPath = "graphs/hugegraph/graph/edges"; + final String edgeGetPath = "conf/graphs/hugegraph/graph/edges"; String vadasId = name2Ids.get("vadas"); Map<String, Object> params = ImmutableMap.of( "vertex_id", id2Json(vadasId),
