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

Merge branch 'cassandra-2.0' into cassandra-2.1 

Conflicts:
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
This commit is contained in:
Yuki Morishita 2014-11-04 13:41:18 -06:00
parent 2d4a305c5e 7bfb34714a
commit c816a7a49e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
View File

@ -1853,7 +1853,16 @@ public class ColumnFamilyStoreTest extends SchemaLoader
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();