evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improve hudcache recalc when db is empty and avoid mysql long int problem

Browse Source
This commit is contained in:
sqlcoder 2009-09-27 13:36:45 +01:00
parent 01c33c26f8
commit 8353d0739b
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pyfpdb/Database.py
View File

@ -1107,10 +1107,12 @@ class Database:
try: try:
stime = time() stime = time()
# get hero's screen names and player ids # derive list of program owner's player ids
self.hero, self.hero_ids = {}, {} self.hero = {} # name of program owner indexed by site id
if start == None: self.hero_ids = {'dummy':-53, 'dummy2':-52} # playerid of owner indexed by site id
start = self.hero_hudstart_def # make sure at least two values in list
# so that tuple generation creates doesn't use
# () or (1,) style
for site in self.config.get_supported_sites(): for site in self.config.get_supported_sites():
result = self.get_site_id(site) result = self.get_site_id(site)
if result: if result:
@ -1118,13 +1120,15 @@ class Database:
self.hero[site_id] = self.config.supported_sites[site].screen_name self.hero[site_id] = self.config.supported_sites[site].screen_name
p_id = self.get_player_id(self.config, site, self.hero[site_id]) p_id = self.get_player_id(self.config, site, self.hero[site_id])
if p_id: if p_id:
self.hero_ids[site_id] = p_id self.hero_ids[site_id] = int(p_id)
if start == None:
start = self.hero_hudstart_def
if self.hero_ids == {}: if self.hero_ids == {}:
where = "" where = ""
else: else:
where = "where hp.playerId not in (-53, " + ", ".join(map(str, self.hero_ids.values())) \ where = "where hp.playerId not in " + str(tuple(self.hero_ids.values())) \
+ ") or h.handStart > '" + start + "'" + " or h.handStart > '" + start + "'"
rebuild_sql = self.sql.query['rebuildHudCache'].replace('<where_clause>', where) rebuild_sql = self.sql.query['rebuildHudCache'].replace('<where_clause>', where)
self.get_cursor().execute(self.sql.query['clearHudCache']) self.get_cursor().execute(self.sql.query['clearHudCache'])
@ -1141,19 +1145,26 @@ class Database:
"""fetches earliest stylekey from hudcache for one of hero's player ids""" """fetches earliest stylekey from hudcache for one of hero's player ids"""
try: try:
self.hero, self.hero_ids = {}, {'dummy':-53} # make sure at least one value is used in sql # derive list of program owner's player ids
self.hero = {} # name of program owner indexed by site id
self.hero_ids = {'dummy':-53, 'dummy2':-52} # playerid of owner indexed by site id
# make sure at least two values in list
# so that tuple generation creates doesn't use
# () or (1,) style
for site in self.config.get_supported_sites(): for site in self.config.get_supported_sites():
result = self.get_site_id(site) result = self.get_site_id(site)
if result: if result:
site_id = result[0][0] site_id = result[0][0]
self.hero[site_id] = self.config.supported_sites[site].screen_name self.hero[site_id] = self.config.supported_sites[site].screen_name
self.hero_ids[site_id] = self.get_player_id(self.config, site, self.hero[site_id]) p_id = self.get_player_id(self.config, site, self.hero[site_id])
if p_id:
self.hero_ids[site_id] = int(p_id)
q = self.sql.query['get_hero_hudcache_start'].replace("<playerid_list>", str(tuple(self.hero_ids.values()))) q = self.sql.query['get_hero_hudcache_start'].replace("<playerid_list>", str(tuple(self.hero_ids.values())))
c = self.get_cursor() c = self.get_cursor()
c.execute(q) c.execute(q)
tmp = c.fetchone() tmp = c.fetchone()
if tmp == None: if tmp == (None,):
return self.hero_hudstart_def return self.hero_hudstart_def
else: else:
return "20"+tmp[0][1:3] + "-" + tmp[0][3:5] + "-" + tmp[0][5:7] return "20"+tmp[0][1:3] + "-" + tmp[0][3:5] + "-" + tmp[0][5:7]