Skip to content

MOD-5904: Fix DocTable memsize#5099

Merged
nafraf merged 35 commits intomasterfrom
nafraf_fix-doctable-memsize
Mar 19, 2025
Merged

MOD-5904: Fix DocTable memsize#5099
nafraf merged 35 commits intomasterfrom
nafraf_fix-doctable-memsize

Conversation

@nafraf
Copy link
Collaborator

@nafraf nafraf commented Oct 9, 2024

Description

Changes to count the memory allocated for DMDChain *buckets as part of DocTable memsize.

Which issues this PR fixes

  1. MOD-5904

Main objects this PR modified

  1. ...
  2. ...

Mark if applicable

  • This PR introduces API changes
  • This PR introduces serialization changes

@nafraf nafraf requested a review from oshadmi October 19, 2024 01:45
@nafraf nafraf marked this pull request as ready for review October 19, 2024 01:45
@codecov
Copy link

codecov bot commented Oct 19, 2024

Codecov Report

Attention: Patch coverage is 57.14286% with 3 lines in your changes missing coverage. Please review.

Project coverage is 87.71%. Comparing base (d02485c) to head (2931496).
Report is 3 commits behind head on master.

Files with missing lines Patch % Lines
src/doc_table.c 57.14% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5099      +/-   ##
==========================================
- Coverage   87.75%   87.71%   -0.05%     
==========================================
  Files         202      202              
  Lines       36213    36220       +7     
  Branches      150      150              
==========================================
- Hits        31780    31771       -9     
- Misses       4433     4449      +16     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@nafraf nafraf changed the base branch from nafraf_fix-triemap-size to master October 19, 2024 02:44
@nafraf nafraf changed the base branch from master to nafraf_fix-triemap-size October 19, 2024 02:46
@nafraf nafraf changed the base branch from nafraf_fix-triemap-size to master October 19, 2024 02:46
@nafraf nafraf changed the base branch from master to nafraf_fix-triemap-size October 19, 2024 04:08
@github-actions
Copy link

github-actions bot commented Jan 5, 2025

This pull request is stale because it has been open for 60 days with no activity.

@github-actions github-actions bot added the stale label Jan 5, 2025
@nafraf nafraf requested a review from raz-mon January 15, 2025 13:10
@github-actions github-actions bot removed the stale label Jan 16, 2025
Copy link
Collaborator

@raz-mon raz-mon left a comment

Choose a reason for hiding this comment

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

💯 👏
A few comments

ASSERT_EQ(info.numDocuments, 2);
ASSERT_EQ(info.maxDocId, 2);
ASSERT_EQ(info.docTableSize, 140);
ASSERT_EQ(info.docTableSize, 16140);
Copy link
Collaborator

Choose a reason for hiding this comment

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

😮

@nafraf nafraf added this pull request to the merge queue Mar 19, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 19, 2025
@nafraf nafraf enabled auto-merge March 19, 2025 16:23
@nafraf nafraf added this pull request to the merge queue Mar 19, 2025
Merged via the queue into master with commit b4234ed Mar 19, 2025
9 of 10 checks passed
@nafraf nafraf deleted the nafraf_fix-doctable-memsize branch March 19, 2025 18:18
@nafraf
Copy link
Collaborator Author

nafraf commented Mar 19, 2025

/backport

@redisearch-backport-pull-request
Copy link
Contributor

Backport failed for 2.8, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.8
git worktree add -d .worktree/backport-5099-to-2.8 origin/2.8
cd .worktree/backport-5099-to-2.8
git switch --create backport-5099-to-2.8
git cherry-pick -x b4234edfc5031a996c903a824a51a02c75825925

@redisearch-backport-pull-request
Copy link
Contributor

Backport failed for 2.6, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.6
git worktree add -d .worktree/backport-5099-to-2.6 origin/2.6
cd .worktree/backport-5099-to-2.6
git switch --create backport-5099-to-2.6
git cherry-pick -x b4234edfc5031a996c903a824a51a02c75825925

@redisearch-backport-pull-request
Copy link
Contributor

Backport failed for 2.10, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin 2.10
git worktree add -d .worktree/backport-5099-to-2.10 origin/2.10
cd .worktree/backport-5099-to-2.10
git switch --create backport-5099-to-2.10
git cherry-pick -x b4234edfc5031a996c903a824a51a02c75825925

redisearch-backport-pull-request bot pushed a commit that referenced this pull request Mar 19, 2025
* Fix TrieMap Size and Cardinality

* Add python tests

* Fix cpp test

* Fix testKeyTableInfo

* Fix DocTable memsize

* Fix test_ft_info()

* Fix testDocTableInfo()

* Add description to DocTable properties

* Fix testDocTableInfo() 2

* Fix test_ft_info() 2

* Fix tests 3

* Fix testDocTableInfo() 4

* Fix unit-tests

* Update DocTable memory size calculation and related tests

* Update DocTable size calculation in tests to include struct size

* Remove unneeded memsize update

* Fix codespell errors

* Fix codespell errors

* testDocTableInfo: Use shardsCount instead of cluster nodes

* Revert changes related to triemap

* Fix codespell ignore comment in test_profile_crash_mod5323

(cherry picked from commit b4234ed)
@redisearch-backport-pull-request
Copy link
Contributor

Successfully created backport PR for 8.0:

github-merge-queue bot pushed a commit that referenced this pull request Mar 19, 2025
MOD-5904: Fix DocTable memsize (#5099)

* Fix TrieMap Size and Cardinality

* Add python tests

* Fix cpp test

* Fix testKeyTableInfo

* Fix DocTable memsize

* Fix test_ft_info()

* Fix testDocTableInfo()

* Add description to DocTable properties

* Fix testDocTableInfo() 2

* Fix test_ft_info() 2

* Fix tests 3

* Fix testDocTableInfo() 4

* Fix unit-tests

* Update DocTable memory size calculation and related tests

* Update DocTable size calculation in tests to include struct size

* Remove unneeded memsize update

* Fix codespell errors

* Fix codespell errors

* testDocTableInfo: Use shardsCount instead of cluster nodes

* Revert changes related to triemap

* Fix codespell ignore comment in test_profile_crash_mod5323

(cherry picked from commit b4234ed)

Co-authored-by: nafraf <[email protected]>
nafraf added a commit that referenced this pull request Mar 19, 2025
nafraf added a commit that referenced this pull request Mar 20, 2025
nafraf added a commit that referenced this pull request Mar 21, 2025
github-merge-queue bot pushed a commit that referenced this pull request Mar 26, 2025
* MOD-5904: Fix DocTable memsize (#5099)

(cherry picked from commit b4234ed)

* Adjust memory usage expectations in LLApi and Stats tests
github-merge-queue bot pushed a commit that referenced this pull request Mar 26, 2025
* MOD-5904: Fix DocTable memsize (#5099)
(cherry picked from commit b4234ed)

* Fix initial DocTable size calculation in tests
github-merge-queue bot pushed a commit that referenced this pull request Mar 26, 2025
* MOD-5904: Fix DocTable memsize (#5099)

(cherry picked from commit b4234ed)

* Fix initial DocTable size calculation in tests
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