Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Yuki Morishita 2014-11-04 13:41:24 -06:00
commit bd32104ec2
1 changed files with 10 additions and 1 deletions

View File

@ -1894,7 +1894,16 @@ public class ColumnFamilyStoreTest
ByteBuffer key = bytes("key");
SSTableSimpleWriter writer = new SSTableSimpleWriter(dir.getDirectoryForNewSSTables(),
cfmeta, StorageService.getPartitioner());
cfmeta, StorageService.getPartitioner())
{
@Override
protected SSTableWriter getWriter()
{
// hack for reset generation
generation.set(0);
return super.getWriter();
}
};
writer.newRow(key);
writer.addColumn(bytes("col"), bytes("val"), 1);
writer.close();