Skip to content

Extract fairness logic#230

Merged
leynos merged 1 commit intomainfrom
codex/extract-fairness-logic-to-helper-struct
Aug 2, 2025
Merged

Extract fairness logic#230
leynos merged 1 commit intomainfrom
codex/extract-fairness-logic-to-helper-struct

Conversation

@leynos
Copy link
Copy Markdown
Owner

@leynos leynos commented Jul 31, 2025

Summary

  • move fairness counters into new Fairness helper
  • use Fairness in ConnectionActor
  • test the new component

Testing

  • make fmt
  • make lint
  • make test
  • make markdownlint
  • make nixie (fails: ENOENT reading puppeteer files)

https://chatgpt.com/codex/tasks/task_e_688bc8dc13608322880c81f8c36d2dd3

Summary by Sourcery

Extract fairness tracking into a dedicated Fairness component, integrate it into ConnectionActor to simplify high/low queue balancing, and validate the behavior with unit tests.

New Features:

  • Introduce Fairness helper to encapsulate and manage high/low priority processing fairness.

Enhancements:

  • Refactor ConnectionActor to delegate fairness tracking and yielding decisions to the new Fairness helper instead of inline counters and logic
  • Derive Debug for FairnessConfig

Tests:

  • Add unit tests for Fairness logic covering threshold-based yielding, reset behavior after low-priority processing, and time-slice based yielding

@sourcery-ai
Copy link
Copy Markdown
Contributor

sourcery-ai Bot commented Jul 31, 2025

Reviewer's Guide

This PR extracts and encapsulates the fairness counting and yielding behavior into a new Fairness helper module, refactors ConnectionActor to delegate all priority-draining logic to this helper, and adds targeted unit tests for the new component.

Class diagram for extracted Fairness helper and refactored ConnectionActor

classDiagram
    class FairnessConfig {
        +max_high_before_low: usize
        +time_slice: Option<Duration>
    }
    class Fairness {
        -config: FairnessConfig
        -high_counter: usize
        -high_start: Option<Instant>
        +new(config: FairnessConfig)
        +set_config(config: FairnessConfig)
        +after_high()
        +should_yield() bool
        +after_low()
        +reset()
    }
    class ConnectionActor {
        -fairness: Fairness
        +set_fairness(fairness: FairnessConfig)
        +after_high()
        +after_low()
    }
    FairnessConfig <.. Fairness : uses
    Fairness <.. ConnectionActor : used by
Loading

File-Level Changes

Change Details Files
Extract fairness logic into new Fairness helper
  • Implement Fairness struct encapsulating config, counters, and timestamp
  • Add methods: new, set_config, after_high, should_yield, after_low, reset
  • Introduce unit tests covering threshold and time-slice scenarios
src/fairness.rs
src/lib.rs
Refactor ConnectionActor to use Fairness helper
  • Replace high_counter, high_start, and raw config fields with a Fairness instance
  • Initialize and configure Fairness in constructor and set_fairness
  • Delegate after_high, after_low, yield checks, and reset operations to Fairness
  • Remove obsolete counter management methods and inline logic
src/connection.rs

Possibly linked issues


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jul 31, 2025

Summary by CodeRabbit

  • Refactor

    • Improved fairness handling by consolidating related logic and state into a dedicated component, resulting in simplified and more maintainable prioritisation behaviour.
  • Tests

    • Added unit tests to ensure correct fairness behaviour under various conditions.

Walkthrough

Refactor the fairness handling in ConnectionActor by introducing a dedicated Fairness struct that encapsulates counters and timing logic. Replace manual management of fairness state with this abstraction. Update method calls and field usage throughout ConnectionActor. Add the new fairness module, and register it privately in the crate root.

Changes

Cohort / File(s) Change Summary
ConnectionActor Fairness Refactor
src/connection.rs
Replace manual fairness counters and timestamps with a Fairness struct. Update method calls and field usage. Remove unused imports.
Fairness Module Introduction
src/fairness.rs
Add new Fairness struct encapsulating fairness logic, counters, and timing. Provide methods for fairness management. Include unit tests.
Crate Root Module Registration
src/lib.rs
Register the new fairness module privately. No changes to public API.

Sequence Diagram(s)

sequenceDiagram
    participant User
    participant ConnectionActor
    participant Fairness

    User->>ConnectionActor: Process high-priority frame
    ConnectionActor->>Fairness: after_high()
    ConnectionActor->>Fairness: should_yield()
    alt Should yield
        Fairness-->>ConnectionActor: true
        ConnectionActor->>User: Yield to low-priority
    else Continue
        Fairness-->>ConnectionActor: false
        ConnectionActor->>User: Continue high-priority
    end
    User->>ConnectionActor: Process low-priority frame
    ConnectionActor->>Fairness: after_low()
Loading

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~15 minutes

Possibly related PRs

Poem

Fairness now lives in a struct of its own,
No more counters scattered, no logic alone.
With methods and tests, and a module to show,
The code is more tidy, the intent in the flow.
Hooray for neatness—let fairness be known!
🦀✨


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between f2c2e56 and 01bb4b7.

📒 Files selected for processing (3)
  • src/connection.rs (9 hunks)
  • src/fairness.rs (1 hunks)
  • src/lib.rs (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
**/*.rs

⚙️ CodeRabbit Configuration File

**/*.rs: * Seek to keep the cyclomatic complexity of functions no more than 12.

  • Adhere to single responsibility and CQRS

  • Place function attributes after doc comments.

  • Do not use return in single-line functions.

  • Move conditionals with >2 branches into a predicate function.

  • Avoid unsafe unless absolutely necessary.

  • Every module must begin with a //! doc comment that explains the module's purpose and utility.

  • Comments and docs must follow en-GB-oxendict (-ize / -our) spelling and grammar

  • Lints must not be silenced except as a last resort.

    • #[allow] is forbidden.
    • Only narrowly scoped #[expect(lint, reason = "...")] is allowed.
    • No lint groups, no blanket or file-wide suppression.
    • Include FIXME: with link if a fix is expected.
  • Use rstest fixtures for shared setup and to avoid repetition between tests.

  • Replace duplicated tests with #[rstest(...)] parameterised cases.

  • Prefer mockall for mocks/stubs.

  • Prefer .expect() over .unwrap()

  • Ensure that any API or behavioural changes are reflected in the documentation in docs/

  • Ensure that any completed roadmap steps are recorded in the appropriate roadmap in docs/

  • Files must not exceed 400 lines in length

    • Large modules must be decomposed
    • Long match statements or dispatch tables should be decomposed by domain and collocated with targets
    • Large blocks of inline data (e.g., test fixtures, constants or templates) must be moved to external files and inlined at compile-time or loaded at run-time.

Files:

  • src/lib.rs
  • src/fairness.rs
  • src/connection.rs
🔇 Additional comments (15)
src/lib.rs (1)

12-12: Module addition looks good.

The fairness module is correctly declared as private, keeping it as an internal implementation detail.

src/fairness.rs (8)

1-6: Module documentation is well-structured.

The documentation clearly explains the module's purpose and follows en-GB conventions.


11-25: Struct design and constructor are appropriate.

Clean encapsulation of fairness state with a straightforward constructor.


27-30: Configuration update correctly resets state.

Good design choice to reset counters when configuration changes.


32-37: High priority tracking logic is correct.

Properly tracks count and initialises timing on first operation.


50-50: Method delegation is acceptable.

While this could be inlined, having a distinct after_low method provides clearer API semantics.


65-77: Threshold test properly validates expected behaviour.

Good use of rstest and clear test logic.


79-91: Reset test validates expected behaviour.

Properly tests that after_low clears the yielding condition.


93-105: Time slice test excellently uses time mocking.

Proper use of time::pause() and time::advance() for deterministic testing.

src/connection.rs (6)

15-15: Import changes align with refactoring.

Correctly adds Fairness import and removes unused Instant.

Also applies to: 46-46


67-67: Debug derive aids debugging.

Good addition for introspection and debugging support.


111-111: Fairness encapsulation improves design.

Replacing three separate fields with a single Fairness instance improves cohesion.


169-169: Constructor and setter properly use Fairness abstraction.

Clean delegation to the Fairness component's methods.

Also applies to: 185-185


304-304: Fairness reset on queue closure is appropriate.

Ensures clean state when high priority source is exhausted.


366-368: Fairness delegation maintains existing behaviour.

The refactoring correctly uses the Fairness component's methods while preserving the original logic.

Also applies to: 387-387

✨ Finishing Touches
  • 📝 Generate Docstrings
🧪 Generate unit tests
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch codex/extract-fairness-logic-to-helper-struct

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai generate unit tests to generate unit tests for this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown
Contributor

@sourcery-ai sourcery-ai Bot left a comment

Choose a reason for hiding this comment

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

Hey @leynos - I've reviewed your changes - here's some feedback:

  • Consider injecting a clock or time source into Fairness instead of calling Instant::now() directly to make timing logic more testable and decoupled from tokio.
  • You might rename Fairness methods (e.g. should_yield → should_yield_to_low_priority) or the struct itself to make the intent clearer when reading ConnectionActor code.
Prompt for AI Agents
Please address the comments from this code review:
## Overall Comments
- Consider injecting a clock or time source into Fairness instead of calling Instant::now() directly to make timing logic more testable and decoupled from tokio.
- You might rename Fairness methods (e.g. should_yield → should_yield_to_low_priority) or the struct itself to make the intent clearer when reading ConnectionActor code.

## Individual Comments

### Comment 1
<location> `src/fairness.rs:39` </location>
<code_context>
+        }
+    }
+
+    pub(crate) fn should_yield(&self) -> bool {
+        let threshold_hit = self.config.max_high_before_low > 0
+            && self.high_counter >= self.config.max_high_before_low;
</code_context>

<issue_to_address>
Consider refactoring the should_yield method to use early-return if-let patterns and consolidating after_low and reset into a shared helper for clarity.

You can flatten the two checks and avoid the `zip…is_some_and` trick with a straightforward early-return `if let` pattern. This makes each “hit” condition explicit and keeps the method under 10 lines:

```rust
impl Fairness {
    pub(crate) fn should_yield(&self) -> bool {
        // 1) threshold hit?
        if self.config.max_high_before_low > 0
            && self.high_counter >= self.config.max_high_before_low
        {
            return true;
        }

        // 2) time‐slice hit?
        if let (Some(slice), Some(start)) = (&self.config.time_slice, &self.high_start) {
            if start.elapsed() >= *slice {
                return true;
            }
        }

        false
    }
}
```

Optionally, since `after_low` is just `reset()`, you can collapse them by inlining the shared logic into a private helper and calling it from both places:

```rust
impl Fairness {
    fn clear(&mut self) {
        self.high_counter = 0;
        self.high_start = None;
    }

    pub(crate) fn after_low(&mut self) {
        self.clear();
    }

    pub(crate) fn reset(&mut self) {
        self.clear();
    }
}
```
</issue_to_address>

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment thread src/fairness.rs
}
}

pub(crate) fn should_yield(&self) -> bool {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

issue (complexity): Consider refactoring the should_yield method to use early-return if-let patterns and consolidating after_low and reset into a shared helper for clarity.

You can flatten the two checks and avoid the zip…is_some_and trick with a straightforward early-return if let pattern. This makes each “hit” condition explicit and keeps the method under 10 lines:

impl Fairness {
    pub(crate) fn should_yield(&self) -> bool {
        // 1) threshold hit?
        if self.config.max_high_before_low > 0
            && self.high_counter >= self.config.max_high_before_low
        {
            return true;
        }

        // 2) time‐slice hit?
        if let (Some(slice), Some(start)) = (&self.config.time_slice, &self.high_start) {
            if start.elapsed() >= *slice {
                return true;
            }
        }

        false
    }
}

Optionally, since after_low is just reset(), you can collapse them by inlining the shared logic into a private helper and calling it from both places:

impl Fairness {
    fn clear(&mut self) {
        self.high_counter = 0;
        self.high_start = None;
    }

    pub(crate) fn after_low(&mut self) {
        self.clear();
    }

    pub(crate) fn reset(&mut self) {
        self.clear();
    }
}

@leynos
Copy link
Copy Markdown
Owner Author

leynos commented Aug 2, 2025

@coderabbitai review

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Aug 2, 2025

✅ Actions performed

Review triggered.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

@leynos leynos merged commit a562127 into main Aug 2, 2025
5 checks passed
@leynos leynos deleted the codex/extract-fairness-logic-to-helper-struct branch August 2, 2025 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant