Unity 8

Merge lp://staging/~lukas-kde/unity8/appdrawer-search-more into lp://staging/unity8

  1. appdrawer-search-more
  2. Merge into trunk
Proposed by Lukáš Tinkl
Status: Needs review
Proposed branch: lp://staging/~lukas-kde/unity8/appdrawer-search-more
Merge into: lp://staging/unity8
Prerequisite: lp://staging/~mzanetti/unity8/appdrawer-recent-apps
Diff against target: 384 lines (+91/-25)
14 files modified
plugins/Greeter/Unity/Launcher/launcheritem.cpp (+13/-0)
plugins/Greeter/Unity/Launcher/launcheritem.h (+3/-0)
plugins/Unity/Launcher/appdrawermodel.cpp (+3/-0)
plugins/Unity/Launcher/launcheritem.cpp (+13/-0)
plugins/Unity/Launcher/launcheritem.h (+3/-0)
plugins/Unity/Launcher/ualwrapper.cpp (+6/-4)
plugins/Unity/Launcher/ualwrapper.h (+1/-0)
plugins/Utils/appdrawerproxymodel.cpp (+24/-19)
qml/Launcher/Drawer.qml (+1/-0)
tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+13/-0)
tests/mocks/Unity/Launcher/MockLauncherItem.h (+3/-0)
tests/plugins/Unity/Launcher/appdrawermodeltest.cpp (+6/-2)
tests/plugins/Unity/Launcher/ualwrapper.cpp (+1/-0)
tests/plugins/Unity/Launcher/ualwrapper.h (+1/-0)
To merge this branch: bzr merge lp://staging/~lukas-kde/unity8/appdrawer-search-more
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Albert Astals Cid (community) Approve
Review via email: mp+321998@code.staging.launchpad.net

This proposal supersedes a proposal from 2017-04-04.

Commit message

Appdrawer: search in more fields (appid and description), optimize and massively speed up

Description of the change

Prereq-archive: ppa:ci-train-ppa-service/2701

Appdrawer: search in more fields (appid and description), optimize and massively speed up

As I added more field to search in, it slowed down a bit. So I optimized the tiny bits throughout the AppDrawerProxyModel but the biggest bottleneck turned out to be the toplevel dynamicSortFilter in Drawer.qml

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, https://code.launchpad.net/~lukas-kde/unity-api/launcheritem-description/+merge/321924 and https://code.launchpad.net/~mzanetti/unity8/appdrawer-recent-apps/+merge/319697

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the UI, has there been a design review?

N/A

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2916
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3678/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4879/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4907
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4718/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3678/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote : Posted in a previous version of this proposal

I guess the startsWith -> contains change is the most "controversial" change here.

Maybe contains should be only for description? What do others think?

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2918
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3693/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4906/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4934
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4742/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3693/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~lukas-kde/unity8/appdrawer-search-more updated
2919. By Lukáš Tinkl

restore sortRole

Revision history for this message
Albert Astals Cid (aacid) wrote :

> I guess the startsWith -> contains change is the most "controversial" change here.
>
> Maybe contains should be only for description? What do others think?

Given yesterday's news i guess it doesn't make sense to nitpick much over this.

Reply
Revision history for this message
Albert Astals Cid (aacid) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
Waiting

review: Approve
Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2918
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3698/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4915/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4943
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4751/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3698/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2919
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3699/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4916/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4944
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4752/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3699/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~lukas-kde/unity8/appdrawer-search-more updated
2920. By Lukáš Tinkl

merge parent

2921. By Lukáš Tinkl

fix segfaulting test (add the missing description field)

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2921
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3700/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4918/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4946
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4754/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3700/rebuild

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~lukas-kde/unity8/appdrawer-search-more updated
2922. By Lukáš Tinkl

don't crash

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2922
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3702/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3702/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2922
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3703/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4921/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4949
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4757
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4757/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4757/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4757
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4757/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4757/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4757
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4757/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4757/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3703/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

^^ now it fails to build on zesty because of ual not being up to date (wrt xenial)

Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2922
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3704/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4922/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4950
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4758/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4758/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4758/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3704/rebuild

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

2922. By Lukáš Tinkl

don't crash

2921. By Lukáš Tinkl

fix segfaulting test (add the missing description field)

2920. By Lukáš Tinkl

merge parent

2919. By Lukáš Tinkl

restore sortRole

2918. By Lukáš Tinkl

merge lp:~mzanetti/unity8/appdrawer-recent-apps

2917. By Lukáš Tinkl

invalidate and sort only after the source model had been set

2916. By Lukáš Tinkl

massive speedup by not using dynamicFilter \o/

2915. By Lukáš Tinkl

optimize the filterString search

2914. By Lukáš Tinkl

perform the search in appName and Description too

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