You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/10/01 15:37:33 UTC
[1/2] cassandra git commit: Update compaction progress when getting
the next partition, not row
Repository: cassandra
Updated Branches:
refs/heads/trunk f1e45028d -> 370117050
Update compaction progress when getting the next partition, not row
Patch by marcuse; reviewed by tjake for CASSANDRA-10427
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bb56c4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb56c4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bb56c4f
Branch: refs/heads/trunk
Commit: 4bb56c4f33d10e304da38509ac848305814e6050
Parents: 80355a1
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Oct 1 08:48:24 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Oct 1 15:34:58 2015 +0200
----------------------------------------------------------------------
.../cassandra/db/partitions/PurgingPartitionIterator.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb56c4f/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java b/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java
index e53e17b..5c7f6f4 100644
--- a/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java
+++ b/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java
@@ -85,6 +85,7 @@ public abstract class PurgingPartitionIterator extends WrappingUnfilteredPartiti
{
UnfilteredRowIterator toReturn = next;
next = null;
+ updateProgress();
return toReturn;
}
@@ -140,14 +141,6 @@ public abstract class PurgingPartitionIterator extends WrappingUnfilteredPartiti
return purger.shouldPurge(((RangeTombstoneBoundMarker)marker).deletionTime()) ? null : marker;
}
}
-
- @Override
- public Unfiltered next()
- {
- Unfiltered next = super.next();
- updateProgress();
- return next;
- }
};
}
};
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-3.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/37011705
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37011705
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37011705
Branch: refs/heads/trunk
Commit: 3701170502f7f67230ebfd70a8e4cb3c3612f129
Parents: f1e4502 4bb56c4
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Oct 1 15:35:58 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Oct 1 15:35:58 2015 +0200
----------------------------------------------------------------------
.../cassandra/db/partitions/PurgingPartitionIterator.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------