Skip to content

Conversation

michaelsembwever
Copy link
Member

https://github.com/riptano/cndb/issues/15482

Port into main-5.0 commit d8005b7

Only count live data size when we are using bytes-sized limits. This prevents issues with paging when row purging or other unexpected transformation changes the size of the read rows.

This fixes  DBPE-16935 and DBPE-17751.

Rebase notes:
 * nowInSec and minDeletionTime are not longs instead of ints (ref CASSANDRA-14227)

…ng (#2010)

Only count live data size when we are using bytes-sized limits. This
prevents issues with paging when row purging or other unexpected
transformation changes the size of the read rows.

This fixes  DBPE-16935 and DBPE-17751.

Rebase notes:
 * nowInSec and minDeletionTime are not longs instead of ints (ref CASSANDRA-14227)
Copy link

Checklist before you submit for review

  • This PR adheres to the Definition of Done
  • Make sure there is a PR in the CNDB project updating the Converged Cassandra version
  • Use NoSpamLogger for log lines that may appear frequently in the logs
  • Verify test results on Butler
  • Test coverage for new/modified code is > 80%
  • Proper code formatting
  • Proper title for each commit staring with the project-issue number, like CNDB-1234
  • Each commit has a meaningful description
  • Each commit is not very long and contains related changes
  • Renames, moves and reformatting are in distinct commits
  • All new files should contain the DataStax copyright header instead of the Apache License one

@michaelsembwever
Copy link
Member Author

PagingAggregationQueryTest is a real breakage here…

@adelapena
Copy link

@michaelsembwever it seems this fails on tests. Do you want me to review or fix the cherry-picking?

@adelapena
Copy link

Just pushed a commit disabling the size thresholds in the new tests, which seems to fix it.


@Override
public int dataSizeBeforePurge()
public int liveDataSize(long nowInSec)

Choose a reason for hiding this comment

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

Nit: I'd move this method up so it's right after the very similar dataSize method.

}

@Override
public int liveDataSize(long nowInSec)

Choose a reason for hiding this comment

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

Same as above, I'd move this to be right after dataSize()

Copy link

sonarqubecloud bot commented Oct 2, 2025

@cassci-bot
Copy link

❌ Build ds-cassandra-pr-gate/PR-2020 rejected by Butler


9 regressions found
See build details here


Found 9 new test failures

Test Explanation Runs Upstream
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithLists[aggregation_sub_page_size=1024 bytes data_size=LARGE flush=false] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithLists[aggregation_sub_page_size=1024 bytes data_size=LARGE flush=true] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithLists[aggregation_sub_page_size=unlimited data_size=LARGE flush=false] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithLists[aggregation_sub_page_size=unlimited data_size=LARGE flush=true] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithRangeRowDeletionsComposite[aggregation_sub_page_size=1024 bytes data_size=LARGE flush=false] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithRangeRowDeletionsComposite[aggregation_sub_page_size=1024 bytes data_size=LARGE flush=true] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithRangeRowDeletionsComposite[aggregation_sub_page_size=unlimited data_size=LARGE flush=false] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.PagingAggregationQueryTest.testAggregationWithRangeRowDeletionsComposite[aggregation_sub_page_size=unlimited data_size=LARGE flush=true] (compression) <span title="The test is NOT RUN on upstream but FLAKY on feature:
• Feature branch: FLAKY because there are 1 passing, 1 failing, 0 missing, and 0 skipped runs in the last 2 runs in 3 builds (1 to 3)
• Upstream branch: MISSING in the last run in 9 builds (147 to 156)">NEW 🔵🔴 0 / 9
o.a.c.cql3.validation.operations.AggregationQueriesTest.testAggregationQueryShouldNotTimeoutWhenItExceedesReadTimeout (compression) <span title="The test is FAILING on feature but FLAKY on upstream:
• Feature branch: FAILING in the recent 2 >= 2 minimum runs (2 actual failures, 0 missing/skipped) in 3 builds (1 to 3)
• Upstream branch: FLAKY because there are 6 passing, 2 failing, 1 missing, and 0 skipped runs in the last 9 runs in 9 builds (147 to 156)">REGRESSION 🔴🔴 2 / 9

Found 7 known test failures

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants