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
Good, compiles offline. Now let's try compiling and running the test module.
Assistant
Now let's run the core-test execution with just the CountStrategyCoreTest via -Dtest, using the surefire execution id.
Assistant
Now let's build a classpath including target/classes of all needed modules and write a small reproduction program.
Assistant
Good, target/classes already built for modules. Let's write a small Java test program that uses HugeFactory to open a rocksdb graph and run the traversals from the issue, printing results and traversal step trees.
Assistant
Already filtered with rocksdb backend. Let's use that as base file.
Assistant
Compiled. Let's run it.
Assistant
Great, TinkerGraph is available. Let's write a repro using TinkerGraph with HugeCountStrategy added, avoiding the need for the full HugeGraph backend stack.
Assistant
Memory backend is builtin, no registration needed. Let's use memory backend + serializer=text for our repro (matches default profile), avoiding the RocksDB complexity entirely.
Assistant
No python available; I'll use the
editcommand directly.Assistant
Now I'll replace lines 206-235 (the
elsebranch) to add a ConnectiveStep-specific branch before the generic partial-extraction fallback.Assistant
Now let's compile hugegraph-core and rebuild the classpath jar for our repro tests.
Assistant
Compiled successfully. Now let's rerun our TinkerGraph-based tests (Repro2, Repro3, Repro4) with the updated classes.
Assistant
Now the fix works correctly — result matches ground truth (all 6 vertices). Let's remove the debug print and rerun full test suite.
Assistant
Good. Now recompile and run the full comparison suite.
Assistant
All 4 cases now pass for HugeCountStrategy (matching ground truth), while old upstream TinkerPop 3.5.1 (without the fix) still mismatches — confirming we've aligned with the intended TINKERPOP-2911 fix. Now let's rerun Repro4 (RepeatStep case) and Repro (HugeGraph backend) to check for regressions.
Assistant
All results now correct on the real HugeGraph backend. Now let's run more comprehensive edge-case tests using TinkerGraph's full "modern"/"crew"/"grateful" datasets to be thorough, and also verify the existing negative-bound regression tests still pass.
Assistant
JVM module access issue with Kryo for GratefulDead dataset (unrelated to our fix). Let's add
--add-opensor just drop that dataset.Assistant
All test cases pass, including negative-bound cases (regression from PR #2993), nested and/or, multi-branch and(), and various label-based datasets. Now let's verify existing negative-bound regression tests in
CountStrategyCoreTeststill pass conceptually, and let's add regression tests for the ConnectiveStep cases as requested by the issue.Assistant
Let's insert a new schema/graph init helper and the four regression tests, right after
initTextRangeSchema.Assistant
Let's fix line 119 to restore proper closing braces.
Assistant
Now that's fixed. Let's add the four regression tests at the end of the file.
Assistant
Now let's compile the test module to verify correctness.
Assistant
Compiles cleanly. Now let's try to actually run these new tests using our manual classpath harness (since full mvn surefire is blocked by missing offline artifacts).
Assistant
Excellent, test passes! Let's run all four new tests together, plus the existing negative-bound tests, to confirm no regressions.
Assistant
264 tests pass. Let's run EdgeCoreTest too.
Assistant
All pass. Let's also check the ProcessStandardTest suite (TinkerPop process compliance tests), if feasible, since it exercises many gremlin steps including and/or/where combinations, which is the most relevant regression coverage for our change.
Assistant
This looks clean. Let's view the test file diff too.
Assistant
Now let's also verify the
sizevariable adjustment doesn't cause a warning about the unusedTraversal.Admin innerlocal variable shadowing, and run a final full compile + test pass to double-check everything is consistent.Assistant
Both compile cleanly. Let's do a final full re-run of the CountStrategyCoreTest, VertexCoreTest and EdgeCoreTest to ensure everything is stable after final recompilation.
Assistant
All confirmed passing. Let's clean up temporary files (outside the repo, so no impact on submission), and do a final review of the diff.
Assistant
Let's do a final full review of the complete
HugeCountStrategy.javato make sure everything is coherent.Assistant
This all looks correct and coherent. Now let's go through the checklist explicitly.
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 →