You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2015/12/24 01:10:29 UTC
[1/2] cassandra git commit: better validator randomness patch by
dbrosius, reviewed by rstupp for CASSANDRA-10917
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 382d9a943 -> 8bafc180b
better validator randomness
patch by dbrosius, reviewed by rstupp for CASSANDRA-10917
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/867fd8e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/867fd8e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/867fd8e2
Branch: refs/heads/cassandra-3.0
Commit: 867fd8e2e9c33e8f2ee1d13c3b7dd177434ec645
Parents: 382d9a9
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Dec 23 19:04:32 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Dec 23 19:04:32 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/Validator.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/867fd8e2/src/java/org/apache/cassandra/repair/Validator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/Validator.java b/src/java/org/apache/cassandra/repair/Validator.java
index d206305..3db9761 100644
--- a/src/java/org/apache/cassandra/repair/Validator.java
+++ b/src/java/org/apache/cassandra/repair/Validator.java
@@ -90,9 +90,11 @@ public class Validator implements Runnable
}
else
{
+ List<DecoratedKey> keys = new ArrayList<>();
+ Random random = new Random();
+
for (Range<Token> range : tree.ranges())
{
- List<DecoratedKey> keys = new ArrayList<>();
for (DecoratedKey sample : cfs.keySamples(range))
{
assert range.contains(sample.getToken()) : "Token " + sample.getToken() + " is not within range " + desc.ranges;
@@ -107,7 +109,6 @@ public class Validator implements Runnable
else
{
int numKeys = keys.size();
- Random random = new Random();
// sample the column family using random keys from the index
while (true)
{
@@ -115,6 +116,7 @@ public class Validator implements Runnable
if (!tree.split(dk.getToken()))
break;
}
+ keys.clear();
}
}
}
[2/2] cassandra git commit: remove leftover code from refactor patch
by dbrosius, reviewed by rstupp for CASSANDRA-10918
Posted by db...@apache.org.
remove leftover code from refactor
patch by dbrosius, reviewed by rstupp for CASSANDRA-10918
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bafc180
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bafc180
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bafc180
Branch: refs/heads/cassandra-3.0
Commit: 8bafc180b62f9bb60ac50a1d87e510bfa9952fcf
Parents: 867fd8e
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Wed Dec 23 19:06:34 2015 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Wed Dec 23 19:06:34 2015 -0500
----------------------------------------------------------------------
.../cassandra/db/commitlog/CommitLogSegmentManager.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bafc180/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
index a514028..564652f 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
@@ -293,13 +293,6 @@ public class CommitLogSegmentManager
// make sure the writes have materialized inside of the memtables by waiting for all outstanding writes
// on the relevant keyspaces to complete
- Set<Keyspace> keyspaces = new HashSet<>();
- for (UUID cfId : last.getDirtyCFIDs())
- {
- ColumnFamilyStore cfs = Schema.instance.getColumnFamilyStoreInstance(cfId);
- if (cfs != null)
- keyspaces.add(cfs.keyspace);
- }
Keyspace.writeOrder.awaitNewBarrier();
// flush and wait for all CFs that are dirty in segments up-to and including 'last'