Changeset 33415 for branches/meh_branches/ppstack_test/ippToPsps/jython/mysql.py

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippToPsps/jython/mysql.py (modified) (8 diffs)

branches/meh_branches/ppstack_test/ippToPsps/jython/mysql.py

@@ -21 +21 @@
 
     '''
-    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 +43 @@
         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
 
     '''
@@ -53 +55 @@
     def disconnect(self):
         self.con.close()
+        self.connected = False
 
     '''
@@ -61 +64 @@
         self.logger.debug("MySql destructor")
         self.disconnect()
+    
+    '''
+    Locks a table. This is wait if the locks is already held by another session
+    '''
+    def lockTable(self, table):
+        self.execute("LOCK TABLES " + table + " WRITE")
+
+    '''
+    Unlocks all tables locked by this session.
+    '''
+    def unlockTables(self):
+        self.execute("UNLOCK TABLES")
 
     '''
@@ -69 +84 @@
         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
 
     '''
@@ -97 +131 @@
 
     '''
+    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
     '''
@@ -215 +269 @@
         nBad = rs.getInt(1)
 
-        sql="DELETE from " + tableName + " WHERE " + columnName + " = " + value
+        sql="DELETE FROM " + tableName + " WHERE " + columnName + " = " + value
         self.execute(sql)
-        self.logger.info("%s '%s' values in %s    %5d deleted" % (columnName, value, tableName, nBad))
+        self.logger.debugPair("%s rows with %s" % (columnName, value), "%d deleted" % nBad)
+
+        return nBad
 
     '''
@@ -229 +285 @@
         nBad = rs.getInt(1)
 
-        sql="DELETE from " + tableName + " WHERE " + columnName + " IS NULL"
+        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