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

Divide src/progress.rs into mods #188

Merged
merged 12 commits into from
Apr 1, 2019

Conversation

Fullstop000
Copy link
Member

@Fullstop000 Fullstop000 commented Feb 22, 2019

#125

The original src/progress.rs is divided into src/progress/{mod.rs, infights.rs, progress_set.rs}

Signed-off-by: Fullstop000 <fullstop1005@gmail.com>
Signed-off-by: Fullstop000 <fullstop1005@gmail.com>
Signed-off-by: Fullstop000 <fullstop1005@gmail.com>
@Hoverbear Hoverbear self-requested a review February 22, 2019 19:42
@Hoverbear Hoverbear added this to the 0.6.0 milestone Feb 22, 2019
@Hoverbear
Copy link
Contributor

Hi @Fullstop000 !

I think this is a step in the right direction. :) In the future we may want to split things up more, and there are certainly other parts of Raft that could have this treatment, but I appreciate you choosing to do this in a bite sized chunk.

Please take a moment to fix the merge conflict if you could.

…e125_divide_progress_into_mods

Signed-off-by: Fullstop000 <fullstop1005@gmail.com>

# Conflicts:
#	src/progress/progress_set.rs
@siddontang
Copy link
Contributor

PTAL @BusyJay

BusyJay
BusyJay previously approved these changes Feb 25, 2019
Signed-off-by: Fullstop000 <fullstop1005@gmail.com>
Hoverbear
Hoverbear previously approved these changes Feb 25, 2019
Hoverbear and others added 3 commits February 25, 2019 14:59
…e125_divide_progress_into_mods

Signed-off-by: Fullstop000 <fullstop1005@gmail.com>

# Conflicts:
#	src/progress/progress_set.rs
#	src/raft.rs
Signed-off-by: Fullstop000 <fullstop1005@gmail.com>
@Hoverbear
Copy link
Contributor

@BusyJay Was your last review a green approved check? :) Can you give another?

@Hoverbear Hoverbear requested a review from hicqu March 27, 2019 23:19
@BusyJay
Copy link
Member

BusyJay commented Apr 1, 2019

Thanks for your contribution!

@BusyJay BusyJay merged commit c4eb4d5 into tikv:master Apr 1, 2019
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.

4 participants