[CASSANDRA-19428] Clean up KeyRangeIterator classes - ASF JIRA

Agile Board

Attach files

Attach Screenshot

Bulk Copy Attachments

Bulk Move Attachments

Voters

Watch issue

Watchers

Create sub-task

Convert to sub-task

Move

Link

Clone

Labels

Update Comment Author

Replace String in Comment

Update Comment Visibility

Delete Comments

XML

Word

Printable

JSON

Details

Type: Improvement
Status: Resolved
Priority: Normal
Resolution: Fixed
Fix Version/s: 5.0-rc1, 5.0, 5.1
Component/s: Feature/2i Index
Labels:
None

Epic Link:
Storage Attached Indexes (Phase 3)
Change Category:
Operability
Complexity:
Normal
Platform:

All
Impacts:

None
Source Control Link:

https://github.com/apache/cassandra/commit/b0150e86fbf5863fd831cfca8118f1a8bd254a43. https://github.com/apache/cassandra/commit/a1b0a310eded202d86d6fd0f746a5176ff8cabbe
Test and Documentation Plan:
Hide

~~5.0 patch PR - https://github.com/apache/cassandra/pull/3194~~

-~~Fully green CI -- [-https://app.circleci.com/pipelines/github/ekaterinadimitrova2/cassandra?branch=19428-5.0-3-]~~

Latest branches:

https://github.com/ekaterinadimitrova2/cassandra/tree/19428-5.0-5

https://github.com/ekaterinadimitrova2/cassandra/pull/new/19428-trunk-2

I tested locally the patch on top of the trunk - running the new fuzz tests added, and they all passed, too.

I can propagate and run full CI when we confirm the final patch.
Clean up KeyRangeIterator classes

replace KeyRangeConcatIterator's PriorityQeueu with List

remove KeyRangeIterator.current and simplify

remove injected exception and tests - not relevant to the current implementation

expand randomized testing

inline getCurrent() -> peek(); rename getCount to getMaxKeys

redefine skipTo contract to not return a value (which saves unnecessary work when skipTo is called multiple times in a row)

calling hasNext in skipTo is a pessimization; if the iterator is in DONE state, then skipTo will see it and avoid further effort; if it is not, then we are computing a next value that we're just going to throw away

Fix a bug in QueryController#getIndexResults error handling
Show
5.0 patch PR - https://github.com/apache/cassandra/pull/3194 - Fully green CI -- [-https://app.circleci.com/pipelines/github/ekaterinadimitrova2/cassandra?branch=19428-5.0-3-] Latest branches: https://github.com/ekaterinadimitrova2/cassandra/tree/19428-5.0-5 https://github.com/ekaterinadimitrova2/cassandra/pull/new/19428-trunk-2 I tested locally the patch on top of the trunk - running the new fuzz tests added, and they all passed, too. I can propagate and run full CI when we confirm the final patch. Clean up KeyRangeIterator classes replace KeyRangeConcatIterator's PriorityQeueu with List remove KeyRangeIterator.current and simplify remove injected exception and tests - not relevant to the current implementation expand randomized testing inline getCurrent() -> peek(); rename getCount to getMaxKeys redefine skipTo contract to not return a value (which saves unnecessary work when skipTo is called multiple times in a row) calling hasNext in skipTo is a pessimization; if the iterator is in DONE state, then skipTo will see it and avoid further effort; if it is not, then we are computing a next value that we're just going to throw away Fix a bug in QueryController#getIndexResults error handling