Author: jbellis
Date: Tue Apr 12 21:21:30 2011
New Revision: 1091576
URL: http://svn.apache.org/viewvc?rev=1091576&view=rev
Log:
fixes for replicationFactor change
patch by Stu Hood; reviewed by jbellis for CASSANDRA-2462
Modified:
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/CountersTest.java
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MovementTest.java
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MutationTest.java
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/TestBase.java
cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/Session.java
Modified:
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/CountersTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/CountersTest.java?rev=1091576&r1=1091575&r2=1091576&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/CountersTest.java
(original)
+++
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/CountersTest.java
Tue Apr 12 21:21:30 2011
@@ -72,7 +72,7 @@ public class CountersTest extends TestBa
{
ByteBuffer bname = ByteBuffer.wrap(name.getBytes());
ColumnPath cpath = new ColumnPath(cf).setColumn(bname);
- CounterColumn col = client.get_counter(key, cpath, cl).column;
+ CounterColumn col = client.get(key, cpath, cl).counter_column;
assertEquals(bname, col.name);
assertEquals(value.longValue(), col.value);
}
Modified:
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MovementTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MovementTest.java?rev=1091576&r1=1091575&r2=1091576&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MovementTest.java
(original)
+++
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MovementTest.java
Tue Apr 12 21:21:30 2011
@@ -29,6 +29,7 @@ import java.util.*;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.tools.NodeProbe;
+import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.CassandraServiceController.Failure;
Modified:
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MutationTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MutationTest.java?rev=1091576&r1=1091575&r2=1091576&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MutationTest.java
(original)
+++
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/MutationTest.java
Tue Apr 12 21:21:30 2011
@@ -18,6 +18,7 @@
package org.apache.cassandra;
+import java.io.IOException;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.*;
@@ -25,7 +26,11 @@ import java.util.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.cassandra.client.RingCache;
+import org.apache.cassandra.dht.RandomPartitioner;
+import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.thrift.*;
+import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.thrift.TException;
Modified:
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/TestBase.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/TestBase.java?rev=1091576&r1=1091575&r2=1091576&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/TestBase.java
(original)
+++
cassandra/branches/cassandra-0.8/test/distributed/org/apache/cassandra/TestBase.java
Tue Apr 12 21:21:30 2011
@@ -82,13 +82,14 @@ public abstract class TestBase
{
List<InetAddress> hosts = controller.getHosts();
Cassandra.Client client = controller.createClient(hosts.get(0));
-
+ Map<String,String> stratOptions = new HashMap<String,String>();
+ stratOptions.put("replication_factor", "" + rf);
client.system_add_keyspace(
new KsDef(
name,
"org.apache.cassandra.locator.SimpleStrategy",
- rf,
- Arrays.asList(cfdef)));
+ Arrays.asList(cfdef))
+ .setStrategy_options(stratOptions));
// poll, until KS added
for (InetAddress host : hosts)
Modified:
cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/Session.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/Session.java?rev=1091576&r1=1091575&r2=1091576&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/Session.java
(original)
+++
cassandra/branches/cassandra-0.8/tools/stress/src/org/apache/cassandra/stress/Session.java
Tue Apr 12 21:21:30 2011
@@ -91,7 +91,6 @@ public class Session
private int progressInterval = 10;
private int keysPerCall = 1000;
- private int replicationFactor = 1;
private boolean replicateOnWrite = true;
private boolean ignoreErrors = false;
@@ -231,7 +230,7 @@ public class Session
keysPerCall = Integer.parseInt(cmd.getOptionValue("g"));
if (cmd.hasOption("l"))
- replicationFactor = Integer.parseInt(cmd.getOptionValue("l"));
+ replicationStrategyOptions.put("replication_factor",
String.valueOf(Integer.parseInt(cmd.getOptionValue("l"))));
if (cmd.hasOption("e"))
consistencyLevel =
ConsistencyLevel.valueOf(cmd.getOptionValue("e").toUpperCase());
@@ -414,9 +413,6 @@ public class Session
keyspace.setName("Keyspace1");
keyspace.setStrategy_class(replicationStrategy);
- Map<String,String> options = new HashMap<String, String>();
- options.put("replication_factor", String.valueOf(replicationFactor));
- keyspace.setStrategy_options(options);
if (!replicationStrategyOptions.isEmpty())
{
