svn commit: r1040184 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db: ColumnFamilyStore.java Memtable.java

[jbellis]

Author: jbellis
Date: Mon Nov 29 16:46:27 2010
New Revision: 1040184

URL: http://svn.apache.org/viewvc?rev=1040184&view=rev
Log:
fix potential int overflows
patch by Dave Brosius for CASSANDRA-1785

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1040184&r1=1040183&r2=1040184&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Mon Nov 29 16:46:27 2010
@@ -594,7 +594,7 @@ public class ColumnFamilyStore implement
      */
     public String getFlushPath()
     {
-        long guessedSize = 2 * memsize.value() * 1024*1024; // 2* adds room 
for keys, column indexes
+        long guessedSize = 2L * memsize.value() * 1024*1024; // 2* adds room 
for keys, column indexes
         String location = 
DatabaseDescriptor.getDataFileLocationForTable(table.name, guessedSize);
         if (location == null)
             throw new RuntimeException("Insufficient disk space to flush");

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java?rev=1040184&r1=1040183&r2=1040184&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java 
(original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/Memtable.java 
Mon Nov 29 16:46:27 2010
@@ -296,6 +296,6 @@ public class Memtable implements Compara
 
     public boolean isExpired()
     {
-        return System.currentTimeMillis() > creationTime + 
cfs.getMemtableFlushAfterMins() * 60 * 1000;
+        return System.currentTimeMillis() > creationTime + 
cfs.getMemtableFlushAfterMins() * 60 * 1000L;
     }
 }