Uploaded image for project: 'Cassandra'
  1. Cassandra
  2. CASSANDRA-19428

Clean up KeyRangeIterator classes

    XMLWordPrintableJSON

Details

    • Improvement
    • Status: Resolved
    • Normal
    • Resolution: Fixed
    • 5.0-rc1, 5.0, 5.1
    • Feature/2i Index
    • None
    • Operability
    • Normal
    • All
    • None
    • 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

    Description

      Remove KeyRangeIterator.current and simplify

      Attachments

        Issue Links

          Activity

            People

              e.dimitrova Ekaterina Dimitrova
              e.dimitrova Ekaterina Dimitrova
              Caleb Rackliffe, Ekaterina Dimitrova, Jonathan Ellis, Michael Marshall, Piotr Kolaczkowski
              Caleb Rackliffe, Ekaterina Dimitrova
              Votes:
              1 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved:

                Time Tracking

                  Estimated:
                  Original Estimate - Not Specified
                  Not Specified
                  Remaining:
                  Remaining Estimate - 0h
                  0h
                  Logged:
                  Time Spent - 3h 20m
                  3h 20m