svn commit: r530427 - in /incubator/ode/trunk/utils/src: java/ main/java/org/apache/ode/utils/LoggingConnectionWrapper.java main/java/org/apache/ode/utils/LoggingDataSourceWrapper.java main/java/org/apache/ode/utils/LoggingStatementWrapper.java

[gn...@apache.org]

Author: gnodet
Date: Thu Apr 19 07:31:26 2007
New Revision: 530427

URL: http://svn.apache.org/viewvc?view=rev&rev=530427
Log:
Avoid building strings for SQL debugging when not needed

Removed:
    incubator/ode/trunk/utils/src/java/
Modified:
    incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java
    incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingDataSourceWrapper.java
    incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingStatementWrapper.java

Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java?view=diff&rev=530427&r1=530426&r2=530427
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingConnectionWrapper.java Thu Apr 19 07:31:26 2007
@@ -46,12 +46,12 @@
     }
 
     public void close() throws SQLException {
-        print("close");
+        if (shouldPrint()) print("close");
         _conn.close();
     }
 
     public void commit() throws SQLException {
-        print("commit");
+        if (shouldPrint()) print("commit");
         _conn.commit();
     }
 
@@ -108,47 +108,47 @@
     }
 
     public CallableStatement prepareCall(String sql) throws SQLException {
-        print("prepareCall: " + sql);
+        if (shouldPrint()) print("prepareCall: " + sql);
         return new LoggingStatementWrapper(_conn.prepareCall(sql), _log);
     }
 
     public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
-        print("prepareCall: " + sql);
+        if (shouldPrint()) print("prepareCall: " + sql);
         return new LoggingStatementWrapper(_conn.prepareCall(sql, resultSetType, resultSetConcurrency), _log);
     }
 
     public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        print("prepareCall: " + sql);
+        if (shouldPrint()) print("prepareCall: " + sql);
         return new LoggingStatementWrapper(_conn.prepareCall(sql, resultSetType, resultSetConcurrency, resultSetHoldability), _log);
     }
 
     public PreparedStatement prepareStatement(String sql) throws SQLException {
-        print("prepareStmt: " + sql);
+        if (shouldPrint()) print("prepareStmt: " + sql);
         return new LoggingStatementWrapper(_conn.prepareStatement(sql), _log);
     }
 
     public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
-        print("prepareStmt: " + sql);
+        if (shouldPrint()) print("prepareStmt: " + sql);
         return new LoggingStatementWrapper(_conn.prepareStatement(sql, autoGeneratedKeys), _log);
     }
 
     public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
-        print("prepareStmt: " + sql);
+        if (shouldPrint()) print("prepareStmt: " + sql);
         return new LoggingStatementWrapper(_conn.prepareStatement(sql, columnIndexes), _log);
     }
 
     public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
-        print("prepareStmt: " + sql);
+        if (shouldPrint()) print("prepareStmt: " + sql);
         return new LoggingStatementWrapper(_conn.prepareStatement(sql, columnNames), _log);
     }
 
     public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException {
-        print("prepareStmt: " + sql);
+        if (shouldPrint()) print("prepareStmt: " + sql);
         return new LoggingStatementWrapper(_conn.prepareStatement(sql, resultSetType, resultSetConcurrency), _log);
     }
 
     public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
-        print("prepareStmt: " + sql);
+        if (shouldPrint()) print("prepareStmt: " + sql);
         return new LoggingStatementWrapper(_conn.prepareStatement(sql, resultSetType, resultSetConcurrency, resultSetHoldability), _log);
     }
 
@@ -157,12 +157,12 @@
     }
 
     public void rollback() throws SQLException {
-        print("rollback");
+        if (shouldPrint()) print("rollback");
         _conn.rollback();
     }
 
     public void rollback(Savepoint savepoint) throws SQLException {
-        print("rollback");
+        if (shouldPrint()) print("rollback");
         _conn.rollback(savepoint);
     }
 
@@ -191,14 +191,20 @@
     }
 
     public void setTransactionIsolation(int level) throws SQLException {
-        print("Setting isolation level to " + level);
+        if (shouldPrint()) print("Setting isolation level to " + level);
         _conn.setTransactionIsolation(level);
     }
 
     public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
         _conn.setTypeMap(map);
     }
-    
+
+    private boolean shouldPrint() {
+        if (_log != null)
+            return _log.isDebugEnabled();
+        else return true;
+    }
+
     private void print(String str) {
         if (_log != null)
             _log.debug(str);

Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingDataSourceWrapper.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingDataSourceWrapper.java?view=diff&rev=530427&r1=530426&r2=530427
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingDataSourceWrapper.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingDataSourceWrapper.java Thu Apr 19 07:31:26 2007
@@ -40,13 +40,13 @@
 
     public Connection getConnection() throws SQLException {
         Connection conn = new LoggingConnectionWrapper(_wrapped.getConnection(), _log);
-        print("getConnection (tx=" + conn.getTransactionIsolation() + ")");
+        if (shouldPrint()) print("getConnection (tx=" + conn.getTransactionIsolation() + ")");
         return conn;
     }
 
     public Connection getConnection(String username, String password) throws SQLException {
         Connection conn =  new LoggingConnectionWrapper(_wrapped.getConnection(username, password), _log);
-        print("getConnection (tx=" + conn.getTransactionIsolation() + ")");
+        if (shouldPrint()) print("getConnection (tx=" + conn.getTransactionIsolation() + ")");
         return conn;
     }
 
@@ -64,6 +64,12 @@
 
     public void setLogWriter(PrintWriter out) throws SQLException {
         _wrapped.setLogWriter(out);
+    }
+
+    private boolean shouldPrint() {
+        if (_log != null)
+            return _log.isDebugEnabled();
+        else return true;
     }
 
     private void print(String str) {

Modified: incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingStatementWrapper.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingStatementWrapper.java?view=diff&rev=530427&r1=530426&r2=530427
==============================================================================
--- incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingStatementWrapper.java (original)
+++ incubator/ode/trunk/utils/src/main/java/org/apache/ode/utils/LoggingStatementWrapper.java Thu Apr 19 07:31:26 2007
@@ -61,7 +61,7 @@
     }
 
     @SuppressWarnings("deprecation")
-	public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException {
+    public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException {
         return ((CallableStatement)_stmt).getBigDecimal(parameterIndex, scale);
     }
 
@@ -555,7 +555,7 @@
     }
 
     @SuppressWarnings("deprecation")
-	public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
+    public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException {
         _paramsIdxr.put(parameterIndex, x);
         _stmt.setUnicodeStream(parameterIndex, x, length);
     }
@@ -586,52 +586,52 @@
     }
 
     public boolean execute(String sql) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.execute(sql);
     }
 
     public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.execute(sql, autoGeneratedKeys);
     }
 
     public boolean execute(String sql, int[] columnIndexes) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.execute(sql, columnIndexes);
     }
 
     public boolean execute(String sql, String[] columnNames) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.execute(sql, columnNames);
     }
 
     public int[] executeBatch() throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.executeBatch();
     }
 
     public ResultSet executeQuery(String sql) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.executeQuery(sql);
     }
 
     public int executeUpdate(String sql) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.executeUpdate(sql);
     }
 
     public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.executeUpdate(sql, autoGeneratedKeys);
     }
 
     public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.executeUpdate(sql, columnIndexes);
     }
 
     public int executeUpdate(String sql, String[] columnNames) throws SQLException {
-        printParams();
+        if (shouldPrint()) printParams();
         return _stmt.executeUpdate(sql, columnNames);
     }
 
@@ -743,6 +743,12 @@
             }
             print(buf.toString());
         }
+    }
+
+    private boolean shouldPrint() {
+        if (_log != null)
+            return _log.isDebugEnabled();
+        else return true;
     }
 
     private void print(String str) {