natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support of compaction strategy option for stress.java 

patch by Pavel Yaskevich; reviewed by Brandon Williams for CASSANDRA-3204

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1170700 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Pavel Yaskevich 2011-09-14 16:02:18 +00:00
parent 178f853aa8
commit f06e1d63a2
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -74,7 +74,7 @@
* Fix backwards compatibilty for CQL memtable properties (CASSANDRA-3190)
* Add five-minute delay before starting compactions on a restarted server
(CASSANDRA-3181)
* support of compaction strategy option for stress.java (CASSANDRA-3204)
0.8.6
* avoid trying to watch cassandra-topology.properties when loaded from jar

2
src/java/org/apache/cassandra/config/CFMetaData.java
View File

@ -776,7 +776,7 @@ public final class CFMetaData
logger.debug("application result is {}", this);
}
private static Class<? extends AbstractCompactionStrategy> createCompactionSrategy(String className) throws ConfigurationException
public static Class<? extends AbstractCompactionStrategy> createCompactionSrategy(String className) throws ConfigurationException
{
className = className.contains(".") ? className : "org.apache.cassandra.db.compaction." + className;
try

28
tools/stress/src/org/apache/cassandra/stress/Session.java
View File

@ -25,7 +25,9 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.cassandra.config.CFMetaData;
import org.apache.cassandra.config.ConfigurationException;
import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.TypeParser;
import org.apache.commons.cli.*;
@ -86,6 +88,7 @@ public class Session implements Serializable
availableOptions.addOption("T", "send-to", true, "Send this as a request to the stress daemon at specified address.");
availableOptions.addOption("I", "compression", true, "Specify the compression to use for sstable, default:no compression");
availableOptions.addOption("Q", "query-names", true, "Comma-separated list of column names to retrieve from each row.");
availableOptions.addOption("Z", "compaction-strategy", true, "CompactionStrategy to use.");
}
private int numKeys = 1000 * 1000;
@ -102,6 +105,7 @@ public class Session implements Serializable
private int port = 9160;
private int superColumns = 1;
private String compression = null;
private String compactionStrategy = null;
private int progressInterval = 10;
private int keysPerCall = 1000;
@ -301,6 +305,22 @@ public class Session implements Serializable
{
columnNames = null;
}
if (cmd.hasOption("Z"))
{
compactionStrategy = cmd.getOptionValue("Z");
try
{
// validate compaction strategy class
CFMetaData.createCompactionSrategy(compactionStrategy);
}
catch (ConfigurationException e)
{
System.err.println(e.getMessage());
System.exit(1);
}
}
}
catch (ParseException e)
{
@ -483,6 +503,14 @@ public class Session implements Serializable
keyspace.setStrategy_options(replicationStrategyOptions);
}
if (compactionStrategy != null)
{
standardCfDef.setCompaction_strategy(compactionStrategy);
superCfDef.setCompaction_strategy(compactionStrategy);
counterCfDef.setCompaction_strategy(compactionStrategy);
counterSuperCfDef.setCompaction_strategy(compactionStrategy);
}
keyspace.setCf_defs(new ArrayList<CfDef>(Arrays.asList(standardCfDef, superCfDef, counterCfDef, counterSuperCfDef)));
Cassandra.Client client = getClient(false);