Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5983ce26 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5983ce26 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5983ce26 Branch: refs/heads/cassandra-3.0 Commit: 5983ce262f991bb6e86acd97f6b360f62cf6d357 Parents: d234468 8a112ca Author: Robert Stupp <sn...@snazy.de> Authored: Wed Jan 4 13:32:47 2017 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Wed Jan 4 13:32:47 2017 +0100 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/RowCacheTest.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5983ce26/test/unit/org/apache/cassandra/db/RowCacheTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/RowCacheTest.java index cff574a,332714fb..06aed47 --- a/test/unit/org/apache/cassandra/db/RowCacheTest.java +++ b/test/unit/org/apache/cassandra/db/RowCacheTest.java @@@ -64,14 -62,16 +64,15 @@@ public class RowCacheTes @BeforeClass public static void defineSchema() throws ConfigurationException { + System.setProperty("org.caffinitas.ohc.segmentCount", "16"); SchemaLoader.prepareServer(); SchemaLoader.createKeyspace(KEYSPACE_CACHED, - SimpleStrategy.class, - KSMetaData.optsWithRF(1), - SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingOptions.ALL), - SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT) - .defaultValidator(IntegerType.instance) - .caching(new CachingOptions(new CachingOptions.KeyCache(CachingOptions.KeyCache.Type.ALL), - new CachingOptions.RowCache(CachingOptions.RowCache.Type.HEAD, 100)))); + KeyspaceParams.simple(1), + SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDNOCLUSTER, 1, AsciiType.instance, AsciiType.instance, null) + .caching(new CachingParams(true, 100)), + SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHED).caching(CachingParams.CACHE_EVERYTHING), + SchemaLoader.standardCFMD(KEYSPACE_CACHED, CF_CACHEDINT, 1, IntegerType.instance) + .caching(new CachingParams(true, 100))); } @AfterClass
