Changeset 33638 for branches/eam_branches/ipp-20111122/ippToPsps/jython/mysql.py

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ippToPsps/jython/mysql.py (modified) (7 diffs)

branches/eam_branches/ipp-20111122/ippToPsps/jython/mysql.py

@@ -19 +19 @@
     '''
     Constructor
-
-    '''
-    def __init__(self, logger, doc, dbType):
+    '''
+    def __init__(self, logger, config, dbType, dbName=None):
 
         # set up logging
         self.logger = logger
-        self.doc = doc
+        self.config = config
         self.logger.debug("MySql class constructor")
 
         # open config and grab database parameters
-        self.dbName = self.doc.find(dbType +"/name").text
-        self.dbHost = self.doc.find(dbType +"/host").text
-        self.dbUser = self.doc.find(dbType +"/user").text
-        self.dbPass = self.doc.find(dbType +"/password").text
+        if not dbName: self.dbName = config.getDbName(dbType)
+        else: self.dbName = dbName
+        self.dbHost = config.getDbHost(dbType)
+        self.dbUser = config.getDbUser(dbType)
+        self.dbPass = config.getDbPassword(dbType)
 
         # set up JDBC connection
@@ -42 +42 @@
         except:
             self.logger.error("Unable to connect to " + self.url)
-            self.everythingOK = False
+            self.everythingOK = False # TODO need this?
+            self.connected = False
             return
 
         self.everythingOK = True
+        self.connected = True
 
     '''
@@ -52 +54 @@
     def disconnect(self):
         self.con.close()
+        self.connected = False
 
     '''
@@ -80 +83 @@
         connectionID = self.getLastConnectionID()
         if connectionID == self.connectionID:
-            self.logger.error("NOT going to kill THIS connection ID")
+            self.logger.debug("NOT going to kill THIS connection ID")
             return
 
         sql = "KILL %d" % connectionID
         self.execute(sql)
+
+    '''
+    Checks whether there are any other connections to this database
+    '''
+    def anyOtherConnections(self):
+
+        sql = "SELECT COUNT(*) \
+               FROM INFORMATION_SCHEMA.PROCESSLIST \
+               WHERE DB='" + self.dbName + "'"
+        try:
+            rs = self.executeQuery(sql)
+            rs.first()
+            if rs.getInt(1) > 1: return True
+            else: return False
+        except:
+            self.logger.errorPair("Could not check for connection", sql)
+            pass
+
+        return True
 
     '''
@@ -108 +130 @@
 
     '''
+    OPTIMIZEs a table
+    '''
+    def optimizeTable(self, table):
+
+        sql = "OPTIMIZE TABLE " + table
+        try: self.execute(sql)
+        except: return
+
+    '''
+    Creates a MySQL-friendly table name from the provided string
+    '''
+    def getDbFriendlyTableName(self, origName):
+
+        name = origName
+        name = name.replace('.', '_')
+        name = name.replace('/', '_')
+
+        return name
+
+    '''
     Drops a table
     '''
@@ -141 +183 @@
         except: pass
             #self.logger.warn("Index already in place on '" + column + "' for table '" + table + "'")
+    '''
+    Changes the database engine for this table to InnoDb
+    '''
+    def changeEngineToInnoDB(self, table):
+        self.changeEngine(table, "InnoDB")
+
+    '''
+    Changes the database engine for this table
+    '''
+    def changeEngine(self, table, engine):
+
+        sql = "ALTER TABLE " + table + " ENGINE=" + engine
+        try: 
+            self.execute(sql)
+        except: 
+            self.logger.errorPair("Could not change table engine", sql)
+            return False
+
+        return True
+
     '''
     Adds an index to the supplied table and column
@@ -244 +306 @@
         sql="DELETE FROM " + tableName + " WHERE " + columnName + " IS NULL"
         self.execute(sql)
-        self.logger.debugPair("NULL %s values" % columnName, "%d deleted" % nBad)
+        self.logger.debugPair("NULL %s values in %s" % (columnName, tableName), "%d deleted" % nBad)
 
         return nBad