Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 496cfa8f5 -> adbe2cc4d refs/heads/cassandra-3.11 943fb02ff -> 6f9610d47 refs/heads/trunk 14c3edcce -> a7c9fa0f1
Test fixes for CASSANDRA-13038 Patch by Jeff Jirsa; Reviewed by Joel Knighton for CASSANDRA-13038 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/adbe2cc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/adbe2cc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/adbe2cc4 Branch: refs/heads/cassandra-3.0 Commit: adbe2cc4df0134955a2c83ae4ebd0086ea5e9164 Parents: 496cfa8 Author: Jeff Jirsa <[email protected]> Authored: Thu Mar 2 09:42:38 2017 -0800 Committer: Jeff Jirsa <[email protected]> Committed: Thu Mar 2 09:42:38 2017 -0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/utils/StreamingHistogram.java | 4 +++- .../unit/org/apache/cassandra/db/compaction/CompactionsTest.java | 3 ++- .../db/compaction/DateTieredCompactionStrategyTest.java | 4 ++-- .../cassandra/db/compaction/LeveledCompactionStrategyTest.java | 4 ++-- .../db/compaction/SizeTieredCompactionStrategyTest.java | 4 ++-- test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java | 4 ++-- .../db/compaction/TimeWindowCompactionStrategyTest.java | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbe2cc4/src/java/org/apache/cassandra/utils/StreamingHistogram.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/StreamingHistogram.java b/src/java/org/apache/cassandra/utils/StreamingHistogram.java index fffa73e..f1752a9 100644 --- a/src/java/org/apache/cassandra/utils/StreamingHistogram.java +++ b/src/java/org/apache/cassandra/utils/StreamingHistogram.java @@ -271,7 +271,9 @@ public class StreamingHistogram return false; StreamingHistogram that = (StreamingHistogram) o; - return maxBinSize == that.maxBinSize && bin.equals(that.bin); + return maxBinSize == that.maxBinSize + && spool.equals(that.spool) + && bin.equals(that.bin); } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbe2cc4/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 2a30ae1..1530741 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -60,11 +60,12 @@ public class CompactionsTest { Map<String, String> compactionOptions = new HashMap<>(); compactionOptions.put("tombstone_compaction_interval", "1"); - SchemaLoader.prepareServer(); // Disable tombstone histogram rounding for tests System.setProperty("cassandra.streaminghistogram.roundseconds", "1"); + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.denseCFMD(KEYSPACE1, CF_DENSE1) http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbe2cc4/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java index 8920d46..aa886b4 100644 --- a/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java @@ -53,11 +53,11 @@ public class DateTieredCompactionStrategyTest extends SchemaLoader @BeforeClass public static void defineSchema() throws ConfigurationException { - SchemaLoader.prepareServer(); - // Disable tombstone histogram rounding for tests System.setProperty("cassandra.streaminghistogram.roundseconds", "1"); + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbe2cc4/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 fc88987..2cda2e8 100644 --- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java @@ -73,11 +73,11 @@ public class LeveledCompactionStrategyTest @BeforeClass public static void defineSchema() throws ConfigurationException { - SchemaLoader.prepareServer(); - // Disable tombstone histogram rounding for tests System.setProperty("cassandra.streaminghistogram.roundseconds", "1"); + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARDDLEVELED) http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbe2cc4/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java index 06bce12..ff0f444 100644 --- a/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java @@ -53,11 +53,11 @@ public class SizeTieredCompactionStrategyTest @BeforeClass public static void defineSchema() throws ConfigurationException { - SchemaLoader.prepareServer(); - // Disable tombstone histogram rounding for tests System.setProperty("cassandra.streaminghistogram.roundseconds", "1"); + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbe2cc4/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java index e998ef0..eb42865 100644 --- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java @@ -57,11 +57,11 @@ public class TTLExpiryTest @BeforeClass public static void defineSchema() throws ConfigurationException { - SchemaLoader.prepareServer(); - // Disable tombstone histogram rounding for tests System.setProperty("cassandra.streaminghistogram.roundseconds", "1"); + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), CFMetaData.Builder.create(KEYSPACE1, CF_STANDARD1) http://git-wip-us.apache.org/repos/asf/cassandra/blob/adbe2cc4/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java index 0dee7e9..c57e0ca 100644 --- a/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java @@ -61,11 +61,11 @@ public class TimeWindowCompactionStrategyTest extends SchemaLoader @BeforeClass public static void defineSchema() throws ConfigurationException { - SchemaLoader.prepareServer(); - // Disable tombstone histogram rounding for tests System.setProperty("cassandra.streaminghistogram.roundseconds", "1"); + SchemaLoader.prepareServer(); + SchemaLoader.createKeyspace(KEYSPACE1, KeyspaceParams.simple(1), SchemaLoader.standardCFMD(KEYSPACE1, CF_STANDARD1));
