Skip to content

fix: support new HugeGraph edge id format #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hutiefang76 wants to merge 7 commits into
base: master
Choose a base branch
from
+264 −13
Open

fix: support new HugeGraph edge id format #349

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27b727a
fix: support new HugeGraph edge id format
hutiefang Jun 21, 2026
91a04d9
fix: align edge id coverage with current HugeGraph
hutiefang Jun 21, 2026
252ea40
fix: parse legacy edge names from edge ids
hutiefang Jun 22, 2026
b84879d
fix: tolerate current edge label schema fields
hutiefang Jun 22, 2026
bc84f0a
test: cover edge name fallback paths
hutiefang Jun 23, 2026
7fa84bd
fix: align edge compatibility with client invariants
hutiefang Jun 24, 2026
5c792eb
fix: avoid dropping current edge label fields
hutiefang Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/computer-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@ jobs:
TRAVIS_DIR: computer-dist/src/assembly/travis
BSP_ETCD_URL: http://localhost:2579
KUBERNETES_VERSION: 1.20.1
# TODO: adapt the HugeGraph Server/Loader version to 1.5.0 (EdgeID has 5 parts now)
# NOTE: Remember to adaptor/update the version before new release
GRAPH_ENV_VERSION: 1.3.0
GRAPH_ENV_VERSION: 1.7.0

steps:
- name: Checkout
Expand Down
31 changes: 31 additions & 0 deletions ...r/computer-core/src/main/java/org/apache/hugegraph/computer/core/input/HugeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,18 @@
import org.apache.hugegraph.computer.core.graph.value.NullValue;
import org.apache.hugegraph.computer.core.graph.value.StringValue;
import org.apache.hugegraph.computer.core.graph.value.Value;
import org.apache.hugegraph.structure.graph.Edge;
import org.apache.hugegraph.util.E;
import org.apache.hugegraph.util.SplicingIdGenerator;

public final class HugeConverter {

private static final int LEGACY_EDGE_ID_PARTS = 4;
private static final int PARENT_EDGE_ID_PARTS = 5;
private static final int DIRECTIONAL_EDGE_ID_PARTS = 6;
private static final int PARENT_EDGE_NAME_INDEX = 3;
private static final int DIRECTIONAL_EDGE_NAME_INDEX = 4;

private static final GraphFactory GRAPH_FACTORY =
ComputerContext.instance().graphFactory();

Expand Down Expand Up @@ -96,4 +104,27 @@ public static Properties convertProperties(
}
return properties;
}

public static String convertEdgeName(Edge edge) {
E.checkArgumentNotNull(edge, "The edge can't be null");
String edgeId = edge.id();
if (edgeId == null) {
return edge.name();
}

String[] parts = SplicingIdGenerator.split(edgeId);
if (parts.length == LEGACY_EDGE_ID_PARTS) {
return edge.name();

@imbajin imbajin Jun 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Keep legacy id parsing inside the shim

convertEdgeName() already splits the id, but the 4-part branch still delegates to edge.name(). That only works with the current hugegraph-client 1.3.0 dependency; the current java-client implementation only accepts 5/6-part ids and derives the name from idParts[idParts.length - 2], so this compatibility shim will break for legacy ids when the client dependency is aligned with the 1.7.0 runtime that this PR now validates against.

Please return parts[2] for LEGACY_EDGE_ID_PARTS directly, or use the shared parts[parts.length - 2] invariant for all accepted arities, and leave edge.name() only for null or unknown formats.

} else if (parts.length == PARENT_EDGE_ID_PARTS) {
return parts[PARENT_EDGE_NAME_INDEX];
} else if (parts.length == DIRECTIONAL_EDGE_ID_PARTS &&

@imbajin imbajin Jun 24, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❗️ High priority: this still does not parse the server-generated 6-part edge ID format correctly.

This branch only accepts parts[1] when it is EDGE_OUT or EDGE_IN, but server-side EdgeId.asString() writes the direction via this.direction.type().string(). In HugeGraph those values are O / I, not the enum names:

So a valid current server ID like S1:178201>O>5>5>参数标准!3BA0>S4:239464 will skip this branch and fall back to edge.name(). That fallback is not safe here because Computer still depends on hugegraph-client 1.3.0, whose Edge.name() only supports the legacy 4-part ID format.

The current java-client invariant is also simpler: for 5/6-part IDs, Edge.name() returns the penultimate segment: https://github.com/apache/hugegraph-toolchain/blob/master/hugegraph-client/src/main/java/org/apache/hugegraph/structure/graph/Edge.java#L142-L149

ownerVertexId > O/I > edgeLabelId > subLabelId > sortValues > otherVertexId
                                                ^
                                      expected edge name

Please align this parser with that invariant, or at least validate against the server tokens O and I. The regression tests should cover both >O> and >I> forms and prove that valid 6-part IDs do not fall back to the old client parser.

isEdgeDirection(parts[1])) {
return parts[DIRECTIONAL_EDGE_NAME_INDEX];
}
return edge.name();
}

private static boolean isEdgeDirection(String part) {
return "EDGE_OUT".equals(part) || "EDGE_IN".equals(part);
}
}
3 changes: 2 additions & 1 deletion ...mputer-core/src/main/java/org/apache/hugegraph/computer/core/worker/load/LoadService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,8 @@ private Edge convert(org.apache.hugegraph.structure.graph.Edge edge) {
Properties properties = HugeConverter.convertProperties(
edge.properties());
Edge computerEdge = graphFactory.createEdge(edge.label(),
edge.name(), targetId
HugeConverter.convertEdgeName(edge),
targetId
);
computerEdge.label(edge.label());
computerEdge.properties(properties);
Expand Down
37 changes: 37 additions & 0 deletions ...mputer-test/src/main/java/org/apache/hugegraph/computer/core/input/HugeConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.hugegraph.computer.core.graph.value.StringValue;
import org.apache.hugegraph.computer.core.graph.value.ValueType;
import org.apache.hugegraph.computer.suite.unit.UnitTestBase;
import org.apache.hugegraph.structure.graph.Edge;
import org.apache.hugegraph.testutil.Assert;
import org.junit.Test;

Expand Down Expand Up @@ -126,4 +127,40 @@ public void testConvertProperties() {
Assert.assertEquals(properties,
HugeConverter.convertProperties(rawProperties));
}

@Test
public void testConvertEdgeNameWithLegacyFourPartEdgeId() {
Edge edge = new Edge("belong_to_el_defect");
edge.id("S1:178201>5>参数标准!3BA0>S4:239464");

Assert.assertEquals("参数标准!3BA0",
HugeConverter.convertEdgeName(edge));
}

@Test
public void testConvertEdgeNameWithFivePartEdgeId() {
Edge edge = new Edge("belong_to_el_defect");
edge.id("S1:178201>5>5>参数标准!3BA0>S4:239464");

Assert.assertEquals("参数标准!3BA0",
HugeConverter.convertEdgeName(edge));
}

@Test
public void testConvertEdgeNameWithSixPartEdgeId() {
Edge edge = new Edge("belong_to_el_defect");
edge.id("S1:178201>EDGE_OUT>5>5>参数标准!3BA0>S4:239464");

Assert.assertEquals("参数标准!3BA0",
HugeConverter.convertEdgeName(edge));
}

@Test
public void testConvertEdgeNameWithSixPartInEdgeId() {
Edge edge = new Edge("belong_to_el_defect");
edge.id("S4:239464>EDGE_IN>5>5>参数标准!3BA0>S1:178201");

Assert.assertEquals("参数标准!3BA0",
HugeConverter.convertEdgeName(edge));
}
}
Loading