Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2499baeb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2499baeb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2499baeb Branch: refs/heads/trunk Commit: 2499baeb3c0e3965a52e334e7cbbcfb64640bd47 Parents: aedce5f 8c5ce66 Author: Benedict Elliott Smith <[email protected]> Authored: Thu May 7 11:58:04 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu May 7 11:58:04 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/db/index/SecondaryIndex.java | 13 ++++++++++++ .../db/index/SecondaryIndexManager.java | 4 ++-- .../cassandra/db/ColumnFamilyStoreTest.java | 21 +++++++++----------- .../db/index/PerRowSecondaryIndexTest.java | 20 +++++++++++++------ 5 files changed, 40 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2499baeb/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2499baeb/src/java/org/apache/cassandra/db/index/SecondaryIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2499baeb/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2499baeb/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index 349edbe,5faab78..60fb195 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@@ -2257,27 -2171,24 +2257,24 @@@ public class ColumnFamilyStoreTes CellName indexedCellName = cellname("indexed"); Mutation rm; - rm = new Mutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k1")); + rm = new Mutation(KEYSPACE4, ByteBufferUtil.bytes("k1")); rm.add("Indexed1", indexedCellName, ByteBufferUtil.bytes("foo"), 1); + rm.apply(); assertTrue(Arrays.equals("k1".getBytes(), PerRowSecondaryIndexTest.TestIndex.LAST_INDEXED_KEY.array())); - - ColumnFamilyStore cfs = Keyspace.open("PerRowSecondaryIndex").getColumnFamilyStore("Indexed1"); - cfs.forceBlockingFlush(); - + + Keyspace.open("PerRowSecondaryIndex").getColumnFamilyStore("Indexed1").forceBlockingFlush(); + PerRowSecondaryIndexTest.TestIndex.reset(); - + ColumnFamilyStore.rebuildSecondaryIndex("PerRowSecondaryIndex", "Indexed1", PerRowSecondaryIndexTest.TestIndex.class.getSimpleName()); assertTrue(Arrays.equals("k1".getBytes(), PerRowSecondaryIndexTest.TestIndex.LAST_INDEXED_KEY.array())); - + PerRowSecondaryIndexTest.TestIndex.reset(); - - ColumnDefinition indexedColumnDef = cfs.metadata.getColumnDefinition(indexedCellName); - cfs.indexManager.getIndexForColumn(indexedColumnDef.name.bytes).getColumnDefs().remove(indexedColumnDef); - + PerRowSecondaryIndexTest.TestIndex.ACTIVE = false; ColumnFamilyStore.rebuildSecondaryIndex("PerRowSecondaryIndex", "Indexed1", PerRowSecondaryIndexTest.TestIndex.class.getSimpleName()); assertNull(PerRowSecondaryIndexTest.TestIndex.LAST_INDEXED_KEY); - + PerRowSecondaryIndexTest.TestIndex.reset(); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/2499baeb/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java ----------------------------------------------------------------------
