Skip to content

Conversation

@cpjulia
Copy link
Contributor

@cpjulia cpjulia commented Nov 25, 2025

Scope & Purpose

In AqlValue.cpp, there's a hashing function and a comparator. An AqlValue object can have different types of values, inline, slice pointers, managed slices and managed strings (and, in the future, supervised slice). Inline values are non-allocated values that are distributed within the AqlValue's 16 bytes of available space, slice pointers are pointers to values not owned by the AqlValue object, and managed slices and strings are dynamically allocated payloads owned by the AqlValue object. Even if multiple aql values point to the same managed slice, still, it's owned by AqlValue, and the last AqlValue that points to it to be destroy has to free this allocated memory. The hashing and comparator are used in AqlItemBlock for deduplication, when inserting the AqlValue on a block, so it has to compare if two aql values are equal.

Now onto the hashing, before, the hash was made with the pointers, not the data pointed to by the pointers. The data that the pointer stores is the address of the payload it points to, hence, if two aql values that own memory were compared using this approach, they would never be considered equal, and they could be, because, even though having memory allocated in different addresses, the payload that each store could be semantically the same. This would lead to the comparison used in AqlItemBlock not working properly, and wrongfully distinguishing values that should be considered the same in practice.
The new approach is to hash by the value stored in the address in cases where there's dynamic allocation.
When the value is inline, it's safe to maintain the original approach.
When the value is of type slice pointer, it means AqlValue doesn't own it, hence, the pointers should be hashed. If they point to the same address, then they could be considered the same.

  • 💩 Bugfix
  • 🍕 New feature
  • 🔥 Performance improvement
  • 🔨 Refactoring/simplification

Checklist

  • Tests -> PROBABLY TO BE ADDED
    • Regression tests
    • C++ Unit tests
    • integration tests
    • resilience tests
  • 📖 CHANGELOG entry made
  • 📚 documentation written (release notes, API changes, ...)
  • Backports
    • Backport for 3.12.0: (Please link PR)
    • Backport for 3.11: (Please link PR)
    • Backport for 3.10: (Please link PR)

Related Information

(Please reference tickets / specification / other PRs etc)

  • Docs PR:
  • Enterprise PR:
  • GitHub issue / Jira ticket:
  • Design document:

Note

Switches AqlValue hashing and equality to normalized, content-based semantics (incl. ranges and doubles), adjusts cloning/serialization paths, and adds extensive tests to validate deduplication behavior.

  • AQL Core:
    • Content-based std::hash<AqlValue> using AqlValue::hash(kDefaultSeed); removes pointer-based hashing and normalizes doubles (-0.0 -> 0.0).
    • Reworks std::equal_to<AqlValue> to compare by semantic content across storage types and to compare RANGE by bounds.
    • Adds AqlValue::kDefaultSeed and updates AqlValue::hash signature; improves Compare and RANGE handling assertions.
  • AqlItemBlock:
    • cloneDataAndMoveShadow: simplify ownership transfer for destructible values; maintain cache by data pointer.
    • toVelocyPack: uses content-based dedup map (try_emplace(a, pos)); minor cleanup.
  • Tests:
    • Adds AqlValueHashAlgorithmCorrectnessTest.cpp, AqlValueHashEqualTest.cpp, AqlValueHashTest.cpp covering hashing/equality contracts, cross-type equality, range handling, and serialization/clone deduplication.
    • Updates tests/CMakeLists.txt to include new tests.

Written by Cursor Bugbot for commit c6a7589. This will update automatically on new commits. Configure here.

@cla-bot cla-bot bot added the cla-signed label Nov 25, 2025
@cpjulia cpjulia added this to the devel milestone Nov 25, 2025
Copy link
Member

@mchacki mchacki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have some clarifying questions

return std::hash<void const*>()(x._data.rangeMeta.range);
using T = AqlValue::AqlValueType;
auto aqlValueType = x.type();
// as this is non owning, we hash by the pointer
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does the owning make for a difference?

Hashing is a quick look of the content is equal.
In my opinion it should not take into account if the value is owned or not.

Comment on lines 1383 to 1386
if (h == 0) { // fallback to avoid collision with the marker that uses h ==
// 0, very unlikely to happen
h = 1;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hö what is this?

Comment on lines 1407 to 1408
return a._data.slicePointerMeta.pointer ==
b._data.slicePointerMeta.pointer;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this pointer comparison?
And not real equality comparison like the default case?

Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is being reviewed by Cursor Bugbot

Details

Your team is on the Bugbot Free tier. On this plan, Bugbot will review limited PRs each billing cycle for each member of your team.

To receive Bugbot reviews on all of your PRs, visit the Cursor dashboard to activate Pro and start your 14-day free trial.

cache.emplace(a.data());
res->setValue(row, col, a);
// Transfer ownership to res - guard won't destroy it
guard.steal();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Shadow row deduplication removed while cache remains populated

The shadow row handling now calls cache.emplace(a.data()) but ignores the return value and always transfers ownership via guard.steal(). The old code used the emplace result to deduplicate: when a pointer was already cached, it would destroy the duplicate value and reuse the cached one. The new code removes this deduplication but still populates the cache, suggesting incomplete refactoring. If multiple shadow row cells share the same underlying data pointer, this could lead to multiple AqlValue objects referencing the same memory, potentially causing memory management issues.

Fix in Cursor Fix in Web

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants