You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2017/09/13 08:50:48 UTC
[1/6] cassandra git commit: Ignore large IndexSummaryTest tests on
Circle CI
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 a08a816a6 -> 9882cd825
refs/heads/cassandra-3.11 cb2a1c8f4 -> 60a2d97a6
refs/heads/trunk 3cec208c4 -> 2b57fb67d
Ignore large IndexSummaryTest tests on Circle CI
patch by Stefania Alborghetti; reviewed by marcuse for CASSANDRA-12014 (follow up)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9882cd82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9882cd82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9882cd82
Branch: refs/heads/cassandra-3.0
Commit: 9882cd825ff95c88264c78dfcdc481aad6fc3522
Parents: a08a816
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Sep 13 10:23:48 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Sep 13 16:44:26 2017 +0800
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9882cd82/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index ad08ba0..6f37d8f 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@ -26,6 +26,7 @@ import java.util.*;
import com.google.common.collect.Lists;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.Assume;
import org.apache.cassandra.Util;
import org.apache.cassandra.db.*;
@@ -58,6 +59,9 @@ public class IndexSummaryTest
@Test
public void testIndexSummaryKeySizes() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
testIndexSummaryProperties(32, 100);
testIndexSummaryProperties(64, 100);
testIndexSummaryProperties(100, 100);
@@ -100,8 +104,11 @@ public class IndexSummaryTest
* create an index summary, albeit one that does not cover the entire sstable.
*/
@Test
- public void tesLargeIndexSummary() throws IOException
+ public void testLargeIndexSummary() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
final int numKeys = 1000000;
final int keySize = 3000;
final int minIndexInterval = 1;
@@ -131,8 +138,11 @@ public class IndexSummaryTest
* the index summary should be downsampled automatically.
*/
@Test
- public void tesLargeIndexSummaryWithExpectedSizeMatching() throws IOException
+ public void testLargeIndexSummaryWithExpectedSizeMatching() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
final int numKeys = 1000000;
final int keySize = 3000;
final int minIndexInterval = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Ignore large IndexSummaryTest tests on
Circle CI
Posted by st...@apache.org.
Ignore large IndexSummaryTest tests on Circle CI
patch by Stefania Alborghetti; reviewed by marcuse for CASSANDRA-12014 (follow up)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9882cd82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9882cd82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9882cd82
Branch: refs/heads/trunk
Commit: 9882cd825ff95c88264c78dfcdc481aad6fc3522
Parents: a08a816
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Sep 13 10:23:48 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Sep 13 16:44:26 2017 +0800
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9882cd82/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index ad08ba0..6f37d8f 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@ -26,6 +26,7 @@ import java.util.*;
import com.google.common.collect.Lists;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.Assume;
import org.apache.cassandra.Util;
import org.apache.cassandra.db.*;
@@ -58,6 +59,9 @@ public class IndexSummaryTest
@Test
public void testIndexSummaryKeySizes() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
testIndexSummaryProperties(32, 100);
testIndexSummaryProperties(64, 100);
testIndexSummaryProperties(100, 100);
@@ -100,8 +104,11 @@ public class IndexSummaryTest
* create an index summary, albeit one that does not cover the entire sstable.
*/
@Test
- public void tesLargeIndexSummary() throws IOException
+ public void testLargeIndexSummary() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
final int numKeys = 1000000;
final int keySize = 3000;
final int minIndexInterval = 1;
@@ -131,8 +138,11 @@ public class IndexSummaryTest
* the index summary should be downsampled automatically.
*/
@Test
- public void tesLargeIndexSummaryWithExpectedSizeMatching() throws IOException
+ public void testLargeIndexSummaryWithExpectedSizeMatching() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
final int numKeys = 1000000;
final int keySize = 3000;
final int minIndexInterval = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@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/60a2d97a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60a2d97a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60a2d97a
Branch: refs/heads/trunk
Commit: 60a2d97a63c151c3f76791775d6ab09d97c74b54
Parents: cb2a1c8 9882cd8
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Sep 13 16:46:49 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Sep 13 16:46:49 2017 +0800
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60a2d97a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index ab0486d,6f37d8f..d83b96c
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@@ -26,9 -26,9 +26,10 @@@ import java.util.*
import com.google.common.collect.Lists;
import org.junit.BeforeClass;
import org.junit.Test;
+ import org.junit.Assume;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.RandomPartitioner;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Ignore large IndexSummaryTest tests on
Circle CI
Posted by st...@apache.org.
Ignore large IndexSummaryTest tests on Circle CI
patch by Stefania Alborghetti; reviewed by marcuse for CASSANDRA-12014 (follow up)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9882cd82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9882cd82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9882cd82
Branch: refs/heads/cassandra-3.11
Commit: 9882cd825ff95c88264c78dfcdc481aad6fc3522
Parents: a08a816
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Sep 13 10:23:48 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Sep 13 16:44:26 2017 +0800
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9882cd82/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index ad08ba0..6f37d8f 100644
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@ -26,6 +26,7 @@ import java.util.*;
import com.google.common.collect.Lists;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.Assume;
import org.apache.cassandra.Util;
import org.apache.cassandra.db.*;
@@ -58,6 +59,9 @@ public class IndexSummaryTest
@Test
public void testIndexSummaryKeySizes() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
testIndexSummaryProperties(32, 100);
testIndexSummaryProperties(64, 100);
testIndexSummaryProperties(100, 100);
@@ -100,8 +104,11 @@ public class IndexSummaryTest
* create an index summary, albeit one that does not cover the entire sstable.
*/
@Test
- public void tesLargeIndexSummary() throws IOException
+ public void testLargeIndexSummary() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
final int numKeys = 1000000;
final int keySize = 3000;
final int minIndexInterval = 1;
@@ -131,8 +138,11 @@ public class IndexSummaryTest
* the index summary should be downsampled automatically.
*/
@Test
- public void tesLargeIndexSummaryWithExpectedSizeMatching() throws IOException
+ public void testLargeIndexSummaryWithExpectedSizeMatching() throws IOException
{
+ // On Circle CI we normally don't have enough off-heap memory for this test so ignore it
+ Assume.assumeTrue(System.getenv("CIRCLECI") == null);
+
final int numKeys = 1000000;
final int keySize = 3000;
final int minIndexInterval = 1;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by st...@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/60a2d97a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/60a2d97a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/60a2d97a
Branch: refs/heads/cassandra-3.11
Commit: 60a2d97a63c151c3f76791775d6ab09d97c74b54
Parents: cb2a1c8 9882cd8
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Sep 13 16:46:49 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Sep 13 16:46:49 2017 +0800
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/60a2d97a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
index ab0486d,6f37d8f..d83b96c
--- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
@@@ -26,9 -26,9 +26,10 @@@ import java.util.*
import com.google.common.collect.Lists;
import org.junit.BeforeClass;
import org.junit.Test;
+ import org.junit.Assume;
import org.apache.cassandra.Util;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.RandomPartitioner;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by st...@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/2b57fb67
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b57fb67
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b57fb67
Branch: refs/heads/trunk
Commit: 2b57fb67dbf74b9fa87ce2ce5ac407f065ac1c3f
Parents: 3cec208 60a2d97
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Wed Sep 13 16:48:42 2017 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Wed Sep 13 16:48:42 2017 +0800
----------------------------------------------------------------------
.../apache/cassandra/io/sstable/IndexSummaryTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b57fb67/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org