[infinispan-commits] Infinispan SVN: r2614 - in trunk/cachestore/cassandra: src/main/java/org/infinispan/loaders/cassandra and 2 other directories.

[infinispan-commits at lists.jboss.org]

Author: NadirX
Date: 2010-10-27 06:23:20 -0400 (Wed, 27 Oct 2010)
New Revision: 2614

Modified:
   trunk/cachestore/cassandra/pom.xml
   trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java
   trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java
   trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java
   trunk/cachestore/cassandra/src/test/resources/storage-conf.xml
Log:
Update to Cassandra 0.6.6 and Cassandra Connection Pool 0.3.0 which separates the cassandra client jar from the server (which is now included only for the tests)

Modified: trunk/cachestore/cassandra/pom.xml
===================================================================
--- trunk/cachestore/cassandra/pom.xml	2010-10-27 10:21:31 UTC (rev 2613)
+++ trunk/cachestore/cassandra/pom.xml	2010-10-27 10:23:20 UTC (rev 2614)
@@ -20,9 +20,16 @@
 		<dependency>
 			<groupId>net.dataforte.cassandra</groupId>
 			<artifactId>cassandra-connection-pool</artifactId>
-			<version>0.1.0</version>
+			<version>${version.cassandra.connection.pool}</version>
 		</dependency>
+
 		<dependency>
+			<groupId>org.apache.cassandra</groupId>
+			<artifactId>apache-cassandra</artifactId>
+			<version>${version.cassandra}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
 			<version>${version.slf4j}</version>

Modified: trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java
===================================================================
--- trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java	2010-10-27 10:21:31 UTC (rev 2613)
+++ trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStore.java	2010-10-27 10:23:20 UTC (rev 2614)
@@ -101,7 +101,7 @@
 	@Override
 	public InternalCacheEntry load(Object key) throws CacheLoaderException {
 		String hashKey = CassandraCacheStore.hashKey(key);
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 		try {
 			cassandraClient = pool.getConnection();
 			ColumnOrSuperColumn column = cassandraClient.get(config.keySpace, hashKey, entryColumnPath, ConsistencyLevel.ONE);
@@ -128,7 +128,7 @@
 
 	@Override
 	public Set<InternalCacheEntry> load(int numEntries) throws CacheLoaderException {
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 		try {
 			cassandraClient = pool.getConnection();
 			Set<InternalCacheEntry> s = new HashSet<InternalCacheEntry>();
@@ -189,7 +189,7 @@
 
 	@Override
 	public Set<Object> loadAllKeys(Set<Object> keysToExclude) throws CacheLoaderException {
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 		try {
 			cassandraClient = pool.getConnection();
 			Set<Object> s = new HashSet<Object>();
@@ -236,7 +236,7 @@
 
 	@Override
 	public void clear() throws CacheLoaderException {
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 		try {
 			cassandraClient = pool.getConnection();
 			SlicePredicate slicePredicate = new SlicePredicate();
@@ -274,7 +274,7 @@
 	public boolean remove(Object key) throws CacheLoaderException {
 		if (trace)
 			log.trace("remove(\"{0}\") ", key);
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 		try {
 			cassandraClient = pool.getConnection();
 			Map<String, Map<String, List<Mutation>>> mutationMap = new HashMap<String, Map<String, List<Mutation>>>();
@@ -306,7 +306,7 @@
 	}
 
 	public void store(InternalCacheEntry entry) throws CacheLoaderException {
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 
 		try {
 			cassandraClient = pool.getConnection();
@@ -396,7 +396,7 @@
 	protected void purgeInternal() throws CacheLoaderException {
 		if (trace)
 			log.trace("purgeInternal");
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 		try {
 			cassandraClient = pool.getConnection();
 			// We need to get all supercolumns from the beginning of time until now, in SLICE_SIZE chunks
@@ -430,7 +430,7 @@
 
 	@Override
 	protected void applyModifications(List<? extends Modification> mods) throws CacheLoaderException {
-		Cassandra.Iface cassandraClient = null;
+		Cassandra.Client cassandraClient = null;
 
 		try {
 			cassandraClient = pool.getConnection();

Modified: trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java
===================================================================
--- trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java	2010-10-27 10:21:31 UTC (rev 2613)
+++ trunk/cachestore/cassandra/src/main/java/org/infinispan/loaders/cassandra/CassandraCacheStoreConfig.java	2010-10-27 10:23:20 UTC (rev 2614)
@@ -83,8 +83,8 @@
 	}
 
 	
-	public boolean getFramed() {
-		return poolProperties.getFramed();
+	public boolean isFramed() {
+		return poolProperties.isFramed();
 	}
 
 	

Modified: trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java
===================================================================
--- trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java	2010-10-27 10:21:31 UTC (rev 2613)
+++ trunk/cachestore/cassandra/src/test/java/org/infinispan/loaders/cassandra/CassandraCacheStoreTest.java	2010-10-27 10:23:20 UTC (rev 2614)
@@ -8,6 +8,7 @@
 import org.apache.thrift.transport.TTransportException;
 import org.infinispan.loaders.BaseCacheStoreTest;
 import org.infinispan.loaders.CacheStore;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -39,6 +40,11 @@
 		t.setDaemon(true);
 		t.start();
 	}
+	
+	@AfterClass
+	public static void cleanup() {
+		System.exit(0);
+	}
 
 	@Override
 	protected CacheStore createCacheStore() throws Exception {

Modified: trunk/cachestore/cassandra/src/test/resources/storage-conf.xml
===================================================================
--- trunk/cachestore/cassandra/src/test/resources/storage-conf.xml	2010-10-27 10:21:31 UTC (rev 2613)
+++ trunk/cachestore/cassandra/src/test/resources/storage-conf.xml	2010-10-27 10:23:20 UTC (rev 2614)
@@ -154,6 +154,7 @@
    ~ disk.  Keep the data disks and the CommitLog disks separate for best
    ~ performance
   -->
+  <SavedCachesDirectory>${java.io.tmpdir}/infinispan-cassandra-cachestore/savedcaches</SavedCachesDirectory>
   <CommitLogDirectory>${java.io.tmpdir}/infinispan-cassandra-cachestore/commitlog</CommitLogDirectory>
   <DataFileDirectories>
       <DataFileDirectory>${java.io.tmpdir}/infinispan-cassandra-cachestore/data</DataFileDirectory>