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

pyfpdb/fpdb_db.py

@@ -572,52 +572,6 @@ class fpdb_db:
             self.db.set_isolation_level(1)   # go back to normal isolation level
     #end def dropAllIndexes
 
-    def analyzeDB(self):
-        """Do whatever the DB can offer to update index/table statistics"""
-        stime = time()
-        if self.backend == self.PGSQL:
-            self.db.set_isolation_level(0)   # allow vacuum to work
-            try:
-                self.cursor.execute("vacuum analyze")
-            except:
-                print "Error during vacuum"
-            self.db.set_isolation_level(1)   # go back to normal isolation level
-        self.db.commit()
-        atime = time() - stime
-        print "analyze took", atime, "seconds"
-    #end def analyzeDB
-
-    # Currently uses an exclusive lock on the Players table as a global lock 
-    # ( Changed because Hands is used in Database.init() )
-    # Return values are Unix style, 0 for success, positive integers for errors
-    # 1 = generic error
-    # 2 = players table does not exist (error message is suppressed)
-    def get_global_lock(self):
-        if self.backend == self.MYSQL_INNODB:
-            try:
-                self.cursor.execute( "lock tables Players write" )
-            except:
-                # Table 'fpdb.players' doesn't exist
-                if str(sys.exc_value).find(".Players' doesn't exist") >= 0:
-                    return(2)
-                print "Error! failed to obtain global lock. Close all programs accessing " \
-                      + "database (including fpdb) and try again (%s)." \
-                      % ( str(sys.exc_value).rstrip('\n'), )
-                return(1)
-        elif self.backend == self.PGSQL:
-            try:
-                self.cursor.execute( "lock table Players in exclusive mode nowait" )
-                #print "... after lock table, status =", self.cursor.statusmessage
-            except:
-                # relation "players" does not exist
-                if str(sys.exc_value).find('relation "players" does not exist') >= 0:
-                    return(2)
-                print "Error! failed to obtain global lock. Close all programs accessing " \
-                      + "database (including fpdb) and try again (%s)." \
-                      % ( str(sys.exc_value).rstrip('\n'), )
-                return(1)
-        return(0)
-
     def getLastInsertId(self):
         if self.backend == self.MYSQL_INNODB:
             ret = self.db.insert_id()