OpenLP

Merge lp://qastaging/~sam92/openlp/bug-1552563-2.4 into lp://qastaging/openlp/2.4

  1. bug-1552563-2.4
  2. Merge into 2.4
Proposed by Samuel Mehrbrodt
Status: Merged
Approved by: Tim Bentley
Approved revision: 2629
Merged at revision: 2628
Proposed branch: lp://qastaging/~sam92/openlp/bug-1552563-2.4
Merge into: lp://qastaging/openlp/2.4
Diff against target: 68 lines (+17/-18)
2 files modified
openlp/plugins/songs/lib/mediaitem.py (+17/-17)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+0/-1)
To merge this branch: bzr merge lp://qastaging/~sam92/openlp/bug-1552563-2.4
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Review via email: mp+293429@code.qastaging.launchpad.net

Description of the change

Fix performance regression with Songbook search

The problem was that in each iteration the database was accessed (the song object).
Fixed this by loading all neccessary information directly in the query.

Also this reintroduces natural sorting.

To post a comment you must log in.
Revision history for this message
Samuel Mehrbrodt (sam92) wrote :

lp:~sam92/openlp/bug-1552563-2.4 (revision 2629)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1510/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1421/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1359/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1155/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/746/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/813/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/681/

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches