svn commit: r1137701 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java

[jb...@apache.org]

Author: jbellis
Date: Mon Jun 20 16:58:46 2011
New Revision: 1137701

URL: http://svn.apache.org/viewvc?rev=1137701&view=rev
Log:
revert unreviewed code

Modified:
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java?rev=1137701&r1=1137700&r2=1137701&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java Mon Jun 20 16:58:46 2011
@@ -489,16 +489,7 @@ public class Table
             ByteBuffer name = iter.next();
             IColumn newColumn = cf.getColumn(name); // null == row delete or it wouldn't be marked Mutated
             if (newColumn != null && cf.isMarkedForDelete())
-            {
-                // row is marked for delete, but column was also updated.  if column is timestamped less than
-                // the row tombstone, treat it as if it didn't exist.  Otherwise we don't care about row
-                // tombstone for the purpose of the index update and we can proceed as usual.
-                if (newColumn.timestamp() <= cf.getMarkedForDeleteAt())
-                {
-                    // don't remove from the cf object; that can race w/ CommitLog write.  Leaving it is harmless.
-                    newColumn = null;
-                }
-            }
+                throw new UnsupportedOperationException("Index manager cannot support deleting and inserting into a row in the same mutation");
             IColumn oldColumn = oldIndexedColumns.getColumn(name);
 
             // deletions are irrelevant to the index unless we're changing state from live -> deleted, i.e.,