cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [10/10] git commit: merge from 2.0
Date Wed, 18 Sep 2013 17:45:21 GMT
merge from 2.0


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

Branch: refs/heads/trunk
Commit: 0eca1652e8a7b943b62a78df9b7d1ea0564a1370
Parents: 1c98583 2648047
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Wed Sep 18 12:44:56 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Wed Sep 18 12:44:56 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 doc/cql3/CQL.textile                            |  2 +-
 .../org/apache/cassandra/db/Directories.java    | 62 +++++---------------
 .../db/compaction/CompactionManager.java        |  2 +-
 .../cassandra/db/compaction/Scrubber.java       |  2 +-
 .../cassandra/io/util/DiskAwareRunnable.java    |  2 +-
 .../cassandra/streaming/StreamReader.java       |  2 +-
 .../cassandra/db/ColumnFamilyStoreTest.java     |  7 +--
 .../apache/cassandra/db/DirectoriesTest.java    |  2 +-
 .../io/sstable/SSTableSimpleWriterTest.java     |  2 +-
 10 files changed, 27 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eca1652/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eca1652/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eca1652/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 47ea97f,2f9aed2..61d187b
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -549,12 -549,12 +549,12 @@@ public class CompactionManager implemen
              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);
 +                logger.debug("Expected bloom filter size : {}", expectedBloomFilterSize);
  
 -            logger.info("Cleaning up " + sstable);
 +            logger.info("Cleaning up {}", sstable);
              // Calculate the expected compacted filesize
              long expectedRangeFileSize = cfs.getExpectedCompactedFileSize(Arrays.asList(sstable),
OperationType.CLEANUP);
-             File compactionFileLocation = cfs.directories.getDirectoryForNewSSTables(expectedRangeFileSize);
+             File compactionFileLocation = cfs.directories.getDirectoryForNewSSTables();
              if (compactionFileLocation == null)
                  throw new IOException("disk full");
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eca1652/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/0eca1652/test/unit/org/apache/cassandra/db/DirectoriesTest.java
----------------------------------------------------------------------


Mime
View raw message