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

TrackDAO: Reformat code / Avoid mutex locks on Track object #2756

Merged
merged 4 commits into from
May 7, 2020
Merged

TrackDAO: Reformat code / Avoid mutex locks on Track object #2756

merged 4 commits into from
May 7, 2020

Conversation

uklotzde
Copy link
Contributor

@uklotzde uklotzde commented May 6, 2020

This technical PR will reduce the number of merge conflicts that I already experience frequently.

  • Reformat code in anonymous namespace, i.e. fix the indentation
  • Bind database column upon insert/update from TrackRecord instead of Track to avoid repeated locking of mutexes. The additional copy shouldn't matter since all dynamically allocated C++ objects are implicitly shared (Qt)

Both changes affect a single part of the code.

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

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

Just one comment, unsure.

I wish we have a 2.3 branch, so that can go to master.

@Holzhaus you working on the last blockers. Are you able to estimate something?

src/library/dao/trackdao.cpp Show resolved Hide resolved
@Holzhaus
Copy link
Member

Holzhaus commented May 6, 2020

@Holzhaus you working on the last blockers. Are you able to estimate something?

AFAIC everything is ready to merge now.

@daschuer
Copy link
Member

daschuer commented May 6, 2020

OK, so lets wait here.

@daschuer daschuer added this to the 2.4.0 milestone May 6, 2020
@uklotzde
Copy link
Contributor Author

uklotzde commented May 7, 2020

I have so many pending pull requests that I need to suspend working on Mixxx. This is becoming unmanageable.

@Be-ing Be-ing merged commit 9c244b6 into mixxxdj:master May 7, 2020
@Be-ing
Copy link
Contributor

Be-ing commented May 7, 2020

I have just pushed the 2.3 branch so this can be merged to master now.

@uklotzde uklotzde deleted the trackdao branch May 16, 2020 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants