finish hudcache rebuild code which speeds up bulk imports nicely - turn off permanently via allow_hudcache_rebuild in fpdb_import.py. Also some more moves into Database.py and cosmetic stuff
This commit is contained in:
+60
-52
@@ -1344,58 +1344,58 @@ class Sql:
|
||||
,count(1)
|
||||
,sum(wonWhenSeenStreet1)
|
||||
,sum(wonAtSD)
|
||||
,sum(CAST(street0VPI as integer))
|
||||
,sum(CAST(street0Aggr as integer))
|
||||
,sum(CAST(street0_3BChance as integer))
|
||||
,sum(CAST(street0_3BDone as integer))
|
||||
,sum(CAST(street1Seen as integer))
|
||||
,sum(CAST(street2Seen as integer))
|
||||
,sum(CAST(street3Seen as integer))
|
||||
,sum(CAST(street4Seen as integer))
|
||||
,sum(CAST(sawShowdown as integer))
|
||||
,sum(CAST(street1Aggr as integer))
|
||||
,sum(CAST(street2Aggr as integer))
|
||||
,sum(CAST(street3Aggr as integer))
|
||||
,sum(CAST(street4Aggr as integer))
|
||||
,sum(CAST(otherRaisedStreet1 as integer))
|
||||
,sum(CAST(otherRaisedStreet2 as integer))
|
||||
,sum(CAST(otherRaisedStreet3 as integer))
|
||||
,sum(CAST(otherRaisedStreet4 as integer))
|
||||
,sum(CAST(foldToOtherRaisedStreet1 as integer))
|
||||
,sum(CAST(foldToOtherRaisedStreet2 as integer))
|
||||
,sum(CAST(foldToOtherRaisedStreet3 as integer))
|
||||
,sum(CAST(foldToOtherRaisedStreet4 as integer))
|
||||
,sum(CAST(stealAttemptChance as integer))
|
||||
,sum(CAST(stealAttempted as integer))
|
||||
,sum(CAST(foldBbToStealChance as integer))
|
||||
,sum(CAST(foldedBbToSteal as integer))
|
||||
,sum(CAST(foldSbToStealChance as integer))
|
||||
,sum(CAST(foldedSbToSteal as integer))
|
||||
,sum(CAST(street1CBChance as integer))
|
||||
,sum(CAST(street1CBDone as integer))
|
||||
,sum(CAST(street2CBChance as integer))
|
||||
,sum(CAST(street2CBDone as integer))
|
||||
,sum(CAST(street3CBChance as integer))
|
||||
,sum(CAST(street3CBDone as integer))
|
||||
,sum(CAST(street4CBChance as integer))
|
||||
,sum(CAST(street4CBDone as integer))
|
||||
,sum(CAST(foldToStreet1CBChance as integer))
|
||||
,sum(CAST(foldToStreet1CBDone as integer))
|
||||
,sum(CAST(foldToStreet2CBChance as integer))
|
||||
,sum(CAST(foldToStreet2CBDone as integer))
|
||||
,sum(CAST(foldToStreet3CBChance as integer))
|
||||
,sum(CAST(foldToStreet3CBDone as integer))
|
||||
,sum(CAST(foldToStreet4CBChance as integer))
|
||||
,sum(CAST(foldToStreet4CBDone as integer))
|
||||
,sum(CAST(totalProfit as integer))
|
||||
,sum(CAST(street1CheckCallRaiseChance as integer))
|
||||
,sum(CAST(street1CheckCallRaiseDone as integer))
|
||||
,sum(CAST(street2CheckCallRaiseChance as integer))
|
||||
,sum(CAST(street2CheckCallRaiseDone as integer))
|
||||
,sum(CAST(street3CheckCallRaiseChance as integer))
|
||||
,sum(CAST(street3CheckCallRaiseDone as integer))
|
||||
,sum(CAST(street4CheckCallRaiseChance as integer))
|
||||
,sum(CAST(street4CheckCallRaiseDone as integer))
|
||||
,sum(street0VPI)
|
||||
,sum(street0Aggr)
|
||||
,sum(street0_3BChance)
|
||||
,sum(street0_3BDone)
|
||||
,sum(street1Seen)
|
||||
,sum(street2Seen)
|
||||
,sum(street3Seen)
|
||||
,sum(street4Seen)
|
||||
,sum(sawShowdown)
|
||||
,sum(street1Aggr)
|
||||
,sum(street2Aggr)
|
||||
,sum(street3Aggr)
|
||||
,sum(street4Aggr)
|
||||
,sum(otherRaisedStreet1)
|
||||
,sum(otherRaisedStreet2)
|
||||
,sum(otherRaisedStreet3)
|
||||
,sum(otherRaisedStreet4)
|
||||
,sum(foldToOtherRaisedStreet1)
|
||||
,sum(foldToOtherRaisedStreet2)
|
||||
,sum(foldToOtherRaisedStreet3)
|
||||
,sum(foldToOtherRaisedStreet4)
|
||||
,sum(stealAttemptChance)
|
||||
,sum(stealAttempted)
|
||||
,sum(foldBbToStealChance)
|
||||
,sum(foldedBbToSteal)
|
||||
,sum(foldSbToStealChance)
|
||||
,sum(foldedSbToSteal)
|
||||
,sum(street1CBChance)
|
||||
,sum(street1CBDone)
|
||||
,sum(street2CBChance)
|
||||
,sum(street2CBDone)
|
||||
,sum(street3CBChance)
|
||||
,sum(street3CBDone)
|
||||
,sum(street4CBChance)
|
||||
,sum(street4CBDone)
|
||||
,sum(foldToStreet1CBChance)
|
||||
,sum(foldToStreet1CBDone)
|
||||
,sum(foldToStreet2CBChance)
|
||||
,sum(foldToStreet2CBDone)
|
||||
,sum(foldToStreet3CBChance)
|
||||
,sum(foldToStreet3CBDone)
|
||||
,sum(foldToStreet4CBChance)
|
||||
,sum(foldToStreet4CBDone)
|
||||
,sum(totalProfit)
|
||||
,sum(street1CheckCallRaiseChance)
|
||||
,sum(street1CheckCallRaiseDone)
|
||||
,sum(street2CheckCallRaiseChance)
|
||||
,sum(street2CheckCallRaiseDone)
|
||||
,sum(street3CheckCallRaiseChance)
|
||||
,sum(street3CheckCallRaiseDone)
|
||||
,sum(street4CheckCallRaiseChance)
|
||||
,sum(street4CheckCallRaiseDone)
|
||||
FROM HandsPlayers hp
|
||||
INNER JOIN Hands h ON (h.id = hp.handId)
|
||||
GROUP BY h.gametypeId
|
||||
@@ -1554,6 +1554,14 @@ class Sql:
|
||||
,to_char(h.handStart, 'YYMMDD')
|
||||
"""
|
||||
|
||||
if db_server == 'mysql':
|
||||
self.query['analyze'] = """
|
||||
analyze table autorates, gametypes, hands, handsplayers, hudcache, players
|
||||
, settings, sites, tourneys, tourneysplayers, tourneytypes
|
||||
"""
|
||||
else: # assume postgres
|
||||
self.query['analyze'] = "vacuum analyze"
|
||||
|
||||
if __name__== "__main__":
|
||||
# just print the default queries and exit
|
||||
s = Sql(game = 'razz', type = 'ptracks')
|
||||
|
||||
Reference in New Issue
Block a user