Changeset 95 for trunk

Timestamp:

05/13/16 08:49:56 (9 years ago)

Author:

sherbold

Message:

• MySQLResultStorage now working with an Apache dbcp connection pool

Location:

trunk/CrossPare

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• lib/commons-dbcp2-2.1.1.jar (added)
• src/de/ugoe/cs/cpdp/eval/MySQLResultStorage.java (modified) (8 diffs)

trunk/CrossPare/.classpath

@@ -26 +26 @@
         <classpathentry kind="lib" path="lib/jgap.jar"/>
         <classpathentry kind="lib" path="lib/commons-lang3-3.4.jar"/>
+        <classpathentry kind="lib" path="lib/commons-dbcp2-2.1.1.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

trunk/CrossPare/build.xml

@@ -36 +36 @@
                 <pathelement location="lib/jgap.jar" />
                 <pathelement location="lib/commons-lang3-3.4.jar" />
+                <pathelement location="lib/dbcp2-2.1.1.jar" />
         </path>
 

trunk/CrossPare/src/de/ugoe/cs/cpdp/eval/MySQLResultStorage.java

@@ -24 +24 @@
 import java.util.Properties;
 
+import org.apache.commons.dbcp2.BasicDataSource;
+
+import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+
 import de.lmu.ifi.dbs.elki.logging.Logging.Level;
 import de.ugoe.cs.util.console.Console;
@@ -39 +43 @@
      * Connection to the database
      */
-    private Connection con = null;
+    //private Connection con = null;
+    
+    /**
+     * Connection pool for the data base.
+     */
+    private MysqlDataSource connectionPool = null;
 
     /**
@@ -95 +104 @@
                              String dbPass)
     {
+        connectionPool = new MysqlDataSource();
+        connectionPool.setUser(dbUser);
+        connectionPool.setPassword(dbPass);
+        connectionPool.setUrl("jdbc:mysql://" + dbHost + ":" + dbPort + "/" + dbName);
+        /*
         try {
             Properties connectionProperties = new Properties();
@@ -102 +116 @@
             connectionProperties.put("maxReconnects", "10000");
             Class.forName("com.mysql.jdbc.Driver");
+            
             con = DriverManager.getConnection("jdbc:mysql://" + dbHost + ":" + dbPort + "/" +
                 dbName, connectionProperties);
@@ -114 +129 @@
             Console.printerr("VendorError: " + e.getErrorCode());
         }
+        */
     }
 
@@ -153 +169 @@
         Statement stmt;
         try {
-            stmt = con.createStatement();
+            stmt = connectionPool.getConnection().createStatement();
             stmt.executeUpdate(sql.toString().replace("NaN", "NULL"));
         }
@@ -177 +193 @@
         boolean contained = false;
         try {
-            stmt = con.createStatement();
+            stmt = connectionPool.getConnection().createStatement();
             ResultSet results = stmt.executeQuery(sql);
             results.next();
@@ -188 +204 @@
             Console.printerr("SQLState: " + e.getSQLState() + "\n");
             Console.printerr("VendorError: " + e.getErrorCode() + "\n");
+            Console.printerr("\nskipping product since we could not check if the results is available");
+            contained = true;
         }
         return contained;