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 2014/02/07 17:12:43 UTC
git commit: revert unintentionally committed code from #6667
Updated Branches:
refs/heads/trunk f71ef6099 -> d69529c3e
revert unintentionally committed code from #6667
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d69529c3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d69529c3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d69529c3
Branch: refs/heads/trunk
Commit: d69529c3e5a3734e97254190d2049124c6f897e4
Parents: f71ef60
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Feb 7 10:12:38 2014 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Feb 7 10:12:38 2014 -0600
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/DataTracker.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d69529c3/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java
index d90c0ff..e748ffa 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -440,9 +440,8 @@ public class DataTracker
long count = 0;
for (SSTableReader sstable : getSSTables())
{
- long n = sstable.getEstimatedColumnCount().count();
- sum += sstable.getEstimatedColumnCount().mean() * n;
- count += n;
+ sum += sstable.getEstimatedColumnCount().mean();
+ count++;
}
return count > 0 ? (int) (sum / count) : 0;
}