You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/08/27 17:20:57 UTC
[1/6] cassandra git commit: Fix
LeveledCompactionStrategyTest#testMutateLevel
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 27bc7a520 -> 408746c90
refs/heads/cassandra-3.0 e3baf28b6 -> 9cc489065
refs/heads/trunk 47886dff3 -> 7ba5845f7
Fix LeveledCompactionStrategyTest#testMutateLevel
patch by yukim; reviewed by ariel for CASSANDRA-9575
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/408746c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/408746c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/408746c9
Branch: refs/heads/cassandra-2.2
Commit: 408746c9032628ecee6522150cd4f5cc642442c6
Parents: 27bc7a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 27 10:14:47 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 27 10:14:47 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/LeveledCompactionStrategyTest.java | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/408746c9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ea11489..6cffd18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.1
+ * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
* Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
* (cqlsh) add CLEAR command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/408746c9/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 63fd0e7..6b3383e 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -255,6 +255,7 @@ public class LeveledCompactionStrategyTest
@Test
public void testMutateLevel() throws Exception
{
+ cfs.disableAutoCompaction();
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
@@ -273,17 +274,13 @@ public class LeveledCompactionStrategyTest
rm.applyUnsafe();
cfs.forceBlockingFlush();
}
- waitForLeveling(cfs);
cfs.forceBlockingFlush();
LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) ((WrappingCompactionStrategy) cfs.getCompactionStrategy()).getWrappedStrategies().get(1);
- cfs.disableAutoCompaction();
-
- while(CompactionManager.instance.isCompacting(Arrays.asList(cfs)))
- Thread.sleep(100);
+ cfs.forceMajorCompaction();
for (SSTableReader s : cfs.getSSTables())
{
- assertTrue(s.getSSTableLevel() != 6);
+ assertTrue(s.getSSTableLevel() != 6 && s.getSSTableLevel() > 0);
strategy.manifest.remove(s);
s.descriptor.getMetadataSerializer().mutateLevel(s.descriptor, 6);
s.reloadSSTableMetadata();
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@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/9cc48906
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cc48906
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cc48906
Branch: refs/heads/trunk
Commit: 9cc489065212ee89dda7d95af16d3f27a8a1486d
Parents: e3baf28 408746c
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 27 10:19:39 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 27 10:19:39 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/LeveledCompactionStrategyTest.java | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2ab4263,6cffd18..ca2ded8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,8 +1,47 @@@
-2.2.1
+3.0.0-beta2
+ * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
+ * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
+ * Fix double flushing of secondary index tables (CASSANDRA-10180)
+ * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
+ * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
+ * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
+ * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
+ * Fix sstablerepairedset (CASSANDRA-10132)
+Merged from 2.2:
+ * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
* Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
+ * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
+ * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
* (cqlsh) add CLEAR command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
+Merged from 2.1:
+ * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
+ * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
+
+
+3.0.0-beta1
+ * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
+ * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
+ * Rewrite hinted handoff (CASSANDRA-6230)
+ * Fix query on static compact tables (CASSANDRA-10093)
+ * Fix race during construction of commit log (CASSANDRA-10049)
+ * Add option to only purge repaired tombstones (CASSANDRA-6434)
+ * Change authorization handling for MVs (CASSANDRA-9927)
+ * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
+ * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
+ * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
+ * Fix multiple slices on RowSearchers (CASSANDRA-10002)
+ * Fix bug in merging of collections (CASSANDRA-10001)
+ * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
+ * Repair improvements when using vnodes (CASSANDRA-5220)
+ * Disable scripted UDFs by default (CASSANDRA-9889)
+ * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
+ * Use byte to serialize MT hash length (CASSANDRA-9792)
+ * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
+ * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
+ * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500)
+ * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111)
+Merged from 2.2:
* Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
* An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
* Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8050b6c,6b3383e..f2ddb00
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -252,23 -265,22 +253,19 @@@ public class LeveledCompactionStrategyT
// Adds enough data to trigger multiple sstable per level
for (int r = 0; r < rows; r++)
{
- DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(KEYSPACE1, key.getKey());
+ UpdateBuilder update = UpdateBuilder.create(cfs.metadata, String.valueOf(r));
for (int c = 0; c < columns; c++)
- {
- rm.add(CF_STANDARDDLEVELED, Util.cellname("column" + c), value, 0);
- }
- rm.applyUnsafe();
+ update.newRow("column" + c).add("val", value);
+ update.applyUnsafe();
cfs.forceBlockingFlush();
}
- waitForLeveling(cfs);
cfs.forceBlockingFlush();
- LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) ((WrappingCompactionStrategy) cfs.getCompactionStrategy()).getWrappedStrategies().get(1);
+ LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) ( cfs.getCompactionStrategyManager()).getStrategies().get(1);
- cfs.disableAutoCompaction();
-
- while(CompactionManager.instance.isCompacting(Arrays.asList(cfs)))
- Thread.sleep(100);
+ cfs.forceMajorCompaction();
- for (SSTableReader s : cfs.getSSTables())
+ for (SSTableReader s : cfs.getLiveSSTables())
{
- assertTrue(s.getSSTableLevel() != 6);
+ assertTrue(s.getSSTableLevel() != 6 && s.getSSTableLevel() > 0);
strategy.manifest.remove(s);
s.descriptor.getMetadataSerializer().mutateLevel(s.descriptor, 6);
s.reloadSSTableMetadata();
[3/6] cassandra git commit: Fix
LeveledCompactionStrategyTest#testMutateLevel
Posted by yu...@apache.org.
Fix LeveledCompactionStrategyTest#testMutateLevel
patch by yukim; reviewed by ariel for CASSANDRA-9575
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/408746c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/408746c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/408746c9
Branch: refs/heads/trunk
Commit: 408746c9032628ecee6522150cd4f5cc642442c6
Parents: 27bc7a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 27 10:14:47 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 27 10:14:47 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/LeveledCompactionStrategyTest.java | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/408746c9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ea11489..6cffd18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.1
+ * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
* Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
* (cqlsh) add CLEAR command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/408746c9/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 63fd0e7..6b3383e 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -255,6 +255,7 @@ public class LeveledCompactionStrategyTest
@Test
public void testMutateLevel() throws Exception
{
+ cfs.disableAutoCompaction();
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
@@ -273,17 +274,13 @@ public class LeveledCompactionStrategyTest
rm.applyUnsafe();
cfs.forceBlockingFlush();
}
- waitForLeveling(cfs);
cfs.forceBlockingFlush();
LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) ((WrappingCompactionStrategy) cfs.getCompactionStrategy()).getWrappedStrategies().get(1);
- cfs.disableAutoCompaction();
-
- while(CompactionManager.instance.isCompacting(Arrays.asList(cfs)))
- Thread.sleep(100);
+ cfs.forceMajorCompaction();
for (SSTableReader s : cfs.getSSTables())
{
- assertTrue(s.getSSTableLevel() != 6);
+ assertTrue(s.getSSTableLevel() != 6 && s.getSSTableLevel() > 0);
strategy.manifest.remove(s);
s.descriptor.getMetadataSerializer().mutateLevel(s.descriptor, 6);
s.reloadSSTableMetadata();
[2/6] cassandra git commit: Fix
LeveledCompactionStrategyTest#testMutateLevel
Posted by yu...@apache.org.
Fix LeveledCompactionStrategyTest#testMutateLevel
patch by yukim; reviewed by ariel for CASSANDRA-9575
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/408746c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/408746c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/408746c9
Branch: refs/heads/cassandra-3.0
Commit: 408746c9032628ecee6522150cd4f5cc642442c6
Parents: 27bc7a5
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 27 10:14:47 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 27 10:14:47 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/LeveledCompactionStrategyTest.java | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/408746c9/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ea11489..6cffd18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.1
+ * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
* Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
* (cqlsh) add CLEAR command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/408746c9/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 63fd0e7..6b3383e 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -255,6 +255,7 @@ public class LeveledCompactionStrategyTest
@Test
public void testMutateLevel() throws Exception
{
+ cfs.disableAutoCompaction();
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
@@ -273,17 +274,13 @@ public class LeveledCompactionStrategyTest
rm.applyUnsafe();
cfs.forceBlockingFlush();
}
- waitForLeveling(cfs);
cfs.forceBlockingFlush();
LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) ((WrappingCompactionStrategy) cfs.getCompactionStrategy()).getWrappedStrategies().get(1);
- cfs.disableAutoCompaction();
-
- while(CompactionManager.instance.isCompacting(Arrays.asList(cfs)))
- Thread.sleep(100);
+ cfs.forceMajorCompaction();
for (SSTableReader s : cfs.getSSTables())
{
- assertTrue(s.getSSTableLevel() != 6);
+ assertTrue(s.getSSTableLevel() != 6 && s.getSSTableLevel() > 0);
strategy.manifest.remove(s);
s.descriptor.getMetadataSerializer().mutateLevel(s.descriptor, 6);
s.reloadSSTableMetadata();
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by yu...@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/7ba5845f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ba5845f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ba5845f
Branch: refs/heads/trunk
Commit: 7ba5845f7a640f2b4baf56836340e00b8d834ba8
Parents: 47886df 9cc4890
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 27 10:19:47 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 27 10:19:47 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/LeveledCompactionStrategyTest.java | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ba5845f/CHANGES.txt
----------------------------------------------------------------------
[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@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/9cc48906
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cc48906
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cc48906
Branch: refs/heads/cassandra-3.0
Commit: 9cc489065212ee89dda7d95af16d3f27a8a1486d
Parents: e3baf28 408746c
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Aug 27 10:19:39 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Aug 27 10:19:39 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/LeveledCompactionStrategyTest.java | 9 +++------
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2ab4263,6cffd18..ca2ded8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,8 +1,47 @@@
-2.2.1
+3.0.0-beta2
+ * Ensures frozen sets and maps are always sorted (CASSANDRA-10162)
+ * Don't deadlock when flushing CFS backed custom indexes (CASSANDRA-10181)
+ * Fix double flushing of secondary index tables (CASSANDRA-10180)
+ * Fix incorrect handling of range tombstones in thrift (CASSANDRA-10046)
+ * Only use batchlog when paired materialized view replica is remote (CASSANDRA-10061)
+ * Reuse TemporalRow when updating multiple MaterializedViews (CASSANDRA-10060)
+ * Validate gc_grace_seconds for batchlog writes and MVs (CASSANDRA-9917)
+ * Fix sstablerepairedset (CASSANDRA-10132)
+Merged from 2.2:
+ * Fix LeveledCompactionStrategyTest (CASSANDRA-9757)
* Fix broken UnbufferedDataOutputStreamPlus.writeUTF (CASSANDRA-10203)
+ * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898)
+ * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168)
* (cqlsh) add CLEAR command (CASSANDRA-10086)
* Support string literals as Role names for compatibility (CASSANDRA-10135)
+Merged from 2.1:
+ * Change streaming_socket_timeout_in_ms default to 1 hour (CASSANDRA-8611)
+ * (cqlsh) update list of CQL keywords (CASSANDRA-9232)
+
+
+3.0.0-beta1
+ * Redesign secondary index API (CASSANDRA-9459, 7771, 9041)
+ * Fix throwing ReadFailure instead of ReadTimeout on range queries (CASSANDRA-10125)
+ * Rewrite hinted handoff (CASSANDRA-6230)
+ * Fix query on static compact tables (CASSANDRA-10093)
+ * Fix race during construction of commit log (CASSANDRA-10049)
+ * Add option to only purge repaired tombstones (CASSANDRA-6434)
+ * Change authorization handling for MVs (CASSANDRA-9927)
+ * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
+ * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
+ * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
+ * Fix multiple slices on RowSearchers (CASSANDRA-10002)
+ * Fix bug in merging of collections (CASSANDRA-10001)
+ * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
+ * Repair improvements when using vnodes (CASSANDRA-5220)
+ * Disable scripted UDFs by default (CASSANDRA-9889)
+ * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
+ * Use byte to serialize MT hash length (CASSANDRA-9792)
+ * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
+ * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
+ * SequentialWriter should extend BufferedDataOutputStreamPlus (CASSANDRA-9500)
+ * Use the same repairedAt timestamp within incremental repair session (CASSANDRA-9111)
+Merged from 2.2:
* Allow count(*) and count(1) to be use as normal aggregation (CASSANDRA-10114)
* An NPE is thrown if the column name is unknown for an IN relation (CASSANDRA-10043)
* Apply commit_failure_policy to more errors on startup (CASSANDRA-9749)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9cc48906/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 8050b6c,6b3383e..f2ddb00
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@@ -252,23 -265,22 +253,19 @@@ public class LeveledCompactionStrategyT
// Adds enough data to trigger multiple sstable per level
for (int r = 0; r < rows; r++)
{
- DecoratedKey key = Util.dk(String.valueOf(r));
- Mutation rm = new Mutation(KEYSPACE1, key.getKey());
+ UpdateBuilder update = UpdateBuilder.create(cfs.metadata, String.valueOf(r));
for (int c = 0; c < columns; c++)
- {
- rm.add(CF_STANDARDDLEVELED, Util.cellname("column" + c), value, 0);
- }
- rm.applyUnsafe();
+ update.newRow("column" + c).add("val", value);
+ update.applyUnsafe();
cfs.forceBlockingFlush();
}
- waitForLeveling(cfs);
cfs.forceBlockingFlush();
- LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) ((WrappingCompactionStrategy) cfs.getCompactionStrategy()).getWrappedStrategies().get(1);
+ LeveledCompactionStrategy strategy = (LeveledCompactionStrategy) ( cfs.getCompactionStrategyManager()).getStrategies().get(1);
- cfs.disableAutoCompaction();
-
- while(CompactionManager.instance.isCompacting(Arrays.asList(cfs)))
- Thread.sleep(100);
+ cfs.forceMajorCompaction();
- for (SSTableReader s : cfs.getSSTables())
+ for (SSTableReader s : cfs.getLiveSSTables())
{
- assertTrue(s.getSSTableLevel() != 6);
+ assertTrue(s.getSSTableLevel() != 6 && s.getSSTableLevel() > 0);
strategy.manifest.remove(s);
s.descriptor.getMetadataSerializer().mutateLevel(s.descriptor, 6);
s.reloadSSTableMetadata();