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 38E2E18DCD for ; Wed, 12 Aug 2015 12:56:47 +0000 (UTC) Received: (qmail 22079 invoked by uid 500); 12 Aug 2015 12:55:43 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 21975 invoked by uid 500); 12 Aug 2015 12:55:43 -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 21777 invoked by uid 99); 12 Aug 2015 12:55:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Aug 2015 12:55:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5D982E00CC; Wed, 12 Aug 2015 12:55:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Wed, 12 Aug 2015 12:55:44 -0000 Message-Id: <5425b9459cee41a289521b4714d352e2@git.apache.org> In-Reply-To: <851f6240501544d493c35a5cfc5da5cc@git.apache.org> References: <851f6240501544d493c35a5cfc5da5cc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Remove default method AbstractRow.isEmpty Remove default method AbstractRow.isEmpty Replacing it with one more efficient concrete implementation in BTreeRow patch by benedict; reviewed by snazy for CASSANDRA-9926 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0be8cb66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0be8cb66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0be8cb66 Branch: refs/heads/trunk Commit: 0be8cb665248982ea9a1f773d845cea926dd683f Parents: 4623aa6 Author: Benedict Elliott Smith Authored: Tue Aug 4 08:24:20 2015 +0100 Committer: Benedict Elliott Smith Committed: Wed Aug 12 14:55:00 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/rows/AbstractRow.java | 7 ------- src/java/org/apache/cassandra/db/rows/BTreeBackedRow.java | 9 +++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0be8cb66/src/java/org/apache/cassandra/db/rows/AbstractRow.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/AbstractRow.java b/src/java/org/apache/cassandra/db/rows/AbstractRow.java index 807d805..6090274 100644 --- a/src/java/org/apache/cassandra/db/rows/AbstractRow.java +++ b/src/java/org/apache/cassandra/db/rows/AbstractRow.java @@ -49,13 +49,6 @@ public abstract class AbstractRow implements Row return Iterables.any(cells(), cell -> cell.isLive(nowInSec)); } - public boolean isEmpty() - { - return primaryKeyLivenessInfo().isEmpty() - && deletion().isLive() - && !iterator().hasNext(); - } - public boolean isStatic() { return clustering() == Clustering.STATIC_CLUSTERING; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0be8cb66/src/java/org/apache/cassandra/db/rows/BTreeBackedRow.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/BTreeBackedRow.java b/src/java/org/apache/cassandra/db/rows/BTreeBackedRow.java index 2e0d320..548fb82 100644 --- a/src/java/org/apache/cassandra/db/rows/BTreeBackedRow.java +++ b/src/java/org/apache/cassandra/db/rows/BTreeBackedRow.java @@ -42,8 +42,6 @@ import org.apache.cassandra.utils.btree.UpdateFunction; */ public class BTreeBackedRow extends AbstractRow { - private static final ColumnData[] NO_DATA = new ColumnData[0]; - private static final long EMPTY_SIZE = ObjectSizes.measure(emptyRow(Clustering.EMPTY)); private final Clustering clustering; @@ -171,6 +169,13 @@ public class BTreeBackedRow extends AbstractRow return primaryKeyLivenessInfo; } + public boolean isEmpty() + { + return primaryKeyLivenessInfo().isEmpty() + && deletion().isLive() + && BTree.isEmpty(btree); + } + public DeletionTime deletion() { return deletion;