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:38 UTC
[1/6] cassandra git commit: Remove unnecessary assertion from
AntiCompactionTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 5fba118e9 -> 51796ea63
refs/heads/cassandra-3.11 b3490c062 -> f624b14ae
refs/heads/trunk cc51b4db0 -> fbf7e1274
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/cassandra-3.0
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)
[2/6] cassandra git commit: Remove unnecessary assertion from
AntiCompactionTest
Posted by yu...@apache.org.
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/cassandra-3.11
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)
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f624b14a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f624b14a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f624b14a
Branch: refs/heads/cassandra-3.11
Commit: f624b14ae586b3dfd4c4d24e04990ea083bc2c17
Parents: b3490c0 51796ea
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 10:08:56 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:08:56 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/f624b14a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3dc192f,afda236..ca490ba
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,17 +1,17 @@@
-3.0.12
+3.11.0
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+Merged from 3.0:
+ * 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)
- * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
- * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
-Merged from 2.1:
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
-
-3.0.11
* Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
* Add vm.max_map_count StartupCheck (CASSANDRA-13008)
- * Hint related logging should include the IP address of the destination in addition to
+ * Hint related logging should include the IP address of the destination in addition to
host ID (CASSANDRA-13205)
* Reloading logback.xml does not work (CASSANDRA-13173)
* Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f624b14a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f624b14a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f624b14a
Branch: refs/heads/trunk
Commit: f624b14ae586b3dfd4c4d24e04990ea083bc2c17
Parents: b3490c0 51796ea
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 10:08:56 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:08:56 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/f624b14a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3dc192f,afda236..ca490ba
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,17 +1,17 @@@
-3.0.12
+3.11.0
+ * Obfuscate password in stress-graphs (CASSANDRA-12233)
+ * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
+ * nodetool stopdaemon errors out (CASSANDRA-13030)
+ * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954)
+ * Fix primary index calculation for SASI (CASSANDRA-12910)
+ * More fixes to the TokenAllocator (CASSANDRA-12990)
+ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983)
+Merged from 3.0:
+ * 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)
- * Fix ColumnCounter::countAll behaviour for reverse queries (CASSANDRA-13222)
- * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
-Merged from 2.1:
- * Log stacktrace of uncaught exceptions (CASSANDRA-13108)
-
-3.0.11
* Use keyspace replication settings on system.size_estimates table (CASSANDRA-9639)
* Add vm.max_map_count StartupCheck (CASSANDRA-13008)
- * Hint related logging should include the IP address of the destination in addition to
+ * Hint related logging should include the IP address of the destination in addition to
host ID (CASSANDRA-13205)
* Reloading logback.xml does not work (CASSANDRA-13173)
* Lightweight transactions temporarily fail after upgrade from 2.1 to 3.0 (CASSANDRA-13109)
[3/6] cassandra git commit: Remove unnecessary assertion from
AntiCompactionTest
Posted by yu...@apache.org.
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)
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbf7e127
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbf7e127
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbf7e127
Branch: refs/heads/trunk
Commit: fbf7e127424a006b6f7f9c1a669db72727efef87
Parents: cc51b4d f624b14
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Feb 23 10:09:05 2017 +0900
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Feb 23 10:09:05 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/fbf7e127/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbf7e127/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
----------------------------------------------------------------------