Repository: cassandra Updated Branches: refs/heads/trunk a4221b721 -> 7376f42fc
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7376f42f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7376f42f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7376f42f Branch: refs/heads/trunk Commit: 7376f42fc183bde6a03f1d94e04556d90ef6e525 Parents: a4221b7 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Wed Mar 4 17:08:16 2015 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Wed Mar 4 17:08:16 2015 +0000 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/SchemaLoader.java | 3 --- .../cassandra/io/sstable/IndexSummaryManagerTest.java | 14 ++++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7376f42f/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index dfef545..3a2725e 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -178,9 +178,6 @@ public class SchemaLoader standardCFMD(ks1, "StandardLowIndexInterval").minIndexInterval(8) .maxIndexInterval(256) .caching(CachingOptions.NONE), - standardCFMD(ks1, "StandardRace").minIndexInterval(8) - .maxIndexInterval(256) - .caching(CachingOptions.NONE), standardCFMD(ks1, "UUIDKeys").keyValidator(UUIDType.instance), CFMetaData.denseCFMetaData(ks1, "MixedTypes", LongType.instance).keyValidator(UUIDType.instance).defaultValidator(BooleanType.instance), CFMetaData.denseCFMetaData(ks1, "MixedTypesComposite", composite).keyValidator(composite).defaultValidator(BooleanType.instance), http://git-wip-us.apache.org/repos/asf/cassandra/blob/7376f42f/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java index ecbbd76..87486ca 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryManagerTest.java @@ -58,7 +58,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @RunWith(OrderedJUnit4ClassRunner.class) -public class IndexSummaryManagerTest extends SchemaLoader +public class IndexSummaryManagerTest { private static final Logger logger = LoggerFactory.getLogger(IndexSummaryManagerTest.class); @@ -69,6 +69,7 @@ public class IndexSummaryManagerTest extends SchemaLoader private static final String KEYSPACE1 = "IndexSummaryManagerTest"; // index interval of 8, no key caching private static final String CF_STANDARDLOWiINTERVAL = "StandardLowIndexInterval"; + private static final String CF_STANDARDRACE = "StandardRace"; @BeforeClass public static void defineSchema() throws ConfigurationException @@ -80,7 +81,12 @@ public class IndexSummaryManagerTest extends SchemaLoader SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLOWiINTERVAL) .minIndexInterval(8) .maxIndexInterval(256) - .caching(CachingOptions.NONE)); + .caching(CachingOptions.NONE), + SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDRACE) + .minIndexInterval(8) + .maxIndexInterval(256) + .caching(CachingOptions.NONE) + ); } @Before @@ -527,8 +533,8 @@ public class IndexSummaryManagerTest extends SchemaLoader @Test public void testCompactionRace() throws InterruptedException, ExecutionException { - String ksname = "Keyspace1"; - String cfname = "StandardRace"; // index interval of 8, no key caching + String ksname = KEYSPACE1; + String cfname = CF_STANDARDRACE; // index interval of 8, no key caching Keyspace keyspace = Keyspace.open(ksname); ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname); int numSSTables = 20;
