You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/08/15 21:15:52 UTC
[1/2] git commit: fix build
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 de5bb5854 -> eab158462
fix build
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/561f6ef5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/561f6ef5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/561f6ef5
Branch: refs/heads/cassandra-2.1
Commit: 561f6ef5cfb50878dff2ea3ceb182b48f400a23e
Parents: e9d0214
Author: Jake Luciani <ja...@apache.org>
Authored: Fri Aug 15 15:15:09 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Fri Aug 15 15:15:09 2014 -0400
----------------------------------------------------------------------
.../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/561f6ef5/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
index cfabf62..7dbbdc2 100644
--- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
+++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java
@@ -530,6 +530,8 @@ public class BufferedRandomAccessFileTest
{
//see https://issues.apache.org/jira/browse/CASSANDRA-7756
+ final FileCacheService.CacheKey cacheKey = new FileCacheService.CacheKey();
+
final int THREAD_COUNT = 40;
ExecutorService executorService = Executors.newFixedThreadPool(THREAD_COUNT);
@@ -550,8 +552,8 @@ public class BufferedRandomAccessFileTest
RandomAccessReader r2 = RandomAccessReader.open(w2);
- FileCacheService.instance.put(r1);
- FileCacheService.instance.put(r2);
+ FileCacheService.instance.put(cacheKey, r1);
+ FileCacheService.instance.put(cacheKey, r2);
final CountDownLatch finished = new CountDownLatch(THREAD_COUNT);
final AtomicBoolean hadError = new AtomicBoolean(false);
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eab15846
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eab15846
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eab15846
Branch: refs/heads/cassandra-2.1
Commit: eab158462441ba414792acc228051250be34ab24
Parents: de5bb58 561f6ef
Author: Jake Luciani <ja...@apache.org>
Authored: Fri Aug 15 15:15:38 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Fri Aug 15 15:15:38 2014 -0400
----------------------------------------------------------------------
.../apache/cassandra/io/util/BufferedRandomAccessFileTest.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------