You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2011/10/17 19:19:10 UTC
svn commit: r1185292 - in
/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra:
db/compaction/LeveledCompactionStrategy.java
db/compaction/LeveledCompactionTask.java io/compress/CompressionMetadata.java
Author: brandonwilliams
Date: Mon Oct 17 17:19:10 2011
New Revision: 1185292
URL: http://svn.apache.org/viewvc?rev=1185292&view=rev
Log:
Use long math in compaction/compression.
Patch by Dave Brosius, reviewed by brandonwilliams for CASSANDRA-3364
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java?rev=1185292&r1=1185291&r2=1185292&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java (original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java Mon Oct 17 17:19:10 2011
@@ -154,7 +154,7 @@ public class LeveledCompactionStrategy e
public long getMaxSSTableSize()
{
- return maxSSTableSizeInMB * 1024 * 1024;
+ return maxSSTableSizeInMB * 1024L * 1024L;
}
public boolean isKeyExistenceExpensive(Set<? extends SSTable> sstablesToIgnore)
Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java?rev=1185292&r1=1185291&r2=1185292&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java (original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java Mon Oct 17 17:19:10 2011
@@ -65,7 +65,7 @@ public class LeveledCompactionTask exten
@Override
protected boolean newSSTableSegmentThresholdReached(SSTableWriter writer, long position)
{
- return position > sstableSizeInMB * 1024 * 1024;
+ return position > sstableSizeInMB * 1024L * 1024L;
}
@Override
Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java?rev=1185292&r1=1185291&r2=1185292&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java (original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java Mon Oct 17 17:19:10 2011
@@ -199,7 +199,7 @@ public class CompressionMetadata
seek(dataLengthOffset
+ 8 // size reserved for uncompressed data length
+ 4 // size reserved for chunk count
- + (chunkIndex * 8));
+ + (chunkIndex * 8L));
try
{
@@ -221,7 +221,7 @@ public class CompressionMetadata
seek(dataLengthOffset
+ 8 // size reserved for uncompressed data length
+ 4 // size reserved for chunk count
- + (chunkIndex * 8));
+ + (chunkIndex * 8L));
getChannel().truncate(getFilePointer());
}
}