You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/05/31 16:42:05 UTC
[01/10] cassandra git commit: Make testJsonThreadSafety less likely
to time out
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 66c8f2b7f -> a5dac1298
refs/heads/cassandra-3.0 57ead56f3 -> 91a48d2a5
refs/heads/cassandra-3.7 a2b73a5aa -> 12af0428e
refs/heads/trunk 5511802ac -> ff7dc7764
Make testJsonThreadSafety less likely to time out
Patch by Tyler Hobbs; reviewed by Alex Petrov for CASSANDRA-11711
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5dac129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5dac129
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5dac129
Branch: refs/heads/cassandra-2.2
Commit: a5dac1298b7cc899e9d1a327f15b31a94e1ce283
Parents: 66c8f2b
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:40:29 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:40:29 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5dac129/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 824d436..4f49c3b 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@ -984,7 +984,7 @@ public class JsonTest extends CQLTester
public void testJsonThreadSafety() throws Throwable
{
int numThreads = 10;
- final int numRows = 10000;
+ final int numRows = 5000;
createTable("CREATE TABLE %s (" +
"k text PRIMARY KEY, " +
@@ -1025,9 +1025,9 @@ public class JsonTest extends CQLTester
futures.add(executor.submit(worker));
for (Future future : futures)
- future.get(10, TimeUnit.SECONDS);
+ future.get(30, TimeUnit.SECONDS);
executor.shutdown();
- Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
+ Assert.assertTrue(executor.awaitTermination(30, TimeUnit.SECONDS));
}
}
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91a48d2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91a48d2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91a48d2a
Branch: refs/heads/cassandra-3.7
Commit: 91a48d2a5eff647fd1af7e8a2f7ae14ec4cf7d52
Parents: 57ead56 a5dac12
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:41:09 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:41:09 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91a48d2a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
[03/10] cassandra git commit: Make testJsonThreadSafety less likely
to time out
Posted by ty...@apache.org.
Make testJsonThreadSafety less likely to time out
Patch by Tyler Hobbs; reviewed by Alex Petrov for CASSANDRA-11711
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5dac129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5dac129
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5dac129
Branch: refs/heads/cassandra-3.7
Commit: a5dac1298b7cc899e9d1a327f15b31a94e1ce283
Parents: 66c8f2b
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:40:29 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:40:29 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5dac129/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 824d436..4f49c3b 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@ -984,7 +984,7 @@ public class JsonTest extends CQLTester
public void testJsonThreadSafety() throws Throwable
{
int numThreads = 10;
- final int numRows = 10000;
+ final int numRows = 5000;
createTable("CREATE TABLE %s (" +
"k text PRIMARY KEY, " +
@@ -1025,9 +1025,9 @@ public class JsonTest extends CQLTester
futures.add(executor.submit(worker));
for (Future future : futures)
- future.get(10, TimeUnit.SECONDS);
+ future.get(30, TimeUnit.SECONDS);
executor.shutdown();
- Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
+ Assert.assertTrue(executor.awaitTermination(30, TimeUnit.SECONDS));
}
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91a48d2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91a48d2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91a48d2a
Branch: refs/heads/trunk
Commit: 91a48d2a5eff647fd1af7e8a2f7ae14ec4cf7d52
Parents: 57ead56 a5dac12
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:41:09 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:41:09 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91a48d2a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ff7dc776
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ff7dc776
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ff7dc776
Branch: refs/heads/trunk
Commit: ff7dc776455308578be71ac815ddbe7d9e4be0be
Parents: 5511802 12af042
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:41:41 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:41:41 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[02/10] cassandra git commit: Make testJsonThreadSafety less likely
to time out
Posted by ty...@apache.org.
Make testJsonThreadSafety less likely to time out
Patch by Tyler Hobbs; reviewed by Alex Petrov for CASSANDRA-11711
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5dac129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5dac129
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5dac129
Branch: refs/heads/cassandra-3.0
Commit: a5dac1298b7cc899e9d1a327f15b31a94e1ce283
Parents: 66c8f2b
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:40:29 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:40:29 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5dac129/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 824d436..4f49c3b 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@ -984,7 +984,7 @@ public class JsonTest extends CQLTester
public void testJsonThreadSafety() throws Throwable
{
int numThreads = 10;
- final int numRows = 10000;
+ final int numRows = 5000;
createTable("CREATE TABLE %s (" +
"k text PRIMARY KEY, " +
@@ -1025,9 +1025,9 @@ public class JsonTest extends CQLTester
futures.add(executor.submit(worker));
for (Future future : futures)
- future.get(10, TimeUnit.SECONDS);
+ future.get(30, TimeUnit.SECONDS);
executor.shutdown();
- Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
+ Assert.assertTrue(executor.awaitTermination(30, TimeUnit.SECONDS));
}
}
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12af0428
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12af0428
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12af0428
Branch: refs/heads/trunk
Commit: 12af0428eacf9bc99e561543c49338107de82062
Parents: a2b73a5 91a48d2
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:41:27 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:41:27 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12af0428
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12af0428
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12af0428
Branch: refs/heads/cassandra-3.7
Commit: 12af0428eacf9bc99e561543c49338107de82062
Parents: a2b73a5 91a48d2
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:41:27 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:41:27 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91a48d2a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91a48d2a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91a48d2a
Branch: refs/heads/cassandra-3.0
Commit: 91a48d2a5eff647fd1af7e8a2f7ae14ec4cf7d52
Parents: 57ead56 a5dac12
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:41:09 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:41:09 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/91a48d2a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
[04/10] cassandra git commit: Make testJsonThreadSafety less likely
to time out
Posted by ty...@apache.org.
Make testJsonThreadSafety less likely to time out
Patch by Tyler Hobbs; reviewed by Alex Petrov for CASSANDRA-11711
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5dac129
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5dac129
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5dac129
Branch: refs/heads/trunk
Commit: a5dac1298b7cc899e9d1a327f15b31a94e1ce283
Parents: 66c8f2b
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Tue May 31 11:40:29 2016 -0500
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Tue May 31 11:40:29 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/cql3/validation/entities/JsonTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5dac129/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
index 824d436..4f49c3b 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java
@@ -984,7 +984,7 @@ public class JsonTest extends CQLTester
public void testJsonThreadSafety() throws Throwable
{
int numThreads = 10;
- final int numRows = 10000;
+ final int numRows = 5000;
createTable("CREATE TABLE %s (" +
"k text PRIMARY KEY, " +
@@ -1025,9 +1025,9 @@ public class JsonTest extends CQLTester
futures.add(executor.submit(worker));
for (Future future : futures)
- future.get(10, TimeUnit.SECONDS);
+ future.get(30, TimeUnit.SECONDS);
executor.shutdown();
- Assert.assertTrue(executor.awaitTermination(10, TimeUnit.SECONDS));
+ Assert.assertTrue(executor.awaitTermination(30, TimeUnit.SECONDS));
}
}