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/11/02 01:41:08 UTC
[1/3] git commit: omit zero counts from compaction merge summary
Updated Branches:
refs/heads/cassandra-2.0 91fa46722 -> 579eb2295
refs/heads/trunk d5e32da4e -> 1fe9a112c
omit zero counts from compaction merge summary
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/579eb229
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/579eb229
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/579eb229
Branch: refs/heads/cassandra-2.0
Commit: 579eb229519e5e3b276f918b89158a242c2dec34
Parents: 91fa467
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Nov 1 19:40:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Nov 1 19:40:56 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/579eb229/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 0b2cb54..cd7d3d9 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -261,8 +261,11 @@ public class CompactionTask extends AbstractCompactionTask
Map<Integer, Long> mergedRows = new HashMap<Integer, Long>();
for (int i = 0; i < counts.length; i++)
{
- int rows = i + 1;
long count = counts[i];
+ if (count == 0)
+ continue;
+
+ int rows = i + 1;
totalSourceRows += rows * count;
mergeSummary.append(String.format("%d:%d, ", rows, count));
mergedRows.put(rows, count);
[2/3] git commit: omit zero counts from compaction merge summary
Posted by jb...@apache.org.
omit zero counts from compaction merge summary
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/579eb229
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/579eb229
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/579eb229
Branch: refs/heads/trunk
Commit: 579eb229519e5e3b276f918b89158a242c2dec34
Parents: 91fa467
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Nov 1 19:40:56 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Nov 1 19:40:56 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/579eb229/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 0b2cb54..cd7d3d9 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -261,8 +261,11 @@ public class CompactionTask extends AbstractCompactionTask
Map<Integer, Long> mergedRows = new HashMap<Integer, Long>();
for (int i = 0; i < counts.length; i++)
{
- int rows = i + 1;
long count = counts[i];
+ if (count == 0)
+ continue;
+
+ int rows = i + 1;
totalSourceRows += rows * count;
mergeSummary.append(String.format("%d:%d, ", rows, count));
mergedRows.put(rows, count);
[3/3] 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/1fe9a112
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe9a112
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fe9a112
Branch: refs/heads/trunk
Commit: 1fe9a112c6d6eb50adc5351cd36db4c34369cd53
Parents: d5e32da 579eb22
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Nov 1 19:41:02 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Nov 1 19:41:02 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1fe9a112/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------