Author: tv
Date: Sat Oct 8 07:18:06 2016
New Revision: 1763857
URL: http://svn.apache.org/viewvc?rev=1763857&view=rev
Log:
Remove duplicate code
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java?rev=1763857&r1=1763856&r2=1763857&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/main/java/org/apache/commons/jcs/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
Sat Oct 8 07:18:06 2016
@@ -128,7 +128,7 @@ public class HSQLDiskCacheFactory
}
Connection cConn = DriverManager.getConnection( database, user,
password );
- setupTABLE( cConn, attributes.getTableName() );
+ setupTable( cConn, attributes.getTableName() );
if ( log.isInfoEnabled() )
{
@@ -144,10 +144,8 @@ public class HSQLDiskCacheFactory
* @param cConn
* @param tableName
*/
- private void setupTABLE( Connection cConn, String tableName ) throws
SQLException
+ protected void setupTable( Connection cConn, String tableName ) throws
SQLException
{
- boolean newT = true;
-
// TODO make the cached nature of the table configurable
StringBuilder createSql = new StringBuilder();
createSql.append( "CREATE CACHED TABLE ").append( tableName );
@@ -155,8 +153,8 @@ public class HSQLDiskCacheFactory
createSql.append( "CACHE_KEY VARCHAR(250) NOT
NULL, " );
createSql.append( "REGION VARCHAR(250) NOT
NULL, " );
createSql.append( "ELEMENT BINARY, " );
- createSql.append( "CREATE_TIME DATE, " );
- createSql.append( "CREATE_TIME_SECONDS BIGINT, " );
+ createSql.append( "CREATE_TIME TIMESTAMP, " );
+ createSql.append( "UPDATE_TIME_SECONDS BIGINT, " );
createSql.append( "MAX_LIFE_SECONDS BIGINT, " );
createSql.append( "SYSTEM_EXPIRE_TIME_SECONDS BIGINT, " );
createSql.append( "IS_ETERNAL CHAR(1), " );
@@ -171,11 +169,7 @@ public class HSQLDiskCacheFactory
}
catch ( SQLException e )
{
- if ("23000".equals(e.getSQLState()))
- {
- newT = false;
- }
- else
+ if (!"23000".equals(e.getSQLState()))
{
throw e;
}
@@ -184,31 +178,5 @@ public class HSQLDiskCacheFactory
{
sStatement.close();
}
-
- if ( newT )
- {
- // TODO create an index on SYSTEM_EXPIRE_TIME_SECONDS
- String setupData[] = { "create index iKEY on " + tableName + "
(CACHE_KEY, REGION)" };
- Statement iStatement = cConn.createStatement();
-
- try
- {
- for ( int i = 0; i < setupData.length; i++ )
- {
- try
- {
- iStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
- {
- log.error( "Exception caught when creating index.", e
);
- }
- }
- }
- finally
- {
- iStatement.close();
- }
- }
}
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java?rev=1763857&r1=1763856&r2=1763857&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/HsqlSetupTableUtil.java
Sat Oct 8 07:18:06 2016
@@ -21,10 +21,11 @@ package org.apache.commons.jcs.auxiliary
import java.sql.Connection;
import java.sql.SQLException;
-import java.sql.Statement;
+
+import org.apache.commons.jcs.auxiliary.disk.jdbc.hsql.HSQLDiskCacheFactory;
/** Can use this to setup a table. */
-public class HsqlSetupTableUtil
+public class HsqlSetupTableUtil extends HSQLDiskCacheFactory
{
/**
* SETUP a TABLE FOR CACHE testing
@@ -36,67 +37,7 @@ public class HsqlSetupTableUtil
*/
public static void setupTABLE( Connection cConn, String tableName ) throws
SQLException
{
- boolean newT = true;
-
- StringBuilder createSql = new StringBuilder();
- createSql.append( "CREATE CACHED TABLE ").append( tableName );
- createSql.append( "( " );
- createSql.append( "CACHE_KEY VARCHAR(250) NOT
NULL, " );
- createSql.append( "REGION VARCHAR(250) NOT
NULL, " );
- createSql.append( "ELEMENT BINARY, " );
- createSql.append( "CREATE_TIME TIMESTAMP, " );
- createSql.append( "UPDATE_TIME_SECONDS BIGINT, " );
- createSql.append( "MAX_LIFE_SECONDS BIGINT, " );
- createSql.append( "SYSTEM_EXPIRE_TIME_SECONDS BIGINT, " );
- createSql.append( "IS_ETERNAL CHAR(1), " );
- createSql.append( "PRIMARY KEY (CACHE_KEY, REGION) " );
- createSql.append( ");" );
-
- Statement sStatement = cConn.createStatement();
-
- try
- {
- sStatement.execute( createSql.toString() );
- }
- catch ( SQLException e )
- {
- if ("23000".equals(e.getSQLState()))
- {
- newT = false;
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- sStatement.close();
- }
-
- if ( newT )
- {
- String setupData[] = { "create index iKEY on " + tableName + "
(CACHE_KEY, REGION)" };
- Statement iStatement = cConn.createStatement();
-
- try
- {
- for ( int i = 0; i < setupData.length; i++ )
- {
- try
- {
- iStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
- {
- System.out.println( "Exception: " + e );
- }
- }
- }
- finally
- {
- iStatement.close();
- }
- }
+ HsqlSetupTableUtil util = new HsqlSetupTableUtil();
+ util.setupTable(cConn, tableName);
}
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java?rev=1763857&r1=1763856&r2=1763857&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheRemovalUnitTest.java
Sat Oct 8 07:18:06 2016
@@ -22,14 +22,13 @@ package org.apache.commons.jcs.auxiliary
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
-import java.sql.Statement;
import java.util.Properties;
-import junit.framework.TestCase;
-
import org.apache.commons.jcs.JCS;
import org.apache.commons.jcs.access.CacheAccess;
+import junit.framework.TestCase;
+
/** Tests for the removal functionality. */
public class JDBCDiskCacheRemovalUnitTest
extends TestCase
@@ -105,79 +104,6 @@ public class JDBCDiskCacheRemovalUnitTes
Class.forName( driver ).newInstance();
Connection cConn = DriverManager.getConnection( url + database, user,
password );
- setupTABLE( cConn );
- }
-
- /**
- * SETUP TABLE FOR CACHE
- * <p>
- * @param cConn
- *
- * @throws SQLException if database problems occur
- */
- private void setupTABLE( Connection cConn ) throws SQLException
- {
- boolean newT = true;
-
- StringBuilder createSql = new StringBuilder();
- createSql.append( "CREATE CACHED TABLE " + databaseName );
- createSql.append( "( " );
- createSql.append( "CACHE_KEY VARCHAR(250) NOT
NULL, " );
- createSql.append( "REGION VARCHAR(250) NOT
NULL, " );
- createSql.append( "ELEMENT BINARY, " );
- createSql.append( "CREATE_TIME TIMESTAMP, " );
- createSql.append( "UPDATE_TIME_SECONDS BIGINT, " );
- createSql.append( "MAX_LIFE_SECONDS BIGINT, " );
- createSql.append( "SYSTEM_EXPIRE_TIME_SECONDS BIGINT, " );
- createSql.append( "IS_ETERNAL CHAR(1), " );
- createSql.append( "PRIMARY KEY (CACHE_KEY, REGION) " );
- createSql.append( ");" );
-
- Statement sStatement = cConn.createStatement();
-
- try
- {
- sStatement.execute( createSql.toString() );
- }
- catch ( SQLException e )
- {
- if ("23000".equals(e.getSQLState()))
- {
- newT = false;
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- sStatement.close();
- }
-
- if ( newT )
- {
- String setupData[] = { "create index iKEY on " + databaseName + "
(CACHE_KEY, REGION)" };
- Statement iStatement = cConn.createStatement();
-
- try
- {
- for ( int i = 0; i < setupData.length; i++ )
- {
- try
- {
- iStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
- {
- System.out.println( "Exception: " + e );
- }
- }
- }
- finally
- {
- iStatement.close();
- }
- } // end ifnew
+ HsqlSetupTableUtil.setupTABLE( cConn, databaseName );
}
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java?rev=1763857&r1=1763856&r2=1763857&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/JDBCDiskCacheShrinkUnitTest.java
Sat Oct 8 07:18:06 2016
@@ -24,8 +24,6 @@ import static org.junit.Assert.assertNul
import java.sql.Connection;
import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
import java.util.Properties;
import org.apache.commons.jcs.JCS;
@@ -65,7 +63,7 @@ public class JDBCDiskCacheShrinkUnitTest
Class.forName( driver ).newInstance();
Connection cConn = DriverManager.getConnection( url + database, user,
password );
- setupTABLE( cConn );
+ HsqlSetupTableUtil.setupTABLE( cConn, "JCS_STORE_SHRINK" );
}
/**
@@ -221,77 +219,4 @@ public class JDBCDiskCacheShrinkUnitTest
assertNull( "Removed key should be null: " + i + ":key", jcs.get(
i + ":key" ) );
}
}
-
- /**
- * SETUP TABLE FOR CACHE
- * @param cConn
- *
- * @throws SQLException if database problems occur
- */
- private static void setupTABLE( Connection cConn ) throws SQLException
- {
- boolean newT = true;
-
- StringBuilder createSql = new StringBuilder();
- createSql.append( "CREATE CACHED TABLE JCS_STORE_SHRINK " );
- createSql.append( "( " );
- createSql.append( "CACHE_KEY VARCHAR(250) NOT
NULL, " );
- createSql.append( "REGION VARCHAR(250) NOT
NULL, " );
- createSql.append( "ELEMENT BINARY, " );
- createSql.append( "CREATE_TIME TIMESTAMP, " );
- createSql.append( "UPDATE_TIME_SECONDS BIGINT, " );
- createSql.append( "MAX_LIFE_SECONDS BIGINT, " );
- createSql.append( "SYSTEM_EXPIRE_TIME_SECONDS BIGINT, " );
- createSql.append( "IS_ETERNAL CHAR(1), " );
- createSql.append( "PRIMARY KEY (CACHE_KEY, REGION) " );
- createSql.append( ");" );
-
- Statement sStatement = cConn.createStatement();
-
- try
- {
- sStatement.execute( createSql.toString() );
- }
- catch ( SQLException e )
- {
- if ("23000".equals(e.getSQLState()))
- {
- newT = false;
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- sStatement.close();
- }
-
-
- if ( newT )
- {
- String setupData[] = { "create index iKEY on JCS_STORE_SHRINK
(CACHE_KEY, REGION)" };
- Statement iStatement = cConn.createStatement();
-
- try
- {
- for ( int i = 0; i < setupData.length; i++ )
- {
- try
- {
- iStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
- {
- System.out.println( "Exception: " + e );
- }
- }
- }
- finally
- {
- iStatement.close();
- }
- } // end ifnew
- }
}
Modified:
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java?rev=1763857&r1=1763856&r2=1763857&view=diff
==============================================================================
---
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
(original)
+++
commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheHsqlBackedUnitTest.java
Sat Oct 8 07:18:06 2016
@@ -25,14 +25,13 @@ import static org.junit.Assert.assertNul
import java.sql.Connection;
import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.commons.jcs.JCS;
import org.apache.commons.jcs.access.CacheAccess;
+import org.apache.commons.jcs.auxiliary.disk.jdbc.HsqlSetupTableUtil;
import org.apache.commons.jcs.engine.behavior.ICacheElement;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -63,7 +62,7 @@ public class MySQLDiskCacheHsqlBackedUni
new org.hsqldb.jdbcDriver();
Connection cConn = DriverManager.getConnection( url + database, user,
password );
- setupTABLE( cConn );
+ HsqlSetupTableUtil.setupTABLE( cConn, "JCS_STORE_MYSQL" );
}
/**
@@ -176,74 +175,4 @@ public class MySQLDiskCacheHsqlBackedUni
// System.out.println( "matchingResults.keySet() " +
matchingResults.keySet() );
// System.out.println( "\nAFTER TEST \n" + jcs.getStats() );
}
-
- /**
- * SETUP TABLE FOR CACHE
- * @param cConn
- */
- private static void setupTABLE( Connection cConn ) throws SQLException
- {
- boolean newT = true;
-
- StringBuilder createSql = new StringBuilder();
- createSql.append( "CREATE CACHED TABLE JCS_STORE_MYSQL " );
- createSql.append( "( " );
- createSql.append( "CACHE_KEY VARCHAR(250) NOT
NULL, " );
- createSql.append( "REGION VARCHAR(250) NOT
NULL, " );
- createSql.append( "ELEMENT BINARY, " );
- createSql.append( "CREATE_TIME TIMESTAMP, " );
- createSql.append( "UPDATE_TIME_SECONDS BIGINT, " );
- createSql.append( "MAX_LIFE_SECONDS BIGINT, " );
- createSql.append( "SYSTEM_EXPIRE_TIME_SECONDS BIGINT, " );
- createSql.append( "IS_ETERNAL CHAR(1), " );
- createSql.append( "PRIMARY KEY (CACHE_KEY, REGION) " );
- createSql.append( ");" );
-
- Statement sStatement = cConn.createStatement();
-
- try
- {
- sStatement.execute( createSql.toString() );
- }
- catch ( SQLException e )
- {
- if ("23000".equals(e.getSQLState()))
- {
- newT = false;
- }
- else
- {
- throw e;
- }
- }
- finally
- {
- sStatement.close();
- }
-
- if ( newT )
- {
- String setupData[] = { "create index iKEY on JCS_STORE_MYSQL
(CACHE_KEY, REGION)" };
- Statement iStatement = cConn.createStatement();
-
- try
- {
- for ( int i = 0; i < setupData.length; i++ )
- {
- try
- {
- iStatement.execute( setupData[i] );
- }
- catch ( SQLException e )
- {
- System.out.println( "Exception: " + e );
- }
- }
- }
- finally
- {
- iStatement.close();
- }
- }
- }
}
