Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/shvid/spring-data-cassandra into DATACASS-34

Browse Source
This commit is contained in:
Alex Shvid
2013-11-27 11:51:55 -08:00
parent fa35d320f9 193a9eb2a9
commit f2fb421801
7 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraOperations.java
View File

@@ -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);
}

13
spring-cassandra/src/main/java/org/springframework/cassandra/core/CassandraTemplate.java
View File

@@ -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;
/**
* <b>This is the Central class in the Cassandra core package.</b> 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<ResultSet>() {
@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());
}
}

6
spring-cassandra/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java
View File

@@ -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;

3
spring-cassandra/src/test/resources/logback.xml
View File

@@ -9,7 +9,8 @@
</encoder>
</appender>
<logger name="org.springframework.cassandra" level="debug" />
<logger name="org.springframework.cassandra" level="info" />
<logger name="org.springframework.data.cassandra" level="info" />
<root level="warn">
<appender-ref ref="console" />

2
spring-data-cassandra/src/test/resources/log4j-embedded-cassandra.properties
View File

@@ -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

2
spring-data-cassandra/src/test/resources/log4j.properties
View File

@@ -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

3
spring-data-cassandra/src/test/resources/logback.xml
View File

@@ -9,7 +9,8 @@
</encoder>
</appender>
<logger name="org.springframework.cassandra" level="debug" />
<logger name="org.springframework.cassandra" level="info" />
<logger name="org.springframework.data.cassandra" level="info" />
<root level="warn">
<appender-ref ref="console" />