add eid to client

alibaba · Sep 21, 2023 · 47f248b · 47f248b
1 parent c26932a
commit 47f248b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/...ctive_engine/groot-client/src/main/java/com/alibaba/graphscope/groot/sdk/GrootClient.java b/...ctive_engine/groot-client/src/main/java/com/alibaba/graphscope/groot/sdk/GrootClient.java
@@ -129,13 +129,18 @@ private void modifyEdge(
         submit(requests, callback);
     }
 
-    private long modifyVerticesAndEdge(List<Vertex> vertices, List<Edge> edges, WriteTypePb writeType) {
+    private long modifyVerticesAndEdge(
+            List<Vertex> vertices, List<Edge> edges, WriteTypePb writeType) {
         List<WriteRequestPb> requests = getVertexWriteRequestPbs(vertices, writeType);
         requests.addAll(getEdgeWriteRequestPbs(edges, writeType));
         return submit(requests);
     }
 
-    private void modifyVerticesAndEdge(List<Vertex> vertices, List<Edge> edges, StreamObserver<BatchWriteResponse> callback, WriteTypePb writeType) {
+    private void modifyVerticesAndEdge(
+            List<Vertex> vertices,
+            List<Edge> edges,
+            StreamObserver<BatchWriteResponse> callback,
+            WriteTypePb writeType) {
         List<WriteRequestPb> requests = getVertexWriteRequestPbs(vertices, writeType);
         requests.addAll(getEdgeWriteRequestPbs(edges, writeType));
         submit(requests, callback);
@@ -153,15 +158,18 @@ public long deleteVerticesAndEdges(List<Vertex> vertices, List<Edge> edges) {
         return modifyVerticesAndEdge(vertices, edges, WriteTypePb.DELETE);
     }
 
-    public void addVerticesAndEdges(List<Vertex> vertices, List<Edge> edges, StreamObserver<BatchWriteResponse> callback) {
+    public void addVerticesAndEdges(
+            List<Vertex> vertices, List<Edge> edges, StreamObserver<BatchWriteResponse> callback) {
         modifyVerticesAndEdge(vertices, edges, callback, WriteTypePb.INSERT);
     }
 
-    public void updateVerticesAndEdges(List<Vertex> vertices, List<Edge> edges, StreamObserver<BatchWriteResponse> callback) {
+    public void updateVerticesAndEdges(
+            List<Vertex> vertices, List<Edge> edges, StreamObserver<BatchWriteResponse> callback) {
         modifyVerticesAndEdge(vertices, edges, callback, WriteTypePb.UPDATE);
     }
 
-    public void deleteVerticesAndEdges(List<Vertex> vertices, List<Edge> edges, StreamObserver<BatchWriteResponse> callback) {
+    public void deleteVerticesAndEdges(
+            List<Vertex> vertices, List<Edge> edges, StreamObserver<BatchWriteResponse> callback) {
         modifyVerticesAndEdge(vertices, edges, callback, WriteTypePb.DELETE);
     }
 

diff --git a/...ctive_engine/groot-client/src/main/java/com/alibaba/graphscope/groot/sdk/schema/Edge.java b/...ctive_engine/groot-client/src/main/java/com/alibaba/graphscope/groot/sdk/schema/Edge.java
@@ -12,6 +12,8 @@ public class Edge {
     public Map<String, String> dstPk;
     public Map<String, String> properties;
 
+    public long eid;
+
     /**
      * Construct an edge
      * @param label edge label
@@ -59,6 +61,10 @@ public Edge(String label, Vertex src, Vertex dst) {
         this(label, src, dst, null);
     }
 
+    public void setEid(long eid) {
+        this.eid = eid;
+    }
+
     public String getLabel() {
         return label;
     }
@@ -88,6 +94,7 @@ public EdgeRecordKeyPb toEdgeRecordKey() {
                 .setLabel(label)
                 .setSrcVertexKey(toVertexRecordKey(srcLabel, srcPk))
                 .setDstVertexKey(toVertexRecordKey(dstLabel, dstPk))
+                .setInnerId(eid)
                 .build();
     }
 

diff --git a/...e/groot-module/src/main/java/com/alibaba/graphscope/groot/frontend/write/GraphWriter.java b/...e/groot-module/src/main/java/com/alibaba/graphscope/groot/frontend/write/GraphWriter.java
@@ -206,8 +206,9 @@ private void addUpdateEdgeOperation(
             OperationBatch.Builder batchBuilder, GraphSchema schema, DataRecord dataRecord) {
         EdgeId edgeId = getEdgeId(schema, dataRecord, false);
         if (edgeId.id == 0) {
-                // This is for update edge, if edgeInnerId is 0, generate new id, incase there isn't such a edge
-                edgeId.id = edgeIdGenerator.getNextId();
+            // This is for update edge, if edgeInnerId is 0, generate new id, incase there isn't
+            // such a edge
+            edgeId.id = edgeIdGenerator.getNextId();
         }
         EdgeKind edgeKind = getEdgeKind(schema, dataRecord);
         GraphElement edgeDef = schema.getElement(edgeKind.getEdgeLabelId().getId());