Updated Branches: refs/heads/trunk 951fc8554 -> 4334f99f4
remove dead params Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4334f99f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4334f99f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4334f99f Branch: refs/heads/trunk Commit: 4334f99f4bbe0f8361d2063f53b1d10cbc4ba8d0 Parents: 951fc85 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Feb 12 21:13:12 2014 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Feb 12 21:13:12 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/RangeTombstoneListTest.java | 6 ------ .../locator/OldNetworkTopologyStrategyTest.java | 12 ++++++------ .../stress/generatedata/DataGenStringDictionary.java | 6 +++--- 3 files changed, 9 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4334f99f/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java index 92a0b4a..7dc86da 100644 --- a/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java +++ b/test/unit/org/apache/cassandra/db/RangeTombstoneListTest.java @@ -196,12 +196,6 @@ public class RangeTombstoneListTest @Test public void addAllTest() { - //addAllTest(false); - addAllTest(true); - } - - private void addAllTest(boolean doMerge) - { RangeTombstoneList l1 = new RangeTombstoneList(cmp, 0); l1.add(rt(0, 4, 5)); l1.add(rt(6, 10, 2)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4334f99f/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java index a11a128..c7470f8 100644 --- a/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java +++ b/test/unit/org/apache/cassandra/locator/OldNetworkTopologyStrategyTest.java @@ -181,7 +181,7 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader BigIntegerToken newToken = new BigIntegerToken("21267647932558653966460912964485513216"); BigIntegerToken[] tokens = initTokens(); BigIntegerToken[] tokensAfterMove = initTokensAfterMove(tokens, movingNodeIdx, newToken); - Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx, newToken); + Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx); assertEquals(ranges.left.iterator().next().left, tokensAfterMove[movingNodeIdx]); assertEquals(ranges.left.iterator().next().right, tokens[movingNodeIdx]); @@ -198,7 +198,7 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader BigIntegerToken newToken = new BigIntegerToken("35267647932558653966460912964485513216"); BigIntegerToken[] tokens = initTokens(); BigIntegerToken[] tokensAfterMove = initTokensAfterMove(tokens, movingNodeIdx, newToken); - Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx, newToken); + Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx); assertEquals("No data should be streamed", ranges.left.size(), 0); assertEquals(ranges.right.iterator().next().left, tokens[movingNodeIdx]); @@ -216,7 +216,7 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader BigIntegerToken newToken = new BigIntegerToken("90070591730234615865843651857942052864"); BigIntegerToken[] tokens = initTokens(); BigIntegerToken[] tokensAfterMove = initTokensAfterMove(tokens, movingNodeIdx, newToken); - Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx, newToken); + Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx); // sort the results, so they can be compared Range[] toStream = ranges.left.toArray(new Range[0]); @@ -248,7 +248,7 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader BigIntegerToken newToken = new BigIntegerToken("52535295865117307932921825928971026432"); BigIntegerToken[] tokens = initTokens(); BigIntegerToken[] tokensAfterMove = initTokensAfterMove(tokens, movingNodeIdx, newToken); - Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx, newToken); + Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx); // sort the results, so they can be compared @@ -280,7 +280,7 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader BigIntegerToken newToken = new BigIntegerToken("158873535527910577765226390751398592512"); BigIntegerToken[] tokens = initTokens(); BigIntegerToken[] tokensAfterMove = initTokensAfterMove(tokens, movingNodeIdx, newToken); - Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx, newToken); + Pair<Set<Range<Token>>, Set<Range<Token>>> ranges = calculateStreamAndFetchRanges(tokens, tokensAfterMove, movingNodeIdx); Range[] toStream = ranges.left.toArray(new Range[0]); Range[] toFetch = ranges.right.toArray(new Range[0]); @@ -350,7 +350,7 @@ public class OldNetworkTopologyStrategyTest extends SchemaLoader } - private Pair<Set<Range<Token>>, Set<Range<Token>>> calculateStreamAndFetchRanges(BigIntegerToken[] tokens, BigIntegerToken[] tokensAfterMove, int movingNodeIdx, BigIntegerToken newToken) throws UnknownHostException + private Pair<Set<Range<Token>>, Set<Range<Token>>> calculateStreamAndFetchRanges(BigIntegerToken[] tokens, BigIntegerToken[] tokensAfterMove, int movingNodeIdx) throws UnknownHostException { RackInferringSnitch endpointSnitch = new RackInferringSnitch(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4334f99f/tools/stress/src/org/apache/cassandra/stress/generatedata/DataGenStringDictionary.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generatedata/DataGenStringDictionary.java b/tools/stress/src/org/apache/cassandra/stress/generatedata/DataGenStringDictionary.java index 7733ed6..5907956 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generatedata/DataGenStringDictionary.java +++ b/tools/stress/src/org/apache/cassandra/stress/generatedata/DataGenStringDictionary.java @@ -27,17 +27,17 @@ public class DataGenStringDictionary extends DataGen @Override public void generate(ByteBuffer fill, long index, ByteBuffer seed) { - fill(fill, 0); + fill(fill); } @Override public void generate(List<ByteBuffer> fills, long index, ByteBuffer seed) { for (int i = 0 ; i < fills.size() ; i++) - fill(fills.get(0), i); + fill(fills.get(0)); } - private void fill(ByteBuffer fill, int column) + private void fill(ByteBuffer fill) { fill.clear(); byte[] trg = fill.array();
