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/28 13:41:54 UTC
svn commit: r615861 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit:
ConnectionPoolDataSourceConnector.java TestConfiguration.java
Author: kristwaa
Date: Mon Jan 28 04:41:52 2008
New Revision: 615861
URL: http://svn.apache.org/viewvc?rev=615861&view=rev
Log:
DERBY-3326: Introduce a caching logical connection and logical prepared statement in the client driver. This commit is a preparation step to allow for reuse of existing tests by adding a decorator that creates pooled connections with statement pooling enabled. Note that the decorator can be used even if statement pooling is not supported, as the current situation is for the embedded ConnectionPoolDataSource.
Patch file: derby-3326-1b_cpds_testing_preparation.diff
Added:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java (with props)
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java?rev=615861&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java (added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java Mon Jan 28 04:41:52 2008
@@ -0,0 +1,166 @@
+/*
+ *
+ * Derby - Class org.apache.derbyTesting.junit.ConnectionPoolDataSourceConnector
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+package org.apache.derbyTesting.junit;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+
+import javax.sql.ConnectionPoolDataSource;
+
+import junit.framework.Assert;
+import junit.framework.AssertionFailedError;
+
+/**
+ * Connection factory using javax.sql.ConnectionPoolDataSource.
+ * <p>
+ * Connections are obtained by calling
+ * <code>getPooledConnection.getConnection()</code>, and statement pooling is
+ * enabled.
+ */
+public class ConnectionPoolDataSourceConnector implements Connector {
+
+ private TestConfiguration config;
+ /**
+ * DataSource that maps to the database for the
+ * configuration. The no-arg getPooledConnection() method
+ * maps to the default user and password for the
+ * configuration.
+ */
+ private ConnectionPoolDataSource ds;
+
+ public void setConfiguration(TestConfiguration config) {
+
+ this.config = config;
+ ds = J2EEDataSource.getConnectionPoolDataSource(config, (HashMap) null);
+ // Enable statement pooling by default.
+ // Note that this does not automatically test the pooling itself, but it
+ // should test basic JDBC operations on the logical wrapper classes.
+ try {
+ J2EEDataSource.setBeanProperty(ds, "maxStatements", new Integer(2));
+ } catch (AssertionFailedError afe) {
+ // Ignore this, it will fail later if it is an actual error.
+ // An assertion error will be thrown every time until statement
+ // pooling (or merely the property maxStatement) is implemented in
+ // the embedded ConnectionPoolDataSource class.
+ }
+ }
+
+ public Connection openConnection() throws SQLException {
+ try {
+ return ds.getPooledConnection().getConnection();
+ } catch (SQLException e) {
+ // Expected state for database not found.
+ // For the client the generic 08004 is returned,
+ // will just retry on that.
+ String expectedState =
+ config.getJDBCClient().isEmbedded() ? "XJ004" : "08004";
+
+ // If there is a database not found exception
+ // then retry the connection request with
+ // a new DataSource with the createDtabase property set.
+ if (!expectedState.equals(e.getSQLState()))
+ throw e;
+ return singleUseDS("createDatabase", "create").
+ getPooledConnection().getConnection();
+ }
+ }
+
+ public Connection openConnection(String databaseName) throws SQLException {
+ JDBCDataSource.setBeanProperty(ds, "databaseName", databaseName);
+ try {
+ return ds.getPooledConnection().getConnection();
+ } catch (SQLException e) {
+ // Expected state for database not found.
+ // For the client the generic 08004 is returned,
+ // will just retry on that.
+ String expectedState =
+ config.getJDBCClient().isEmbedded() ? "XJ004" : "08004";
+
+ // If there is a database not found exception
+ // then retry the connection request with
+ // a new DataSource with the createDtabase property set.
+ if (!expectedState.equals(e.getSQLState()))
+ throw e;
+ ConnectionPoolDataSource tmpDs =
+ singleUseDS("createDatabase", "create");
+ JDBCDataSource.setBeanProperty(tmpDs, "databaseName", databaseName);
+ return tmpDs.getPooledConnection().getConnection();
+ }
+ }
+
+ public Connection openConnection(String user, String password)
+ throws SQLException {
+ try {
+ return ds.getPooledConnection(user, password).getConnection();
+ } catch (SQLException e) {
+ // If there is a database not found exception
+ // then retry the connection request with
+ // a new DataSource with the createDatabase property set.
+ if (!"XJ004".equals(e.getSQLState()))
+ throw e;
+ return singleUseDS("createDatabase", "create").
+ getPooledConnection(user, password).getConnection();
+ }
+ }
+
+ public Connection openConnection(String databaseName,
+ String user,
+ String password)
+ throws SQLException {
+ JDBCDataSource.setBeanProperty(ds, "databaseName", databaseName);
+ try {
+ return ds.getPooledConnection(user, password).getConnection();
+ } catch (SQLException e) {
+ // If there is a database not found exception
+ // then retry the connection request with
+ // a new DataSource with the createDatabase property set.
+ if (!"XJ004".equals(e.getSQLState()))
+ throw e;
+ ConnectionPoolDataSource tmpDs =
+ singleUseDS("createDatabase", "create");
+ JDBCDataSource.setBeanProperty(tmpDs, "databaseName", databaseName);
+ return tmpDs.getPooledConnection(user, password).getConnection();
+ }
+ }
+
+ public void shutDatabase() throws SQLException {
+ singleUseDS("shutdownDatabase", "shutdown").
+ getPooledConnection().getConnection();
+ }
+
+ public void shutEngine() throws SQLException {
+ Assert.fail("shutdown engine not implemened");
+ }
+
+ /**
+ * Get a connection from a single use ConnectionPoolDataSource configured
+ * from the configuration but with the passed in property set.
+ */
+ private ConnectionPoolDataSource singleUseDS(String property, String value)
+ throws SQLException {
+ HashMap hm = JDBCDataSource.getDataSourceProperties(config);
+ hm.put(property, value);
+ ConnectionPoolDataSource sds =
+ J2EEDataSource.getConnectionPoolDataSource(config, hm);
+ return sds;
+ }
+
+}
Propchange: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/ConnectionPoolDataSourceConnector.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java?rev=615861&r1=615860&r2=615861&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java Mon Jan 28 04:41:52 2008
@@ -688,6 +688,26 @@
/**
* Return a decorator that changes the configuration to obtain
+ * connections from a ConnectionPoolDataSource using
+ * <code>getPooledConnection().getConnection()</code>
+ * <p>
+ * Note that statement pooling is enabled in the data source and in all the
+ * connections created from it.
+ * <p>
+ * The tearDown reverts the configuration to the previous
+ * configuration.
+ *
+ * @param test the test/suite to decorate
+ * @return A test setup with the requested decorator.
+ */
+ public static TestSetup connectionCPDecorator(Test test)
+ {
+ return new ConnectorSetup(test,
+ "org.apache.derbyTesting.junit.ConnectionPoolDataSourceConnector");
+ }
+
+ /**
+ * Return a decorator that changes the configuration to obtain
* connections from an XADataSource using
* <code>
* getXAConnection().getConnection()