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 implementation and the upstream changes to port. - Assistant
Porting TINKERPOP-2911 ConnectiveStep handling into
HugeCountStrategyand adding regression tests. - Assistant
The
where/ortests fail because HugeGraph validates edge labels at schema time. I'll adjust them to use a defined but unused edge label. - Assistant
All four new tests passed. Checking lints and reviewing the final implementation.
- Assistant
Aligned
HugeCountStrategywith upstream TinkerPopTINKERPOP-2911ConnectiveStep handling.Changes
HugeCountStrategy.javaPorted the upstream fix from TinkerPop 3.5.6 (
apache/tinkerpop#2016):-
ConnectiveStep handling — When
count().is(0)appears underand()/or(), the strategy now wraps the entire child traversal innot()instead of walking backward and partially hoisting filter steps (the old behavior that broke patterns likeout("none").out().count().is(0)). -
transformToNotStep()helper — Extracted shared logic that clones the inner traversal (traversal.clone()) before wrapping, matching upstream semantics. -
FilterStep handling — Non-connective
where(...)filters now use the same helper, consistent with upstream.
HugeGraph-specific guards from #2993 are unchanged:
- Negative compare bounds still disable
not()/dismissCountIsoptimization (TINKERPOP-2893) - Negative
highRangeis still cleared to avoid invalid backend ranges
CountStrategyCoreTest.javaAdded regression coverage for the suggested connective shapes:
Test Traversal testAndCountIsZeroConnectiveBranches__.and(__.out().count().is(0), __.in().count().is(0))testOrCountIsZeroConnectiveBranches__.or(__.out().count().is(0), __.in().count().is(0))testWhereOrCountIsZeroWithMissingEdgeLabel__.where(__.or(__.out("none").out().count().is(0), __.has("none")))testWhereOrCountIsZeroWithMissingEdgeLabelAndProperty__.where(__.or(__.out("none").out().count().is(0), __.has("none").count().is(0)))The
where/ortests use a helper (initConnectiveCountSchema) that defines thenoneedge label and property in schema (HugeGraph requires this) but creates nononeedges or property values — matching the upstream intent of “label/property exists in schema but has no data.”All four new tests pass in the core test suite.
-
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 →