cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Mon, 21 Oct 2013 22:55:34 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7ec65f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7ec65f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7ec65f6

Branch: refs/heads/cassandra-2.0
Commit: e7ec65f6625357302ef09f3f940aef12dcab7faa
Parents: c4c8bca a9b403e
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Mon Oct 21 18:55:04 2013 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Mon Oct 21 18:55:04 2013 -0400

----------------------------------------------------------------------
 .../org/apache/cassandra/db/compaction/CompactionManager.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7ec65f6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index bcf9422,d26a072..310ddfb
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -548,14 -573,16 +548,13 @@@ public class CompactionManager implemen
  
              long totalkeysWritten = 0;
  
 -            int expectedBloomFilterSize = Math.max(DatabaseDescriptor.getIndexInterval(),
 -                                                   (int)(SSTableReader.getApproximateKeyCount(Arrays.asList(sstable))));
 +            int expectedBloomFilterSize = Math.max(cfs.metadata.getIndexInterval(),
 +                                                   (int) (SSTableReader.getApproximateKeyCount(Arrays.asList(sstable),
cfs.metadata)));
              if (logger.isDebugEnabled())
 -              logger.debug("Expected bloom filter size : " + expectedBloomFilterSize);
 -
 -            SSTableWriter writer = null;
 -            SSTableReader newSstable = null;
 +                logger.debug("Expected bloom filter size : " + expectedBloomFilterSize);
  
              logger.info("Cleaning up " + sstable);
-             // Calculate the expected compacted filesize
-             long expectedRangeFileSize = cfs.getExpectedCompactedFileSize(Arrays.asList(sstable),
OperationType.CLEANUP);
+ 
              File compactionFileLocation = cfs.directories.getDirectoryForNewSSTables();
              if (compactionFileLocation == null)
                  throw new IOException("disk full");


Mime
View raw message