cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Date Tue, 31 Mar 2015 08:51:55 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: f91cfc7e400fc446f248d2eddae72b5e589a4372
Parents: f6217ae 3575cd3
Author: Robert Stupp <snazy@snazy.de>
Authored: Tue Mar 31 10:50:46 2015 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Tue Mar 31 10:51:07 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 5 +++++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f91cfc7e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 7f1bf98,430259e..dbd55a0
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1356,6 -1368,11 +1356,11 @@@ public class ColumnFamilyStore implemen
              for (Pair<Long, Long> position : positions)
                  expectedFileSize += position.right - position.left;
          }
+ 
 -        double compressionRatio = getCompressionRatio();
++        double compressionRatio = metric.compressionRatio.getValue();
+         if (compressionRatio > 0d)
+             expectedFileSize *= compressionRatio;
+ 
          return expectedFileSize;
      }
  


Mime
View raw message