You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/08/21 16:53:08 UTC
[1/3] cassandra git commit: Ninja follow-on to 10115 - fix
LeveledCompactionStrategyTest
Repository: cassandra
Updated Branches:
refs/heads/trunk e5b64f841 -> 34b893aff
Ninja follow-on to 10115 - fix LeveledCompactionStrategyTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab628761
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab628761
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab628761
Branch: refs/heads/trunk
Commit: ab6287612e8c7d8b944d3833ca90bd8b887b9709
Parents: cd46ca1
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Aug 21 10:52:11 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Aug 21 10:52:11 2015 -0400
----------------------------------------------------------------------
.../db/compaction/LeveledCompactionStrategyTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab628761/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index ccfc6ab..03aaf03 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -172,8 +172,8 @@ public class LeveledCompactionStrategyTest
ByteBuffer value = ByteBuffer.wrap(b); // 100 KB value, make it easy to have multiple files
// Enough data to have a level 1 and 2
- int rows = 20;
- int columns = 10;
+ int rows = 40;
+ int columns = 20;
// Adds enough data to trigger multiple sstable per level
for (int r = 0; r < rows; r++)
@@ -258,8 +258,8 @@ public class LeveledCompactionStrategyTest
ByteBuffer value = ByteBuffer.wrap(new byte[100 * 1024]); // 100 KB value, make it easy to have multiple files
// Enough data to have a level 1 and 2
- int rows = 20;
- int columns = 10;
+ int rows = 40;
+ int columns = 20;
// Adds enough data to trigger multiple sstable per level
for (int r = 0; r < rows; r++)
@@ -306,8 +306,8 @@ public class LeveledCompactionStrategyTest
ByteBuffer value = ByteBuffer.wrap(b); // 100 KB value, make it easy to have multiple files
// Enough data to have a level 1 and 2
- int rows = 20;
- int columns = 10;
+ int rows = 40;
+ int columns = 20;
// Adds enough data to trigger multiple sstable per level
for (int r = 0; r < rows; r++)
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by jm...@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/34b893af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34b893af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34b893af
Branch: refs/heads/trunk
Commit: 34b893aff104a72d1d4cb1af6713eb5e5cc3d770
Parents: e5b64f8 0ad1e0a
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Aug 21 10:52:45 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Aug 21 10:52:45 2015 -0400
----------------------------------------------------------------------
.../db/compaction/LeveledCompactionStrategyTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ad1e0aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ad1e0aa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ad1e0aa
Branch: refs/heads/trunk
Commit: 0ad1e0aaf665c5afb1a85d2d8b6dce73aaee772e
Parents: 4cf97f4 ab62876
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Aug 21 10:52:35 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Aug 21 10:52:35 2015 -0400
----------------------------------------------------------------------
.../db/compaction/LeveledCompactionStrategyTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ad1e0aa/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------