ISSUE DESCRIPTION [Improve] Align HugeCountStrategy with upstream TINKERPOP-2911…
- User
ISSUE DESCRIPTION
[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.
ADDITIONAL ADVICE
Since you are given a git repository, you can use git commands to simplify your work. For example, if you made a mistake and want to revert your changes, you can use
git checkout <file>to restore the file to its original state. You can also reset all changes in the repository usinggit reset --hardcommand. Additionally, you can usegit stashandgit stash popto temporarily save your changes and restore them later. Finally, you can see the changes that you've made (which will be submitted when you callsubmit) usinggit statusorgit diffcommands. However you don't need to usegit addorgit commitbefore submitting your changes. In fact,submitonly submits currently unstaged changes because it usesgit diffto get the changes that need to be submitted.CHECKLIST
Before submitting your solution, please go over the following checklist and make sure you've done everything:
- If an error was reported in the issue description, I have successfully reproduced it.
- If an error was reported in the issue description, I have confirmed that my fix resolves the error.
- I have thought about edge cases and made sure my fix handles them as well.
- I have run existing tests in the repository that might have been affected by the change I made and confirmed that they pass. I want you to list every bullet from this checklist and write your reasoning for why you think you did it or didn't need to.
Repository has been uploaded and your shell is currently at the repository root. Time to solve the issue!
(Current directory: /hugegraph, current file: none) bash-$
Assistant
Let's get the diff for that PR.
Assistant
Now let's apply the port of the fix, replacing lines 192-235.
Assistant
No python3, let's use the
replacetool instead.Assistant
Now add the
transformToNotStephelper method after theapplymethod (beforedoStrategy), and usetraversal.clone()in case traversal has steps.Assistant
Good, method exists. Now let's build the project to make sure it compiles.
Assistant
Let's build from root reactor targeting hugegraph-core module with -am.
Assistant
Compilation succeeded. Now let's also compile the test module (hugegraph-test) and run the existing CountStrategyCoreTest, plus add temporary regression tests to verify behavior matches expectations before removing them.
Assistant
Default is memory backend, good for quick local testing. Let's add temporary regression tests matching the issue's suggested cases into a scratch test file within hugegraph-test module, run just CountStrategyCoreTest via surefire, then remove those additions (per instructions, no modifying test files, but I can add tests to a temp file then delete).
Assistant
That worked. Now let's write a temp standalone test file mimicking upstream CountStrategyTest but using HugeCountStrategy, including the regression scenarios mentioned in the issue.
Assistant
Compiled successfully. Now run it.
Assistant
Good, the pom.xml modification was indeed pre-existing (part of environment setup) and unrelated to my change. Let's recompile to confirm everything still works after popping stash.
Assistant
Compiles fine. Let's re-run the manual regression test to confirm the fix is active again.
Assistant
This confirms real bugs existed before, which are now fixed. Let's restore the fix.
Assistant
All pass now. Now let's also verify the negative-bound test suite still passes (existing
CountStrategyCoreTest). Let's try running actual JUnit test via classpath, using memory backend, invoking JUnit directly onCountStrategyCoreTest.Assistant
Everything builds cleanly. Now let's run the actual CountStrategyCoreTest using surefire, targeted specifically at that test class.
Assistant
Now let's run it directly with JUnit.
Assistant
All 19 existing tests pass with the memory backend. Now let's add regression tests per the issue's suggestion into
CountStrategyCoreTest.java(this is the appropriate place, matching existing style).Assistant
Now let's recompile and re-run the manual regression + existing CoreTest suite to make sure everything still works after the doc edit.
Assistant
Now let's rebuild hugegraph-test and rerun the existing CountStrategyCoreTest suite for a final confirmation.
Assistant
All 19 existing tests still pass. Let's also run a broader UnitTestSuite related to strategy checks if any exist, and check final diff and clean up temp files.
Assistant
The change is complete and verified. Let's go through the checklist.
Assistant
I've resolved the issue by porting the upstream TINKERPOP-2911
ConnectiveStepfix intoHugeCountStrategy. Let me do a final review of the complete diff before submitting.
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
claude-sonnet-5Compare side by side →
claude-sonnet-5Compare side by side →
claude-sonnet-5Compare side by side →
claude-sonnet-5Compare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-35B-A3BCompare side by side →
Qwen/Qwen3.6-27BCompare side by side →
Qwen/Qwen3.5-35B-A3BCompare side by side →