diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraOperations.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraOperations.java index 3d5d8cf41..a43ebf085 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraOperations.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraOperations.java @@ -438,4 +438,11 @@ public interface CassandraOperations { */ void ingest(String cql, Object[][] rows); + /** + * Delete all rows in the table + * + * @param tableName + */ + void truncate(String tableName); + } diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java index cf4c3f20e..a9f3a5987 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java @@ -38,6 +38,8 @@ import com.datastax.driver.core.ResultSetFuture; import com.datastax.driver.core.Row; import com.datastax.driver.core.Session; import com.datastax.driver.core.exceptions.DriverException; +import com.datastax.driver.core.querybuilder.QueryBuilder; +import com.datastax.driver.core.querybuilder.Truncate; /** * This is the Central class in the Cassandra core package. It simplifies the use of Cassandra and helps to avoid @@ -185,6 +187,8 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe */ protected ResultSet doExecute(final String cql) { + logger.info(cql); + return doExecute(new SessionCallback() { @Override @@ -616,4 +620,13 @@ public class CassandraTemplate extends CassandraAccessor implements CassandraOpe }); } + + /* (non-Javadoc) + * @see org.springframework.cassandra.core.CassandraOperations#truncate(java.lang.String) + */ + @Override + public void truncate(String tableName) throws DataAccessException { + Truncate truncate = QueryBuilder.truncate(tableName); + doExecute(truncate.getQueryString()); + } } \ No newline at end of file diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java b/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java index 12c7c9e39..b41e852e5 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java @@ -15,8 +15,8 @@ */ package org.springframework.cassandra.support; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; import com.datastax.driver.core.Session; @@ -28,7 +28,7 @@ import com.datastax.driver.core.Session; public class CassandraAccessor implements InitializingBean { /** Logger available to subclasses */ - protected final Log logger = LogFactory.getLog(getClass()); + protected final Logger logger = LoggerFactory.getLogger(getClass()); private Session session; diff --git a/spring-cassandra/src/test/resources/logback.xml b/spring-cassandra/src/test/resources/logback.xml index 72ad7057e..38a367981 100644 --- a/spring-cassandra/src/test/resources/logback.xml +++ b/spring-cassandra/src/test/resources/logback.xml @@ -9,7 +9,8 @@ - + + diff --git a/spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties b/spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties index 6e2ec3286..3984b4c0c 100644 --- a/spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties +++ b/spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties @@ -2,5 +2,5 @@ log4j.rootLogger=WARN, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.logger.org.springframework.cassandra=INFO log4j.logger.org.springframework.data.cassandra=INFO - diff --git a/spring-data-cassandra/src/test/resources/log4j.properties b/spring-data-cassandra/src/test/resources/log4j.properties index 6e2ec3286..3984b4c0c 100644 --- a/spring-data-cassandra/src/test/resources/log4j.properties +++ b/spring-data-cassandra/src/test/resources/log4j.properties @@ -2,5 +2,5 @@ log4j.rootLogger=WARN, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n +log4j.logger.org.springframework.cassandra=INFO log4j.logger.org.springframework.data.cassandra=INFO - diff --git a/spring-data-cassandra/src/test/resources/logback.xml b/spring-data-cassandra/src/test/resources/logback.xml index 72ad7057e..38a367981 100644 --- a/spring-data-cassandra/src/test/resources/logback.xml +++ b/spring-data-cassandra/src/test/resources/logback.xml @@ -9,7 +9,8 @@ - + +