From hyperair at debian.org Fri Jan 23 05:35:42 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:42 +0000 Subject: [Pkg-cli-apps-commits] [banshee] branch experimental updated (a83db7c -> bf8ed79) Message-ID: <20150123053539.31604.14300@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. hyperair pushed a change to branch experimental in repository banshee. from a83db7c Update changelog new afa00a4 Import upstream patch to fix SQLite performance regression new bf8ed79 Update changelog The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 7 + ...x-performance-for-the-new-SQLite-s-query-.patch | 156 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 164 insertions(+) create mode 100644 debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:42 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:42 +0000 Subject: [Pkg-cli-apps-commits] [banshee] 01/02: Import upstream patch to fix SQLite performance regression In-Reply-To: <20150123053539.31604.14300@moszumanska.debian.org> References: <20150123053539.31604.14300@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. hyperair pushed a commit to branch experimental in repository banshee. commit afa00a468190f697211420c74127a58d70d4c962 Author: Chow Loong Jin Date: Fri Jan 23 13:10:12 2015 +0800 Import upstream patch to fix SQLite performance regression Closes: #766560 --- ...x-performance-for-the-new-SQLite-s-query-.patch | 156 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 157 insertions(+) diff --git a/debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch b/debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch new file mode 100644 index 0000000..3d3034a --- /dev/null +++ b/debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch @@ -0,0 +1,156 @@ +From: Samuel Gyger +Date: Fri, 12 Dec 2014 17:07:45 +0100 +Subject: Database: fix performance for the new SQLite's query planner + (bgo#740879) + +Starting with sqlite version 3.8.6, a new query planner is used. +To get back the performance on filling the CoreCache Table, +this commit provides hints to sqlite (using the UNLIKELY statement). +But the UNLIKELY statement is only supported in version 3.8.1 and +above, so in order not to raise the version of the dependency on +sqlite, we can use this new clause conditionally. + +Applied-Upstream: yes +Origin: commit:fd3f08ec702f3a38918e0a96d2fc01d74af64ee4 +Bug-Debian: https://bugs.debian.org/766560 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=740879 +--- + .../DatabaseAlbumArtistListModel.cs | 2 +- + .../Banshee.Collection.Database/DatabaseAlbumListModel.cs | 2 +- + .../Banshee.Collection.Database/DatabaseArtistListModel.cs | 2 +- + .../Banshee.Collection.Database/DatabaseFilterListModel.cs | 7 ++++--- + .../Banshee.Collection.Database/DatabaseQueryFilterModel.cs | 5 +++-- + .../Banshee.Collection.Database/DatabaseYearListModel.cs | 2 +- + .../Banshee.Services/Banshee.Database/BansheeDbConnection.cs | 10 ++++++++++ + 7 files changed, 21 insertions(+), 9 deletions(-) + +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs +index dee9c81..e91018b 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs +@@ -46,7 +46,7 @@ namespace Banshee.Collection.Database + ReloadFragmentFormat = @" + FROM CoreArtists WHERE CoreArtists.ArtistID IN + (SELECT CoreAlbums.ArtistID FROM CoreAlbums, CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreTracks.AlbumID = CoreAlbums.AlbumID AND + EXISTS (SELECT 1 FROM CoreArtists WHERE ArtistID = CoreAlbums.ArtistID) AND + CoreCache.ItemID = {2} {3}) +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs +index 2550ab0..88235aa 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs +@@ -58,7 +58,7 @@ namespace Banshee.Collection.Database + ReloadFragmentFormat = @" + FROM CoreAlbums WHERE CoreAlbums.AlbumID IN + (SELECT CoreTracks.AlbumID FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreCache.ItemId = {2} {3}) + ORDER BY CoreAlbums.TitleSortKey, CoreAlbums.ArtistNameSortKey"; + } +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs +index f7a2b4b..171e9e2 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs +@@ -49,7 +49,7 @@ namespace Banshee.Collection.Database + ReloadFragmentFormat = @" + FROM CoreArtists WHERE CoreArtists.ArtistID IN + (SELECT CoreTracks.ArtistID FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreCache.ItemID = {2} {3}) + ORDER BY NameSortKey"; + } +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs +index 018a0f4..2a5d4fd 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs +@@ -57,10 +57,10 @@ namespace Banshee.Collection.Database + } + + protected readonly U select_all_item; +- private HyenaSqliteConnection connection; ++ private BansheeDbConnection connection; + + public DatabaseFilterListModel (string name, string label, Banshee.Sources.DatabaseSource source, +- DatabaseTrackListModel trackModel, HyenaSqliteConnection connection, SqliteModelProvider provider, U selectAllItem, string uuid) ++ DatabaseTrackListModel trackModel, BansheeDbConnection connection, SqliteModelProvider provider, U selectAllItem, string uuid) + : base (trackModel) + { + this.source = source; +@@ -124,7 +124,8 @@ namespace Banshee.Collection.Database + "{0}.{1} AND CoreTracks.TrackID = {0}.{2}", + FilteredModel.JoinTable, FilteredModel.JoinPrimaryKey, FilteredModel.JoinColumn) + : "CoreTracks.TrackID", +- filtered ? GetFilterFragment () : "" ++ filtered ? GetFilterFragment () : "", ++ connection.LikelihoodSupport ? "UNLIKELY" : "" + ); + } + +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs +index a4c00fb..339e351 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs +@@ -37,6 +37,7 @@ using Hyena.Data.Sqlite; + using Mono.Unix; + + using Banshee.ServiceStack; ++using Banshee.Database; + + namespace Banshee.Collection.Database + { +@@ -51,7 +52,7 @@ namespace Banshee.Collection.Database + private string select_all_fmt; + + public DatabaseQueryFilterModel (Banshee.Sources.DatabaseSource source, DatabaseTrackListModel trackModel, +- HyenaSqliteConnection connection, string select_all_fmt, string uuid, QueryField field, string filter_column) ++ BansheeDbConnection connection, string select_all_fmt, string uuid, QueryField field, string filter_column) + : base (field.Name, field.Label, source, trackModel, connection, QueryFilterInfo.CreateProvider (filter_column, field), new QueryFilterInfo (), String.Format ("{0}-{1}", uuid, field.Name)) + { + this.field = field; +@@ -59,7 +60,7 @@ namespace Banshee.Collection.Database + + ReloadFragmentFormat = @" + FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND CoreCache.ItemID = {2} {3} ++ WHERE {4}(CoreCache.ModelID = {1}) AND CoreCache.ItemID = {2} {3} + ORDER BY Value"; + + QueryFields = new QueryFieldSet (query_filter_field); +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs +index b58d1df..5f96d2f 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs +@@ -47,7 +47,7 @@ namespace Banshee.Collection.Database + FROM (SELECT MIN(CoreTracks.TrackID) AS TrackID, CoreTracks.Year FROM CoreTracks GROUP BY CoreTracks.Year) AS CoreTracks + WHERE CoreTracks.Year IN + (SELECT CoreTracks.Year FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreCache.ItemID = {2} {3}) + ORDER BY Year"; + } +diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs +index e9bbbf5..3ae0728 100644 +--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs ++++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs +@@ -52,6 +52,16 @@ namespace Banshee.Database + get { return configuration; } + } + ++ private bool? likelihood_support = null; ++ public bool LikelihoodSupport { ++ get { ++ if (!likelihood_support.HasValue) { ++ likelihood_support = Query ("SELECT sqlite_version () >= '3.8.1'"); ++ } ++ return likelihood_support.Value; ++ } ++ } ++ + public BansheeDbConnection () : this (DatabaseFile) + { + validate_schema = ApplicationContext.CommandLine.Contains ("validate-db-schema"); diff --git a/debian/patches/series b/debian/patches/series index 598fcbd..069221d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ Enable-MPRIS-extension-by-default.patch Use-dbus-2.patch Fix-ambiguity-in-DateTime-class.patch +Database-fix-performance-for-the-new-SQLite-s-query-.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:43 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:43 +0000 Subject: [Pkg-cli-apps-commits] [banshee] 02/02: Update changelog In-Reply-To: <20150123053539.31604.14300@moszumanska.debian.org> References: <20150123053539.31604.14300@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. hyperair pushed a commit to branch experimental in repository banshee. commit bf8ed79d054f991df07a427b33d08473f6cbff8c Author: Chow Loong Jin Date: Fri Jan 23 13:13:08 2015 +0800 Update changelog Git-Dch: Ignore --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 338ce63..5f9c637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +banshee (2.9.1-3) experimental; urgency=medium + + * [afa00a4] Import upstream patch to fix SQLite performance regression + (Closes: #766560) + + -- Chow Loong Jin Fri, 23 Jan 2015 13:13:00 +0800 + banshee (2.9.1-2) experimental; urgency=medium * [d3175de] Call configure with --enable-gst-native. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:44 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:44 +0000 Subject: [Pkg-cli-apps-commits] [banshee] branch master updated (d960a38 -> 396f9b2) Message-ID: <20150123053539.31604.96780@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. hyperair pushed a change to branch master in repository banshee. from d960a38 Update changelog new 967721a Reexport patches via gbp-pq new 03d8a90 Import upstream patch to fix SQLite performance regression new 396f9b2 Update changelog The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 8 ++ ...x-performance-for-the-new-SQLite-s-query-.patch | 156 +++++++++++++++++++++ ...e-the-new-decoded-pad-signal-of-decodebin.patch | 2 +- debian/patches/Initial-port-to-GStreamer-1.0.patch | 2 +- ...le-GStreamer-1.0-raw-audio-caps-in-the-WA.patch | 2 +- debian/patches/series | 1 + 6 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:44 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:44 +0000 Subject: [Pkg-cli-apps-commits] [banshee] 01/03: Reexport patches via gbp-pq In-Reply-To: <20150123053539.31604.96780@moszumanska.debian.org> References: <20150123053539.31604.96780@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. hyperair pushed a commit to branch master in repository banshee. commit 967721a6f2e8c556ef145204a0dc94d0870e3ca8 Author: Chow Loong Jin Date: Fri Jan 23 13:07:03 2015 +0800 Reexport patches via gbp-pq --- debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch | 2 +- debian/patches/Initial-port-to-GStreamer-1.0.patch | 2 +- .../patches/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch b/debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch index 3a012c9..b0b66d8 100644 --- a/debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch +++ b/debian/patches/Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch @@ -1,4 +1,4 @@ -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +From: =?utf-8?q?Sebastian_Dr=C3=B6ge?= Date: Tue, 28 May 2013 11:36:04 +0200 Subject: Don't use the new-decoded-pad signal of decodebin diff --git a/debian/patches/Initial-port-to-GStreamer-1.0.patch b/debian/patches/Initial-port-to-GStreamer-1.0.patch index e14c362..ae4c85f 100644 --- a/debian/patches/Initial-port-to-GStreamer-1.0.patch +++ b/debian/patches/Initial-port-to-GStreamer-1.0.patch @@ -1,4 +1,4 @@ -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +From: =?utf-8?q?Sebastian_Dr=C3=B6ge?= Date: Wed, 19 Sep 2012 11:34:06 +0200 Subject: Initial port to GStreamer 1.0 diff --git a/debian/patches/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch b/debian/patches/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch index 2d2cc33..4135783 100644 --- a/debian/patches/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch +++ b/debian/patches/Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch @@ -1,4 +1,4 @@ -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +From: =?utf-8?q?Sebastian_Dr=C3=B6ge?= Date: Tue, 28 May 2013 11:49:29 +0200 Subject: Use new-style GStreamer 1.0 raw audio caps in the WAV audio profile -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:44 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:44 +0000 Subject: [Pkg-cli-apps-commits] [banshee] 02/03: Import upstream patch to fix SQLite performance regression In-Reply-To: <20150123053539.31604.96780@moszumanska.debian.org> References: <20150123053539.31604.96780@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. hyperair pushed a commit to branch master in repository banshee. commit 03d8a903f5135bd64cea74b4deb9386e5ebe73cf Author: Chow Loong Jin Date: Fri Jan 23 13:10:12 2015 +0800 Import upstream patch to fix SQLite performance regression Closes: #766560 --- ...x-performance-for-the-new-SQLite-s-query-.patch | 156 +++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 157 insertions(+) diff --git a/debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch b/debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch new file mode 100644 index 0000000..e95effa --- /dev/null +++ b/debian/patches/Database-fix-performance-for-the-new-SQLite-s-query-.patch @@ -0,0 +1,156 @@ +From: Samuel Gyger +Date: Fri, 12 Dec 2014 17:07:45 +0100 +Subject: Database: fix performance for the new SQLite's query planner + (bgo#740879) + +Starting with sqlite version 3.8.6, a new query planner is used. +To get back the performance on filling the CoreCache Table, +this commit provides hints to sqlite (using the UNLIKELY statement). +But the UNLIKELY statement is only supported in version 3.8.1 and +above, so in order not to raise the version of the dependency on +sqlite, we can use this new clause conditionally. + +Applied-Upstream: yes +Origin: commit:fd3f08ec702f3a38918e0a96d2fc01d74af64ee4 +Bug-Debian: https://bugs.debian.org/766560 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=740879 +--- + .../DatabaseAlbumArtistListModel.cs | 2 +- + .../Banshee.Collection.Database/DatabaseAlbumListModel.cs | 2 +- + .../Banshee.Collection.Database/DatabaseArtistListModel.cs | 2 +- + .../Banshee.Collection.Database/DatabaseFilterListModel.cs | 7 ++++--- + .../Banshee.Collection.Database/DatabaseQueryFilterModel.cs | 5 +++-- + .../Banshee.Collection.Database/DatabaseYearListModel.cs | 2 +- + .../Banshee.Services/Banshee.Database/BansheeDbConnection.cs | 10 ++++++++++ + 7 files changed, 21 insertions(+), 9 deletions(-) + +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs +index dee9c81..e91018b 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumArtistListModel.cs +@@ -46,7 +46,7 @@ namespace Banshee.Collection.Database + ReloadFragmentFormat = @" + FROM CoreArtists WHERE CoreArtists.ArtistID IN + (SELECT CoreAlbums.ArtistID FROM CoreAlbums, CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreTracks.AlbumID = CoreAlbums.AlbumID AND + EXISTS (SELECT 1 FROM CoreArtists WHERE ArtistID = CoreAlbums.ArtistID) AND + CoreCache.ItemID = {2} {3}) +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs +index 0705eab..213f137 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseAlbumListModel.cs +@@ -56,7 +56,7 @@ namespace Banshee.Collection.Database + ReloadFragmentFormat = @" + FROM CoreAlbums WHERE CoreAlbums.AlbumID IN + (SELECT CoreTracks.AlbumID FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreCache.ItemId = {2} {3}) + ORDER BY CoreAlbums.TitleSortKey, CoreAlbums.ArtistNameSortKey"; + } +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs +index f7a2b4b..171e9e2 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseArtistListModel.cs +@@ -49,7 +49,7 @@ namespace Banshee.Collection.Database + ReloadFragmentFormat = @" + FROM CoreArtists WHERE CoreArtists.ArtistID IN + (SELECT CoreTracks.ArtistID FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreCache.ItemID = {2} {3}) + ORDER BY NameSortKey"; + } +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs +index 018a0f4..2a5d4fd 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseFilterListModel.cs +@@ -57,10 +57,10 @@ namespace Banshee.Collection.Database + } + + protected readonly U select_all_item; +- private HyenaSqliteConnection connection; ++ private BansheeDbConnection connection; + + public DatabaseFilterListModel (string name, string label, Banshee.Sources.DatabaseSource source, +- DatabaseTrackListModel trackModel, HyenaSqliteConnection connection, SqliteModelProvider provider, U selectAllItem, string uuid) ++ DatabaseTrackListModel trackModel, BansheeDbConnection connection, SqliteModelProvider provider, U selectAllItem, string uuid) + : base (trackModel) + { + this.source = source; +@@ -124,7 +124,8 @@ namespace Banshee.Collection.Database + "{0}.{1} AND CoreTracks.TrackID = {0}.{2}", + FilteredModel.JoinTable, FilteredModel.JoinPrimaryKey, FilteredModel.JoinColumn) + : "CoreTracks.TrackID", +- filtered ? GetFilterFragment () : "" ++ filtered ? GetFilterFragment () : "", ++ connection.LikelihoodSupport ? "UNLIKELY" : "" + ); + } + +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs +index a4c00fb..339e351 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseQueryFilterModel.cs +@@ -37,6 +37,7 @@ using Hyena.Data.Sqlite; + using Mono.Unix; + + using Banshee.ServiceStack; ++using Banshee.Database; + + namespace Banshee.Collection.Database + { +@@ -51,7 +52,7 @@ namespace Banshee.Collection.Database + private string select_all_fmt; + + public DatabaseQueryFilterModel (Banshee.Sources.DatabaseSource source, DatabaseTrackListModel trackModel, +- HyenaSqliteConnection connection, string select_all_fmt, string uuid, QueryField field, string filter_column) ++ BansheeDbConnection connection, string select_all_fmt, string uuid, QueryField field, string filter_column) + : base (field.Name, field.Label, source, trackModel, connection, QueryFilterInfo.CreateProvider (filter_column, field), new QueryFilterInfo (), String.Format ("{0}-{1}", uuid, field.Name)) + { + this.field = field; +@@ -59,7 +60,7 @@ namespace Banshee.Collection.Database + + ReloadFragmentFormat = @" + FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND CoreCache.ItemID = {2} {3} ++ WHERE {4}(CoreCache.ModelID = {1}) AND CoreCache.ItemID = {2} {3} + ORDER BY Value"; + + QueryFields = new QueryFieldSet (query_filter_field); +diff --git a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs +index b58d1df..5f96d2f 100644 +--- a/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs ++++ b/src/Core/Banshee.Services/Banshee.Collection.Database/DatabaseYearListModel.cs +@@ -47,7 +47,7 @@ namespace Banshee.Collection.Database + FROM (SELECT MIN(CoreTracks.TrackID) AS TrackID, CoreTracks.Year FROM CoreTracks GROUP BY CoreTracks.Year) AS CoreTracks + WHERE CoreTracks.Year IN + (SELECT CoreTracks.Year FROM CoreTracks, CoreCache{0} +- WHERE CoreCache.ModelID = {1} AND ++ WHERE {4}(CoreCache.ModelID = {1}) AND + CoreCache.ItemID = {2} {3}) + ORDER BY Year"; + } +diff --git a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs +index e9bbbf5..3ae0728 100644 +--- a/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs ++++ b/src/Core/Banshee.Services/Banshee.Database/BansheeDbConnection.cs +@@ -52,6 +52,16 @@ namespace Banshee.Database + get { return configuration; } + } + ++ private bool? likelihood_support = null; ++ public bool LikelihoodSupport { ++ get { ++ if (!likelihood_support.HasValue) { ++ likelihood_support = Query ("SELECT sqlite_version () >= '3.8.1'"); ++ } ++ return likelihood_support.Value; ++ } ++ } ++ + public BansheeDbConnection () : this (DatabaseFile) + { + validate_schema = ApplicationContext.CommandLine.Contains ("validate-db-schema"); diff --git a/debian/patches/series b/debian/patches/series index 3241079..9ba96c8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,3 +13,4 @@ Don-t-use-the-new-decoded-pad-signal-of-decodebin.patch Use-new-style-GStreamer-1.0-raw-audio-caps-in-the-WA.patch Use-dbus-2.patch Remove-IDBusExportable-inheritance-from-exported-int.patch +Database-fix-performance-for-the-new-SQLite-s-query-.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:44 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:44 +0000 Subject: [Pkg-cli-apps-commits] [banshee] 03/03: Update changelog In-Reply-To: <20150123053539.31604.96780@moszumanska.debian.org> References: <20150123053539.31604.96780@moszumanska.debian.org> Message-ID: This is an automated email from the git hooks/post-receive script. hyperair pushed a commit to branch master in repository banshee. commit 396f9b2c41a96fc18ba791b6e59dade11e50ffcb Author: Chow Loong Jin Date: Fri Jan 23 13:11:51 2015 +0800 Update changelog Git-Dch: Ignore --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index ee2dcde..84d9a1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +banshee (2.6.2-3) unstable; urgency=medium + + * [967721a] Reexport patches via gbp-pq + * [03d8a90] Import upstream patch to fix SQLite performance regression + (Closes: #766560) + + -- Chow Loong Jin Fri, 23 Jan 2015 13:11:42 +0800 + banshee (2.6.2-2) unstable; urgency=low * [9d70c78] Patch to fix Banshee's second instance crashing out. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:48 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:48 +0000 Subject: [Pkg-cli-apps-commits] [banshee] annotated tag debian/2.6.2-3 created (now d65aa1b) Message-ID: <20150123053547.3609.2514@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. hyperair pushed a change to annotated tag debian/2.6.2-3 in repository banshee. at d65aa1b (tag) tagging 396f9b2c41a96fc18ba791b6e59dade11e50ffcb (commit) replaces debian/2.6.2-2 tagged by Chow Loong Jin on Fri Jan 23 13:35:27 2015 +0800 - Log ----------------------------------------------------------------- banshee Debian release 2.6.2-3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUwd2fAAoJEPvVIltYh1KhJvQQAIWyB7od/+ed/dC+V6Jx+VSI 06eo68ga0qP8RqFnFizzxSEKv6NCekdvWyELJG6v30vc8i8YjukryVIGPZg7/27W tqkNRShv27fD5fOwWHDlMaHRctVg2zbguN3yoTY1AkVCgGqEYNMaYWaj5w+XL7q1 jq17z7dt2++JgbhJ3N1XnhA365VZlIlPX1U6WNLXTwtqwKdqUu2uh4YTx38H0swC GVu4RjqbtnoAsXc4Rl1quzDSYwLo6KLsVhWtDyiQ1BfOioxPIoSCZsvIBnpAT7xL FD+8X1UQhKEHC6x2oJtwIM5DmIU810iqprEMmUX4aaikQvjPuJ1BxTgVUTnevqvI JKlwGrgqGrdg8YlFoT87lZfrwCahX9NpdCx+DlPJ71bcrH+j4VYMa6fLBJLoZInO WwkMqt6K7px/7fJVqw+/RwjDmt+1K+JoibkvgYY0m6+fjE9oe50o2u4ioWFYZ4M9 S1gq5Nrabt5R+K+kzaTkDL6V45JtcUNadC+U0X8o6drJQNs8lggola4kj8f72oQJ YdVPaVNTCb/MWKSvEMeHz4S5fFHOCoS46xRfHdBmF7PTy//kPDI3OzMqTdvRFHfK jknP42oaWE0qsA0S5FhzF5kSJ73voc4RSmh7e15sAxdtoo21fVzB8vAvdD1k+zXF Rm5Tqb6jI9Ar/tYfUtCz =S2Mk -----END PGP SIGNATURE----- Chow Loong Jin (3): Reexport patches via gbp-pq Import upstream patch to fix SQLite performance regression Update changelog ----------------------------------------------------------------------- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git From hyperair at debian.org Fri Jan 23 05:35:48 2015 From: hyperair at debian.org (Chow Loong Jin) Date: Fri, 23 Jan 2015 05:35:48 +0000 Subject: [Pkg-cli-apps-commits] [banshee] annotated tag debian/2.9.1-3 created (now db3eb88) Message-ID: <20150123053547.3609.11086@moszumanska.debian.org> This is an automated email from the git hooks/post-receive script. hyperair pushed a change to annotated tag debian/2.9.1-3 in repository banshee. at db3eb88 (tag) tagging bf8ed79d054f991df07a427b33d08473f6cbff8c (commit) replaces debian/2.9.1-2 tagged by Chow Loong Jin on Fri Jan 23 13:19:54 2015 +0800 - Log ----------------------------------------------------------------- banshee Debian release 2.9.1-3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUwdn6AAoJEPvVIltYh1KhnhAP/3Njz2txGoQ8VdMw6cx6RjYn DVIetaOJTcQWa1kxEQdfcfgkNTVkrKofMrU+/LBAAhtxvn1gGTbhoEJ4jpjIuqfi LR2lfjw7/Wa023C/dOaLwAGGhEgYq3iKEJgM3GFdq7LCjCwKj0GS0ugbNj56QXD7 N4QFHjaPygM5Xqr1oibNzLmFC9/BFLHnlXBFqy0R1FM3MX4c5zGJO0A2L42q9XuP l5n8fdFIjbakJdrqzWR9VvZxiAePXsKryz9Op1AVZc6XC2whEyn7wmRUvKJV5Gxa MvcxqpGZ3dCoTuRoHAhLqwD8CirMFIA94QkGvHzajYAXo4/ChZyvDrgaOPED8/+X txrg2HU06FgS0TpLgro9NeGU2Hj1mTt7XYLr2dJYNBlE32qFo+RGftyGSKf4dpDI BW74S/SpdbKapr8Y6ob0N6KuiC15b3Xt52N0omsPZeFUeYFRm9Z/jfgKuThZQMS9 3MMrCJrhwMbFASzRVujkEh+LQ4c9HbHXLLFQNaaX0uihFTbeXbKZWJycMDSeRfK4 OtnHgEymdpKQKHPzgq1CteQsONpvh5wuWrpyeejRBgd1YFREJ9Vl7D0ruzVrXAkq T2bpqwBDZl+gmAfAWVLPtU45RmerchtGh2DgCj72gzkOdJ8PBbw1DpOkfbJd+KcN nimGkToDFznIcIUF4d3m =yswO -----END PGP SIGNATURE----- Chow Loong Jin (2): Import upstream patch to fix SQLite performance regression Update changelog ----------------------------------------------------------------------- No new revisions were added by this update. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git