Merge fixup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3573faf4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3573faf4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3573faf4
Branch: refs/heads/cassandra-3.0
Commit: 3573faf49e356a0530cac9f0a8ec02297011fe15
Parents: 757dac9
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Oct 9 14:49:34 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Oct 9 14:49:34 2015 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/KeyCacheTest.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3573faf4/test/unit/org/apache/cassandra/db/KeyCacheTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/KeyCacheTest.java b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
index 9a98bde..c8caff9 100644
--- a/test/unit/org/apache/cassandra/db/KeyCacheTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCacheTest.java
@@ -66,7 +66,8 @@ public class KeyCacheTest
SimpleStrategy.class,
KSMetaData.optsWithRF(1),
SchemaLoader.standardCFMD(KEYSPACE1, COLUMN_FAMILY1),
- SchemaLoader.standardCFMD(KEYSPACE1, COLUMN_FAMILY2));
+ SchemaLoader.standardCFMD(KEYSPACE1, COLUMN_FAMILY2),
+ SchemaLoader.standardCFMD(KEYSPACE1, COLUMN_FAMILY3));
}
@AfterClass
@@ -139,21 +140,21 @@ public class KeyCacheTest
assertKeyCacheSize(0, KEYSPACE1, COLUMN_FAMILY3);
// insert data and force to disk
- insertData(KEYSPACE1, COLUMN_FAMILY3, 0, 100);
+ SchemaLoader.insertData(KEYSPACE1, COLUMN_FAMILY3, 0, 100);
store.forceBlockingFlush();
Collection<SSTableReader> firstFlushTables = ImmutableList.copyOf(store.getSSTables());
// populate the cache
- readData(KEYSPACE1, COLUMN_FAMILY3, 0, 100);
+ SchemaLoader.readData(KEYSPACE1, COLUMN_FAMILY3, 0, 100);
assertKeyCacheSize(100, KEYSPACE1, COLUMN_FAMILY3);
// insert some new data and force to disk
- insertData(KEYSPACE1, COLUMN_FAMILY3, 100, 50);
+ SchemaLoader.insertData(KEYSPACE1, COLUMN_FAMILY3, 100, 50);
store.forceBlockingFlush();
// check that it's fine
- readData(KEYSPACE1, COLUMN_FAMILY3, 100, 50);
+ SchemaLoader.readData(KEYSPACE1, COLUMN_FAMILY3, 100, 50);
assertKeyCacheSize(150, KEYSPACE1, COLUMN_FAMILY3);
// force the cache to disk
|