Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 310814 Details for
Bug 453356
PackageKit unbearably slow
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
test patch
packagekit-yum-sqlite.patch (text/plain), 7.58 KB, created by
Richard Hughes
on 2008-07-02 15:58:50 UTC
(
hide
)
Description:
test patch
Filename:
MIME Type:
Creator:
Richard Hughes
Created:
2008-07-02 15:58:50 UTC
Size:
7.58 KB
patch
obsolete
>diff --git a/backends/yum/helpers/yumBackend.py b/backends/yum/helpers/yumBackend.py >index 40e2e43..cc2d5da 100644 >--- a/backends/yum/helpers/yumBackend.py >+++ b/backends/yum/helpers/yumBackend.py >@@ -42,6 +42,7 @@ import signal > import time > import os.path > from packagekit.backend import PackagekitProgress >+from pysqlite2 import dbapi2 as sqlite > > # Global vars > yumbase = None >@@ -211,6 +212,45 @@ def sigquit(signum,frame): > yumbase.doUnlock(YUM_PID_FILE) > sys.exit(1) > >+# simple object that we can use when we use sqlite directly >+class PackageObjectSimple(object): >+ def __init__(self, name=None,epoch=None,version=None,release=None,arch=None,repo=None,summary=None): >+ self.name = name >+ self.epoch = epoch >+ self.version = version >+ self.release = release >+ self.arch = arch >+ self.repo = repo >+ self.summary = summary >+ >+# use direct access for speed, for more details see >+# https://bugzilla.redhat.com/show_bug.cgi?id=453356 >+class YumDirectSQL(object): >+ def __init__(self,yumbase): >+ # connect to all enabled repos >+ self.repo_list = [] >+ self.cursor_list = [] >+ for repo in yumbase.repos.repos.values(): >+ if repo.isEnabled(): >+ database = '/var/cache/yum/' + repo.id + '/primary.sqlite' >+ connection = sqlite.connect(database) >+ cursor = connection.cursor() >+ self.repo_list.append((repo.id,connection)) >+ self.cursor_list.append((cursor,repo.id)) >+ >+ def resolve(self,package): >+ pkgs = [] >+ for cursor,repoid in self.cursor_list: >+ cursor.execute('SELECT name,epoch,version,release,arch,summary FROM packages WHERE name = ?',[package]) >+ for row in cursor: >+ pkg = PackageObjectSimple(name=row[0],epoch=row[1],version=row[2],release=row[3],arch=row[4],repo=repoid,summary=row[5]) >+ pkgs.append(pkg) >+ return pkgs >+ >+ def close(self): >+ for repo_id,repo_connection in self.repo_list: >+ repo_connection.close() >+ > class PackageKitYumBackend(PackageKitBaseBackend): > > # Packages there require a reboot >@@ -385,7 +425,10 @@ class PackageKitYumBackend(PackageKitBaseBackend): > wantInstalled = True > else: > wantInstalled = False >- isInstalled = pkg.repo.id == 'installed' >+ if isinstance(pkg,PackageObjectSimple): >+ isInstalled = False >+ else: >+ isInstalled = pkg.repo.id == 'installed' > return isInstalled == wantInstalled > > def _do_gui_filtering(self,flt,pkg): >@@ -473,53 +516,67 @@ class PackageKitYumBackend(PackageKitBaseBackend): > return pkgGroups > > @handle_repo_error >- def search_group(self,filters,key): >+ def search_group(self,filters,group_key): > ''' > Implement the {backend}-search-group functionality > ''' > self._check_init(lazy_cache=True) > self.allow_cancel(True) >- self.percentage(None) > self.yumbase.doConfigSetup(errorlevel=0,debuglevel=0)# Setup Yum Config > self.yumbase.conf.cache = 1 # Only look in cache. > self.status(STATUS_QUERY) > package_list = [] #we can't do emitting as found if we are post-processing >+ fltlist = filters.split(';') > >- try: >- pkgGroupDict = self._buildGroupDict() >- self.yumbase.conf.cache = 1 # Only look in cache. >- fltlist = filters.split(';') >- installed_nevra = [] # yum returns packages as available even when installed >- >- if not FILTER_NOT_INSTALLED in fltlist: >- # Check installed for group >- for pkg in self.yumbase.rpmdb: >- group = GROUP_OTHER # Default Group >- if pkgGroupDict.has_key(pkg.name): # check if pkg name exist in package / group dictinary >- cg = pkgGroupDict[pkg.name] >- if groupMap.has_key(cg): >- group = groupMap[cg] # use the pk group name, instead of yum 'category/group' >- if group == key: >- if self._do_extra_filtering(pkg,fltlist): >- package_list.append((pkg,INFO_INSTALLED)) >- installed_nevra.append(self._get_nevra(pkg)) >- >- if not FILTER_INSTALLED in fltlist: >- # Check available for group >- for pkg in self.yumbase.pkgSack: >- nevra = self._get_nevra(pkg) >- if nevra not in installed_nevra: >- group = GROUP_OTHER >- if pkgGroupDict.has_key(pkg.name): >- cg = pkgGroupDict[pkg.name] >- if groupMap.has_key(cg): >- group = groupMap[cg] >- if group == key: >- if self._do_extra_filtering(pkg,fltlist): >- package_list.append((pkg,INFO_AVAILABLE)) >- >- except yum.Errors.GroupsError,e: >- self.error(ERROR_GROUP_NOT_FOUND,str(e)) >+ # use direct access for speed >+ direct = YumDirectSQL(self.yumbase) >+ >+ # invert the group map >+ self.percentage(0) >+ groupMapInv = {} >+ for key in groupMap.keys(): >+ group = groupMap[key] >+ if not groupMapInv.has_key(group): >+ # just assign >+ groupMapInv[group] = key; >+ else: >+ # append, using delimiter ' ' >+ old = groupMapInv[group] >+ groupMapInv[group] = old + ' ' + key >+ >+ # get all the packages >+ self.percentage(5) >+ all_packages = []; >+ if not groupMapInv.has_key(group_key): >+ self.error(ERROR_GROUP_NOT_FOUND,'cannot find %s' % group_key) >+ for category in groupMapInv[group_key].split(' '): >+ group_name = category.split(';')[1]; >+ for group in self.yumbase.comps.return_groups(group_name): >+ for package in group.mandatory_packages: >+ all_packages.append(package); >+ for package in group.default_packages: >+ all_packages.append(package); >+ for package in group.optional_packages: >+ all_packages.append(package); >+ >+ # get installed packages >+ self.percentage(10) >+ for package in all_packages: >+ if FILTER_NOT_INSTALLED not in fltlist: >+ pkgs = self.yumbase.rpmdb.searchNevra(name=package) >+ for pkg in pkgs: >+ if self._do_extra_filtering(pkg,fltlist): >+ package_list.append((pkg,INFO_INSTALLED)) >+ >+ # get available packages >+ self.percentage(20) >+ size = len(all_packages) >+ for package in all_packages: >+ if FILTER_INSTALLED not in fltlist: >+ pkgs = direct.resolve(package) >+ for pkg in pkgs: >+ if self._do_extra_filtering(pkg,fltlist): >+ package_list.append((pkg,INFO_AVAILABLE)) > > # basename filter if specified > if FILTER_BASENAME in fltlist: >@@ -529,8 +586,13 @@ class PackageKitYumBackend(PackageKitBaseBackend): > if FILTER_NEWEST in fltlist: > package_list = self._do_newest_filtering(package_list) > >+ self.percentage(90) > self._show_package_list(package_list) > >+ # close all the databases >+ direct.close() >+ self.percentage(100) >+ > @handle_repo_error > def get_packages(self,filters): > '''
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 453356
: 310814