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/06/20 21:09:52 UTC
git commit: fix Upgrader for 2.0
Updated Branches:
refs/heads/trunk 1f061f949 -> 24da2bcc5
fix Upgrader for 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24da2bcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24da2bcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24da2bcc
Branch: refs/heads/trunk
Commit: 24da2bcc5d74dfe02ad0148eafc9e22368be34f5
Parents: 1f061f9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Jun 20 14:09:47 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Jun 20 14:09:47 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/Upgrader.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/24da2bcc/src/java/org/apache/cassandra/db/compaction/Upgrader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/Upgrader.java b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
index e7211ba..17b68ec 100644
--- a/src/java/org/apache/cassandra/db/compaction/Upgrader.java
+++ b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
@@ -69,14 +69,14 @@ public class Upgrader
this.controller = new UpgradeController(cfs);
this.strategy = cfs.getCompactionStrategy();
- long estimatedTotalKeys = Math.max(DatabaseDescriptor.getIndexInterval(), SSTableReader.getApproximateKeyCount(toUpgrade));
+ long estimatedTotalKeys = Math.max(cfs.metadata.getIndexInterval(), SSTableReader.getApproximateKeyCount(toUpgrade, cfs.metadata));
long estimatedSSTables = Math.max(1, SSTable.getTotalBytes(this.toUpgrade) / strategy.getMaxSSTableSize());
this.estimatedRows = (long) Math.ceil((double) estimatedTotalKeys / estimatedSSTables);
}
private SSTableWriter createCompactionWriter()
{
- SSTableMetadata.Collector sstableMetadataCollector = SSTableMetadata.createCollector();
+ SSTableMetadata.Collector sstableMetadataCollector = SSTableMetadata.createCollector(cfs.getComparator());
// Get the max timestamp of the precompacted sstables
// and adds generation of live ancestors
@@ -130,7 +130,7 @@ public class Upgrader
// also remove already completed SSTables
for (SSTableReader sstable : sstables)
{
- sstable.markCompacted();
+ sstable.markObsolete();
sstable.releaseReference();
}
throw Throwables.propagate(t);