You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/07/31 07:50:03 UTC
[5/7] git commit: fix merge
fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cde56662
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cde56662
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cde56662
Branch: refs/heads/trunk
Commit: cde5666290a89fcfff0c6a4bf2a421caa615de36
Parents: c4d23e1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 31 07:46:10 2014 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jul 31 07:46:10 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/ColumnFamily.java | 4 ++--
.../org/apache/cassandra/db/compaction/LazilyCompactedRow.java | 4 ++--
src/java/org/apache/cassandra/io/sstable/SSTableWriter.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java
index cf47508..cd96785 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@ -411,8 +411,8 @@ public abstract class ColumnFamily implements Iterable<Cell>, IRowCacheEntry
{
RangeTombstone rangeTombstone = it.next();
tombstones.update(rangeTombstone.getLocalDeletionTime());
- minTimestampSeen = Math.min(minTimestampSeen, rangeTombstone.minTimestamp());
- maxTimestampSeen = Math.max(maxTimestampSeen, rangeTombstone.maxTimestamp());
+ minTimestampSeen = Math.min(minTimestampSeen, rangeTombstone.timestamp());
+ maxTimestampSeen = Math.max(maxTimestampSeen, rangeTombstone.timestamp());
minColumnNamesSeen = ColumnNameHelper.minComponents(minColumnNamesSeen, rangeTombstone.min, metadata.comparator);
maxColumnNamesSeen = ColumnNameHelper.maxComponents(maxColumnNamesSeen, rangeTombstone.max, metadata.comparator);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
index e922492..7d6f872 100644
--- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@ -245,8 +245,8 @@ public class LazilyCompactedRow extends AbstractCompactedRow
else
{
tombstones.update(t.getLocalDeletionTime());
- minTimestampSeen = Math.min(minTimestampSeen, t.minTimestamp());
- maxTimestampSeen = Math.max(maxTimestampSeen, t.maxTimestamp());
+ minTimestampSeen = Math.min(minTimestampSeen, t.timestamp());
+ maxTimestampSeen = Math.max(maxTimestampSeen, t.timestamp());
minColumnNameSeen = ColumnNameHelper.minComponents(minColumnNameSeen, t.min, controller.cfs.metadata.comparator);
maxColumnNameSeen = ColumnNameHelper.maxComponents(maxColumnNameSeen, t.max, controller.cfs.metadata.comparator);
return t;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cde56662/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index 20df91b..bfb2445 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -266,8 +266,8 @@ public class SSTableWriter extends SSTable
{
RangeTombstone rangeTombstone = rangeTombstoneIterator.next();
tombstones.update(rangeTombstone.getLocalDeletionTime());
- minTimestamp = Math.min(minTimestamp, rangeTombstone.minTimestamp());
- maxTimestamp = Math.max(maxTimestamp, rangeTombstone.maxTimestamp());
+ minTimestamp = Math.min(minTimestamp, rangeTombstone.timestamp());
+ maxTimestamp = Math.max(maxTimestamp, rangeTombstone.timestamp());
minColumnNames = ColumnNameHelper.minComponents(minColumnNames, rangeTombstone.min, metadata.comparator);
maxColumnNames = ColumnNameHelper.maxComponents(maxColumnNames, rangeTombstone.max, metadata.comparator);