Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 79535 invoked from network); 16 Apr 2009 02:09:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Apr 2009 02:09:48 -0000 Received: (qmail 46567 invoked by uid 500); 16 Apr 2009 02:09:48 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 46540 invoked by uid 500); 16 Apr 2009 02:09:48 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 46530 invoked by uid 99); 16 Apr 2009 02:09:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2009 02:09:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Apr 2009 02:09:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3C85B23889E9; Thu, 16 Apr 2009 02:09:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r765451 - /incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java Date: Thu, 16 Apr 2009 02:09:25 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090416020925.3C85B23889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Thu Apr 16 02:09:24 2009 New Revision: 765451 URL: http://svn.apache.org/viewvc?rev=765451&view=rev Log: generate supercolumn tombstone when a 2-tuple delete is passed to a super CF. patch by jbellis; reviewed by Sandeep Tata for #84 Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java?rev=765451&r1=765450&r2=765451&view=diff ============================================================================== --- incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java (original) +++ incubator/cassandra/trunk/src/org/apache/cassandra/db/RowMutation.java Thu Apr 16 02:09:24 2009 @@ -42,6 +42,7 @@ import org.apache.cassandra.service.column_t; import org.apache.cassandra.service.superColumn_t; import org.apache.cassandra.utils.FBUtilities; +import org.apache.cassandra.config.DatabaseDescriptor; /** @@ -187,7 +188,16 @@ columnFamily = new ColumnFamily(cfName); if (values.length == 2) { - columnFamily.addColumn(values[1], ArrayUtils.EMPTY_BYTE_ARRAY, timestamp, true); + if (DatabaseDescriptor.getColumnFamilyType(cfName).equals("Standard")) + { + columnFamily.addColumn(values[1], ArrayUtils.EMPTY_BYTE_ARRAY, timestamp, true); + } + else + { + SuperColumn sc = new SuperColumn(values[1]); + sc.markForDeleteAt(timestamp); + columnFamily.addColumn(sc); + } } else if (values.length == 3) {