You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/03/11 19:22:00 UTC
svn commit: r1080710 - in /cassandra/branches/cassandra-0.7:
contrib/stress/src/org/apache/cassandra/contrib/stress/
contrib/stress/src/org/apache/cassandra/contrib/stress/operations/
contrib/stress/src/org/apache/cassandra/contrib/stress/util/ src/jav...
Author: jbellis
Date: Fri Mar 11 18:22:00 2011
New Revision: 1080710
URL: http://svn.apache.org/viewvc?rev=1080710&view=rev
Log:
fix stress.java column sizes
patch by jbellis; reviewed by Pavel Yaskevich for CASSANDRA-2312
Modified:
cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java
cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java
cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java?rev=1080710&r1=1080709&r2=1080710&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java (original)
+++ cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/Session.java Fri Mar 11 18:22:00 2011
@@ -366,17 +366,20 @@ public class Session
public void createKeySpaces()
{
KsDef keyspace = new KsDef();
- ColumnDef standardColumn = new ColumnDef(ByteBuffer.wrap("C1".getBytes()), "UTF8Type");
- ColumnDef superSubColumn = new ColumnDef(ByteBuffer.wrap("S1".getBytes()), "UTF8Type");
+ // column family for standard columns
+ CfDef standardCfDef = new CfDef("Keyspace1", "Standard1");
+ standardCfDef.setComparator_type("AsciiType").setDefault_validation_class("BytesType");
if (indexType != null)
+ {
+ ColumnDef standardColumn = new ColumnDef(ByteBuffer.wrap("C1".getBytes()), "BytesType");
standardColumn.setIndex_type(indexType).setIndex_name("Idx1");
-
- // column family for standard columns
- CfDef standardCfDef = new CfDef("Keyspace1", "Standard1").setColumn_metadata(Arrays.asList(standardColumn));
+ standardCfDef.setColumn_metadata(Arrays.asList(standardColumn));
+ }
// column family with super columns
- CfDef superCfDef = new CfDef("Keyspace1", "Super1").setColumn_metadata(Arrays.asList(superSubColumn)).setColumn_type("Super");
+ CfDef superCfDef = new CfDef("Keyspace1", "Super1").setColumn_type("Super");
+ superCfDef.setComparator_type("AsciiType").setSubcomparator_type("AsciiType").setDefault_validation_class("BytesType");
keyspace.setName("Keyspace1");
keyspace.setStrategy_class(replicationStrategy);
Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java?rev=1080710&r1=1080709&r2=1080710&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java (original)
+++ cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java Fri Mar 11 18:22:00 2011
@@ -39,7 +39,7 @@ public class Inserter extends Operation
public void run(Cassandra.Client client) throws IOException
{
- List<String> values = generateValues();
+ List<ByteBuffer> values = generateValues();
List<Column> columns = new ArrayList<Column>();
List<SuperColumn> superColumns = new ArrayList<SuperColumn>();
@@ -49,8 +49,7 @@ public class Inserter extends Operation
for (int i = 0; i < session.getColumnsPerKey(); i++)
{
String columnName = ("C" + Integer.toString(i));
- ByteBuffer columnValue = ByteBufferUtil.bytes(values.get(i % values.size()));
-
+ ByteBuffer columnValue = values.get(i % values.size());
columns.add(new Column(ByteBufferUtil.bytes(columnName), columnValue, System.currentTimeMillis()));
}
Modified: cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java?rev=1080710&r1=1080709&r2=1080710&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java (original)
+++ cassandra/branches/cassandra-0.7/contrib/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java Fri Mar 11 18:22:00 2011
@@ -59,9 +59,9 @@ public abstract class Operation
* Generate values of average size specified by -S, up to cardinality specified by -C
* @return Collection of the values
*/
- protected List<String> generateValues()
+ protected List<ByteBuffer> generateValues()
{
- List<String> values = new ArrayList<String>();
+ List<ByteBuffer> values = new ArrayList<ByteBuffer>();
int limit = 2 * session.getColumnSize();
@@ -69,8 +69,7 @@ public abstract class Operation
{
byte[] value = new byte[Stress.randomizer.nextInt(limit)];
Stress.randomizer.nextBytes(value);
-
- values.add(FBUtilities.bytesToHex(value));
+ values.add(ByteBuffer.wrap(value));
}
return values;
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1080710&r1=1080709&r2=1080710&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/CFMetaData.java Fri Mar 11 18:22:00 2011
@@ -270,10 +270,10 @@ public final class CFMetaData
column_metadata);
}
- public static CFMetaData newIndexMetadata(String table, String parentCf, ColumnDefinition info, AbstractType columnComparator)
+ public static CFMetaData newIndexMetadata(CFMetaData parent, ColumnDefinition info, AbstractType columnComparator)
{
- return new CFMetaData(table,
- indexName(parentCf, info),
+ return new CFMetaData(parent.tableName,
+ indexName(parent.cfName, info),
ColumnFamilyType.Standard,
columnComparator,
null,
@@ -281,15 +281,15 @@ public final class CFMetaData
0,
0,
0,
- DEFAULT_GC_GRACE_SECONDS,
+ parent.gcGraceSeconds,
BytesType.instance,
- DEFAULT_MIN_COMPACTION_THRESHOLD,
- DEFAULT_MAX_COMPACTION_THRESHOLD,
- DEFAULT_ROW_CACHE_SAVE_PERIOD_IN_SECONDS,
- DEFAULT_KEY_CACHE_SAVE_PERIOD_IN_SECONDS,
- DEFAULT_MEMTABLE_LIFETIME_IN_MINS,
- DEFAULT_MEMTABLE_THROUGHPUT_IN_MB,
- DEFAULT_MEMTABLE_OPERATIONS_IN_MILLIONS,
+ parent.minCompactionThreshold,
+ parent.maxCompactionThreshold,
+ 0,
+ 0,
+ parent.memtableFlushAfterMins,
+ parent.memtableThroughputInMb,
+ parent.memtableOperationsInMillions,
Collections.<ByteBuffer, ColumnDefinition>emptyMap());
}
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1080710&r1=1080709&r2=1080710&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri Mar 11 18:22:00 2011
@@ -313,7 +313,7 @@ public class ColumnFamilyStore implement
AbstractType columnComparator = (rowPartitioner instanceof OrderPreservingPartitioner || rowPartitioner instanceof ByteOrderedPartitioner)
? BytesType.instance
: new LocalByPartionerType(StorageService.getPartitioner());
- final CFMetaData indexedCfMetadata = CFMetaData.newIndexMetadata(table.name, columnFamily, info, columnComparator);
+ final CFMetaData indexedCfMetadata = CFMetaData.newIndexMetadata(metadata, info, columnComparator);
ColumnFamilyStore indexedCfs = ColumnFamilyStore.createColumnFamilyStore(table,
indexedCfMetadata.cfName,
new LocalPartitioner(metadata.getColumn_metadata().get(info.name).validator),