Author: sebb
Date: Wed May 2 16:22:58 2007
New Revision: 534651
URL: http://svn.apache.org/viewvc?view=rev&rev=534651
Log:
JDBC Sampler: add Commit, Rollback and Autocommit
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java?view=diff&rev=534651&r1=534650&r2=534651
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
Wed May 2 16:22:58 2007
@@ -82,6 +82,10 @@
static final String CALLABLE = "Callable Statement"; // $NON-NLS-1$
static final String PREPARED_SELECT = "Prepared Select Statement"; //
$NON-NLS-1$
static final String PREPARED_UPDATE = "Prepared Update Statement"; //
$NON-NLS-1$
+ static final String COMMIT = "Commit"; // $NON-NLS-1$
+ static final String ROLLBACK = "Rollback"; // $NON-NLS-1$
+ static final String AUTOCOMMIT_FALSE = "AutoCommit(false)"; //
$NON-NLS-1$
+ static final String AUTOCOMMIT_TRUE = "AutoCommit(true)"; //
$NON-NLS-1$
private String query = ""; // $NON-NLS-1$
@@ -183,6 +187,18 @@
pstmt.executeUpdate();
String sb = resultSetsToString(pstmt,false);
res.setResponseData(sb.toString().getBytes());
+ } else if (ROLLBACK.equals(_queryType)){
+ conn.rollback();
+ res.setResponseData(ROLLBACK.getBytes());
+ } else if (COMMIT.equals(_queryType)){
+ conn.commit();
+ res.setResponseData(COMMIT.getBytes());
+ } else if (AUTOCOMMIT_FALSE.equals(_queryType)){
+ conn.setAutoCommit(false);
+ res.setResponseData(AUTOCOMMIT_FALSE.getBytes());
+ } else if (AUTOCOMMIT_TRUE.equals(_queryType)){
+ conn.setAutoCommit(true);
+ res.setResponseData(AUTOCOMMIT_TRUE.getBytes());
} else { // User provided incorrect query type
String results="Unexpected query type: "+_queryType;
res.setResponseMessage(results);
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java?view=diff&rev=534651&r1=534650&r2=534651
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/sampler/JDBCSamplerBeanInfo.java
Wed May 2 16:22:58 2007
@@ -67,7 +67,17 @@
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
p.setValue(DEFAULT, JDBCSampler.SELECT);
p.setValue(NOT_OTHER,Boolean.TRUE);
- p.setValue(TAGS,new
String[]{JDBCSampler.SELECT,JDBCSampler.UPDATE,JDBCSampler.CALLABLE,
JDBCSampler.PREPARED_SELECT, JDBCSampler.PREPARED_UPDATE});
+ p.setValue(TAGS,new String[]{
+ JDBCSampler.SELECT,
+ JDBCSampler.UPDATE,
+ JDBCSampler.CALLABLE,
+ JDBCSampler.PREPARED_SELECT,
+ JDBCSampler.PREPARED_UPDATE,
+ JDBCSampler.COMMIT,
+ JDBCSampler.ROLLBACK,
+ JDBCSampler.AUTOCOMMIT_FALSE,
+ JDBCSampler.AUTOCOMMIT_TRUE,
+ });
p = property("query"); // $NON-NLS-1$
p.setValue(NOT_UNDEFINED, Boolean.TRUE);
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=534651&r1=534650&r2=534651
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Wed May 2 16:22:58 2007
@@ -137,6 +137,7 @@
<li>Bug 40369 - LDAP: Stable search results in sampler</li>
<li>Bug 36755 - Save XML test files with UTF-8 encoding</li>
<li>Bug 42223 - Add ability to upload files via FTP</li>
+<li>Extend JDBC Sampler: Commit, Rollback, AutoCommit</li>
</ul>
<h4>Non-functional improvements:</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
