github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#1472] Add a Settings.executeDebugging property, and move server-side

Browse Source 
Console logic to core - Renamed ResultSetLoggingData into ResultSetLog
for conciseness
This commit is contained in:
Lukas Eder 2012-09-08 14:13:57 +02:00
parent b98612e53e
commit a79783aa41
6 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ-console/src/main/java/org/jooq/debug/DebugListener.java
View File

@ -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);
}
}
};

2
jOOQ-console/src/main/java/org/jooq/debug/LoggingListener.java
View File

@ -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);
}

25
jOOQ-console/src/main/java/org/jooq/debug/ResultSetLoggingData.java → jOOQ-console/src/main/java/org/jooq/debug/ResultSetLog.java
View File

@ -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;
}
}

26
jOOQ-console/src/main/java/org/jooq/debug/console/LoggerPane.java
View File

@ -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 {
"<th>Stack trace</th>" +
"</tr>\n");
for(QueryDebuggingInfo queryDebuggingInfo: queryDebuggingInfos) {
ResultSetLoggingData resultSetData = queryDebuggingInfo.getResultSetLoggingData();
ResultSetLog resultSetData = queryDebuggingInfo.getResultSetLoggingData();
htmlSB.append("<tr>\n");
htmlSB.append("<td>");
htmlSB.append(queryDebuggingInfo.getQueryType());

4
jOOQ-console/src/main/java/org/jooq/debug/console/remote/ClientDebugger.java
View File

@ -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;
}

6
jOOQ-console/src/main/java/org/jooq/debug/console/remote/ServerDebugger.java
View File

@ -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 {