Updated Branches: refs/heads/trunk a751d04d7 -> 162675983
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16267598 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16267598 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16267598 Branch: refs/heads/trunk Commit: 162675983c0a41edd29220e6cbc061f04830142b Parents: a751d04 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 9 17:00:37 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 9 17:00:37 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/index/SecondaryIndexManager.java | 9 ++++-- .../db/index/PerRowSecondaryIndexTest.java | 24 +++++++------- 2 files changed, 18 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/16267598/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java index 6859c81..f949823 100644 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java @@ -608,9 +608,12 @@ public class SecondaryIndexManager { for (SecondaryIndex index : indexFor(column.name())) { - ((PerColumnSecondaryIndex) index).delete(key.key, oldColumn); - if (!column.isMarkedForDelete()) - ((PerColumnSecondaryIndex) index).insert(key.key, column); + if (index instanceof PerColumnSecondaryIndex) + { + ((PerColumnSecondaryIndex) index).delete(key.key, oldColumn); + if (!column.isMarkedForDelete()) + ((PerColumnSecondaryIndex) index).insert(key.key, column); + } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/16267598/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java index a4f97fe..44bf6a1 100644 --- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java @@ -18,6 +18,14 @@ package org.apache.cassandra.db.index; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.util.Arrays; +import java.util.Set; + +import org.junit.Before; +import org.junit.Test; + import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; @@ -25,14 +33,6 @@ import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.utils.ByteBufferUtil; -import org.junit.Before; -import org.junit.Test; - -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.Set; - import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -82,13 +82,13 @@ public class PerRowSecondaryIndexTest extends SchemaLoader // issue a column delete and test that the configured index instance was notified to update RowMutation rm; rm = new RowMutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k2")); - rm.delete(new QueryPath("Indexed1", null, ByteBufferUtil.bytes("indexed")), 1); + rm.delete("Indexed1", ByteBufferUtil.bytes("indexed"), 1); rm.apply(); ColumnFamily indexedRow = TestIndex.LAST_INDEXED_ROW; assertNotNull(indexedRow); - for (IColumn column : indexedRow.getSortedColumns()) + for (Column column : indexedRow.getSortedColumns()) { assertTrue(column.isMarkedForDelete()); } @@ -101,12 +101,12 @@ public class PerRowSecondaryIndexTest extends SchemaLoader // issue a row level delete and test that the configured index instance was notified to update RowMutation rm; rm = new RowMutation("PerRowSecondaryIndex", ByteBufferUtil.bytes("k3")); - rm.delete(new QueryPath("Indexed1"), 1); + rm.delete("Indexed1", 1); rm.apply(); ColumnFamily indexedRow = TestIndex.LAST_INDEXED_ROW; assertNotNull(indexedRow); - for (IColumn column : indexedRow.getSortedColumns()) + for (Column column : indexedRow.getSortedColumns()) { assertTrue(column.isMarkedForDelete()); }
