Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 415D79AD9 for ; Fri, 21 Oct 2011 17:34:26 +0000 (UTC) Received: (qmail 32575 invoked by uid 500); 21 Oct 2011 17:34:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 32536 invoked by uid 500); 21 Oct 2011 17:34:26 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 32528 invoked by uid 99); 21 Oct 2011 17:34:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Oct 2011 17:34:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Fri, 21 Oct 2011 17:34:23 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AF0E623889DA for ; Fri, 21 Oct 2011 17:34:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1187477 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Date: Fri, 21 Oct 2011 17:34:02 -0000 To: commits@cassandra.apache.org From: slebresne@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111021173402.AF0E623889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: slebresne Date: Fri Oct 21 17:34:02 2011 New Revision: 1187477 URL: http://svn.apache.org/viewvc?rev=1187477&view=rev Log: Don't expire counter tombstones after streaming patch by slebresne; reviewed by jbellis for CASSANDRA-3394 Modified: cassandra/branches/cassandra-0.8/CHANGES.txt cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Modified: cassandra/branches/cassandra-0.8/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1187477&r1=1187476&r2=1187477&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Fri Oct 21 17:34:02 2011 @@ -28,6 +28,7 @@ * avoid locking on update when no indexes are involved (CASSANDRA-3386) * fix assertionError during repair with ordered partitioners (CASSANDRA-3369) * correctly serialize key_validation_class for avro (CASSANDRA-3391) + * don't expire counter tombstone after streaming (CASSANDRA-3394) 0.8.7 Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1187477&r1=1187476&r2=1187477&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Fri Oct 21 17:34:02 2011 @@ -491,7 +491,7 @@ public class SSTableWriter extends SSTab long rows = 0L; DecoratedKey key; - CompactionController controller = new CompactionController(cfs, Collections.emptyList(), Integer.MAX_VALUE, true); + CompactionController controller = new CompactionController(cfs, Collections.emptyList(), Integer.MIN_VALUE, true); while (!dfile.isEOF()) { // read key @@ -502,6 +502,9 @@ public class SSTableWriter extends SSTab SSTableIdentityIterator iter = new SSTableIdentityIterator(cfs.metadata, dfile, key, dfile.getFilePointer(), dataSize, true); AbstractCompactedRow row = controller.getCompactedRow(iter); + // We don't remove any tombstone, so we can't have an empty row here + assert !row.isEmpty(); + updateCache(key, dataSize, row); rowSizes.add(dataSize);