You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/05/16 03:08:22 UTC
git commit: inline some synonyms of timestamp that no longer make
sense as distinct concepts post-supercolumns
Updated Branches:
refs/heads/trunk 42a39b5d6 -> ad191c55d
inline some synonyms of timestamp that no longer make sense as distinct concepts post-supercolumns
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ad191c55
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad191c55
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad191c55
Branch: refs/heads/trunk
Commit: ad191c55d207e4c2f5fc683133fbbfd966eeb905
Parents: 42a39b5
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 15 20:06:24 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 15 20:06:24 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/Column.java | 10 ----------
src/java/org/apache/cassandra/db/DeletionInfo.java | 3 +--
.../apache/cassandra/db/filter/QueryFilter.java | 5 +----
3 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad191c55/src/java/org/apache/cassandra/db/Column.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Column.java b/src/java/org/apache/cassandra/db/Column.java
index a8c1f94..b42097c 100644
--- a/src/java/org/apache/cassandra/db/Column.java
+++ b/src/java/org/apache/cassandra/db/Column.java
@@ -153,16 +153,6 @@ public class Column implements OnDiskAtom
throw new IllegalStateException("column is not marked for delete");
}
- public long mostRecentLiveChangeAt()
- {
- return timestamp;
- }
-
- public long mostRecentNonGCableChangeAt(int gcbefore)
- {
- return timestamp;
- }
-
public int dataSize()
{
return name().remaining() + value.remaining() + TypeSizes.NATIVE.sizeof(timestamp);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad191c55/src/java/org/apache/cassandra/db/DeletionInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java b/src/java/org/apache/cassandra/db/DeletionInfo.java
index cdb2dde..53937c0 100644
--- a/src/java/org/apache/cassandra/db/DeletionInfo.java
+++ b/src/java/org/apache/cassandra/db/DeletionInfo.java
@@ -32,7 +32,6 @@ import org.apache.cassandra.io.ISSTableSerializer;
import org.apache.cassandra.io.ISerializer;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.sstable.Descriptor;
-import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.IntervalTree;
@@ -100,7 +99,7 @@ public class DeletionInfo
*/
public boolean isDeleted(Column column)
{
- return isDeleted(column.name(), column.mostRecentLiveChangeAt());
+ return isDeleted(column.name(), column.timestamp());
}
public boolean isDeleted(ByteBuffer name, long timestamp)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad191c55/src/java/org/apache/cassandra/db/filter/QueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/QueryFilter.java b/src/java/org/apache/cassandra/db/filter/QueryFilter.java
index 6e30c17..e65e85a 100644
--- a/src/java/org/apache/cassandra/db/filter/QueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/QueryFilter.java
@@ -17,17 +17,14 @@
*/
package org.apache.cassandra.db.filter;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.*;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
-import org.apache.cassandra.db.columniterator.OnDiskAtomIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.FileDataInput;
-import org.apache.cassandra.utils.CloseableIterator;
import org.apache.cassandra.utils.MergeIterator;
public class QueryFilter
@@ -175,7 +172,7 @@ public class QueryFilter
// the column itself must be not gc-able (it is live, or a still relevant tombstone, or has live subcolumns), (1)
// and if its container is deleted, the column must be changed more recently than the container tombstone (2)
// (since otherwise, the only thing repair cares about is the container tombstone)
- long maxChange = column.mostRecentNonGCableChangeAt(gcBefore);
+ long maxChange = column.timestamp();
return (column.getLocalDeletionTime() >= gcBefore || maxChange > column.getMarkedForDeleteAt()) // (1)
&& (!container.deletionInfo().isDeleted(column.name(), maxChange)); // (2)
}