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 2016/05/13 07:13:42 UTC
[1/3] cassandra git commit: Run LongLeveledCompactionStrategyTests in
separate tables
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.7 c9ac0506c -> 590d20b0a
refs/heads/trunk bd39d73a6 -> 3f46df541
Run LongLeveledCompactionStrategyTests in separate tables
Patch by marcuse; reviewed by yukim for CASSANDRA-11657
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/590d20b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590d20b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590d20b0
Branch: refs/heads/cassandra-3.7
Commit: 590d20b0a1e1b1fb71e97508bb6b475f8aac205a
Parents: c9ac050
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed May 11 15:53:43 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri May 13 09:11:19 2016 +0200
----------------------------------------------------------------------
.../LongLeveledCompactionStrategyTest.java | 27 +++++++++++++++++---
.../LeveledCompactionStrategyTest.java | 2 +-
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590d20b0/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 24a9cea..f8f5a7c 100644
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -45,6 +45,7 @@ public class LongLeveledCompactionStrategyTest
{
public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
public static final String CF_STANDARDLVL = "StandardLeveled";
+ public static final String CF_STANDARDLVL2 = "StandardLeveled2";
@BeforeClass
public static void defineSchema() throws ConfigurationException
@@ -55,6 +56,8 @@ public class LongLeveledCompactionStrategyTest
SchemaLoader.createKeyspace(KEYSPACE1,
KeyspaceParams.simple(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
+ .compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
.compaction(CompactionParams.lcs(leveledOptions)));
}
@@ -145,14 +148,32 @@ public class LongLeveledCompactionStrategyTest
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
+ ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
+ 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 = 128;
+ int columns = 10;
+
+ // Adds enough data to trigger multiple sstable per level
+ for (int r = 0; r < rows; r++)
+ {
+ DecoratedKey key = Util.dk(String.valueOf(r));
+ UpdateBuilder builder = UpdateBuilder.create(store.metadata, key);
+ for (int c = 0; c < columns; c++)
+ builder.newRow("column" + c).add("val", value);
+
+ Mutation rm = new Mutation(builder.build());
+ rm.apply();
+ store.forceBlockingFlush();
+ }
+ LeveledCompactionStrategyTest.waitForLeveling(store);
store.disableAutoCompaction();
CompactionStrategyManager mgr = store.getCompactionStrategyManager();
LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) mgr.getStrategies().get(1).get(0);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
// Adds 10 partitions
for (int r = 0; r < 10; r++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590d20b0/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 6ed57ba..7da926c 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -196,7 +196,7 @@ public class LeveledCompactionStrategyTest
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
CompactionStrategyManager strategyManager = cfs.getCompactionStrategyManager();
while (true)
[3/3] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3f46df54
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3f46df54
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3f46df54
Branch: refs/heads/trunk
Commit: 3f46df541a238630f44e23f21c16cd1bf2d725c7
Parents: bd39d73 590d20b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri May 13 09:13:18 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri May 13 09:13:18 2016 +0200
----------------------------------------------------------------------
.../LongLeveledCompactionStrategyTest.java | 27 +++++++++++++++++---
.../LeveledCompactionStrategyTest.java | 2 +-
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/3] cassandra git commit: Run LongLeveledCompactionStrategyTests in
separate tables
Posted by ma...@apache.org.
Run LongLeveledCompactionStrategyTests in separate tables
Patch by marcuse; reviewed by yukim for CASSANDRA-11657
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/590d20b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/590d20b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/590d20b0
Branch: refs/heads/trunk
Commit: 590d20b0a1e1b1fb71e97508bb6b475f8aac205a
Parents: c9ac050
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed May 11 15:53:43 2016 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri May 13 09:11:19 2016 +0200
----------------------------------------------------------------------
.../LongLeveledCompactionStrategyTest.java | 27 +++++++++++++++++---
.../LeveledCompactionStrategyTest.java | 2 +-
2 files changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590d20b0/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --git a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
index 24a9cea..f8f5a7c 100644
--- a/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
+++ b/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
@@ -45,6 +45,7 @@ public class LongLeveledCompactionStrategyTest
{
public static final String KEYSPACE1 = "LongLeveledCompactionStrategyTest";
public static final String CF_STANDARDLVL = "StandardLeveled";
+ public static final String CF_STANDARDLVL2 = "StandardLeveled2";
@BeforeClass
public static void defineSchema() throws ConfigurationException
@@ -55,6 +56,8 @@ public class LongLeveledCompactionStrategyTest
SchemaLoader.createKeyspace(KEYSPACE1,
KeyspaceParams.simple(1),
SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL)
+ .compaction(CompactionParams.lcs(leveledOptions)),
+ SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDLVL2)
.compaction(CompactionParams.lcs(leveledOptions)));
}
@@ -145,14 +148,32 @@ public class LongLeveledCompactionStrategyTest
@Test
public void testLeveledScanner() throws Exception
{
- testParallelLeveledCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE1);
- ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL);
+ ColumnFamilyStore store = keyspace.getColumnFamilyStore(CF_STANDARDLVL2);
+ 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 = 128;
+ int columns = 10;
+
+ // Adds enough data to trigger multiple sstable per level
+ for (int r = 0; r < rows; r++)
+ {
+ DecoratedKey key = Util.dk(String.valueOf(r));
+ UpdateBuilder builder = UpdateBuilder.create(store.metadata, key);
+ for (int c = 0; c < columns; c++)
+ builder.newRow("column" + c).add("val", value);
+
+ Mutation rm = new Mutation(builder.build());
+ rm.apply();
+ store.forceBlockingFlush();
+ }
+ LeveledCompactionStrategyTest.waitForLeveling(store);
store.disableAutoCompaction();
CompactionStrategyManager mgr = store.getCompactionStrategyManager();
LeveledCompactionStrategy lcs = (LeveledCompactionStrategy) mgr.getStrategies().get(1).get(0);
- ByteBuffer value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
+ value = ByteBuffer.wrap(new byte[10 * 1024]); // 10 KB value
// Adds 10 partitions
for (int r = 0; r < 10; r++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/590d20b0/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 6ed57ba..7da926c 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -196,7 +196,7 @@ public class LeveledCompactionStrategyTest
/**
* wait for leveled compaction to quiesce on the given columnfamily
*/
- private void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
+ public static void waitForLeveling(ColumnFamilyStore cfs) throws InterruptedException
{
CompactionStrategyManager strategyManager = cfs.getCompactionStrategyManager();
while (true)