You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2014/02/10 18:39:28 UTC
[1/3] git commit: Fix CleanupTest
Updated Branches:
refs/heads/trunk 861d9960d -> 503a8a865
Fix CleanupTest
patch by marcuse, reviewed by jbellis for CASSANDRA-6679
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b83a6f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b83a6f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b83a6f9
Branch: refs/heads/trunk
Commit: 4b83a6f9d9c00fe662ddb9db4533df8b9b96883d
Parents: 887558f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Feb 10 18:32:06 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Feb 10 18:32:06 2014 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/CleanupTest.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b83a6f9/test/unit/org/apache/cassandra/db/CleanupTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java b/test/unit/org/apache/cassandra/db/CleanupTest.java
index 5872407..d5c2b07 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -64,8 +64,7 @@ public class CleanupTest extends SchemaLoader
@Test
public void testCleanup() throws IOException, ExecutionException, InterruptedException, ConfigurationException
{
- StorageService.instance.initServer(0);
-
+ StorageService.instance.getTokenMetadata().clearUnsafe();
Table table = Table.open(TABLE1);
ColumnFamilyStore cfs = table.getColumnFamilyStore(CF2);
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/503a8a86
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/503a8a86
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/503a8a86
Branch: refs/heads/trunk
Commit: 503a8a865ed60b08e6c512c206a295a6a78f2848
Parents: 861d996 9a6ae96
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Feb 10 18:35:41 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Feb 10 18:35:41 2014 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/503a8a86/test/unit/org/apache/cassandra/db/CleanupTest.java
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by ma...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
test/unit/org/apache/cassandra/db/CleanupTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6ae96a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6ae96a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a6ae96a
Branch: refs/heads/trunk
Commit: 9a6ae96af725e307d05332554f221c97e10647d1
Parents: b5321d5 4b83a6f
Author: Marcus Eriksson <ma...@apache.org>
Authored: Mon Feb 10 18:34:43 2014 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Mon Feb 10 18:34:43 2014 +0100
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6ae96a/test/unit/org/apache/cassandra/db/CleanupTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java
index 562df1e,d5c2b07..9914c90
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@@ -64,10 -64,9 +64,10 @@@ public class CleanupTest extends Schema
@Test
public void testCleanup() throws IOException, ExecutionException, InterruptedException, ConfigurationException
{
- StorageService.instance.initServer(0);
+ StorageService.instance.getTokenMetadata().clearUnsafe();
- Table table = Table.open(TABLE1);
- ColumnFamilyStore cfs = table.getColumnFamilyStore(CF2);
+
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF2);
List<Row> rows;