You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2008/01/31 11:59:25 UTC
svn commit: r617099 - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java
testing/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java
Author: kristwaa
Date: Thu Jan 31 02:59:19 2008
New Revision: 617099
URL: http://svn.apache.org/viewvc?rev=617099&view=rev
Log:
DERBY-3324: JDBC statement cache implementation. Reordered some arguments in two methods for consistency. Update test accordingly.
Patch file: derby-3324-2a_argument_reordering.diff
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java?rev=617099&r1=617098&r2=617099&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java Thu Jan 31 02:59:19 2008
@@ -90,14 +90,14 @@
*
* @param sql SQL query string
* @param schema current compilation schema
- * @param holdability result set holdability
* @param rst result set type
* @param rsc result set concurrency level
+ * @param rsh result set holdability
* @return A statement key.
*/
public static StatementKey newPrepared(
- String sql, String schema, int holdability, int rst, int rsc) {
- return new StatementKey(PREPARED, sql, schema, rst, rsc, holdability,
+ String sql, String schema, int rst, int rsc, int rsh) {
+ return new StatementKey(PREPARED, sql, schema, rst, rsc, rsh,
Statement.NO_GENERATED_KEYS);
}
@@ -127,14 +127,14 @@
*
* @param sql SQL query string
* @param schema current compilation schema
- * @param holdability result set holdability
* @param rst result set type
* @param rsc result set concurrency level
+ * @param rsh result set holdability
* @return A statement key.
*/
public static StatementKey newCallable(
- String sql, String schema, int holdability, int rst, int rsc) {
- return new StatementKey(CALLABLE, sql, schema, rst, rsc, holdability,
+ String sql, String schema, int rst, int rsc, int rsh) {
+ return new StatementKey(CALLABLE, sql, schema, rst, rsc, rsh,
Statement.NO_GENERATED_KEYS);
}
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java?rev=617099&r1=617098&r2=617099&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/StatementKeyFactoryTest.java Thu Jan 31 02:59:19 2008
@@ -128,9 +128,9 @@
StatementKey[] keys = new StatementKey[] {
StatementKeyFactory.newPrepared(sql, schema, rsh),
StatementKeyFactory.newPrepared(sql, schema, rsh, auto),
- StatementKeyFactory.newPrepared(sql, schema, rsh, rst, rsc),
+ StatementKeyFactory.newPrepared(sql, schema, rst, rsc, rsh),
StatementKeyFactory.newCallable(sql, schema, rsh),
- StatementKeyFactory.newCallable(sql, schema, rsh, rst, rsc)};
+ StatementKeyFactory.newCallable(sql, schema, rst, rsc, rsh)};
for (int outer=0; outer < keys.length; outer++) {
StatementKey current = keys[outer];
for (int inner=0; inner < keys.length; inner++) {