Author: [email protected]
Date: Mon Sep 19 09:16:26 2011
New Revision: 1388
Log:
[AMDATUCASSANDRA-87] Upgraded cassandra to 0.8.5 and hector to 0.8.0-2
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/java/org/amdatu/cassandra/application/service/CassandraDaemonServiceImpl.java
Mon Sep 19 09:16:26 2011
@@ -85,17 +85,13 @@
}
public synchronized boolean keyspaceExists(final String keyspaceName) {
- try {
- m_cassandraServer.describe_keyspace(keyspaceName);
- return true;
- }
- catch (NotFoundException e) {
- return false;
- }
- catch (InvalidRequestException e) {
- // Rethrow the checked exception as a new unchecked Thrift
exception
- throw new ThriftException(e).setKeyspace(keyspaceName);
+ List<String> ksNames = getKeyspaces();
+ for (String ksName : ksNames) {
+ if (ksName.equalsIgnoreCase(keyspaceName)) {
+ return true;
+ }
}
+ return false;
}
public synchronized List<String> getKeyspaces() {
@@ -153,7 +149,7 @@
}
else {
m_logService
- .log(LogService.LOG_DEBUG, "Keyspace '" + name + "' was not
added since it already existed");
+ .log(LogService.LOG_DEBUG, "Keyspace '" + name + "' was
not added since it already existed");
return false;
}
}
@@ -170,7 +166,7 @@
&&
keyspace.getStrategy_options().containsKey(RF_STRATEGY_OPTION)) {
int currentRF =
Integer.parseInt(keyspace.getStrategy_options().get(RF_STRATEGY_OPTION));
return currentRF == rf;
- }
+ }
else {
return false;
}
Modified: trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-persistencemanager/pom.xml Mon Sep 19
09:16:26 2011
@@ -59,7 +59,7 @@
<dependency>
<groupId>me.prettyprint</groupId>
<artifactId>hector-core</artifactId>
- <version>0.8.0-1</version>
+ <version>0.8.0-2</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Mon Sep 19 09:16:26 2011
@@ -36,7 +36,7 @@
<amdatu.web.version>0.2.0</amdatu.web.version>
<!-- Version of cassandra itself -->
- <cassandra.version>0.8.0</cassandra.version>
+ <cassandra.version>0.8.5</cassandra.version>
<!-- Name of the Cassandra cluster this node is part of -->
<cassandra.clustername>'Amdatu Cluster'</cassandra.clustername>
Modified:
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
==============================================================================
---
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
(original)
+++
trunk/amdatu-cassandra/test-integration/tests/src/test/java/org/amdatu/cassandra/test/integration/tests/CassandraDaemonTest.java
Mon Sep 19 09:16:26 2011
@@ -43,17 +43,20 @@
public void execute() throws Exception {
// -1- Test adding/updating/removing keyspaces
- int beforeCount = m_daemonService.getKeyspaces().size();
- m_daemonService.addKeyspace(KEYSPACE);
+ int ksCount = m_daemonService.getKeyspaces().size();
+ if (m_daemonService.addKeyspace(KEYSPACE)) {
+ ksCount++;
+ }
Assert.assertTrue("Keyspace '" + KEYSPACE + "' does not exist after
creation",
m_daemonService.keyspaceExists(KEYSPACE));
// Try to create keyspace with the same name twice, should return false
Assert.assertFalse(m_daemonService.addKeyspace(KEYSPACE));
- // Case sensitivity check: Cassandra is case-sensitive!
- m_daemonService.addKeyspace(KEYSPACE.toLowerCase());
- m_daemonService.addKeyspace(KEYSPACE.toUpperCase());
+ // Case sensitivity check: Cassandra is NOT case-sensitive, so the
following two methods are
+ // supposed to throw an exception (see AMDATUCASSANDRA-87)!
+
Assert.assertFalse(m_daemonService.addKeyspace(KEYSPACE.toLowerCase()));
+
Assert.assertFalse(m_daemonService.addKeyspace(KEYSPACE.toUpperCase()));
// Sleep a second, this increases the probability that write requests
have been handled
Thread.sleep(5000);
@@ -62,10 +65,8 @@
List<String> allKeyspaces = m_daemonService.getKeyspaces();
Assert.assertTrue(allKeyspaces.contains(KEYSPACE));
- Assert.assertTrue(allKeyspaces.contains(KEYSPACE.toLowerCase()));
- Assert.assertTrue(allKeyspaces.contains(KEYSPACE.toUpperCase()));
- Assert.assertTrue("Expected available keyspaces = " + (beforeCount +
3) + ", but actual = "
- + allKeyspaces.size(), allKeyspaces.size() == beforeCount + 3);
+ Assert.assertTrue("Expected available keyspaces = " + (ksCount) + ",
but actual = "
+ + allKeyspaces.size(), allKeyspaces.size() == ksCount);
// -2- Test adding/updating ColumnFamily's to the keyspace
m_daemonService.addColumnFamily(KEYSPACE, COLUMNFAMILY,
ColumnType.STANDARD.getValue(),
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
