You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/02/05 14:34:29 UTC
cassandra git commit: Follow-up merge fix
Repository: cassandra
Updated Branches:
refs/heads/trunk e70959dea -> 49f1a629d
Follow-up merge fix
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49f1a629
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49f1a629
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49f1a629
Branch: refs/heads/trunk
Commit: 49f1a629d0c79c5aa7bda1b8aadbde343e52ecb6
Parents: e70959d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Feb 5 16:34:21 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Feb 5 16:34:21 2015 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/49f1a629/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
index dea5467..1b30db3 100644
--- a/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
+++ b/src/java/org/apache/cassandra/db/SizeEstimatesRecorder.java
@@ -75,7 +75,10 @@ public class SizeEstimatesRecorder extends MigrationListener implements Runnable
List<SSTableReader> sstables = null;
Refs<SSTableReader> refs = null;
while (refs == null)
- refs = Refs.tryRef(table.viewFilter(range.toRowBounds()).apply(table.getDataTracker().getView()));
+ {
+ sstables = table.viewFilter(range.toRowBounds()).apply(table.getDataTracker().getView());
+ refs = Refs.tryRef(sstables);
+ }
long partitionsCount, meanPartitionSize;
try