From 07b904e2202a8a63074c6eea7fb473366f34892f Mon Sep 17 00:00:00 2001 From: alexandru Date: Tue, 17 Nov 2026 23:22:56 +0200 Subject: [PATCH] fix(core): keep later ranges local after barrier - push only the first range step into the backend query - keep later ranges after a barrier as local steps - fix Invalid range and wrong counts for g.V() ranges - fix empty results for out() ranges after a barrier - add regression tests in VertexCoreTest and EdgeCoreTest Fixes #2216 --- .../traversal/optimize/TraversalUtil.java | 7 ++++--- .../org/apache/hugegraph/core/EdgeCoreTest.java | 16 ++++++++++++++++ .../apache/hugegraph/core/VertexCoreTest.java | 12 ++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java index aa5a4c8ab1..90d07eb671 100644 --- a/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java +++ b/hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java @@ -1390,10 +1390,11 @@ public static void extractRange(Step newStep, traversal, 0, limit); TraversalHelper.replaceStep(range, newRange, traversal); } + // Only the first range is in the backend query's coordinates. + // Later ranges apply to the already-limited stream, so keep them as local steps. + break; } - } while (step instanceof RangeGlobalStep || - step instanceof IdentityStep || - step instanceof NoOpBarrierStep); + } while (step instanceof IdentityStep || step instanceof NoOpBarrierStep); } public static void extractCount(Step newStep, diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java index aa414df0ae..7443a1a341 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/EdgeCoreTest.java @@ -3738,6 +3738,22 @@ public void testLocalEdgeIdAndLabelRepresentations() { } } + @Test + public void testQueryOutVerticesWithRangesSeparatedByBarrier() { + HugeGraph graph = graph(); + init100LookEdges(); + + Vertex louise = vertex("person", "name", "Louise"); + + List vertices = graph.traversal().V(louise.id()) + .out("look") + .range(2, 3) + .barrier() + .range(0, 1) + .toList(); + Assert.assertEquals(1, vertices.size()); + } + @Test public void testQueryEdgesByNonEqLabelAndIndexedPropertyAcrossBarrier() { HugeGraph graph = graph(); diff --git a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java index 63cbc5c844..53017df28e 100644 --- a/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java +++ b/hugegraph-server/hugegraph-test/src/main/java/org/apache/hugegraph/core/VertexCoreTest.java @@ -3081,6 +3081,18 @@ public void testQueryAllWithOffsetAndLimitWithMultiTimes() { Assert.assertEquals(0, vertices.size()); } + @Test + public void testQueryAllWithRangesSeparatedByBarrier() { + HugeGraph graph = graph(); + this.init10VerticesAndCommit(); + + List vertices = graph.traversal().V().range(2, 3).barrier().range(0, 1).toList(); + Assert.assertEquals(1, vertices.size()); + + vertices = graph.traversal().V().range(1, 6).barrier().range(3, 8).toList(); + Assert.assertEquals(2, vertices.size()); + } + @Test public void testQueryAllWithIllegalOffsetOrLimit() { HugeGraph graph = graph();