Untitled conversation
- User
[Improve] Align HugeCountStrategy with upstream TINKERPOP-2911 ConnectiveStep fixes
Feature Description (功能描述)
Background
PR #2993 introduced
HugeCountStrategyto fix the negative-bound optimization issues behind #2930, #2931, and #2932.That fix was implemented by forking an older version of TinkerPop's
CountStrategyand adding HugeGraph-specific guards for negative bounds.However, the current local fork does not yet include the upstream follow-up fix for
ConnectiveStep/and()/or()handling fromTINKERPOP-2911.As a result, HugeGraph is now aligned for the negative-bound cases fixed in #2993, but it may still inherit older
CountStrategybehavior for some connective-filter patterns.Follow-up Scope
Port the upstream
TINKERPOP-2911changes forConnectiveStepintoHugeCountStrategy, and add regression coverage for connective traversal shapes.Suggested regression cases include:
__.and(__.out().count().is(0), __.in().count().is(0))__.or(__.out().count().is(0), __.in().count().is(0))__.where(__.or(__.out("none").out().count().is(0), __.has("none")))__.where(__.or(__.out("none").out().count().is(0), __.has("none").count().is(0)))
Expected Result
HugeCountStrategyshould behave consistently with the upstreamCountStrategyfixes aroundConnectiveStep- connective
and()/or()traversal shapes should no longer rely on older inherited behavior from the forked strategy - regression tests should cover the above traversal forms and protect against future drift
I’d be happy to follow up on this as a separate improvement issue and work on a later refinement PR.
Interface
No new interfaces are introduced.
- Assistant
I'll align
HugeCountStrategywith upstream TINKERPOP-2911 ConnectiveStep fixes. First I'm locating the current strategy implementation and any existing tests. - Assistant
Searching for upstream TinkerPop CountStrategy and the TINKERPOP-2911 fix.
- Assistant
Porting the TINKERPOP-2911 ConnectiveStep handling from upstream and adding regression tests.
- Assistant
HugeGraph requires schema-defined labels, so I'm updating the tests to define the
noneedge label and property without creating any data. - Assistant
Aligned
HugeCountStrategywith upstream TinkerPop 3.5.6CountStrategyfixes from TINKERPOP-2911.HugeCountStrategychangesThe old fork excluded
ConnectiveStepfrom thenot()rewrite path and fell back to pulling preceding filter steps backward. That brokeand()/or()branches — e.g.out("none").out().count().is(0)could becomeout("none"), not(out())instead ofnot(out("none").out()).The fix mirrors upstream:
ConnectiveStephandling — When the parent isand()/or(), wrap the entire branch innot()viaTraversalHelper.removeAllSteps()+addStep(notStep).FilterStephandling —where(...)branches use a dedicated path that replaces the filter step withnot(...).transformToNotStep()helper — Clones the inner traversal (traversal.clone()) before wrapping, matching upstream semantics.
HugeGraph-specific negative-bound guards from #2993 are unchanged (
hasNegativeCompareBoundandhighRange < 0dismissal).Regression tests
Added four cases to
CountStrategyCoreTest:and(__.out().count().is(0), __.in().count().is(0))or(__.out().count().is(0), __.in().count().is(0))where(__.or(__.out("none").out().count().is(0), __.has("none")))where(__.or(__.out("none").out().count().is(0), __.has("none").count().is(0)))
The
where/ortests define schema for thenoneedge label and property (no data) because HugeGraph requires labels to exist at query time, unlike TinkerGraph.All 23 tests in
CountStrategyCoreTestpass.
Other models, same or similar prompt
Responses were produced in different, uncontrolled contexts (system prompts, settings, prior turns). This is not a benchmark.
Identical first prompt
- composer-2.5Compare side by side →
- composer-2.5Compare side by side →
- composer-2.5Compare side by side →
- composer-2.5Compare side by side →
- gpt-5.6-solCompare side by side →
- gpt-5.6-solCompare side by side →
- gpt-5.6-solCompare side by side →
- gpt-5.6-solCompare side by side →
- gpt-5.6-solCompare side by side →
- fable-5Compare side by side →
- fable-5Compare side by side →