You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jj...@apache.org on 2017/03/02 17:45:21 UTC
[1/6] cassandra git commit: Test fixes for CASSANDRA-13038
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 <je...@jeffjirsa.net>
Authored: Thu Mar 2 09:42:38 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
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));
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by jj...@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/6f9610d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f9610d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f9610d4
Branch: refs/heads/cassandra-3.11
Commit: 6f9610d4796a1592bf68e1755134a873a5b847d2
Parents: 943fb02 adbe2cc
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 09:43:26 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Thu Mar 2 09:43:49 2017 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/StreamingHistogram.java | 3 +--
.../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, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/src/java/org/apache/cassandra/utils/StreamingHistogram.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/StreamingHistogram.java
index 6fde931,f1752a9..9114c7d
--- a/src/java/org/apache/cassandra/utils/StreamingHistogram.java
+++ b/src/java/org/apache/cassandra/utils/StreamingHistogram.java
@@@ -296,10 -271,9 +296,9 @@@ public class StreamingHistogra
return false;
StreamingHistogram that = (StreamingHistogram) o;
- return maxBinSize == that.maxBinSize
- && spool.equals(that.spool)
- && bin.equals(that.bin);
+ return maxBinSize == that.maxBinSize &&
- maxSpoolSize == that.maxSpoolSize &&
+ spool.equals(that.spool) &&
+ bin.equals(that.bin);
}
@Override
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
----------------------------------------------------------------------
[3/6] cassandra git commit: Test fixes for CASSANDRA-13038
Posted by jj...@apache.org.
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/trunk
Commit: adbe2cc4df0134955a2c83ae4ebd0086ea5e9164
Parents: 496cfa8
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 09:42:38 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
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));
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by jj...@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/6f9610d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f9610d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f9610d4
Branch: refs/heads/trunk
Commit: 6f9610d4796a1592bf68e1755134a873a5b847d2
Parents: 943fb02 adbe2cc
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 09:43:26 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Thu Mar 2 09:43:49 2017 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/StreamingHistogram.java | 3 +--
.../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, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/src/java/org/apache/cassandra/utils/StreamingHistogram.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/StreamingHistogram.java
index 6fde931,f1752a9..9114c7d
--- a/src/java/org/apache/cassandra/utils/StreamingHistogram.java
+++ b/src/java/org/apache/cassandra/utils/StreamingHistogram.java
@@@ -296,10 -271,9 +296,9 @@@ public class StreamingHistogra
return false;
StreamingHistogram that = (StreamingHistogram) o;
- return maxBinSize == that.maxBinSize
- && spool.equals(that.spool)
- && bin.equals(that.bin);
+ return maxBinSize == that.maxBinSize &&
- maxSpoolSize == that.maxSpoolSize &&
+ spool.equals(that.spool) &&
+ bin.equals(that.bin);
}
@Override
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f9610d4/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Test fixes for CASSANDRA-13038
Posted by jj...@apache.org.
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.11
Commit: adbe2cc4df0134955a2c83ae4ebd0086ea5e9164
Parents: 496cfa8
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 09:42:38 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
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));
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by jj...@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/a7c9fa0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7c9fa0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7c9fa0f
Branch: refs/heads/trunk
Commit: a7c9fa0f17518482c3ca691e542ed2c0f41af84a
Parents: 14c3edc 6f9610d
Author: Jeff Jirsa <je...@jeffjirsa.net>
Authored: Thu Mar 2 09:43:57 2017 -0800
Committer: Jeff Jirsa <je...@jeffjirsa.net>
Committed: Thu Mar 2 09:44:23 2017 -0800
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/StreamingHistogram.java | 3 +--
.../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, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
index 615b206,e340ee3..0a970e1
--- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java
@@@ -60,21 -59,21 +60,21 @@@ public class TTLExpiryTes
// 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)
- .addPartitionKey("pKey", AsciiType.instance)
- .addRegularColumn("col1", AsciiType.instance)
- .addRegularColumn("col", AsciiType.instance)
- .addRegularColumn("col311", AsciiType.instance)
- .addRegularColumn("col2", AsciiType.instance)
- .addRegularColumn("col3", AsciiType.instance)
- .addRegularColumn("col7", AsciiType.instance)
- .addRegularColumn("col8", MapType.getInstance(AsciiType.instance, AsciiType.instance, true))
- .addRegularColumn("shadow", AsciiType.instance)
- .build().gcGraceSeconds(0));
+ TableMetadata.builder(KEYSPACE1, CF_STANDARD1)
+ .addPartitionKeyColumn("pKey", AsciiType.instance)
+ .addRegularColumn("col1", AsciiType.instance)
+ .addRegularColumn("col", AsciiType.instance)
+ .addRegularColumn("col311", AsciiType.instance)
+ .addRegularColumn("col2", AsciiType.instance)
+ .addRegularColumn("col3", AsciiType.instance)
+ .addRegularColumn("col7", AsciiType.instance)
+ .addRegularColumn("col8", MapType.getInstance(AsciiType.instance, AsciiType.instance, true))
+ .addRegularColumn("shadow", AsciiType.instance)
+ .gcGraceSeconds(0));
}
@Test
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7c9fa0f/test/unit/org/apache/cassandra/db/compaction/TimeWindowCompactionStrategyTest.java
----------------------------------------------------------------------