Author: cbegin
Date: Mon Sep 14 03:38:57 2009
New Revision: 814468
URL: http://svn.apache.org/viewvc?rev=814468&view=rev
Log:
Simplified logging output
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java?rev=814468&r1=814467&r2=814468&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/BaseJdbcLogger.java
Mon Sep 14 03:38:57 2009
@@ -8,7 +8,6 @@
public class BaseJdbcLogger {
protected static final Set<String> SET_METHODS = new HashSet<String>();
- protected static final Set<String> GET_METHODS = new HashSet<String>();
protected static final Set<String> EXECUTE_METHODS = new HashSet<String>();
private Map<Object, Object> columnMap = new HashMap<Object, Object>();
@@ -45,28 +44,6 @@
SET_METHODS.add("setObject");
SET_METHODS.add("setNull");
- GET_METHODS.add("getString");
- GET_METHODS.add("getInt");
- GET_METHODS.add("getByte");
- GET_METHODS.add("getShort");
- GET_METHODS.add("getLong");
- GET_METHODS.add("getDouble");
- GET_METHODS.add("getFloat");
- GET_METHODS.add("getTimestamp");
- GET_METHODS.add("getDate");
- GET_METHODS.add("getTime");
- GET_METHODS.add("getArray");
- GET_METHODS.add("getBigDecimal");
- GET_METHODS.add("getAsciiStream");
- GET_METHODS.add("getBinaryStream");
- GET_METHODS.add("getBlob");
- GET_METHODS.add("getBoolean");
- GET_METHODS.add("getBytes");
- GET_METHODS.add("getCharacterStream");
- GET_METHODS.add("getClob");
- GET_METHODS.add("getObject");
- GET_METHODS.add("getNull");
-
EXECUTE_METHODS.add("execute");
EXECUTE_METHODS.add("executeUpdate");
EXECUTE_METHODS.add("executeQuery");
@@ -83,20 +60,17 @@
return columnMap.get(key);
}
- protected String getValueString() {
- return columnValues.toString();
- }
-
- protected String getTypeString() {
+ protected String getParameterValueString() {
List<Object> typeList = new ArrayList<Object>(columnValues.size());
for (Object value : columnValues) {
if (value == null) {
typeList.add("null");
} else {
- typeList.add(value.getClass().getName());
+ typeList.add(value + "(" + value.getClass().getSimpleName() + ")");
}
}
- return typeList.toString();
+ final String parameters = typeList.toString();
+ return parameters.substring(1,parameters.length() - 1);
}
protected String getColumnString() {
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java?rev=814468&r1=814467&r2=814468&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
Mon Sep 14 03:38:57 2009
@@ -25,9 +25,8 @@
try {
if (EXECUTE_METHODS.contains(method.getName())) {
if (log.isDebugEnabled()) {
- log.debug("==> Executing: " + removeBreakingWhitespace(sql));
- log.debug("==> Parameter Types: " + getTypeString());
- log.debug("==> Parameters: " + getValueString());
+ log.debug("==> Executing: " + removeBreakingWhitespace(sql));
+ log.debug("==> Parameters: " + getParameterValueString());
}
clearColumnInfo();
if ("executeQuery".equals(method.getName())) {
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java?rev=814468&r1=814467&r2=814468&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
Mon Sep 14 03:38:57 2009
@@ -5,6 +5,8 @@
import java.lang.reflect.*;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
/**
* ResultSet proxy to add logging
@@ -19,42 +21,51 @@
private ResultSetLogger(ResultSet rs) {
super();
this.rs = rs;
- if (log.isDebugEnabled()) {
- log.debug("<== ResultSet Returned");
- }
}
public Object invoke(Object proxy, Method method, Object[] params) throws
Throwable {
try {
Object o = method.invoke(rs, params);
- if (GET_METHODS.contains(method.getName())) {
- if (params[0] instanceof String) {
- setColumn(params[0], o);
- // setColumn(params[0], rs.getObject((String) params[0]));
- // } else {
- // setColumn(params[0], rs.getObject(((Integer)
params[0]).intValue()));
- }
- } else if ("next".equals(method.getName()) ||
"close".equals(method.getName())) {
- String s = getValueString();
- if (!"[]".equals(s)) {
+ if ("next".equals(method.getName())) {
+ ResultSetMetaData rsmd = rs.getMetaData();
+ final int columnCount = rsmd.getColumnCount();
+ if (log.isDebugEnabled()) {
if (first) {
first = false;
- if (log.isDebugEnabled()) {
- log.debug("<== Columns: " + getColumnString());
- }
- }
- if (log.isDebugEnabled()) {
- log.debug("<== Row: " + s);
+ printColumnHeaders(rsmd, columnCount);
}
+ printColumnValues(columnCount);
}
- clearColumnInfo();
}
+ clearColumnInfo();
return o;
} catch (Throwable t) {
throw ExceptionUtil.unwrapThrowable(t);
}
}
+ private void printColumnHeaders(ResultSetMetaData rsmd, int columnCount)
throws SQLException {
+ StringBuilder row = new StringBuilder();
+ row.append("<== Columns: ");
+ for (int i=1; i <= columnCount; i++) {
+ String colname = rsmd.getColumnName(i);
+ row.append(colname);
+ if (i != columnCount) row.append(", ");
+ }
+ log.debug(row.toString());
+ }
+
+ private void printColumnValues(int columnCount) throws SQLException {
+ StringBuilder row = new StringBuilder();
+ row.append("<== Row: ");
+ for (int i=1; i <= columnCount; i++) {
+ String colname = rs.getString(i);
+ row.append(colname);
+ if (i != columnCount) row.append(", ");
+ }
+ log.debug(row.toString());
+ }
+
/**
* Creates a logging version of a ResultSet
*
Modified:
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
URL:
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java?rev=814468&r1=814467&r2=814468&view=diff
==============================================================================
---
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
(original)
+++
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
Mon Sep 14 03:38:57 2009
@@ -24,7 +24,7 @@
try {
if (EXECUTE_METHODS.contains(method.getName())) {
if (log.isDebugEnabled()) {
- log.debug("==> Executing: " + removeBreakingWhitespace((String)
params[0]));
+ log.debug("==> Executing: " + removeBreakingWhitespace((String)
params[0]));
}
if ("executeQuery".equals(method.getName())) {
ResultSet rs = (ResultSet) method.invoke(statement, params);
