From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 10 Apr 2007 06:03:38 +0000 (-0000)
Subject: Efficiently recycle partial valid vdb cache when possible.  This reduces disk load... 
X-Git-Tag: v2.2_pre1~1499
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb75791d44d2d27d3d82a24b7729188041a3d5c5;p=portage.git

Efficiently recycle partial valid vdb cache when possible.  This reduces disk load when switching between versions of portage that cache different keys.

svn path=/main/trunk/; revision=6360
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 2d1d7c126..e4de9c88d 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -396,13 +396,16 @@ class vardbapi(dbapi):
 		if pkg_data:
 			cache_mtime, metadata = pkg_data
 			cache_valid = cache_mtime == mydir_mtime
-			if cache_valid and set(metadata) != self._aux_cache_keys:
+		if cache_valid:
+			cache_incomplete = self._aux_cache_keys.difference(metadata)
+			if cache_incomplete:
 				# Allow self._aux_cache_keys to change without a cache version
-				# bump.
+				# bump and efficiently recycle partial cache whenever possible.
 				cache_valid = False
-		if cache_valid:
+				pull_me = cache_incomplete.union(wants)
+			else:
+				pull_me = set(wants).difference(self._aux_cache_keys)
 			mydata.update(metadata)
-			pull_me = set(wants).difference(self._aux_cache_keys)
 		else:
 			pull_me = self._aux_cache_keys.union(wants)
 		if pull_me: