sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[entropy.db] improve reliability of contentDiff(), generating random temp. table in a smarter way

Browse Source
This commit is contained in:
Fabio Erculiani
2010-10-03 15:48:48 +02:00
parent 440f379966
commit ea63fe2b16
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/entropy/db/__init__.py
View File

@@ -1951,19 +1951,21 @@ class EntropyRepository(EntropyRepositoryBase):
content = set((x,) for x in dbconn.retrieveContent(dbconn_package_id))
# setup random table name
randomtable = "cdiff%s" % (entropy.tools.get_random_number(),)
while self._doesTableExist(randomtable, temporary = True):
randomtable = "cdiff%s" % (entropy.tools.get_random_number(),)
random_str = "%svs%s_%s" % (package_id, id(dbconn),
dbconn_package_id)
randomtable = "cdiff%s" % (hashlib.md5(random_str).hexdigest(),)
# create random table
self._cursor().execute("""
CREATE TEMPORARY TABLE %s ( file VARCHAR )""" % (randomtable,)
self._cursor().executescript("""
DROP TABLE IF EXISTS `%s`;
CREATE TEMPORARY TABLE `%s` ( file VARCHAR );
""" % (randomtable, randomtable,)
)
try:
self._cursor().executemany("""
INSERT INTO %s VALUES (?)""" % (randomtable,), content)
INSERT INTO `%s` VALUES (?)""" % (randomtable,), content)
# remove this when the one in retrieveContent will be removed
self._connection().text_factory = const_convert_to_unicode
@@ -1972,14 +1974,14 @@ class EntropyRepository(EntropyRepositoryBase):
cur = self._cursor().execute("""
SELECT file FROM content
WHERE content.idpackage = (?) AND
content.file NOT IN (SELECT file from %s)""" % (randomtable,),
content.file NOT IN (SELECT file from `%s`)""" % (randomtable,),
(package_id,))
# suck back
return self._cur2frozenset(cur)
finally:
self._cursor().execute('DROP TABLE IF EXISTS %s' % (randomtable,))
self._cursor().execute('DROP TABLE IF EXISTS `%s`' % (randomtable,))
def clean(self):
"""