You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/31 05:59:44 UTC
[1/2] git commit: use long math for long results
Repository: cassandra
Updated Branches:
refs/heads/trunk 91ea6da10 -> 953a3729f
use long math for long results
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c33ea36
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c33ea36
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c33ea36
Branch: refs/heads/trunk
Commit: 1c33ea3677ce788dacc3e158991cf99452c0325a
Parents: f66689d
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 30 23:58:51 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 30 23:58:51 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/concurrent/SEPWorker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1c33ea36/src/java/org/apache/cassandra/concurrent/SEPWorker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/SEPWorker.java b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
index ef79c74..60a8d61 100644
--- a/src/java/org/apache/cassandra/concurrent/SEPWorker.java
+++ b/src/java/org/apache/cassandra/concurrent/SEPWorker.java
@@ -221,7 +221,7 @@ final class SEPWorker extends AtomicReference<SEPWorker.Work> implements Runnabl
{
// pick a random sleep interval based on the number of threads spinning, so that
// we should always have a thread about to wake up, but most threads are sleeping
- long sleep = 10000 * pool.spinningCount.get();
+ long sleep = 10000L * pool.spinningCount.get();
sleep = Math.min(1000000, sleep);
sleep *= Math.random();
sleep = Math.max(10000, sleep);
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/953a3729
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/953a3729
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/953a3729
Branch: refs/heads/trunk
Commit: 953a3729fe24afd9f9cac731ffc21671f27f3a30
Parents: 91ea6da 1c33ea3
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Fri May 30 23:59:29 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Fri May 30 23:59:29 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/concurrent/SEPWorker.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------