Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix expected values in SingleRestrictionEstimatedRowCountTest #1523

Merged
merged 2 commits into from
Jan 28, 2025

Conversation

k-rus
Copy link

@k-rus k-rus commented Jan 21, 2025

Fixes https://github.com/riptano/cndb/issues/12243

main-5.0 uses different default for memetable SAI structure than 5.0. This commits adjusts the expected row count values. Also removes assert on the total row count, since it varies in this branch for different column types.

This PR is likely to conflict with #1502 after the merge when rebased from main.

Checklist before you submit for review

  • 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

@k-rus
Copy link
Author

k-rus commented Jan 24, 2025

#1502 was merged. @djatnieks should I cherry pick it into this PR?

@djatnieks
Copy link

#1502 was merged. @djatnieks should I cherry pick it into this PR?

Yes, I think that sounds good.

k-rus and others added 2 commits January 27, 2025 14:37
Reduces amount of created tables by creating all needed tables in advance. As the result the test can be placed into single test function.
This improves local test execution time from 5.5 seconds down to 1.4 seconds. Reduction in CI from 13 to 5 seconds.

Also removes disabling optimizer, which wasn't necessary.
Fixes riptano/cndb#12243

main-5.0 uses different default for memetable SAI structure than 5.0.
This commits adjusts the expected row count values. Also removes assert
on the total row count, since it varies in this branch for different
column types.
@k-rus k-rus force-pushed the rf-cndb-12154-5.0-fix-row-count-test branch from 9bac9ed to f72dc89 Compare January 27, 2025 13:42
@k-rus
Copy link
Author

k-rus commented Jan 27, 2025

@djatnieks I cherry picked the commit from main, which this PR is based on, and resolved conflicts. So this PR should be ready to merge at suitable for you time. You can see the cherry-picked commit in the commit history of the PR.

@cassci-bot
Copy link

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


70 new test failure(s) in 2 builds
See build details here


Found 70 new test failures

Showing only first 15 new test failures

Test Explanation Branch history Upstream history
t.TestCqlshUnicode.test_unicode_identifier regression 🔴🔴
o.a.c.d.c.CompactionControllerTest.testMemtable... regression 🔴🔴
...adCommitLogAndSSTablesWithDroppedColumnTestCC50 regression 🔴🔴
...ersionTest.v4ConnectionCleansUpThreadLocalState regression 🔴🔴
...d.t.QueriesTableTest.shouldExposeReadsAndWrites regression 🔴🔴
...rtitionRestrictedQueryTest.testSAIWarnThreshold regression 🔴🔴
o.a.c.d.t.r.ForceRepairTest.force regression 🔴
..., expectedHeaders=[Ljava.lang.String;@792bbc74] regression 🔴🔴
...eadSizeWarningTest.warnThresholdSinglePartition regression 🔴🔴
....s.f.SnapshotTest.shouldTakeAndRestoreSnapshots regression 🔴🔴
o.a.c.i.c.CompressionMetadataTest.testMemoryIsF... regression 🔴🔴
...ntIrWithPreviewFuzzTest.concurrentIrWithPreview regression 🔴🔴
o.a.c.t.SSTablePartitionsTest.testBackups regression 🔴🔴
o.a.c.t.SSTablePartitionsTest.testCurrentTimestamp regression 🔴🔴
o.a.c.t.SSTablePartitionsTest.testExcludedKeys regression 🔴🔴

Found 5 known test failures

@djatnieks djatnieks merged commit 99bdf21 into main-5.0 Jan 28, 2025
511 of 552 checks passed
@djatnieks djatnieks deleted the rf-cndb-12154-5.0-fix-row-count-test branch January 28, 2025 02:05
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