From a79783aa41806918bde172b7477485607a2d5c9f Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Sat, 8 Sep 2012 14:13:57 +0200 Subject: [PATCH] [#1472] Add a Settings.executeDebugging property, and move server-side Console logic to core - Renamed ResultSetLoggingData into ResultSetLog for conciseness --- .../java/org/jooq/debug/DebugListener.java | 8 +++--- .../java/org/jooq/debug/LoggingListener.java | 2 +- ...tSetLoggingData.java => ResultSetLog.java} | 25 +++++++++--------- .../org/jooq/debug/console/LoggerPane.java | 26 +++++++++---------- .../debug/console/remote/ClientDebugger.java | 4 +-- .../debug/console/remote/ServerDebugger.java | 6 ++--- 6 files changed, 35 insertions(+), 36 deletions(-) rename jOOQ-console/src/main/java/org/jooq/debug/{ResultSetLoggingData.java => ResultSetLog.java} (80%) diff --git a/jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java b/jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java index c458bc6b99..2e374f3265 100644 --- a/jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java +++ b/jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java @@ -338,12 +338,12 @@ public class DebugListener extends DefaultExecuteListener { ResultSet newResultSet = new UsageTrackingResultSet(resultSet) { @Override protected void notifyData(long lifeTime, int readRows, int readCount, int writeCount) { - ResultSetLoggingData resultSetLoggingData = null; + ResultSetLog resultSetLog = null; for(LoggingListener loggingListener: loggingListenerList) { - if(resultSetLoggingData == null) { - resultSetLoggingData = new ResultSetLoggingData(lifeTime, readRows, readCount, writeCount); + if(resultSetLog == null) { + resultSetLog = new ResultSetLog(lifeTime, readRows, readCount, writeCount); } - loggingListener.logResultSet(queryLoggingDataID, resultSetLoggingData); + loggingListener.logResultSet(queryLoggingDataID, resultSetLog); } } }; diff --git a/jOOQ-console/src/main/java/org/jooq/debug/LoggingListener.java b/jOOQ-console/src/main/java/org/jooq/debug/LoggingListener.java index 09ddd85cdf..8a6d09fe11 100644 --- a/jOOQ-console/src/main/java/org/jooq/debug/LoggingListener.java +++ b/jOOQ-console/src/main/java/org/jooq/debug/LoggingListener.java @@ -44,6 +44,6 @@ public interface LoggingListener { public void logQueries(StatementLog statementLog); - public void logResultSet(int queryLoggingDataID, ResultSetLoggingData sqlQueryDebuggerResultSetData); + public void logResultSet(int queryLoggingDataID, ResultSetLog sqlQueryDebuggerResultSetData); } diff --git a/jOOQ-console/src/main/java/org/jooq/debug/ResultSetLoggingData.java b/jOOQ-console/src/main/java/org/jooq/debug/ResultSetLog.java similarity index 80% rename from jOOQ-console/src/main/java/org/jooq/debug/ResultSetLoggingData.java rename to jOOQ-console/src/main/java/org/jooq/debug/ResultSetLog.java index 29ffc4a7ab..d81a0e9e87 100644 --- a/jOOQ-console/src/main/java/org/jooq/debug/ResultSetLoggingData.java +++ b/jOOQ-console/src/main/java/org/jooq/debug/ResultSetLog.java @@ -41,23 +41,23 @@ import java.io.Serializable; /** * @author Christopher Deckers */ -public class ResultSetLoggingData implements Serializable { +public class ResultSetLog implements Serializable { - /** + /** * Generated UID */ - private static final long serialVersionUID = 6968225986331050805L; + private static final long serialVersionUID = 6968225986331050805L; private static volatile int nextID; - private int id; - private long lifeTime; - private final int readRows; - private final int readCount; - private final int writeCount; + private final int id; + private final long lifeTime; + private final int readRows; + private final int readCount; + private final int writeCount; - public ResultSetLoggingData(long lifeTime, final int readRows, final int readCount, final int writeCount) { - this.id = nextID++; + public ResultSetLog(long lifeTime, final int readRows, final int readCount, final int writeCount) { + this.id = nextID++; this.lifeTime = lifeTime; this.readRows = readRows; this.readCount = readCount; @@ -65,8 +65,8 @@ public class ResultSetLoggingData implements Serializable { } public int getId() { - return id; - } + return id; + } public long getLifeTime() { return lifeTime; @@ -83,5 +83,4 @@ public class ResultSetLoggingData implements Serializable { public int getWriteCount() { return writeCount; } - } diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/LoggerPane.java b/jOOQ-console/src/main/java/org/jooq/debug/console/LoggerPane.java index 350156cd88..0ba9277c64 100644 --- a/jOOQ-console/src/main/java/org/jooq/debug/console/LoggerPane.java +++ b/jOOQ-console/src/main/java/org/jooq/debug/console/LoggerPane.java @@ -100,7 +100,7 @@ import javax.swing.table.DefaultTableCellRenderer; import org.jooq.debug.Debugger; import org.jooq.debug.LoggingListener; import org.jooq.debug.QueryType; -import org.jooq.debug.ResultSetLoggingData; +import org.jooq.debug.ResultSetLog; import org.jooq.debug.StatementLog; import org.jooq.debug.StatementMatcher; import org.jooq.debug.console.misc.InvisibleSplitPane; @@ -381,15 +381,15 @@ public class LoggerPane extends JPanel { return duration < 0? null: duration; } case COLUMN_RS_LIFETIME: { - ResultSetLoggingData rsData = queryDebuggingInfo.getResultSetLoggingData(); + ResultSetLog rsData = queryDebuggingInfo.getResultSetLoggingData(); return rsData == null? null: rsData.getLifeTime(); } case COLUMN_RS_READ: { - ResultSetLoggingData rsData = queryDebuggingInfo.getResultSetLoggingData(); + ResultSetLog rsData = queryDebuggingInfo.getResultSetLoggingData(); return rsData == null? null: rsData.getReadCount(); } case COLUMN_RS_READ_ROWS: { - ResultSetLoggingData rsData = queryDebuggingInfo.getResultSetLoggingData(); + ResultSetLog rsData = queryDebuggingInfo.getResultSetLoggingData(); return rsData == null? null: rsData.getReadRows(); } case COLUMN_DUPLICATION_COUNT: { @@ -809,12 +809,12 @@ public class LoggerPane extends JPanel { public int getDuplicationCount() { return duplicationCount; } - private ResultSetLoggingData resultSetLoggingData; - public void setResultSetLoggingData(ResultSetLoggingData resultSetLoggingData) { - this.resultSetLoggingData = resultSetLoggingData; + private ResultSetLog resultSetLog; + public void setResultSetLoggingData(ResultSetLog resultSetLog) { + this.resultSetLog = resultSetLog; } - public ResultSetLoggingData getResultSetLoggingData() { - return resultSetLoggingData; + public ResultSetLog getResultSetLoggingData() { + return resultSetLog; } private int displayedRow = -1; public int getDisplayedRow() { @@ -853,12 +853,12 @@ public class LoggerPane extends JPanel { addRow(queryDebuggingInfo); } @Override - public void logResultSet(final int queryLoggingDataID, final ResultSetLoggingData resultSetLoggingData) { + public void logResultSet(final int queryLoggingDataID, final ResultSetLog resultSetLog) { if(!SwingUtilities.isEventDispatchThread()) { SwingUtilities.invokeLater(new Runnable() { @Override public void run() { - logResultSet(queryLoggingDataID, resultSetLoggingData); + logResultSet(queryLoggingDataID, resultSetLog); } }); return; @@ -866,7 +866,7 @@ public class LoggerPane extends JPanel { for(int i=queryDebuggingInfoList.size()-1; i>=0; i--) { QueryDebuggingInfo queryDebuggingInfo = queryDebuggingInfoList.get(i); if(queryDebuggingInfo.getQueryLoggingData().getID() == queryLoggingDataID) { - queryDebuggingInfo.setResultSetLoggingData(resultSetLoggingData); + queryDebuggingInfo.setResultSetLoggingData(resultSetLog); XTableColumnModel columnModel = (XTableColumnModel)table.getColumnModel(); boolean isResultSetDataShown = columnModel.isColumnVisible(columnModel.getColumnByModelIndex(COLUMN_RS_LIFETIME)); if(isResultSetDataShown) { @@ -934,7 +934,7 @@ public class LoggerPane extends JPanel { "Stack trace" + "\n"); for(QueryDebuggingInfo queryDebuggingInfo: queryDebuggingInfos) { - ResultSetLoggingData resultSetData = queryDebuggingInfo.getResultSetLoggingData(); + ResultSetLog resultSetData = queryDebuggingInfo.getResultSetLoggingData(); htmlSB.append("\n"); htmlSB.append(""); htmlSB.append(queryDebuggingInfo.getQueryType()); diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ClientDebugger.java b/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ClientDebugger.java index a5ca1403fe..8aaad02e45 100644 --- a/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ClientDebugger.java +++ b/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ClientDebugger.java @@ -49,7 +49,7 @@ import org.jooq.debug.BreakpointHitHandler; import org.jooq.debug.Debugger; import org.jooq.debug.LoggingListener; import org.jooq.debug.StatementLog; -import org.jooq.debug.ResultSetLoggingData; +import org.jooq.debug.ResultSetLog; import org.jooq.debug.StatementExecutor; import org.jooq.debug.StatementMatcher; import org.jooq.debug.console.remote.ServerDebugger.CMS_addBreakpoint; @@ -264,7 +264,7 @@ public class ClientDebugger implements Debugger { public Serializable run(Serializable... args) { LoggingListener loggingListener = getDebugger().getLoggingListener(); if(loggingListener != null) { - loggingListener.logResultSet((Integer)args[0], (ResultSetLoggingData)args[1]); + loggingListener.logResultSet((Integer)args[0], (ResultSetLog)args[1]); } return null; } diff --git a/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ServerDebugger.java b/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ServerDebugger.java index 9755c65d9f..1e2d5745bb 100644 --- a/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ServerDebugger.java +++ b/jOOQ-console/src/main/java/org/jooq/debug/console/remote/ServerDebugger.java @@ -49,7 +49,7 @@ import org.jooq.debug.LocalDebugger; import org.jooq.debug.LocalStatementExecutor; import org.jooq.debug.LoggingListener; import org.jooq.debug.StatementLog; -import org.jooq.debug.ResultSetLoggingData; +import org.jooq.debug.ResultSetLog; import org.jooq.debug.StatementExecution; import org.jooq.debug.StatementExecutor; import org.jooq.debug.StatementMatcher; @@ -83,8 +83,8 @@ class ServerDebugger extends LocalDebugger { comm.asyncExec(new CMC_logQueries(), statementLog); } @Override - public void logResultSet(int sqlQueryDebuggerDataID, ResultSetLoggingData resultSetLoggingData) { - comm.asyncExec(new CMC_logResultSet(), sqlQueryDebuggerDataID, resultSetLoggingData); + public void logResultSet(int sqlQueryDebuggerDataID, ResultSetLog resultSetLog) { + comm.asyncExec(new CMC_logResultSet(), sqlQueryDebuggerDataID, resultSetLog); } }); } else {