You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/09/04 06:45:08 UTC
[1/2] git commit: Do less work when there are no dropped columns
present
Updated Branches:
refs/heads/trunk 2495c5f78 -> 67ea099f2
Do less work when there are no dropped columns present
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1595b21
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1595b21
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1595b21
Branch: refs/heads/trunk
Commit: d1595b2175f09d69400c4287994845412f8a8e87
Parents: 3b49849
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Sep 4 07:43:49 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Sep 4 07:43:49 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1595b21/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 0cd4ef4..4f2d223 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -890,6 +890,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
Iterator<Column> iter = cf.iterator();
DeletionInfo.InOrderTester tester = cf.inOrderDeletionTester();
+ boolean hasDroppedColumns = !cf.metadata.getDroppedColumns().isEmpty();
while (iter.hasNext())
{
Column c = iter.next();
@@ -897,7 +898,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
// (a) the column itself is gcable or
// (b) the column is shadowed by a CF tombstone
// (c) the column has been dropped from the CF schema (CQL3 tables only)
- if (c.getLocalDeletionTime() < gcBefore || tester.isDeleted(c) || isDroppedColumn(c, cf.metadata()))
+ if (c.getLocalDeletionTime() < gcBefore || tester.isDeleted(c) || (hasDroppedColumns && isDroppedColumn(c, cf.metadata())))
{
iter.remove();
indexer.remove(c);
@@ -915,15 +916,13 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
// 2. if it has been re-added since then, this particular column was inserted before the last drop
private static boolean isDroppedColumn(Column c, CFMetaData meta)
{
- if (meta.getDroppedColumns().isEmpty())
- return false;
Long droppedAt = meta.getDroppedColumns().get(((CompositeType) meta.comparator).extractLastComponent(c.name()));
return droppedAt != null && c.timestamp() <= droppedAt;
}
private void removeDroppedColumns(ColumnFamily cf)
{
- if (cf == null)
+ if (cf == null || cf.metadata.getDroppedColumns().isEmpty())
return;
Iterator<Column> iter = cf.iterator();
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67ea099f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67ea099f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/67ea099f
Branch: refs/heads/trunk
Commit: 67ea099f20d0ee5cde58c9948c582b08842bf1a1
Parents: 2495c5f d1595b2
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Sep 4 07:44:56 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Sep 4 07:44:56 2013 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/67ea099f/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------