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 2017/02/23 01:09:40 UTC
[3/6] cassandra git commit: Remove unnecessary assertion from
AntiCompactionTest
Remove unnecessary assertion from AntiCompactionTest
patch by Jay Zhuang; reviewed by yukim for CASSANDRA-13070
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51796ea6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51796ea6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51796ea6
Branch: refs/heads/trunk
Commit: 51796ea63420f8daa49c9d491588ba9740c6b0d1
Parents: 5fba118
Author: Jay Zhuang <ja...@yahoo.com>
Authored: Thu Feb 23 10:06:57 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:08:37 2017 +0900
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/compaction/AntiCompactionTest.java | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b744b40..afda236 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.12
+ * Remove unnecessary assertion from AntiCompactionTest (CASSANDRA-13070)
* Fix cqlsh COPY for dates before 1900 (CASSANDRA-13185)
Merged from 2.2
* Fix failing COPY TO STDOUT (CASSANDRA-12497)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51796ea6/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index 4c25f3a..b98421d 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -143,7 +143,6 @@ public class AntiCompactionTest
cfs.disableAutoCompaction();
SSTableReader s = writeFile(cfs, 1000);
cfs.addSSTable(s);
- long origSize = s.bytesOnDisk();
Range<Token> range = new Range<Token>(new BytesToken(ByteBufferUtil.bytes(0)), new BytesToken(ByteBufferUtil.bytes(500)));
Collection<SSTableReader> sstables = cfs.getLiveSSTables();
UUID parentRepairSession = UUID.randomUUID();
@@ -161,7 +160,6 @@ public class AntiCompactionTest
}
assertEquals(sum, cfs.metric.liveDiskSpaceUsed.getCount());
assertEquals(rows, 1000 * (1000 * 5));//See writeFile for how this number is derived
- assertEquals(origSize, cfs.metric.liveDiskSpaceUsed.getCount(), 16000000);
}
private SSTableReader writeFile(ColumnFamilyStore cfs, int count)