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

wip: completed all insert unit tests.

Browse Source
This commit is contained in:
dwebb
2013-11-15 15:29:03 -05:00
parent 6dce0ef81e
commit 0b591a5a71
3 changed files with 165 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java
View File

@@ -1036,7 +1036,7 @@ public class CassandraTemplate implements CassandraOperations {
try {
final Batch b = CqlUtils.toInsertBatchQuery(keyspace.getKeyspace(), tableName, entities, CPEntity, optionsByName);
log.info(b.toString());
log.info(b.getQueryString());
return execute(new SessionCallback<List<T>>() {

8
src/main/java/org/springframework/data/cassandra/util/CqlUtils.java
View File

@@ -21,6 +21,7 @@ import org.springframework.data.mapping.PropertyHandler;
import com.datastax.driver.core.ColumnMetadata;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.Query;
import com.datastax.driver.core.Statement;
import com.datastax.driver.core.TableMetadata;
import com.datastax.driver.core.querybuilder.Batch;
import com.datastax.driver.core.querybuilder.Delete;
@@ -400,6 +401,13 @@ public abstract class CqlUtils {
}
/*
* Add all the Queries to the batch
*/
for (Query query : queries) {
b.add((Statement) query);
}
addQueryOptions(b, optionsByName);
return b;

183
src/test/java/org/springframework/data/cassandra/template/CassandraOperationsTest.java
View File

@@ -18,9 +18,11 @@ package org.springframework.data.cassandra.template;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.thrift.transport.TTransportException;
@@ -31,7 +33,6 @@ import org.cassandraunit.dataset.yaml.ClassPathYamlDataSet;
import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -51,6 +52,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
/**
* Unit Tests for CassnadraTemplate
*
* @author David Webb
*
*/
@@ -63,47 +66,29 @@ public class CassandraOperationsTest {
private static Logger log = LoggerFactory.getLogger(CassandraOperationsTest.class);
private final static String CASSANDRA_CONFIG = "cassandra.yaml";
private final static String KEYSPACE_NAME = "test";
private final static String CASSANDRA_HOST = "localhost";
private final static int CASSANDRA_NATIVE_PORT = 9042;
private final static int CASSANDRA_THRIFT_PORT = 9160;
@Rule
public CassandraCQLUnit cassandraCQLUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cql-dataload.cql", "test"),
"cassandra.yaml", "localhost", 9042);
public CassandraCQLUnit cassandraCQLUnit = new CassandraCQLUnit(new ClassPathCQLDataSet("cql-dataload.cql",
KEYSPACE_NAME), CASSANDRA_CONFIG, CASSANDRA_HOST, CASSANDRA_NATIVE_PORT);
@BeforeClass
public static void startCassandra() throws IOException, TTransportException, ConfigurationException,
InterruptedException {
EmbeddedCassandraServerHelper.startEmbeddedCassandra("cassandra.yaml");
EmbeddedCassandraServerHelper.startEmbeddedCassandra(CASSANDRA_CONFIG);
/*
* Load data file to creat the test keyspace before we init the template
*/
DataLoader dataLoader = new DataLoader("Test Cluster", "localhost:9160");
DataLoader dataLoader = new DataLoader("Test Cluster", CASSANDRA_HOST + ":" + CASSANDRA_THRIFT_PORT);
dataLoader.load(new ClassPathYamlDataSet("cassandra-keyspace.yaml"));
}
@Before
public void setupKeyspace() {
/*
* Load data file to creat the test keyspace before we init the template
*/
// DataLoader dataLoader = new DataLoader("Test Cluster", "localhost:9160");
// dataLoader.load(new ClassPathYamlDataSet("cassandra-keyspace.yaml"));
log.info("Creating Table...");
createTables();
}
private void createTables() {
// cassandraTemplate
// .executeQuery("create table users (username text, firstName text, lastName text, PRIMARY KEY (username));");
// cassandraCQLUnit.
}
@Test
public void ringTest() {
@@ -173,6 +158,28 @@ public class CassandraOperationsTest {
cassandraTemplate.insert(b4, "book", optionsByName);
/*
* Test Single Insert with entity
*/
Book b5 = new Book();
b5.setIsbn("123456-5");
b5.setTitle("Spring Data Cassandra Guide");
b5.setAuthor("Cassandra Guru");
b5.setPages(265);
cassandraTemplate.insert(b5, options);
/*
* Test Single Insert with entity
*/
Book b6 = new Book();
b6.setIsbn("123456-6");
b6.setTitle("Spring Data Cassandra Guide");
b6.setAuthor("Cassandra Guru");
b6.setPages(465);
cassandraTemplate.insert(b6, optionsByName);
}
@Test
@@ -228,6 +235,128 @@ public class CassandraOperationsTest {
cassandraTemplate.insertAsynchronously(b4, "book", optionsByName);
/*
* Test Single Insert with entity
*/
Book b5 = new Book();
b5.setIsbn("123456-5");
b5.setTitle("Spring Data Cassandra Guide");
b5.setAuthor("Cassandra Guru");
b5.setPages(265);
cassandraTemplate.insertAsynchronously(b5, options);
/*
* Test Single Insert with entity
*/
Book b6 = new Book();
b6.setIsbn("123456-6");
b6.setTitle("Spring Data Cassandra Guide");
b6.setAuthor("Cassandra Guru");
b6.setPages(465);
cassandraTemplate.insertAsynchronously(b6, optionsByName);
}
@Test
public void insertBatchTest() {
QueryOptions options = new QueryOptions();
options.setConsistencyLevel(ConsistencyLevel.ONE);
options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY);
Map<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);
cassandraTemplate.insert(books);
books = getBookList(20);
cassandraTemplate.insert(books, "book_alt");
books = getBookList(20);
cassandraTemplate.insert(books, "book", options);
books = getBookList(20);
cassandraTemplate.insert(books, "book", optionsByName);
books = getBookList(20);
cassandraTemplate.insert(books, options);
books = getBookList(20);
cassandraTemplate.insert(books, optionsByName);
}
@Test
public void insertBatchAsynchronouslyTest() {
QueryOptions options = new QueryOptions();
options.setConsistencyLevel(ConsistencyLevel.ONE);
options.setRetryPolicy(RetryPolicy.DOWNGRADING_CONSISTENCY);
Map<String, Object> optionsByName = new HashMap<String, Object>();
optionsByName.put(QueryOptions.QueryOptionMapKeys.CONSISTENCY_LEVEL, ConsistencyLevel.ALL);
optionsByName.put(QueryOptions.QueryOptionMapKeys.RETRY_POLICY, RetryPolicy.FALLTHROUGH);
optionsByName.put(QueryOptions.QueryOptionMapKeys.TTL, 30);
List<Book> books = null;
books = getBookList(20);
cassandraTemplate.insertAsynchronously(books);
books = getBookList(20);
cassandraTemplate.insertAsynchronously(books, "book_alt");
books = getBookList(20);
cassandraTemplate.insertAsynchronously(books, "book", options);
books = getBookList(20);
cassandraTemplate.insertAsynchronously(books, "book", optionsByName);
books = getBookList(20);
cassandraTemplate.insertAsynchronously(books, options);
books = getBookList(20);
cassandraTemplate.insertAsynchronously(books, optionsByName);
}
/**
* @return
*/
private List<Book> getBookList(int numBooks) {
List<Book> books = new ArrayList<Book>();
Book b = null;
for (int i = 0; i < numBooks; i++) {
b = new Book();
b.setIsbn(UUID.randomUUID().toString());
b.setTitle("Spring Data Cassandra Guide");
b.setAuthor("Cassandra Guru");
b.setPages(i * 10 + 5);
books.add(b);
}
return books;
}
@After