You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/08 18:33:54 UTC
[01/16] git commit: replace volatile regionCount w/ AtomicInteger
Updated Branches:
refs/heads/cassandra-1.2 7d45d2bde -> 23d7bd857
refs/heads/cassandra-2.0 23becceb7 -> c52613124
refs/heads/cassandra-2.0.0 88fea9fe7 -> f30629b83
refs/heads/trunk 66182082c -> c7782f2de
replace volatile regionCount w/ AtomicInteger
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f022354c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f022354c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f022354c
Branch: refs/heads/cassandra-2.0
Commit: f022354cb44a15d034b3a28dec5d38cc97084faf
Parents: 23becce
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 10:57:48 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 10:57:48 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/SlabAllocator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f022354c/src/java/org/apache/cassandra/utils/SlabAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SlabAllocator.java b/src/java/org/apache/cassandra/utils/SlabAllocator.java
index 6ff66f8..edd6f86 100644
--- a/src/java/org/apache/cassandra/utils/SlabAllocator.java
+++ b/src/java/org/apache/cassandra/utils/SlabAllocator.java
@@ -48,7 +48,7 @@ public class SlabAllocator extends Allocator
private final static int MAX_CLONED_SIZE = 128 * 1024; // bigger than this don't go in the region
private final AtomicReference<Region> currentRegion = new AtomicReference<Region>();
- private volatile int regionCount = 0;
+ private final AtomicInteger regionCount = new AtomicInteger(0);
private AtomicLong unslabbed = new AtomicLong(0);
public ByteBuffer allocate(int size)
@@ -99,7 +99,7 @@ public class SlabAllocator extends Allocator
{
// we won race - now we need to actually do the expensive allocation step
region.init();
- regionCount++;
+ regionCount.incrementAndGet();
logger.trace("{} regions now allocated in {}", regionCount, this);
return region;
}
@@ -113,7 +113,7 @@ public class SlabAllocator extends Allocator
*/
public long getMinimumSize()
{
- return unslabbed.get() + (regionCount - 1) * (long)REGION_SIZE;
+ return unslabbed.get() + (regionCount.get() - 1) * (long)REGION_SIZE;
}
/**
@@ -121,7 +121,7 @@ public class SlabAllocator extends Allocator
*/
public long getMaximumSize()
{
- return unslabbed.get() + regionCount * (long)REGION_SIZE;
+ return unslabbed.get() + regionCount.get() * (long)REGION_SIZE;
}
/**
[09/16] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f30629b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f30629b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f30629b8
Branch: refs/heads/trunk
Commit: f30629b83fb14b6a93e38d440f79a16200cfcef2
Parents: 88fea9f 23d7bd8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:15:54 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:15:54 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f30629b8/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e30e417,412e4c1..31a40cb
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@@ -594,7 -597,7 +594,7 @@@ public class SSTableReader extends SSTa
*/
public long estimatedKeys()
{
- return indexSummary.size() * indexSummary.getIndexInterval();
- return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval();
++ return ((long) indexSummary.size()) * indexSummary.getIndexInterval();
}
/**
[13/16] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' 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/f2d04333
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2d04333
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2d04333
Branch: refs/heads/trunk
Commit: f2d04333eb5af0ae96ff2c42b09a818f899d1e7a
Parents: e533d5a f30629b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:16:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:16:01 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[07/16] git commit: fix potential overflow in extimatedKeys
Posted by jb...@apache.org.
fix potential overflow in extimatedKeys
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d7bd85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d7bd85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d7bd85
Branch: refs/heads/cassandra-2.0
Commit: 23d7bd85758762dbc2b717af56c4f590702a8b30
Parents: 7d45d2b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:15:27 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:15:27 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d7bd85/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e9a03c8..412e4c1 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -597,7 +597,7 @@ public class SSTableReader extends SSTable
*/
public long estimatedKeys()
{
- return indexSummary.size() * DatabaseDescriptor.getIndexInterval();
+ return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval();
}
/**
[14/16] git commit: comment
Posted by jb...@apache.org.
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5261312
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5261312
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5261312
Branch: refs/heads/cassandra-2.0
Commit: c5261312459791ba6356b73cd61abf778879ed0e
Parents: f2d0433
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:18:41 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:18:41 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5261312/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BiMultiValMap.java b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
index 3712d25..d827d3f 100644
--- a/src/java/org/apache/cassandra/utils/BiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Multimaps;
/**
*
* A variant of BiMap which does not enforce uniqueness of values. This means the inverse
- * is a Multimap.
+ * is a Multimap. (But the "forward" view is not a multimap; keys may only each have one value.)
*
* @param <K>
* @param <V>
[10/16] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f30629b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f30629b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f30629b8
Branch: refs/heads/cassandra-2.0
Commit: f30629b83fb14b6a93e38d440f79a16200cfcef2
Parents: 88fea9f 23d7bd8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:15:54 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:15:54 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f30629b8/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e30e417,412e4c1..31a40cb
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@@ -594,7 -597,7 +594,7 @@@ public class SSTableReader extends SSTa
*/
public long estimatedKeys()
{
- return indexSummary.size() * indexSummary.getIndexInterval();
- return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval();
++ return ((long) indexSummary.size()) * indexSummary.getIndexInterval();
}
/**
[02/16] git commit: replace volatile regionCount w/ AtomicInteger
Posted by jb...@apache.org.
replace volatile regionCount w/ AtomicInteger
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f022354c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f022354c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f022354c
Branch: refs/heads/trunk
Commit: f022354cb44a15d034b3a28dec5d38cc97084faf
Parents: 23becce
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 10:57:48 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 10:57:48 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/SlabAllocator.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f022354c/src/java/org/apache/cassandra/utils/SlabAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SlabAllocator.java b/src/java/org/apache/cassandra/utils/SlabAllocator.java
index 6ff66f8..edd6f86 100644
--- a/src/java/org/apache/cassandra/utils/SlabAllocator.java
+++ b/src/java/org/apache/cassandra/utils/SlabAllocator.java
@@ -48,7 +48,7 @@ public class SlabAllocator extends Allocator
private final static int MAX_CLONED_SIZE = 128 * 1024; // bigger than this don't go in the region
private final AtomicReference<Region> currentRegion = new AtomicReference<Region>();
- private volatile int regionCount = 0;
+ private final AtomicInteger regionCount = new AtomicInteger(0);
private AtomicLong unslabbed = new AtomicLong(0);
public ByteBuffer allocate(int size)
@@ -99,7 +99,7 @@ public class SlabAllocator extends Allocator
{
// we won race - now we need to actually do the expensive allocation step
region.init();
- regionCount++;
+ regionCount.incrementAndGet();
logger.trace("{} regions now allocated in {}", regionCount, this);
return region;
}
@@ -113,7 +113,7 @@ public class SlabAllocator extends Allocator
*/
public long getMinimumSize()
{
- return unslabbed.get() + (regionCount - 1) * (long)REGION_SIZE;
+ return unslabbed.get() + (regionCount.get() - 1) * (long)REGION_SIZE;
}
/**
@@ -121,7 +121,7 @@ public class SlabAllocator extends Allocator
*/
public long getMaximumSize()
{
- return unslabbed.get() + regionCount * (long)REGION_SIZE;
+ return unslabbed.get() + regionCount.get() * (long)REGION_SIZE;
}
/**
[05/16] git commit: fix potential overflow in extimatedKeys
Posted by jb...@apache.org.
fix potential overflow in extimatedKeys
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d7bd85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d7bd85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d7bd85
Branch: refs/heads/trunk
Commit: 23d7bd85758762dbc2b717af56c4f590702a8b30
Parents: 7d45d2b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:15:27 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:15:27 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d7bd85/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e9a03c8..412e4c1 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -597,7 +597,7 @@ public class SSTableReader extends SSTable
*/
public long estimatedKeys()
{
- return indexSummary.size() * DatabaseDescriptor.getIndexInterval();
+ return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval();
}
/**
[06/16] git commit: fix potential overflow in extimatedKeys
Posted by jb...@apache.org.
fix potential overflow in extimatedKeys
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d7bd85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d7bd85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d7bd85
Branch: refs/heads/cassandra-1.2
Commit: 23d7bd85758762dbc2b717af56c4f590702a8b30
Parents: 7d45d2b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:15:27 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:15:27 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d7bd85/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e9a03c8..412e4c1 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -597,7 +597,7 @@ public class SSTableReader extends SSTable
*/
public long estimatedKeys()
{
- return indexSummary.size() * DatabaseDescriptor.getIndexInterval();
+ return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval();
}
/**
[03/16] git commit: r/m unnecessary null check
Posted by jb...@apache.org.
r/m unnecessary null check
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e533d5af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e533d5af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e533d5af
Branch: refs/heads/cassandra-2.0
Commit: e533d5afbc0cc1c321060dc40224422d23578b4f
Parents: f022354
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:11:38 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:11:38 2013 -0500
----------------------------------------------------------------------
.../db/compaction/LeveledCompactionStrategy.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e533d5af/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index 292220d..b3e01ed 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@ -54,16 +54,13 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy implem
super(cfs, options);
int configuredMaxSSTableSize = 160;
SizeTieredCompactionStrategyOptions localOptions = new SizeTieredCompactionStrategyOptions(options);
- if (options != null)
+ if (options.containsKey(SSTABLE_SIZE_OPTION))
{
- if (options.containsKey(SSTABLE_SIZE_OPTION))
+ configuredMaxSSTableSize = Integer.parseInt(options.get(SSTABLE_SIZE_OPTION));
+ if (configuredMaxSSTableSize >= 1000)
{
- configuredMaxSSTableSize = Integer.parseInt(options.get(SSTABLE_SIZE_OPTION));
- if (configuredMaxSSTableSize >= 1000)
- {
- // Yes, people have done this
- logger.warn("Max sstable size of {}MB is configured; having a unit of compaction this large is probably a bad idea", configuredMaxSSTableSize);
- }
+ // Yes, people have done this
+ logger.warn("Max sstable size of {}MB is configured; having a unit of compaction this large is probably a bad idea", configuredMaxSSTableSize);
}
}
maxSSTableSizeInMB = configuredMaxSSTableSize;
[16/16] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7782f2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7782f2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7782f2d
Branch: refs/heads/trunk
Commit: c7782f2de044ce18db3441ea27e90d60df531e3f
Parents: 6618208 c526131
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:33:47 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:33:47 2013 -0500
----------------------------------------------------------------------
.../db/compaction/LeveledCompactionStrategy.java | 13 +++++--------
.../org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 2 +-
src/java/org/apache/cassandra/utils/SlabAllocator.java | 8 ++++----
4 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
[11/16] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f30629b8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f30629b8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f30629b8
Branch: refs/heads/cassandra-2.0.0
Commit: f30629b83fb14b6a93e38d440f79a16200cfcef2
Parents: 88fea9f 23d7bd8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:15:54 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:15:54 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f30629b8/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e30e417,412e4c1..31a40cb
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@@ -594,7 -597,7 +594,7 @@@ public class SSTableReader extends SSTa
*/
public long estimatedKeys()
{
- return indexSummary.size() * indexSummary.getIndexInterval();
- return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval();
++ return ((long) indexSummary.size()) * indexSummary.getIndexInterval();
}
/**
[04/16] git commit: r/m unnecessary null check
Posted by jb...@apache.org.
r/m unnecessary null check
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e533d5af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e533d5af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e533d5af
Branch: refs/heads/trunk
Commit: e533d5afbc0cc1c321060dc40224422d23578b4f
Parents: f022354
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:11:38 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:11:38 2013 -0500
----------------------------------------------------------------------
.../db/compaction/LeveledCompactionStrategy.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e533d5af/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index 292220d..b3e01ed 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@ -54,16 +54,13 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy implem
super(cfs, options);
int configuredMaxSSTableSize = 160;
SizeTieredCompactionStrategyOptions localOptions = new SizeTieredCompactionStrategyOptions(options);
- if (options != null)
+ if (options.containsKey(SSTABLE_SIZE_OPTION))
{
- if (options.containsKey(SSTABLE_SIZE_OPTION))
+ configuredMaxSSTableSize = Integer.parseInt(options.get(SSTABLE_SIZE_OPTION));
+ if (configuredMaxSSTableSize >= 1000)
{
- configuredMaxSSTableSize = Integer.parseInt(options.get(SSTABLE_SIZE_OPTION));
- if (configuredMaxSSTableSize >= 1000)
- {
- // Yes, people have done this
- logger.warn("Max sstable size of {}MB is configured; having a unit of compaction this large is probably a bad idea", configuredMaxSSTableSize);
- }
+ // Yes, people have done this
+ logger.warn("Max sstable size of {}MB is configured; having a unit of compaction this large is probably a bad idea", configuredMaxSSTableSize);
}
}
maxSSTableSizeInMB = configuredMaxSSTableSize;
[08/16] git commit: fix potential overflow in extimatedKeys
Posted by jb...@apache.org.
fix potential overflow in extimatedKeys
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d7bd85
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d7bd85
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d7bd85
Branch: refs/heads/cassandra-2.0.0
Commit: 23d7bd85758762dbc2b717af56c4f590702a8b30
Parents: 7d45d2b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:15:27 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:15:27 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d7bd85/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index e9a03c8..412e4c1 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -597,7 +597,7 @@ public class SSTableReader extends SSTable
*/
public long estimatedKeys()
{
- return indexSummary.size() * DatabaseDescriptor.getIndexInterval();
+ return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval();
}
/**
[15/16] git commit: comment
Posted by jb...@apache.org.
comment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c5261312
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c5261312
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c5261312
Branch: refs/heads/trunk
Commit: c5261312459791ba6356b73cd61abf778879ed0e
Parents: f2d0433
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:18:41 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:18:41 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/BiMultiValMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c5261312/src/java/org/apache/cassandra/utils/BiMultiValMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BiMultiValMap.java b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
index 3712d25..d827d3f 100644
--- a/src/java/org/apache/cassandra/utils/BiMultiValMap.java
+++ b/src/java/org/apache/cassandra/utils/BiMultiValMap.java
@@ -29,7 +29,7 @@ import com.google.common.collect.Multimaps;
/**
*
* A variant of BiMap which does not enforce uniqueness of values. This means the inverse
- * is a Multimap.
+ * is a Multimap. (But the "forward" view is not a multimap; keys may only each have one value.)
*
* @param <K>
* @param <V>
[12/16] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' 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/f2d04333
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2d04333
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2d04333
Branch: refs/heads/cassandra-2.0
Commit: f2d04333eb5af0ae96ff2c42b09a818f899d1e7a
Parents: e533d5a f30629b
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Aug 8 11:16:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Aug 8 11:16:01 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------