|
From: <ger...@us...> - 2012-03-04 11:44:42
|
Revision: 6597
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6597&view=rev
Author: gerdwagner
Date: 2012-03-04 11:44:35 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
Bug fix: Query for non queries statistics were not written to message panel. The problem was introduced lately by revision 6579 (Swing Dispatch thread fix)
Revision Links:
--------------
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6579&view=rev
Modified Paths:
--------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
Removed Paths:
-------------
trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfo.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -46,48 +46,9 @@
/** Number of rows query limited to. */
private final int _maxRows;
private Integer _numberResultRowsRead;
- private SQLExecutionInfoFinishedListener _sqlExecutionInfoFinishedListener;
- /**
- * Default ctor. Defaults SQL execution start time to the current time.
- */
-// public SQLExecutionInfo()
-// {
-// this(1, "");
-// }
- /**
- * ctor specifying the query index. Defaults SQL execution start time to
- * the current time.
- *
- * @param idx Query index.
- */
-// public SQLExecutionInfo(int idx)
-// {
-// this(idx, "");
-// }
-
- /**
- * ctor specifying the SQL being executed. Defaults SQL execution start time
- * to the current time.
- *
- * @param sql SQL being executed.
- *
- * @throws IllegalArgumentException
- * Thrown if <TT>null</TT> sql passed.
- */
-// public SQLExecutionInfo(String sql)
-// {
-// super();
-// if (sql == null)
-// {
-// throw new IllegalArgumentException("SQL script == null");
-// }
-// _sql = sql;
-// _sqlExecutionStart = Calendar.getInstance().getTime();
-// }
-
- /**
+ /**
* ctor specifying the SQL being executed and the query index. Defaults SQL
* execution start time to the current time.
*
@@ -119,30 +80,8 @@
_resultsProcessingStart = Calendar.getInstance().getTime();
}
- /**
- * Flag that the results processing is complete.
- */
- public void resultsProcessingComplete()
- {
- _resultsProcessingEnd = Calendar.getInstance().getTime();
- if(null != _sqlExecutionInfoFinishedListener)
- {
- _sqlExecutionInfoFinishedListener.allProcessingComplete(this);
- }
- }
-
- /**
- * Retrieve the query index.
- *
- * @return Query index.
- */
- public int getQueryIndex()
- {
- return _idx;
- }
-
- /**
+ /**
* Retrieve the SQL script executed.
*
* @return SQL script executed.
@@ -162,24 +101,7 @@
return _sqlExecutionStart;
}
- /**
- * Set the SQL Execution start time.
- *
- * @param value SQL execution start time.
- *
- * @throws IllegalArgumentException
- * Thrown if <TT>null</TT> <TT>Date</TT> passed.
- */
- public void setSQLExecutionStartTime(Date value)
- {
- if (value == null)
- {
- throw new IllegalArgumentException("SQL Execution start time == null");
- }
- _sqlExecutionStart = value;
- }
-
- /**
+ /**
* Retrieve the elapsed time time in milliseconds for the SQL execution.
*
* @return SQL execution elapsed time in millis.
@@ -229,8 +151,9 @@
return _maxRows;
}
- public void setNumberResultRowsRead(int numberResultRowsRead)
+ public void resultsProcessingComplete(int numberResultRowsRead)
{
+ _resultsProcessingEnd = Calendar.getInstance().getTime();
_numberResultRowsRead = numberResultRowsRead;
}
@@ -238,9 +161,4 @@
{
return _numberResultRowsRead;
}
-
- public void setFinishedListener(SQLExecutionInfoFinishedListener sqlExecutionInfoFinishedListener)
- {
- _sqlExecutionInfoFinishedListener = sqlExecutionInfoFinishedListener;
- }
}
Deleted: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/SQLExecutionInfoFinishedListener.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -1,6 +0,0 @@
-package net.sourceforge.squirrel_sql.client.session;
-
-public interface SQLExecutionInfoFinishedListener
-{
- void allProcessingComplete(SQLExecutionInfo sqlExecutionInfo);
-}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/ResultTab.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -265,8 +265,6 @@
_metaDataOutput.show(mdds, null); // Why null??
}
- _exInfo.resultsProcessingComplete();
-
_queryInfoPanel.load(rowCount, _exInfo);
}
Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/mainpanel/SQLExecutionHandler.java 2012-03-04 11:44:35 UTC (rev 6597)
@@ -246,18 +246,11 @@
}
else
{
- exInfo.setFinishedListener(new SQLExecutionInfoFinishedListener()
- {
- @Override
- public void allProcessingComplete(SQLExecutionInfo exInfo)
- {
- onAllProcessingComplete(exInfo, processedStatementCount, statementCount, numberResultRowsRead);
- }
- });
+ allProcessingComplete(exInfo, processedStatementCount, statementCount, numberResultRowsRead);
}
}
- private void onAllProcessingComplete(SQLExecutionInfo exInfo, int processedStatementCount, int statementCount, Integer numberResultRowsRead)
+ private void allProcessingComplete(SQLExecutionInfo exInfo, int processedStatementCount, int statementCount, Integer numberResultRowsRead)
{
double executionLength = ((double) exInfo.getSQLExecutionElapsedMillis()) / 1000;
double outputLength = ((double) exInfo.getResultsProcessingElapsedMillis()) / 1000;
@@ -408,7 +401,9 @@
DialectType dialectType =
DialectFactory.getDialectType(_session.getMetaData());
- info.setNumberResultRowsRead(rsds.setContentsTabResultSet(rs, null, dialectType));
+ // rsds.setContentsTabResultSet() reads the result set. So results processing on the DB is over
+ // and this time is measured. None is interested in the time that it takes us to render Swing tables ...
+ info.resultsProcessingComplete(rsds.setContentsTabResultSet(rs, null, dialectType));
_executionHandlerListener.addResultsTab(info, rsds, rsmdds, model, _resultTabToReplace);
Modified: trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties
===================================================================
--- trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-02-29 21:03:17 UTC (rev 6596)
+++ trunk/sql12/app/src/main/resources/net/sourceforge/squirrel_sql/client/session/mainpanel/I18NStrings.properties 2012-03-04 11:44:35 UTC (rev 6597)
@@ -28,14 +28,14 @@
SQLResultExecuterPanel.nonStickyPanel=Cannot make a cancel or error tab sticky
SQLResultExecuterPanel.nosqlselected=No SQL selected for execution.
SQLResultExecuterPanel.outputStatus=Building output...
-SQLResultExecuterPanel.queryStatistics=Query {0} of {1}, Rows read: {2}, Elapsed time (seconds) - Total: {3}, SQL query: {4}, Building output: {5}
+SQLResultExecuterPanel.queryStatistics=Query {0} of {1}, Rows read: {2}, Elapsed time (seconds) - Total: {3}, SQL query: {4}, Reading results: {5}
SQLResultExecuterPanel.rowsDeleted={0} Row(s) Deleted
SQLResultExecuterPanel.rowsInserted={0} Row(s) Inserted
SQLResultExecuterPanel.rowsReturned={0} Row(s) Returned
SQLResultExecuterPanel.rowsSelected={0} Row(s) Selected
SQLResultExecuterPanel.rowsUpdated={0} Row(s) Updated
SQLResultExecuterPanel.scriptStmtCounts=Row update counts: {0} Inserts, {1} Selects, {2} Updates, {3} Deletes
-SQLResultExecuterPanel.scriptQueryStatistics=Executed {0} queries; elapsed time (seconds) - Total: {1}, SQL query: {2}, Building output: {3}
+SQLResultExecuterPanel.scriptQueryStatistics=Executed {0} queries; elapsed time (seconds) - Total: {1}, SQL query: {2}, Reading results: {3}
SQLResultExecuterPanel.sqlLabel=SQL:
SQLResultExecuterPanel.statusLabel=Status:
SQLResultExecuterPanel.title=Results
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
