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 0A2BA10B80 for ; Thu, 21 Nov 2013 21:14:29 +0000 (UTC) Received: (qmail 71436 invoked by uid 500); 21 Nov 2013 21:14:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71358 invoked by uid 500); 21 Nov 2013 21:14:28 -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 71333 invoked by uid 99); 21 Nov 2013 21:14:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Nov 2013 21:14:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4F69589BED4; Thu, 21 Nov 2013 21:14:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Thu, 21 Nov 2013 21:14:29 -0000 Message-Id: In-Reply-To: <625676299f7143ac821f665befc9e667@git.apache.org> References: <625676299f7143ac821f665befc9e667@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: fix attempting to flush empty rows patch by jbellis; reviewed by jasobrown for CASSANDRA-6374 fix attempting to flush empty rows patch by jbellis; reviewed by jasobrown for CASSANDRA-6374 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ca459d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ca459d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ca459d1 Branch: refs/heads/trunk Commit: 1ca459d1461cabf1bb3b3df7aa8526415b666b67 Parents: 0d8ea04 Author: Jonathan Ellis Authored: Thu Nov 21 15:14:18 2013 -0600 Committer: Jonathan Ellis Committed: Thu Nov 21 15:14:18 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Memtable.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ca459d1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8cc61ad..24d14ee 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,6 @@ 2.0.4 * remove RF from nodetool ring output (CASSANDRA-6289) + * fix attempting to flush empty rows (CASSANDRA-6374) 2.0.3 http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ca459d1/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index 456221a..1ca7e39 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -362,7 +362,9 @@ public class Memtable if (!cfs.indexManager.hasIndexes()) currentSize.addAndGet(-ColumnFamilyStore.removeDeletedColumnsOnly(cf, Integer.MIN_VALUE)); } - writer.append((DecoratedKey)entry.getKey(), cf); + + if (cf.getColumnCount() > 0 || cf.isMarkedForDelete()) + writer.append((DecoratedKey)entry.getKey(), cf); } if (writer.getFilePointer() > 0)